Update to 0.96.5 of Quagga. This fixes a number of bugs, especially on

-CURRENT, and adds support for the OSI IS-IS backbone routing protocol.

Submitted by:	Boris Kovalenko

5 files changed, 95 insertions, 79 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index b2eed0f8031c..52ada15711b5 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -6,30 +6,29 @@
 #
 
 PORTNAME=	quagga
-PORTVERSION=	0.96.4
-PORTREVISION=	5
+PORTVERSION=	0.96.5
+PORTREVISION=	0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://quagga.net/download/
 
 PATCH_SITES=	http://quagga.net/
-PATCHFILES=	quagga-bgp_route-wspace.diff
 
 MAINTAINER=	boris@tagnet.ru
-COMMENT=	Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
+COMMENT=	Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software (server/reflector)
 
 CONFLICTS=	zebra-devel-* zebra-0*
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SUBMAKE=	yes
-WANT_AUTOCONF_VER=	253
-WANT_AUTOMAKE_VER=	15
-AUTOMAKE_ARGS= -a -i
+WANT_AUTOCONF_VER=	257
+WANT_AUTOMAKE_VER=	17
+AUTOMAKE_ARGS=	-a -i
 
 MAN1=		vtysh.1
 MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
 
-CONFIGURE_ARGS+=--includedir=${PREFIX}/include/quagga
+CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga
 SCRIPTS_ENV=	WRKDIRPREFIX=${WRKDIRPREFIX} WITH_SNMP_4=${WITH_SNMP_4} \
 		SYSCONF_DIR=${SYSCONF_DIR} SYSSTATE_DIR=${SYSSTATE_DIR} \
 		ENABLE_USER=${ENABLE_USER} ENABLE_GROUP=${ENABLE_GROUP}
@@ -44,9 +43,13 @@ pre-fetch:
 .if ${CONFIGURE_ARGS:M--enable-opaque-lsa} != ""
 PLIST_SUB+=	OSPFAPI_HEADER="include/quagga/ospfapi/ospf_apiclient.h"
 PLIST_SUB+=	OSPFAPI_PATH="@dirrm include/quagga/ospfapi"
+PLIST_SUB+=	OSPFAPI_LIB="lib/libospfapiclient.a"
+PLIST_SUB+=	OSPFAPI_SBIN="sbin/ospfclient"
 .else
 PLIST_SUB+=	OSPFAPI_HEADER=
 PLIST_SUB+=	OSPFAPI_PATH=
+PLIST_SUB+=	OSPFAPI_LIB=
+PLIST_SUB+=	OSPFAPI_SBIN=
 .endif
 
 .if !defined(ENABLE_USER)
@@ -136,7 +139,7 @@ post-build:
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/quagga.sh > ${WRKDIR}/quagga.sh
 
 post-install:
-	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO} "===>     installing ${PORTNAME} startup file..."
 	@${ECHO} "Add the folliwing lines to /etc/rc.conf to enable quagga:"
 	@${ECHO} ""
