diff options
author | itojun <itojun> | 2000-01-17 05:06:15 +0000 |
---|---|---|
committer | itojun <itojun> | 2000-01-17 05:06:15 +0000 |
commit | bb940683b4d39e5342be33b493d3a9504cd5e3d2 (patch) | |
tree | 338ff7d83a32cc32700f8db2de19dfe4b56d8d68 /net | |
parent | b1c3852ef4a8ef0fbbb0046307d86622eac33a14 (diff) | |
download | pkgsrc-bb940683b4d39e5342be33b493d3a9504cd5e3d2.tar.gz |
upgrade to 0.84a. note that config file format is changed since 0.7x.
Diffstat (limited to 'net')
-rw-r--r-- | net/zebra/Makefile | 25 | ||||
-rw-r--r-- | net/zebra/files/md5 | 4 | ||||
-rw-r--r-- | net/zebra/patches/patch-aa | 86 | ||||
-rw-r--r-- | net/zebra/pkg/PLIST | 14 | ||||
-rw-r--r-- | net/zebra/pkg/PLIST.v6 | 17 |
5 files changed, 27 insertions, 119 deletions
diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 94567802468..e19d738014d 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 1999/11/19 02:47:00 hubertf Exp $ +# $NetBSD: Makefile,v 1.18 2000/01/17 05:06:15 itojun Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp # -DISTNAME= zebra-0.79 +DISTNAME= zebra-0.84a CATEGORIES= net MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ # you might need debugging, it's a developer release ! @@ -20,23 +20,30 @@ BUILD_DEFS+= USE_INET6 .include "../../mk/bsd.prefs.mk" .if defined(USE_INET6) && ${USE_INET6} == YES -PLIST_SRC= ${PKGDIR}/PLIST.v6 +PLIST_SRC= ${WRKSRC}/PLIST .else CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd PLIST_SRC= ${PKGDIR}/PLIST .endif -post-build: - cd ${WRKSRC}/doc ; \ - ${TOUCH} zebra.texi ; \ - makeinfo --no-split zebra.texi +.if defined(USE_INET6) && ${USE_INET6} == YES +post-patch: + ${CAT} ${PKGDIR}/PLIST.v6 ${PKGDIR}/PLIST > ${PLIST_SRC} +.endif + +#post-build: +# cd ${WRKSRC}/doc ; \ +# ${TOUCH} zebra.texi ; \ +# makeinfo --no-split zebra.texi post-install: ${INSTALL_MAN} ${WRKSRC}/doc/bgpd.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/ospf6d.1 ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/ospfd.1 ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/ripd.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/ripngd.1 ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/zebra.1 ${PREFIX}/man/man1 +.if defined(USE_INET6) && ${USE_INET6} == YES + ${INSTALL_MAN} ${WRKSRC}/doc/ospf6d.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/ripngd.1 ${PREFIX}/man/man1 +.endif .include "../../mk/bsd.pkg.mk" diff --git a/net/zebra/files/md5 b/net/zebra/files/md5 index 1f2c62fa7bc..061c6318006 100644 --- a/net/zebra/files/md5 +++ b/net/zebra/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.11 1999/09/13 16:34:36 itojun Exp $ +$NetBSD: md5,v 1.12 2000/01/17 05:06:16 itojun Exp $ -MD5 (zebra-0.79.tar.gz) = 06018edc72ca9473fe60f51fe70fdcdf +MD5 (zebra-0.84a.tar.gz) = f438f081e2abe5261dccae5cd04e158b diff --git a/net/zebra/patches/patch-aa b/net/zebra/patches/patch-aa deleted file mode 100644 index 07223cc3d3b..00000000000 --- a/net/zebra/patches/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -$NetBSD: patch-aa,v 1.3 1999/09/13 16:34:37 itojun Exp $ - -Index: ospf6d/ospf6_network.c -=================================================================== -RCS file: /cvsroot/zebra/ospf6d/ospf6_network.c,v -retrieving revision 1.40 -diff -c -r1.40 ospf6_network.c -*** ospf6d/ospf6_network.c 1999/09/10 22:36:00 1.40 ---- ospf6d/ospf6_network.c 1999/09/13 16:20:01 -*************** -*** 347,366 **** - zlog_warn ("*** can't leave AllDRouters6 on ifindex %d", ifindex); - } - -- #ifndef s6_addr32 -- #define s6_addr32 u6_addr.u6_addr32 -- #define s6_addr16 u6_addr.u6_addr16 -- #define s6_addr8 u6_addr.u6_addr8 -- #define s6_addr u6_addr.u6_addr8 -- #endif -- - void - ospf6_ipv4_encode_ipv6 (struct in_addr *in4, struct in6_addr *in6) - { - /* IPv4 address to IPv4 Mapped Address */ - memset (in6, 0, sizeof (struct in6_addr)); -! in6->s6_addr16[5] = 0xffff; -! in6->s6_addr32[3] = in4->s_addr; - } - - void ---- 347,360 ---- - zlog_warn ("*** can't leave AllDRouters6 on ifindex %d", ifindex); - } - - void - ospf6_ipv4_encode_ipv6 (struct in_addr *in4, struct in6_addr *in6) - { - /* IPv4 address to IPv4 Mapped Address */ - memset (in6, 0, sizeof (struct in6_addr)); -! in6->s6_addr[10] = 0xff; -! in6->s6_addr[11] = 0xff; -! memcpy(&in6->s6_addr[12], in4, sizeof(*in4)); - } - - void -*************** -*** 371,377 **** - - /* IPv4 Mapped Address to IPv4 address*/ -! memset (in4, 0, sizeof (struct in_addr)); -! in4->s_addr = in6->s6_addr32[3]; - } - - int ---- 365,371 ---- - - /* IPv4 Mapped Address to IPv4 address*/ -! memset (in6, 0, sizeof (struct in6_addr)); -! memcpy(&in6->s6_addr[12], in4, sizeof(*in4)); - } - - int -Index: ospf6d/ospf6d.h -=================================================================== -RCS file: /cvsroot/zebra/ospf6d/ospf6d.h,v -retrieving revision 1.36 -diff -c -r1.36 ospf6d.h -*** ospf6d/ospf6d.h 1999/09/08 08:58:59 1.36 ---- ospf6d/ospf6d.h 1999/09/13 16:20:01 -*************** -*** 116,128 **** - #endif - - -- #ifndef s6_addr32 -- #define s6_addr32 u6_addr.u6_addr32 -- #define s6_addr16 u6_addr.u6_addr16 -- #define s6_addr8 u6_addr.u6_addr8 -- #define s6_addr u6_addr.u6_addr8 -- #endif -- - /* Command Description */ - #define V4NOTATION_STR "specify by IPv4 address notation(e.g. 0.0.0.0)\n" - #define OSPF6_NUMBER_STR "Specify by number\n" ---- 116,121 ---- diff --git a/net/zebra/pkg/PLIST b/net/zebra/pkg/PLIST index 9df3848b7e3..60f13c3c5e7 100644 --- a/net/zebra/pkg/PLIST +++ b/net/zebra/pkg/PLIST @@ -1,24 +1,22 @@ -@comment $NetBSD: PLIST,v 1.5 1999/11/19 02:47:01 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.6 2000/01/17 05:06:17 itojun Exp $ sbin/bgpd -sbin/client sbin/ospfd -@comment sbin/ospf6d sbin/ripd -@comment sbin/ripngd sbin/zebra etc/zebra/bgpd.conf.sample +etc/zebra/bgpd.conf.sample2 +etc/zebra/README.mbgp etc/zebra/ripd.conf.sample -@comment etc/zebra/ripngd.conf.sample etc/zebra/zebra.conf.sample etc/zebra/ospfd.conf.sample -@comment etc/zebra/ospf6d.conf.sample @unexec install-info --delete %D/info/zebra.info %D/info/dir info/zebra.info +info/zebra.info-1 +info/zebra.info-2 +info/zebra.info-3 @exec install-info %D/info/zebra.info %D/info/dir @dirrm etc/zebra man/man1/bgpd.1 -man/man1/ospf6d.1 man/man1/ospfd.1 man/man1/ripd.1 -man/man1/ripngd.1 man/man1/zebra.1 diff --git a/net/zebra/pkg/PLIST.v6 b/net/zebra/pkg/PLIST.v6 index 401861572fb..d745722be13 100644 --- a/net/zebra/pkg/PLIST.v6 +++ b/net/zebra/pkg/PLIST.v6 @@ -1,18 +1,7 @@ -@comment $NetBSD: PLIST.v6,v 1.3 1999/07/27 13:42:22 itojun Exp $ -sbin/bgpd -sbin/client -sbin/ospfd +@comment $NetBSD: PLIST.v6,v 1.4 2000/01/17 05:06:17 itojun Exp $ sbin/ospf6d -sbin/ripd sbin/ripngd -sbin/zebra -etc/zebra/bgpd.conf.sample -etc/zebra/ripd.conf.sample etc/zebra/ripngd.conf.sample -etc/zebra/zebra.conf.sample -etc/zebra/ospfd.conf.sample etc/zebra/ospf6d.conf.sample -@unexec install-info --delete %D/info/zebra.info %D/info/dir -info/zebra.info -@exec install-info %D/info/zebra.info %D/info/dir -@dirrm etc/zebra +man/man1/ospf6d.1 +man/man1/ripngd.1 |