Index: branches/2018Q1/net/quagga/Makefile =================================================================== --- branches/2018Q1/net/quagga/Makefile (revision 461982) +++ branches/2018Q1/net/quagga/Makefile (revision 461983) @@ -1,107 +1,107 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= quagga -PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTVERSION= 1.2.3 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH MAINTAINER= pi@FreeBSD.org COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software LICENSE= GPLv2 BUILD_DEPENDS= gawk:lang/gawk CONFLICTS= openbgpd openospfd zebra quagga-esr frr pimd +USES= compiler:c11 cpe gmake libtool makeinfo \ + perl5 readline ssl GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-exampledir=${PREFIX}/share/examples/quagga INSTALL_TARGET= install-strip -USES= gmake libtool makeinfo perl5 readline compiler:c11 cpe USE_LDCONFIG= yes USE_PERL5= build INFO= quagga OPTIONS_DEFINE= ISISD PIMD PAM RTADV SNMP TCPSOCKETS DLMALLOC \ NO_BGP_ANNOUNCE OSPF_NEXTHOP ISIS_TOPOLOGY # IRDP needs something freebsd does not seem to have: # configure: error: 'IRDP requires in_pktinfo at the moment!' 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= irdp 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: branches/2018Q1/net/quagga/distinfo =================================================================== --- branches/2018Q1/net/quagga/distinfo (revision 461982) +++ branches/2018Q1/net/quagga/distinfo (revision 461983) @@ -1,3 +1,3 @@ -TIMESTAMP = 1507052274 -SHA256 (quagga-1.2.2.tar.gz) = 522e22f2beee64e3f0c2cde3d0155f3b8103f4f6fc8abef92cb40bc3a4cc2931 -SIZE (quagga-1.2.2.tar.gz) = 2986142 +TIMESTAMP = 1517952673 +SHA256 (quagga-1.2.3.tar.gz) = ee2c0907a106902abbdcaf63b4f28c67241c4f3396989ed54da7b4976eecad31 +SIZE (quagga-1.2.3.tar.gz) = 2925444 Index: branches/2018Q1/net/quagga/files/patch-configure =================================================================== --- branches/2018Q1/net/quagga/files/patch-configure (revision 461982) +++ branches/2018Q1/net/quagga/files/patch-configure (nonexistent) @@ -1,12 +0,0 @@ ---- configure.orig 2017-10-03 14:59:10 UTC -+++ configure -@@ -22070,7 +22070,7 @@ fi - fi - - - --if test "${enable_snmp}" != ""; then -+if test "x${enable_snmp}" != "xno"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}net-snmp-config", so it can be a program name with args. - set dummy ${ac_tool_prefix}net-snmp-config; ac_word=$2 Property changes on: branches/2018Q1/net/quagga/files/patch-configure ___________________________________________________________________ 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: branches/2018Q1/net/quagga/files/patch-bgpd_bgp__nht.c =================================================================== --- branches/2018Q1/net/quagga/files/patch-bgpd_bgp__nht.c (revision 461982) +++ branches/2018Q1/net/quagga/files/patch-bgpd_bgp__nht.c (nonexistent) @@ -1,13 +0,0 @@ ---- bgpd/bgp_nht.c.orig 2017-10-03 16:57:10.000000000 +0200 -+++ bgpd/bgp_nht.c 2017-12-15 21:12:37.058505000 +0100 -@@ -409,8 +409,8 @@ - break; - #ifdef HAVE_IPV6 - case AFI_IP6: -- if (ri->attr->extra->mp_nexthop_len != 16 -- || IN6_IS_ADDR_LINKLOCAL (&ri->attr->extra->mp_nexthop_global)) -+ if (ri->attr->extra->mp_nexthop_len == 16 -+ && IN6_IS_ADDR_LINKLOCAL (&ri->attr->extra->mp_nexthop_global)) - return -1; - - p->family = AF_INET6; Property changes on: branches/2018Q1/net/quagga/files/patch-bgpd_bgp__nht.c ___________________________________________________________________ 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: branches/2018Q1/net/quagga/files/patch-bgpd_bgp__aspath.c =================================================================== --- branches/2018Q1/net/quagga/files/patch-bgpd_bgp__aspath.c (revision 461982) +++ branches/2018Q1/net/quagga/files/patch-bgpd_bgp__aspath.c (nonexistent) @@ -1,11 +0,0 @@ ---- bgpd/bgp_aspath.c.orig 2017-10-03 14:57:10 UTC -+++ bgpd/bgp_aspath.c -@@ -901,7 +901,7 @@ aspath_put (struct stream *s, struct aspath *as, int u - while ( (seg->length - written) > AS_SEGMENT_MAX) - { - assegment_header_put (s, seg->type, AS_SEGMENT_MAX); -- assegment_data_put (s, seg->as, AS_SEGMENT_MAX, use32bit); -+ assegment_data_put (s, (seg->as+written), AS_SEGMENT_MAX, use32bit); - written += AS_SEGMENT_MAX; - bytes += ASSEGMENT_SIZE (AS_SEGMENT_MAX, use32bit); - } Property changes on: branches/2018Q1/net/quagga/files/patch-bgpd_bgp__aspath.c ___________________________________________________________________ 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: branches/2018Q1/net/quagga/files/patch-lib_command.c =================================================================== --- branches/2018Q1/net/quagga/files/patch-lib_command.c (nonexistent) +++ branches/2018Q1/net/quagga/files/patch-lib_command.c (revision 461983) @@ -0,0 +1,21 @@ +--- lib/command.c.orig 2018-02-04 17:34:34 UTC ++++ lib/command.c +@@ -3127,15 +3127,15 @@ DEFUN (config_write_file, + + if ((dupfd = dup (file_vty->wfd)) < 0) + { +- vty_out (vty, "Couldn't dup fd (for fdatasync) for %s, %s (%d).%s", ++ vty_out (vty, "Couldn't dup fd (for fsync) for %s, %s (%d).%s", + config_file, safe_strerror(errno), errno, VTY_NEWLINE); + } + + vty_close (file_vty); + +- if (fdatasync (dupfd) < 0) ++ if (fsync (dupfd) < 0) + { +- vty_out (vty, "Couldn't fdatasync %s, %s (%d)!%s", ++ vty_out (vty, "Couldn't fsync %s, %s (%d)!%s", + config_file, safe_strerror(errno), errno, VTY_NEWLINE); + } + Property changes on: branches/2018Q1/net/quagga/files/patch-lib_command.c ___________________________________________________________________ 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: branches/2018Q1/net/quagga/files/patch-vtysh_extract.pl.in =================================================================== --- branches/2018Q1/net/quagga/files/patch-vtysh_extract.pl.in (revision 461982) +++ branches/2018Q1/net/quagga/files/patch-vtysh_extract.pl.in (revision 461983) @@ -1,11 +1,11 @@ ---- vtysh/extract.pl.in.orig 2016-10-18 13:03:52 UTC +--- vtysh/extract.pl.in.orig 2018-02-04 17:34:34 UTC +++ vtysh/extract.pl.in -@@ -69,7 +69,7 @@ my $cli_stomp = 0; +@@ -75,7 +75,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); Index: branches/2018Q1/net/quagga/pkg-plist =================================================================== --- branches/2018Q1/net/quagga/pkg-plist (revision 461982) +++ branches/2018Q1/net/quagga/pkg-plist (revision 461983) @@ -1,109 +1,109 @@ bin/bgp_btoa %%PIMD%%bin/test_igmpv3_join bin/vtysh include/quagga/buffer.h include/quagga/checksum.h include/quagga/command.h include/quagga/distribute.h include/quagga/event_counter.h include/quagga/fifo.h include/quagga/filter.h include/quagga/getopt.h include/quagga/hash.h 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 include/quagga/nexthop.h include/quagga/ospfapi/ospf_apiclient.h 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/pqueue.h include/quagga/prefix.h include/quagga/privs.h include/quagga/route_types.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/vrf.h include/quagga/vty.h include/quagga/workqueue.h include/quagga/zassert.h include/quagga/zclient.h include/quagga/zebra.h lib/libfpm_pb.a lib/libfpm_pb.so lib/libfpm_pb.so.0 lib/libfpm_pb.so.0.0.0 lib/libospf.a lib/libospf.so lib/libospf.so.0 lib/libospf.so.0.0.0 lib/libospfapiclient.a lib/libospfapiclient.so lib/libospfapiclient.so.0 lib/libospfapiclient.so.0.0.0 lib/libquagga_pb.a lib/libquagga_pb.so lib/libquagga_pb.so.0 lib/libquagga_pb.so.0.0.0 lib/libzebra.a lib/libzebra.so lib/libzebra.so.1 lib/libzebra.so.1.0.0 man/man1/vtysh.1.gz man/man8/bgpd.8.gz %%ISISD%%man/man8/isisd.8.gz man/man8/ospf6d.8.gz man/man8/ospfclient.8.gz man/man8/ospfd.8.gz %%PIMD%%man/man8/pimd.8.gz man/man8/ripd.8.gz man/man8/ripngd.8.gz man/man8/watchquagga.8.gz man/man8/zebra.8.gz sbin/bgpd %%ISISD%%sbin/isisd sbin/ospf6d sbin/ospfclient sbin/ospfd %%PIMD%%sbin/pimd sbin/ripd sbin/ripngd sbin/watchquagga sbin/zebra %%EXAMPLESDIR%%/bgpd.conf.sample %%EXAMPLESDIR%%/bgpd.conf.sample2 %%ISISD%%%%EXAMPLESDIR%%/isisd.conf.sample %%EXAMPLESDIR%%/ospf6d.conf.sample %%EXAMPLESDIR%%/ospfd.conf.sample -%%PIMD%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pimd.conf.sample +%%PIMD%%%%EXAMPLESDIR%%/pimd.conf.sample %%EXAMPLESDIR%%/ripd.conf.sample %%EXAMPLESDIR%%/ripngd.conf.sample %%EXAMPLESDIR%%/vtysh.conf.sample %%EXAMPLESDIR%%/zebra.conf.sample @dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%LOCALSTATE_DIR%% @dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%SYSCONF_DIR%% Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 461982) +++ branches/2018Q1 (revision 461983) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r461952