@@ -144,7 +147,7 @@ post-install:
 	@${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.4_5 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 --git a/net/quagga/distinfo b/net/quagga/distinfo
index 6354d9f86050..b27d0fee2f9a 100644
--- a/net/quagga/distinfo
+++ b/net/quagga/distinfo
@@ -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 --git a/net/quagga/files/quagga.sh b/net/quagga/files/quagga.sh
index 4b2a92a968dd..caef30d1d60a 100644
--- a/net/quagga/files/quagga.sh
+++ b/net/quagga/files/quagga.sh
@@ -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 @@ stop_postcmd()
 
 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 --git a/net/quagga/pkg-install b/net/quagga/pkg-install
index 89e5e2f5edb4..71b2cb314b4e 100644
--- a/net/quagga/pkg-install
+++ b/net/quagga/pkg-install
@@ -53,14 +53,23 @@ case $2 in
 		fi
 	fi
 
-	chown -R ${ENABLE_USER}:${ENABLE_GROUP} ${SYSCONF_DIR}
-
 	mkdir ${LOCALSTATE_DIR}
 	if [ ! -d ${LOCALSTATE_DIR} ]; then
 	    echo "Creating \"${LOCALSTATE_DIR}\" failed."
 	    exit 1
 	fi
-
+	
 	chown -R ${ENABLE_USER}:${ENABLE_GROUP} ${LOCALSTATE_DIR}
+
+	if [ ! -d ${SYSCONF_DIR} ]; then
+	    mkdir -p ${SYSCONF_DIR}
+	fi
+	
+	if [ ! -d ${SYSCONF_DIR} ]; then
+	    echo "Creating \"${SYSCONF_DIR}\" failed."
+	    exit 1
+	fi
+
+	chown -R ${ENABLE_USER}:${ENABLE_GROUP} ${SYSCONF_DIR}
 	;;
 esac
diff --git a/net/quagga/pkg-plist b/net/quagga/pkg-plist
index 2f6aaaa8388b..0a8ab7d39109 100644
--- a/net/quagga/pkg-plist
+++ b/net/quagga/pkg-plist
@@ -1,71 +1,77 @@
-sbin/zebra
-sbin/ripngd
-sbin/ripd
-sbin/ospfd
-sbin/ospf6d
 sbin/bgpd
-lib/libzebra.a
+sbin/isisd
+sbin/ospf6d
+%%OSPFAPI_SBIN%%
+sbin/ospfd
+sbin/ripd
+sbin/ripngd
+sbin/zebra
+bin/vtysh
 lib/libospf.a
-info/quagga.info-4
-info/quagga.info-3
-info/quagga.info-2
-info/quagga.info-1
+%%OSPFAPI_LIB%%
+lib/libzebra.a
 info/quagga.info
-include/quagga/zebra.h
-include/quagga/zclient.h
-include/quagga/vty.h
-include/quagga/version.h
-include/quagga/vector.h
-include/quagga/thread.h
-include/quagga/table.h
-include/quagga/stream.h
-include/quagga/str.h
-include/quagga/sockunion.h
-include/quagga/sockopt.h
-include/quagga/smux.h
-include/quagga/routemap.h
-include/quagga/privs.h
-include/quagga/prefix.h
-include/quagga/plist.h
-include/quagga/ospfd/ospfd.h
-include/quagga/ospfd/ospf_opaque.h
-include/quagga/ospfd/ospf_nsm.h
-include/quagga/ospfd/ospf_lsdb.h
-include/quagga/ospfd/ospf_lsa.h
-include/quagga/ospfd/ospf_ism.h
-include/quagga/ospfd/ospf_dump.h
-include/quagga/ospfd/ospf_asbr.h
-include/quagga/ospfd/ospf_api.h
-include/quagga/network.h
-include/quagga/memory.h
-include/quagga/md5-gnu.h
-include/quagga/log.h
-include/quagga/linklist.h
-include/quagga/keychain.h
-include/quagga/if_rmap.h
-include/quagga/if.h
-include/quagga/hash.h
-include/quagga/getopt.h
-include/quagga/filter.h
-include/quagga/distribute.h
-include/quagga/debug.h
-include/quagga/command.h
+info/quagga.info-1
+info/quagga.info-2
+info/quagga.info-3
+info/quagga.info-4
 include/quagga/buffer.h
-etc/quagga/zebra.conf.sample
-etc/quagga/vtysh.conf.sample
-etc/quagga/ripngd.conf.sample
-etc/quagga/ripd.conf.sample
-etc/quagga/ospfd.conf.sample
-etc/quagga/ospf6d.conf.sample
-etc/quagga/bgpd.conf.sample2
-etc/quagga/bgpd.conf.sample
-bin/vtysh
+include/quagga/command.h
+include/quagga/debug.h
+include/quagga/distribute.h
+include/quagga/filter.h
+include/quagga/getopt.h
+include/quagga/hash.h
+include/quagga/if.h
+include/quagga/if_rmap.h
+include/quagga/keychain.h
+include/quagga/linklist.h
+include/quagga/log.h
+include/quagga/md5-gnu.h
+include/quagga/memory.h
+include/quagga/network.h
+%%OSPFAPI_HEADER%%
+include/quagga/ospfd/ospf_api.h
+include/quagga/ospfd/ospf_asbr.h
+include/quagga/ospfd/ospf_dump.h
+include/quagga/ospfd/ospf_ism.h
+include/quagga/ospfd/ospf_lsa.h
+include/quagga/ospfd/ospf_lsdb.h
+include/quagga/ospfd/ospf_nsm.h
+include/quagga/ospfd/ospf_opaque.h
+include/quagga/ospfd/ospfd.h
+include/quagga/plist.h
+include/quagga/prefix.h
+include/quagga/privs.h
+include/quagga/routemap.h
+include/quagga/sigevent.h
+include/quagga/smux.h
+include/quagga/sockopt.h
+include/quagga/sockunion.h
+include/quagga/str.h
+include/quagga/stream.h
+include/quagga/table.h
+include/quagga/thread.h
+include/quagga/vector.h
+include/quagga/version.h
+include/quagga/vty.h
+include/quagga/zclient.h
+include/quagga/zebra.h
+share/examples/quagga/bgpd.conf.sample
+share/examples/quagga/bgpd.conf.sample2
+share/examples/quagga/isisd.conf.sample
+share/examples/quagga/ospf6d.conf.sample
+share/examples/quagga/ospfd.conf.sample
+share/examples/quagga/ripd.conf.sample
+share/examples/quagga/ripngd.conf.sample
+share/examples/quagga/vtysh.conf.sample
+share/examples/quagga/zebra.conf.sample
 @unexec install-info --delete %D/info/quagga.info %D/info/dir
 @exec install-info %D/info/quagga.info %D/info/dir
-@dirrm include/quagga/ospfd
-%%OSPFAPI_HEADER%%
 %%OSPFAPI_PATH%%
+@dirrm include/quagga/ospfd
 @dirrm include/quagga
+@dirrm share/examples/quagga
 @dirrm etc/quagga
 @cwd %%RC_DIR%%
 quagga%%RC_SUFX%%