Index: head/net/quagga/Makefile =================================================================== --- head/net/quagga/Makefile (revision 456723) +++ head/net/quagga/Makefile (revision 456724) @@ -1,106 +1,107 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= quagga PORTVERSION= 1.2.2 +PORTREVISION= 1 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 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: head/net/quagga/files/patch-bgpd_bgp__aspath.c =================================================================== --- head/net/quagga/files/patch-bgpd_bgp__aspath.c (nonexistent) +++ head/net/quagga/files/patch-bgpd_bgp__aspath.c (revision 456724) @@ -0,0 +1,11 @@ +--- 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: head/net/quagga/files/patch-bgpd_bgp__aspath.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: head/net/quagga/files/patch-bgpd_bgp__nht.c =================================================================== --- head/net/quagga/files/patch-bgpd_bgp__nht.c (nonexistent) +++ head/net/quagga/files/patch-bgpd_bgp__nht.c (revision 456724) @@ -0,0 +1,13 @@ +--- 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: head/net/quagga/files/patch-bgpd_bgp__nht.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: head/net/quagga/files/patch-configure =================================================================== --- head/net/quagga/files/patch-configure (revision 456723) +++ head/net/quagga/files/patch-configure (revision 456724) @@ -1,11 +1,12 @@ ---- configure.orig 2016-10-18 13:06:39 UTC +--- configure.orig 2017-10-03 14:59:10 UTC +++ configure -@@ -19874,7 +19874,7 @@ fi +@@ -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 Index: head/net/quagga/files/patch-doc_bgpd.8 =================================================================== --- head/net/quagga/files/patch-doc_bgpd.8 (revision 456723) +++ head/net/quagga/files/patch-doc_bgpd.8 (revision 456724) @@ -1,21 +1,21 @@ ---- doc/bgpd.8.orig 2016-10-18 13:03:52 UTC +--- doc/bgpd.8.orig 2017-10-03 14:57:10 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 +@@ -79,6 +81,9 @@ Skip setting the process effective user and group. .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