Date: Thu, 20 Oct 2016 12:27:20 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424324 - in head/net/quagga: . files Message-ID: <201610201227.u9KCRKuv092160@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Oct 20 12:27:20 2016 New Revision: 424324 URL: https://svnweb.freebsd.org/changeset/ports/424324 Log: Fix build. As I managed to somehow build it yesterday before committing the update, and I am removing an option, I'm bumping PORTREVISION Submitted by: pkg-fallout Sponsored by: Absolight Added: head/net/quagga/files/patch-configure (contents, props changed) Deleted: head/net/quagga/files/patch-configure.ac Modified: head/net/quagga/Makefile (contents, props changed) head/net/quagga/files/extra-patch-ospf-nexthop (contents, props changed) head/net/quagga/pkg-plist (contents, props changed) Modified: head/net/quagga/Makefile ============================================================================== --- head/net/quagga/Makefile Thu Oct 20 12:10:44 2016 (r424323) +++ head/net/quagga/Makefile Thu Oct 20 12:27:20 2016 (r424324) @@ -3,6 +3,7 @@ PORTNAME= quagga PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH @@ -18,14 +19,16 @@ 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 compiler:c11 autoreconf cpe +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 IRDP ISIS_TOPOLOGY + 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 @@ -62,7 +65,7 @@ CONFIGURE_ARGS+=--enable-vty-group=${ENA ISISD_CONFIGURE_ENABLE= isisd ISIS_TOPOLOGY_CONFIGURE_ENABLE= isis-topology PIMD_CONFIGURE_ENABLE= pimd -IRDP_CONFIGURE_ENABLE= irdb +IRDP_CONFIGURE_ENABLE= irdp PAM_CONFIGURE_WITH= libpam RTADV_CONFIGURE_ENABLE= rtadv SNMP_CONFIGURE_ENABLE= snmp Modified: head/net/quagga/files/extra-patch-ospf-nexthop ============================================================================== --- head/net/quagga/files/extra-patch-ospf-nexthop Thu Oct 20 12:10:44 2016 (r424323) +++ head/net/quagga/files/extra-patch-ospf-nexthop Thu Oct 20 12:27:20 2016 (r424324) @@ -1,4 +1,4 @@ ---- ospfd/ospf_asbr.c.orig 2016-03-15 23:17:17 UTC +--- ospfd/ospf_asbr.c.orig 2016-10-18 13:03:52 UTC +++ ospfd/ospf_asbr.c @@ -122,6 +122,7 @@ ospf_reset_route_map_set_values (struct { @@ -8,7 +8,7 @@ } int ---- ospfd/ospf_asbr.h.orig 2016-03-15 23:17:17 UTC +--- ospfd/ospf_asbr.h.orig 2016-10-18 13:03:52 UTC +++ ospfd/ospf_asbr.h @@ -27,6 +27,7 @@ struct route_map_set_values { @@ -26,7 +26,7 @@ }; #define OSPF_ASBR_CHECK_DELAY 30 ---- ospfd/ospf_lsa.c.orig 2016-03-15 23:17:17 UTC +--- ospfd/ospf_lsa.c.orig 2016-10-18 13:03:52 UTC +++ ospfd/ospf_lsa.c @@ -1644,7 +1644,8 @@ ospf_external_lsa_body_set (struct strea stream_put_ospf_metric (s, mvalue); @@ -38,10 +38,10 @@ /* Put forwarding address. */ stream_put_ipv4 (s, fwd_addr.s_addr); ---- ospfd/ospf_routemap.c.orig 2016-03-15 23:17:17 UTC +--- ospfd/ospf_routemap.c.orig 2016-10-18 13:03:52 UTC +++ ospfd/ospf_routemap.c -@@ -531,6 +531,62 @@ struct route_map_rule_cmd route_set_metr - route_set_metric_type_free, +@@ -668,6 +668,62 @@ struct route_map_rule_cmd route_set_tag_ + route_set_tag_free, }; +/* `set ip next-hop IP_ADDRESS' */ @@ -103,9 +103,9 @@ DEFUN (match_ip_nexthop, match_ip_nexthop_cmd, "match ip next-hop (<1-199>|<1300-2699>|WORD)", -@@ -785,6 +841,49 @@ ALIAS (no_set_metric_type, - "OSPF[6] external type 1 metric\n" - "OSPF[6] external type 2 metric\n") +@@ -984,6 +1040,49 @@ ALIAS (no_set_tag, + "Tag value for routing protocol\n" + "Tag value\n") +DEFUN (set_ip_nexthop, + set_ip_nexthop_cmd, @@ -153,30 +153,32 @@ /* Route-map init */ void ospf_route_map_init (void) -@@ -804,6 +903,7 @@ ospf_route_map_init (void) - +@@ -1005,6 +1104,7 @@ ospf_route_map_init (void) route_map_install_set (&route_set_metric_cmd); route_map_install_set (&route_set_metric_type_cmd); + route_map_install_set (&route_set_tag_cmd); + route_map_install_set (&route_set_ip_nexthop_cmd); install_element (RMAP_NODE, &match_ip_nexthop_cmd); install_element (RMAP_NODE, &no_match_ip_nexthop_cmd); -@@ -827,4 +927,7 @@ ospf_route_map_init (void) +@@ -1031,6 +1131,9 @@ ospf_route_map_init (void) 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); + install_element (RMAP_NODE, &set_ip_nexthop_cmd); + install_element (RMAP_NODE, &no_set_ip_nexthop_cmd); + install_element (RMAP_NODE, &no_set_ip_nexthop_val_cmd); - } ---- vtysh/extract.pl.in.orig 2016-03-15 23:17:17 UTC + install_element (RMAP_NODE, &set_tag_cmd); + install_element (RMAP_NODE, &no_set_tag_cmd); + install_element (RMAP_NODE, &no_set_tag_val_cmd); +--- vtysh/extract.pl.in.orig 2016-10-20 11:59:56 UTC +++ vtysh/extract.pl.in @@ -180,7 +180,7 @@ foreach (@ARGV) { } } --my $bad_cli_stomps = 89; -+my $bad_cli_stomps = 92; +-my $bad_cli_stomps = 102; ++my $bad_cli_stomps = 105; # Currently we have $bad_cli_stomps. This was determined by # running this script and counting up the collisions from what # was returned. Added: head/net/quagga/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/quagga/files/patch-configure Thu Oct 20 12:27:20 2016 (r424324) @@ -0,0 +1,11 @@ +--- configure.orig 2016-10-18 13:06:39 UTC ++++ configure +@@ -19874,7 +19874,7 @@ 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 Modified: head/net/quagga/pkg-plist ============================================================================== --- head/net/quagga/pkg-plist Thu Oct 20 12:10:44 2016 (r424323) +++ head/net/quagga/pkg-plist Thu Oct 20 12:27:20 2016 (r424324) @@ -1,10 +1,11 @@ +bin/bgp_btoa %%PIMD%%bin/test_igmpv3_join bin/vtysh -bin/bgp_btoa 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 @@ -20,6 +21,7 @@ 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 @@ -52,6 +54,10 @@ 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 @@ -60,6 +66,10 @@ 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.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610201227.u9KCRKuv092160>