Index: head/net/quagga/Makefile =================================================================== --- head/net/quagga/Makefile (revision 424239) +++ head/net/quagga/Makefile (revision 424240) @@ -1,104 +1,104 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= quagga -PORTVERSION= 1.0.20161017 +PORTVERSION= 1.1.0 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH MAINTAINER= mat@FreeBSD.org COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software LICENSE= GPLv2 BUILD_DEPENDS= gawk:lang/gawk CONFLICTS= openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-exampledir=${PREFIX}/share/examples/quagga INSTALL_TARGET= install-strip USES= gmake libtool makeinfo perl5 readline compiler:c11 autoreconf cpe USE_LDCONFIG= yes USE_PERL5= build INFO= quagga OPTIONS_DEFINE= ISISD PIMD PAM RTADV SNMP TCPSOCKETS DLMALLOC \ NO_BGP_ANNOUNCE OSPF_NEXTHOP IRDP ISIS_TOPOLOGY OPTIONS_DEFAULT= ISISD PIMD RTADV OPTIONS_SUB= yes PIMD_DESC= PIM-SSM multicast routing IRDP_DESC= Enable IRDP server support ISISD_DESC= Enable ISIS daemon (beta) ISIS_TOPOLOGY_DESC= Enable IS-IS topology generator PAM_DESC= PAM authentication for vtysh RTADV_DESC= IPv6 Router Advertisements TCPSOCKETS_DESC= Use TCP/IP sockets for protocol daemons DLMALLOC_DESC= Use dlmalloc (makes bgpd much faster) NO_BGP_ANNOUNCE_DESC= Turn off BGP route announcement OSPF_NEXTHOP_DESC= Set ip next-hop in OSPF route maps ENABLE_USER?= quagga ENABLE_GROUP?= quagga USERS= ${ENABLE_USER} GROUPS= ${ENABLE_GROUP} SYSCONF_DIR?= ${ETCDIR} LOCALSTATE_DIR?=/var/run/quagga 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 ISISD_CONFIGURE_ENABLE= isisd ISIS_TOPOLOGY_CONFIGURE_ENABLE= isis-topology PIMD_CONFIGURE_ENABLE= pimd IRDP_CONFIGURE_ENABLE= irdb PAM_CONFIGURE_WITH= libpam RTADV_CONFIGURE_ENABLE= rtadv SNMP_CONFIGURE_ENABLE= snmp SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra DLMALLOC_LIB_DEPENDS= libdlmalloc.so:devel/libdlmalloc DLMALLOC_LIBS= -L${LOCALBASE}/lib -ldlmalloc OSPF_NEXTHOP_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ospf-nexthop # inverse option. NO_BGP_ANNOUNCE_CONFIGURE_ON= --disable-bgp-announce NO_BGP_ANNOUNCE_CONFIGURE_OFF= --enable-bgp-announce USE_RC_SUBR= quagga watchquagga SUB_LIST+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \ SYSCONF_DIR=${SYSCONF_DIR} PLIST_SUB+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \ SYSCONF_DIR=${SYSCONF_DIR} \ ENABLE_USER=${ENABLE_USER} \ ENABLE_GROUP=${ENABLE_GROUP} pre-everything:: @${ECHO} "=============================================================" @${ECHO} @${ECHO} "You can build ${PORTNAME} with the following options:" @${ECHO} @${ECHO} "ENABLE_USER Specify user to run Quagga suite as" @${ECHO} "ENABLE_GROUP Specify group to run Quagga suite as" @${ECHO} "ENABLE_VTY_GROUP Specify group for vty socket ownership" @${ECHO} "SYSCONF_DIR Specify directory for Quagga configuration files" @${ECHO} "LOCALSTATE_DIR Specify directory for Quagga runtime files" post-install: ${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR} ${STAGEDIR}${SYSCONF_DIR} \ ${STAGEDIR}${EXAMPLESDIR} @${MV} ${STAGEDIR}${SYSCONF_DIR}/* ${STAGEDIR}${EXAMPLESDIR} .include Index: head/net/quagga/distinfo =================================================================== --- head/net/quagga/distinfo (revision 424239) +++ head/net/quagga/distinfo (revision 424240) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476726152 -SHA256 (quagga-1.0.20161017.tar.gz) = 8f26724ddb7419f3912f80ce8f13689190289e0022cf09921d0a403fd7714918 -SIZE (quagga-1.0.20161017.tar.gz) = 2758494 +TIMESTAMP = 1476875984 +SHA256 (quagga-1.1.0.tar.gz) = f7a43a9c59bfd3722002210530b2553c8d5cc05bfea5acd56d4f102b9f55dc63 +SIZE (quagga-1.1.0.tar.gz) = 2870278 Index: head/net/quagga/files/patch-vtysh__extract.pl.in =================================================================== --- head/net/quagga/files/patch-vtysh__extract.pl.in (revision 424239) +++ head/net/quagga/files/patch-vtysh__extract.pl.in (nonexistent) @@ -1,11 +0,0 @@ ---- vtysh/extract.pl.in.orig 2015-03-02 23:50:57 UTC -+++ vtysh/extract.pl.in -@@ -63,7 +63,7 @@ $ignore{'"show history"'} = "ignore"; - foreach (@ARGV) { - $file = $_; - -- open (FH, "@CPP@ -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_builddir@/lib -I@top_srcdir@/isisd/topology @CPPFLAGS@ $file |"); -+ open (FH, "@CPP@ -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_builddir@/lib -I/usr/local/include -I@top_srcdir@/isisd/topology @CPPFLAGS@ $file |"); - local $/; undef $/; - $line = ; - close (FH); Property changes on: head/net/quagga/files/patch-vtysh__extract.pl.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/quagga/files/patch-doc__bgpd.8 =================================================================== --- head/net/quagga/files/patch-doc__bgpd.8 (revision 424239) +++ head/net/quagga/files/patch-doc__bgpd.8 (nonexistent) @@ -1,21 +0,0 @@ ---- doc/bgpd.8.orig 2015-03-02 23:50:57 UTC -+++ doc/bgpd.8 -@@ -28,6 +28,8 @@ software - ] [ - .B \-g - .I group -+] [ -+.B \--no_kernel - ] - .SH DESCRIPTION - .B bgpd -@@ -76,6 +78,9 @@ When the program terminates, retain rout - .TP - \fB\-v\fR, \fB\-\-version\fR - Print the version and exit. -+.TP -+\fB\--no_kernel\fR -+Prevents route updates to be submitted to the kernel. - .SH FILES - .TP - .BI /usr/local/sbin/bgpd Property changes on: head/net/quagga/files/patch-doc__bgpd.8 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/quagga/files/patch-configure.ac =================================================================== --- head/net/quagga/files/patch-configure.ac (revision 424239) +++ head/net/quagga/files/patch-configure.ac (revision 424240) @@ -1,11 +1,11 @@ ---- configure.ac.orig 2015-03-02 23:50:57 UTC +--- configure.ac.orig 2016-10-18 13:03:52 UTC +++ configure.ac -@@ -1219,7 +1219,7 @@ AC_SUBST(LIB_REGEX) +@@ -1278,7 +1278,7 @@ AC_SUBST(LIB_REGEX) 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]) Index: head/net/quagga/files/patch-doc_bgpd.8 =================================================================== --- head/net/quagga/files/patch-doc_bgpd.8 (nonexistent) +++ head/net/quagga/files/patch-doc_bgpd.8 (revision 424240) @@ -0,0 +1,21 @@ +--- doc/bgpd.8.orig 2016-10-18 13:03:52 UTC ++++ doc/bgpd.8 +@@ -28,6 +28,8 @@ software + ] [ + .B \-g + .I group ++] [ ++.B \--no_kernel + ] + .SH DESCRIPTION + .B bgpd +@@ -79,6 +81,9 @@ Skip setting the process effective user + .TP + \fB\-v\fR, \fB\-\-version\fR + Print the version and exit. ++.TP ++\fB\--no_kernel\fR ++Prevents route updates to be submitted to the kernel. + .SH FILES + .TP + .BI /usr/local/sbin/bgpd Property changes on: head/net/quagga/files/patch-doc_bgpd.8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/quagga/files/patch-vtysh_extract.pl.in =================================================================== --- head/net/quagga/files/patch-vtysh_extract.pl.in (nonexistent) +++ head/net/quagga/files/patch-vtysh_extract.pl.in (revision 424240) @@ -0,0 +1,11 @@ +--- vtysh/extract.pl.in.orig 2016-10-18 13:03:52 UTC ++++ vtysh/extract.pl.in +@@ -69,7 +69,7 @@ my $cli_stomp = 0; + foreach (@ARGV) { + $file = $_; + +- open (FH, "@CPP@ -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_builddir@/lib -I@top_srcdir@/isisd/topology @CPPFLAGS@ $file |"); ++ open (FH, "@CPP@ -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_builddir@/lib -I/usr/local/include -I@top_srcdir@/isisd/topology @CPPFLAGS@ $file |"); + local $/; undef $/; + $line = ; + close (FH); Property changes on: head/net/quagga/files/patch-vtysh_extract.pl.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property