From owner-svn-ports-head@FreeBSD.ORG Thu Oct 2 15:44:06 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B88523E9; Thu, 2 Oct 2014 15:44:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3E0D63F; Thu, 2 Oct 2014 15:44:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s92Fi6uT047464; Thu, 2 Oct 2014 15:44:06 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s92Fi4wJ047447; Thu, 2 Oct 2014 15:44:04 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201410021544.s92Fi4wJ047447@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 2 Oct 2014 15:44:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369831 - in head/net/quagga: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Oct 2014 15:44:06 -0000 Author: mat Date: Thu Oct 2 15:44:03 2014 New Revision: 369831 URL: https://svnweb.freebsd.org/changeset/ports/369831 QAT: https://qat.redports.org/buildarchive/r369831/ Log: Update to 0.99.23.1. [1] General cleanup. PR: 194090 [1] Submitted by: Olivier Cochard [1] Sponsored by: Absolight Added: head/net/quagga/files/patch-configure.ac (contents, props changed) head/net/quagga/files/patch-doc__bgpd.8 - copied, changed from r369814, head/net/quagga/files/patch-doc-bgpd.8 head/net/quagga/files/patch-lib__zebra.h - copied, changed from r369814, head/net/quagga/files/patch-lib-zebra.h head/net/quagga/files/patch-vtysh__extract.pl.in - copied, changed from r369814, head/net/quagga/files/patch-vtysh-extract Deleted: head/net/quagga/files/patch-doc-bgpd.8 head/net/quagga/files/patch-lib-zebra.h head/net/quagga/files/patch-vtysh-extract Modified: head/net/quagga/Makefile head/net/quagga/distinfo head/net/quagga/files/extra-patch-ospf-nexthop head/net/quagga/files/quagga.in head/net/quagga/files/watchquagga.in head/net/quagga/pkg-plist Modified: head/net/quagga/Makefile ============================================================================== --- head/net/quagga/Makefile Thu Oct 2 15:31:31 2014 (r369830) +++ head/net/quagga/Makefile Thu Oct 2 15:44:03 2014 (r369831) @@ -2,13 +2,9 @@ # $FreeBSD$ PORTNAME= quagga -PORTVERSION= 0.99.22.4 -PORTREVISION= 4 +PORTVERSION= 0.99.23.1 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH -MASTER_SITE_SUBDIR= quagga - -PATCH_SITES= http://quagga.net/ MAINTAINER= mat@FreeBSD.org COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software @@ -22,7 +18,7 @@ CONFLICTS= openbgpd-[0-9]* openospfd-[0- GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-exampledir=${PREFIX}/share/examples/quagga INSTALL_TARGET= install-strip -USES= gmake libtool makeinfo perl5 readline +USES= gmake libtool makeinfo perl5 readline autoreconf USE_LDCONFIG= yes USE_PERL5= build @@ -30,6 +26,8 @@ INFO= quagga OPTIONS_DEFINE= ISISD PAM OSPF_OPAQUE_LSA RTADV SNMP TCPSOCKETS DLMALLOC \ NO_BGP_ANNOUNCE OSPF_NEXTHOP +WITHOUT=${OPTIONS_DEFINE} +OPTIONS_SUB= yes ISISD_DESC= Enable experimental ISIS daemon PAM_DESC= PAM authentication for vtysh @@ -46,73 +44,30 @@ ENABLE_GROUP?= quagga USERS= ${ENABLE_USER} GROUPS= ${ENABLE_GROUP} -CONFIGURE_ARGS+=--enable-user=${ENABLE_USER} -CONFIGURE_ARGS+=--enable-group=${ENABLE_GROUP} - SYSCONF_DIR?= ${ETCDIR} LOCALSTATE_DIR?=/var/run/quagga -CONFIGURE_ARGS+=--sysconfdir=${SYSCONF_DIR} -CONFIGURE_ARGS+=--localstatedir=${LOCALSTATE_DIR} +CONFIGURE_ARGS= --enable-user=${ENABLE_USER} \ + --enable-group=${ENABLE_GROUP} \ + --sysconfdir=${SYSCONF_DIR} \ + --localstatedir=${LOCALSTATE_DIR} \ + --enable-vtysh .if defined(ENABLE_VTY_GROUP) CONFIGURE_ARGS+=--enable-vty-group=${ENABLE_VTY_GROUP} .endif -CONFIGURE_ARGS+=--enable-vtysh - -.include - -.if ${PORT_OPTIONS:MISISD} -CONFIGURE_ARGS+=--enable-isisd -MAN8+= isisd.8 -PLIST_SUB+= ISISD="" -.else -PLIST_SUB+= ISISD="@comment " -.endif - -.if ${PORT_OPTIONS:MPAM} -CONFIGURE_ARGS+=--with-libpam -.endif - -.if ${PORT_OPTIONS:MOSPF_OPAQUE_LSA} -CONFIGURE_ARGS+=--enable-opaque-lsa -MAN8+= ospfclient.8 -PLIST_SUB+= OSPFAPI="" -.else -CONFIGURE_ARGS+=--disable-opaque-lsa -PLIST_SUB+= OSPFAPI="@comment " -.endif - -.if ${PORT_OPTIONS:MRTADV} -CONFIGURE_ARGS+=--enable-rtadv -.endif - -.if ${PORT_OPTIONS:MSNMP} -CONFIGURE_ARGS+=--enable-snmp -LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp -.endif - -.if ${PORT_OPTIONS:MTCPSOCKETS} -CONFIGURE_ARGS+=--enable-tcp-zebra -.endif - -.if ${PORT_OPTIONS:MDLMALLOC} -LIB_DEPENDS+= libdlmalloc.so:${PORTSDIR}/devel/libdlmalloc -LIBS+= -L${LOCALBASE}/lib -ldlmalloc -SUB_LIST= RCLDCONFIG=ldconfig -.else -SUB_LIST= RCLDCONFIG= -.endif - -.if ${PORT_OPTIONS:MNO_BGP_ANNOUNCE} -CONFIGURE_ARGS+=--disable-bgp-announce -.endif - -.if ${PORT_OPTIONS:MOSPF_NEXTHOP} -post-patch: - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-ospf-nexthop -.endif +ISISD_CONFIGURE_ENABLE= isisd +PAM_CONFIGURE_WITH= libpam +OSPF_OPAQUE_LSA_CONFIGURE_ENABLE= opaque-lsa +RTADV_CONFIGURE_ENABLE= rtadv +SNMP_CONFIGURE_ENABLE= snmp +SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp +TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra +DLMALLOC_LIB_DEPENDS= libdlmalloc.so:${PORTSDIR}/devel/libdlmalloc +DLMALLOC_LIBS= -L${LOCALBASE}/lib -ldlmalloc +NO_BGP_ANNOUNCE_CONFIGURE_ARGS+=--disable-bgp-announce +OSPF_NEXTHOP_EXTRA_PATCH= ${PATCHDIR}/extra-patch-ospf-nexthop USE_RC_SUBR= quagga watchquagga @@ -136,12 +91,8 @@ pre-everything:: @${ECHO} "LOCALSTATE_DIR Specify directory for Quagga runtime files" post-install: - ${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR} - ${MKDIR} ${STAGEDIR}${SYSCONF_DIR} - -.if !defined(BATCH) -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc -.endif + ${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR} ${STAGEDIR}${SYSCONF_DIR} \ + ${STAGEDIR}${EXAMPLESDIR} + @${MV} ${STAGEDIR}${ETCDIR}/* ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/net/quagga/distinfo ============================================================================== --- head/net/quagga/distinfo Thu Oct 2 15:31:31 2014 (r369830) +++ head/net/quagga/distinfo Thu Oct 2 15:44:03 2014 (r369831) @@ -1,2 +1,2 @@ -SHA256 (quagga-0.99.22.4.tar.gz) = cbe48d5cc57bbaa07cfd8362ba598447dc94aa866ddc5794e57172709d36ba79 -SIZE (quagga-0.99.22.4.tar.gz) = 2352406 +SHA256 (quagga-0.99.23.1.tar.gz) = 3abf2046bc27539ce2d17c238e06c8fd0d479a8e402580c6aa455808bd48e004 +SIZE (quagga-0.99.23.1.tar.gz) = 2526612 Modified: head/net/quagga/files/extra-patch-ospf-nexthop ============================================================================== --- head/net/quagga/files/extra-patch-ospf-nexthop Thu Oct 2 15:31:31 2014 (r369830) +++ head/net/quagga/files/extra-patch-ospf-nexthop Thu Oct 2 15:44:03 2014 (r369831) @@ -1,6 +1,5 @@ -diff -Nur ./ospfd/ospf_asbr.c /tmp/quagga-0.99.20-patched/ospfd/ospf_asbr.c ---- ./ospfd/ospf_asbr.c 2011-09-29 16:59:32.000000000 +0400 -+++ /tmp/quagga-0.99.20-patched/ospfd/ospf_asbr.c 2012-01-15 18:44:18.000000000 +0400 +--- ospfd/ospf_asbr.c.orig 2014-08-25 16:56:53 UTC ++++ ospfd/ospf_asbr.c @@ -122,6 +122,7 @@ { values->metric = -1; @@ -9,9 +8,8 @@ diff -Nur ./ospfd/ospf_asbr.c /tmp/quagg } int -diff -Nur ./ospfd/ospf_asbr.h /tmp/quagga-0.99.20-patched/ospfd/ospf_asbr.h ---- ./ospfd/ospf_asbr.h 2011-09-29 16:59:32.000000000 +0400 -+++ /tmp/quagga-0.99.20-patched/ospfd/ospf_asbr.h 2012-01-15 18:44:18.000000000 +0400 +--- ospfd/ospf_asbr.h.orig 2014-08-25 16:56:53 UTC ++++ ospfd/ospf_asbr.h @@ -27,6 +27,7 @@ { int32_t metric; @@ -28,10 +26,9 @@ diff -Nur ./ospfd/ospf_asbr.h /tmp/quagg }; #define OSPF_ASBR_CHECK_DELAY 30 -diff -Nur ./ospfd/ospf_lsa.c /tmp/quagga-0.99.20-patched/ospfd/ospf_lsa.c ---- ./ospfd/ospf_lsa.c 2011-09-29 16:59:32.000000000 +0400 -+++ /tmp/quagga-0.99.20-patched/ospfd/ospf_lsa.c 2012-01-15 18:44:18.000000000 +0400 -@@ -1614,7 +1614,8 @@ +--- ospfd/ospf_lsa.c.orig 2014-08-25 16:56:53 UTC ++++ ospfd/ospf_lsa.c +@@ -1633,7 +1633,8 @@ stream_put_ospf_metric (s, mvalue); /* Get forwarding address to nexthop if on the Connection List, else 0. */ @@ -41,10 +38,9 @@ diff -Nur ./ospfd/ospf_lsa.c /tmp/quagga /* Put forwarding address. */ stream_put_ipv4 (s, fwd_addr.s_addr); -diff -Nur ./ospfd/ospf_routemap.c /tmp/quagga-0.99.20-patched/ospfd/ospf_routemap.c ---- ./ospfd/ospf_routemap.c 2011-09-29 16:59:32.000000000 +0400 -+++ /tmp/quagga-0.99.20-patched/ospfd/ospf_routemap.c 2012-01-15 18:44:18.000000000 +0400 -@@ -527,6 +527,62 @@ +--- ospfd/ospf_routemap.c.orig 2014-08-25 16:56:53 UTC ++++ ospfd/ospf_routemap.c +@@ -531,6 +531,62 @@ route_set_metric_type_free, }; @@ -107,7 +103,7 @@ diff -Nur ./ospfd/ospf_routemap.c /tmp/q DEFUN (match_ip_nexthop, match_ip_nexthop_cmd, "match ip next-hop (<1-199>|<1300-2699>|WORD)", -@@ -781,6 +837,49 @@ +@@ -785,6 +841,49 @@ "OSPF[6] external type 1 metric\n" "OSPF[6] external type 2 metric\n") @@ -157,7 +153,7 @@ diff -Nur ./ospfd/ospf_routemap.c /tmp/q /* Route-map init */ void ospf_route_map_init (void) -@@ -800,6 +899,7 @@ +@@ -804,6 +903,7 @@ route_map_install_set (&route_set_metric_cmd); route_map_install_set (&route_set_metric_type_cmd); @@ -165,7 +161,7 @@ diff -Nur ./ospfd/ospf_routemap.c /tmp/q install_element (RMAP_NODE, &match_ip_nexthop_cmd); install_element (RMAP_NODE, &no_match_ip_nexthop_cmd); -@@ -823,4 +923,7 @@ +@@ -827,4 +927,7 @@ install_element (RMAP_NODE, &set_metric_type_cmd); install_element (RMAP_NODE, &no_set_metric_type_cmd); install_element (RMAP_NODE, &no_set_metric_type_val_cmd); Added: head/net/quagga/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/quagga/files/patch-configure.ac Thu Oct 2 15:44:03 2014 (r369831) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2014-08-25 16:56:53 UTC ++++ configure.ac +@@ -1415,7 +1415,7 @@ + dnl ------------------ + dnl check Net-SNMP library + dnl ------------------ +-if test "${enable_snmp}" != ""; then ++if test "x${enable_snmp}" != "xno"; then + AC_PATH_TOOL([NETSNMP_CONFIG], [net-snmp-config], [no]) + if test x"$NETSNMP_CONFIG" = x"no"; then + AC_MSG_ERROR([--enable-snmp given but unable to find net-snmp-config]) Copied and modified: head/net/quagga/files/patch-doc__bgpd.8 (from r369814, head/net/quagga/files/patch-doc-bgpd.8) ============================================================================== --- head/net/quagga/files/patch-doc-bgpd.8 Thu Oct 2 11:18:34 2014 (r369814, copy source) +++ head/net/quagga/files/patch-doc__bgpd.8 Thu Oct 2 15:44:03 2014 (r369831) @@ -1,5 +1,5 @@ ---- doc/bgpd.8.orig 2012-07-13 23:02:24.000000000 +0600 -+++ doc/bgpd.8 2013-03-23 10:08:50.551916290 +0600 +--- doc/bgpd.8.orig 2014-08-25 16:56:53 UTC ++++ doc/bgpd.8 @@ -28,6 +28,8 @@ ] [ .B \-g Copied and modified: head/net/quagga/files/patch-lib__zebra.h (from r369814, head/net/quagga/files/patch-lib-zebra.h) ============================================================================== --- head/net/quagga/files/patch-lib-zebra.h Thu Oct 2 11:18:34 2014 (r369814, copy source) +++ head/net/quagga/files/patch-lib__zebra.h Thu Oct 2 15:44:03 2014 (r369831) @@ -1,6 +1,6 @@ ---- lib/zebra.h.orig 2014-03-16 09:54:05.510349508 +0100 -+++ lib/zebra.h 2014-03-16 10:57:36.640087484 +0100 -@@ -355,7 +355,8 @@ +--- lib/zebra.h.orig 2014-08-25 16:56:53 UTC ++++ lib/zebra.h +@@ -358,7 +358,8 @@ * OpenBSD: network byte order, apart from older versions which are as per * *BSD */ @@ -8,5 +8,5 @@ +#if defined(__NetBSD__) \ + || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) \ || (defined(__OpenBSD__) && (OpenBSD < 200311)) \ + || (defined(__APPLE__)) \ || (defined(SUNOS_5) && defined(WORDS_BIGENDIAN)) - #define HAVE_IP_HDRINCL_BSD_ORDER Copied and modified: head/net/quagga/files/patch-vtysh__extract.pl.in (from r369814, head/net/quagga/files/patch-vtysh-extract) ============================================================================== --- head/net/quagga/files/patch-vtysh-extract Thu Oct 2 11:18:34 2014 (r369814, copy source) +++ head/net/quagga/files/patch-vtysh__extract.pl.in Thu Oct 2 15:44:03 2014 (r369831) @@ -1,5 +1,5 @@ ---- vtysh/extract.pl.in-orig 2014-06-14 21:41:20.000000000 +0200 -+++ vtysh/extract.pl.in 2014-06-14 21:41:44.000000000 +0200 +--- vtysh/extract.pl.in.orig 2014-08-25 16:56:53 UTC ++++ vtysh/extract.pl.in @@ -63,7 +63,7 @@ foreach (@ARGV) { $file = $_; Modified: head/net/quagga/files/quagga.in ============================================================================== --- head/net/quagga/files/quagga.in Thu Oct 2 15:31:31 2014 (r369830) +++ head/net/quagga/files/quagga.in Thu Oct 2 15:44:03 2014 (r369831) @@ -1,14 +1,14 @@ #!/bin/sh - +# # $FreeBSD$ # + # PROVIDE: quagga # REQUIRE: netif routing -# KEYWORD: nojail +# KEYWORD: nojail shutdown -# # Add the following line to /etc/rc.conf to enable quagga: -#quagga_enable="YES" +# quagga_enable="YES" # # You may also wish to use the following variables to fine-tune startup: # quagga_flags="-d" @@ -28,15 +28,61 @@ . /etc/rc.subr -name="quagga" +name=quagga rcvar=quagga_enable start_postcmd=start_postcmd -stop_postcmd=stop_postcmd +stop_postcmd="rm -f $pidfile" configtest_cmd=check_config -extra_commands="configtest" +extra_commands=configtest + +load_rc_config $name + +quagga_enable=${quagga_enable:-"NO"} +quagga_flags=${quagga_flags:-"-d"} +quagga_daemons=${quagga_daemons:-"zebra ripd ripngd ospfd ospf6d bgpd isisd"} +quagga_vtysh_boot=${quagga_vtysh_boot:-"NO"} + +quagga_cmd=$1 + +case "$1" in + force*) + quagga_cmd=${quagga_cmd#force} + ;; + fast*) + quagga_cmd=${quagga_cmd#fast} + ;; +esac +shift + +if [ $# -ge 1 ]; then + quagga_daemons="$*" +fi -check_config() { +case "${quagga_cmd}" in + start) + if [ ! -z ${quagga_extralibs_path} ]; then + /sbin/ldconfig -m ${quagga_extralibs_path} + fi + do_cmd "start" + ;; + stop) + quagga_daemons=$(reverse_list ${quagga_daemons}) + do_cmd "stop" + ;; + restart) + quagga_daemons=$(reverse_list ${quagga_daemons}) + do_cmd "stop" + quagga_daemons=$(reverse_list ${quagga_daemons}) + do_cmd "start" + ;; + *) + do_cmd "${quagga_cmd}" + ;; +esac + +check_config() +{ echo "Checking $daemon.conf" $command $daemon_flags -C result=$? @@ -63,11 +109,6 @@ start_postcmd() fi } -stop_postcmd() -{ - rm -f $pidfile -} - do_cmd() { local ret @@ -96,50 +137,3 @@ do_cmd() fi return ${ret} } - -# set defaults - -load_rc_config $name - -: ${quagga_enable="NO"} -: ${quagga_flags="-d"} -: ${quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"} -: ${quagga_vtysh_boot="NO"} - -quagga_cmd=$1 - -case "$1" in - force*) - quagga_cmd=${quagga_cmd#force} - ;; - fast*) - quagga_cmd=${quagga_cmd#fast} - ;; -esac -shift - -if [ $# -ge 1 ]; then - quagga_daemons="$*" -fi - -case "${quagga_cmd}" in - start) - if [ ! -z ${quagga_extralibs_path} ]; then - /sbin/ldconfig -m ${quagga_extralibs_path} - fi - do_cmd "start" - ;; - stop) - quagga_daemons=$(reverse_list ${quagga_daemons}) - do_cmd "stop" - ;; - restart) - quagga_daemons=$(reverse_list ${quagga_daemons}) - do_cmd "stop" - quagga_daemons=$(reverse_list ${quagga_daemons}) - do_cmd "start" - ;; - *) - do_cmd "${quagga_cmd}" - ;; -esac Modified: head/net/quagga/files/watchquagga.in ============================================================================== --- head/net/quagga/files/watchquagga.in Thu Oct 2 15:31:31 2014 (r369830) +++ head/net/quagga/files/watchquagga.in Thu Oct 2 15:44:03 2014 (r369831) @@ -1,37 +1,30 @@ #!/bin/sh - +# # $FreeBSD$ # + # PROVIDE: watchquagga # REQUIRE: NETWORKING quagga -# -# Add the following line to /etc/rc.conf to enable quagga: +# KEYWORD: shutdown + +# Add the following line to /etc/rc.conf to enable watchquagga: # watchquagga_enable="YES" # # You may also wish to use the following variables to fine-tune startup: # watchquagga_flags -# -# . /etc/rc.subr -name="watchquagga" +name=watchquagga rcvar=watchquagga_enable - -stop_postcmd=stop_postcmd - -stop_postcmd() -{ - rm -f $pidfile -} - -# set defaults - load_rc_config $name -: ${watchquagga_enable="NO"} +stop_postcmd="rm -f $pidfile" + +watchquagga_enable=${watchquagga_enable:-"NO"} command=%%PREFIX%%/sbin/watchquagga pidfile=%%LOCALSTATE_DIR%%/watchquagga.pid + run_rc_command "$1" Modified: head/net/quagga/pkg-plist ============================================================================== --- head/net/quagga/pkg-plist Thu Oct 2 15:31:31 2014 (r369830) +++ head/net/quagga/pkg-plist Thu Oct 2 15:44:03 2014 (r369831) @@ -2,7 +2,7 @@ sbin/babeld sbin/bgpd %%ISISD%%sbin/isisd sbin/ospf6d -%%OSPFAPI%%sbin/ospfclient +%%OSPF_OPAQUE_LSA%%sbin/ospfclient sbin/ospfd sbin/ripd sbin/ripngd @@ -13,10 +13,10 @@ lib/libospf.a lib/libospf.so lib/libospf.so.0 lib/libospf.so.0.0.0 -%%OSPFAPI%%lib/libospfapiclient.a -%%OSPFAPI%%lib/libospfapiclient.so -%%OSPFAPI%%lib/libospfapiclient.so.0 -%%OSPFAPI%%lib/libospfapiclient.so.0.0.0 +%%OSPF_OPAQUE_LSA%%lib/libospfapiclient.a +%%OSPF_OPAQUE_LSA%%lib/libospfapiclient.so +%%OSPF_OPAQUE_LSA%%lib/libospfapiclient.so.0 +%%OSPF_OPAQUE_LSA%%lib/libospfapiclient.so.0.0.0 lib/libzebra.a lib/libzebra.so lib/libzebra.so.0 @@ -32,13 +32,14 @@ include/quagga/if.h include/quagga/if_rmap.h include/quagga/jhash.h include/quagga/keychain.h +include/quagga/libospf.h include/quagga/linklist.h include/quagga/log.h include/quagga/md5.h include/quagga/memory.h include/quagga/memtypes.h include/quagga/network.h -%%OSPFAPI%%include/quagga/ospfapi/ospf_apiclient.h +%%OSPF_OPAQUE_LSA%%include/quagga/ospfapi/ospf_apiclient.h include/quagga/ospfd/ospf_api.h include/quagga/ospfd/ospf_asbr.h include/quagga/ospfd/ospf_dump.h @@ -81,20 +82,13 @@ include/quagga/zebra.h %%EXAMPLESDIR%%/zebra.conf.sample man/man1/vtysh.1.gz man/man8/bgpd.8.gz +%%ISISD%%man/man8/isisd.8.gz man/man8/ospf6d.8.gz man/man8/ospfd.8.gz -%%OSPFAPI%%man/man8/ospfclient.8.gz +%%OSPF_OPAQUE_LSA%%man/man8/ospfclient.8.gz man/man8/ripd.8.gz man/man8/ripngd.8.gz man/man8/watchquagga.8.gz man/man8/zebra.8.gz -@dirrm include/quagga/ospfd -%%OSPFAPI%%@dirrm include/quagga/ospfapi -@dirrm include/quagga -@dirrm share/examples/quagga -@owner %%ENABLE_USER%% -@group %%ENABLE_GROUP%% -@dirrmtry %%LOCALSTATE_DIR%% -@dirrmtry %%ETCDIR%% -@group wheel -@owner root +@dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%LOCALSTATE_DIR%% +@dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%ETCDIR%%