FreeBSD Port: quagga-0.96.4_5 to quagga-0.96.5 upgrade patch

[Claus Endres]

Hi,

The attached patch upgrades the quagga port to version 0.96.5.
quagga-0.96.5 contains the new isis daemon, and lots of bug fixes.

This is the first release where ospfd does not crash under 5.x-CURRENT.

Regards,
Claus.
-- 
--------------------------------------------------------
Claus Endres                | Phone:  +61-3-5998 2310
Endres Consulting Pty. Ltd. | Mobile: +61-418-595 136
10 Facey Road               | Fax:    +61-3-5998 2540
Devon Meadows, VIC 3977     | claus at endresconsulting.com
-------------- next part --------------
diff -u -r quagga/Makefile quagga-0.96.5/Makefile
--- quagga/Makefile	Fri Apr 23 15:08:06 2004
+++ quagga-0.96.5/Makefile	Sat May  8 13:08:34 2004
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	quagga
-PORTVERSION=	0.96.4
-PORTREVISION=	5
+PORTVERSION=	0.96.5
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://quagga.net/download/
 
-PATCH_SITES=	http://quagga.net/
-PATCHFILES=	quagga-bgp_route-wspace.diff
-
 MAINTAINER=	boris at tagnet.ru
 COMMENT=	Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
 
@@ -27,7 +24,7 @@
 AUTOMAKE_ARGS= -a -i
 
 MAN1=		vtysh.1
-MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
+MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 isisd.8
 
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include/quagga
 SCRIPTS_ENV=	WRKDIRPREFIX=${WRKDIRPREFIX} WITH_SNMP_4=${WITH_SNMP_4} \
@@ -87,7 +84,7 @@
 RC_SUFX=	.sh
 .endif
 
-QUAGGA_SCRIPTS=	zebra ripd ripngd ospfd ospf6d bgpd
+QUAGGA_SCRIPTS=	zebra ripd ripngd ospfd ospf6d bgpd isisd
 
 SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%SYSCONF_DIR%%,${SYSCONF_DIR},g' \
@@ -144,7 +141,7 @@
 	@${ECHO} "quagga_enable=\"YES\""
 	@${ECHO} "Also You may want to set router_enable=\"NO\""
 	@${ECHO} ""
-	@${ECHO} "Note!!! Since 0.96_5 port uses new id for quagga user and group."
+	@${ECHO} "Note!!! Since 0.96.5_1 port uses new id for quagga user and group."
 	@${ECHO} "        So, You need to manually chown files:"
 	@${ECHO} "        in ${SYSCONF_DIR}"
 	@${ECHO} "        and ${LOCALSTATE_DIR}"
diff -u -r quagga/distinfo quagga-0.96.5/distinfo
--- quagga/distinfo	Fri Apr 23 15:08:06 2004
+++ quagga-0.96.5/distinfo	Sat May  8 12:50:45 2004
@@ -1,4 +1,2 @@
-MD5 (quagga-0.96.4.tar.gz) = 55f5a307c453f90d7dfcc13f0dabb83d
-SIZE (quagga-0.96.4.tar.gz) = 1401066
-MD5 (quagga-bgp_route-wspace.diff) = 180682299947c8d7fe7d0ed1f540e5ae
-SIZE (quagga-bgp_route-wspace.diff) = 687
+MD5 (quagga-0.96.5.tar.gz) = cc84ef15cf4c2823a36097fe01775dc3
+SIZE (quagga-0.96.5.tar.gz) = 1558033
diff -u -r quagga/files/quagga.sh quagga-0.96.5/files/quagga.sh
--- quagga/files/quagga.sh	Fri Apr 23 15:08:06 2004
+++ quagga-0.96.5/files/quagga.sh	Sat May  8 12:45:09 2004
@@ -13,7 +13,7 @@
 #
 # You may also use next flags to tune startup
 #quagga_flags="-d"
-#quagga_daemons="zebra ripd ripng ospfd ospf6d bgpd"
+#quagga_daemons="zebra ripd ripng ospfd ospf6d bgpd isisd"
 #
 
 . %%RC_SUBR%%
@@ -33,7 +33,7 @@
 
 quagga_enable=${quagga_enable:-"NO"}
 quagga_flags=${quagga_flags:-"-d"}
-quagga_daemons=${quagga_daemons:-"zebra ripd ripng ospfd ospf6d bgpd"}
+quagga_daemons=${quagga_daemons:-"zebra ripd ripng ospfd ospf6d bgpd isisd"}
 load_rc_config $name
 
 quagga_cmd=$1
diff -u -r quagga/pkg-descr quagga-0.96.5/pkg-descr
--- quagga/pkg-descr	Sun Sep 28 09:40:56 2003
+++ quagga-0.96.5/pkg-descr	Sat May  8 13:01:40 2004
@@ -1,7 +1,7 @@
 From the website:
 
 Quagga is a routing software suite, providing implementations of
-OSPFv2, OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for Unix platforms,
+OSPFv2, OSPFv3, RIP v1 and v2, RIPv3, BGPv4 and ISIS for Unix platforms,
 particularly FreeBSD and Linux and also NetBSD, to mention a few.
 Quagga is a fork of GNU Zebra which was developed by Kunihiro
 Ishiguro. The Quagga tree aims to build a more involved community
diff -u -r quagga/pkg-plist quagga-0.96.5/pkg-plist
--- quagga/pkg-plist	Fri Apr 23 15:08:06 2004
+++ quagga-0.96.5/pkg-plist	Sat May  8 13:05:41 2004
@@ -4,6 +4,7 @@
 sbin/ospfd
 sbin/ospf6d
 sbin/bgpd
+sbin/isisd
 lib/libzebra.a
 lib/libospf.a
 info/quagga.info-4
@@ -59,6 +60,7 @@
 etc/quagga/ospf6d.conf.sample
 etc/quagga/bgpd.conf.sample2
 etc/quagga/bgpd.conf.sample
+etc/quagga/isisd.conf.sample
 bin/vtysh
 @unexec install-info --delete %D/info/quagga.info %D/info/dir
 @exec install-info %D/info/quagga.info %D/info/dir