mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

Update to 0.99.24.

Browse Source 
Enable ISISD, RTADV, OSPF_OPAQUE_LSA by default as they're enabled by
default by quagga's configure.
Enable PIMD because the releases notes says we should unless short on
space.

Release notes:	http://savannah.nongnu.org/forum/forum.php?forum_id=8222
Changelog:	http://download.savannah.gnu.org/releases/quagga/quagga-0.99.24.changelog.txt
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2015-03-03 13:57:33 +00:00
parent afe7451938
commit afd4eca55b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=380374
9 changed files with 81 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/quagga/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= quagga
PORTVERSION= 0.99.23.1
PORTREVISION= 4
PORTVERSION= 0.99.24
CATEGORIES= net ipv6
MASTER_SITES= SAVANNAH
@ -19,17 +18,21 @@ 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
USES= gmake libtool makeinfo perl5 readline compiler:c11 tar:xz autoreconf
USE_LDCONFIG= yes
USE_PERL5= build
INFO= quagga
OPTIONS_DEFINE= ISISD PAM OSPF_OPAQUE_LSA RTADV SNMP TCPSOCKETS DLMALLOC \
NO_BGP_ANNOUNCE OSPF_NEXTHOP
OPTIONS_DEFINE= ISISD PIMD PAM OSPF_OPAQUE_LSA RTADV SNMP TCPSOCKETS DLMALLOC \
NO_BGP_ANNOUNCE OSPF_NEXTHOP IRDP ISIS_TOPOLOGY
OPTIONS_DEFAULT= ISISD PIMD RTADV OSPF_OPAQUE_LSA
OPTIONS_SUB= yes
ISISD_DESC= Enable experimental ISIS daemon
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
OSPF_OPAQUE_LSA_DESC= OSPF Opaque-LSA support (RFC2370)
RTADV_DESC= IPv6 Router Advertisements
@ -58,6 +61,9 @@ 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
OSPF_OPAQUE_LSA_CONFIGURE_ENABLE= opaque-lsa
RTADV_CONFIGURE_ENABLE= rtadv
@ -66,8 +72,8 @@ 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
NO_BGP_ANNOUNCE_CONFIGURE_ENABLE= bgp-announce
OSPF_NEXTHOP_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ospf-nexthop
USE_RC_SUBR= quagga watchquagga

4
net/quagga/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (quagga-0.99.23.1.tar.gz) = 3abf2046bc27539ce2d17c238e06c8fd0d479a8e402580c6aa455808bd48e004
SIZE (quagga-0.99.23.1.tar.gz) = 2526612
SHA256 (quagga-0.99.24.tar.xz) = eca9eeb75005c8c403d48747c93456389e837e07dfc06ce08f70602c32dd4041
SIZE (quagga-0.99.24.tar.xz) = 1680796

24
net/quagga/files/extra-patch-ospf-nexthop
View File

@ -1,6 +1,6 @@
--- ospfd/ospf_asbr.c.orig 2014-08-25 16:56:53 UTC
--- ospfd/ospf_asbr.c.orig 2015-03-02 23:50:57 UTC
+++ ospfd/ospf_asbr.c
@@ -122,6 +122,7 @@
@@ -122,6 +122,7 @@ ospf_reset_route_map_set_values (struct
{
values->metric = -1;
values->metric_type = -1;
@ -8,9 +8,9 @@
}
int
--- ospfd/ospf_asbr.h.orig 2014-08-25 16:56:53 UTC
--- ospfd/ospf_asbr.h.orig 2015-03-02 23:50:57 UTC
+++ ospfd/ospf_asbr.h
@@ -27,6 +27,7 @@
@@ -27,6 +27,7 @@ struct route_map_set_values
{
int32_t metric;
int32_t metric_type;
@ -18,7 +18,7 @@
};
/* Redistributed external information. */
@@ -50,6 +51,7 @@
@@ -50,6 +51,7 @@ struct external_info
struct route_map_set_values route_map_set;
#define ROUTEMAP_METRIC(E) (E)->route_map_set.metric
#define ROUTEMAP_METRIC_TYPE(E) (E)->route_map_set.metric_type
@ -26,9 +26,9 @@
};
#define OSPF_ASBR_CHECK_DELAY 30
--- ospfd/ospf_lsa.c.orig 2014-08-25 16:56:53 UTC
--- ospfd/ospf_lsa.c.orig 2015-03-02 23:50:57 UTC
+++ ospfd/ospf_lsa.c
@@ -1633,7 +1633,8 @@
@@ -1633,7 +1633,8 @@ ospf_external_lsa_body_set (struct strea
stream_put_ospf_metric (s, mvalue);
/* Get forwarding address to nexthop if on the Connection List, else 0. */
@ -38,9 +38,9 @@
/* Put forwarding address. */
stream_put_ipv4 (s, fwd_addr.s_addr);
--- ospfd/ospf_routemap.c.orig 2014-08-25 16:56:53 UTC
--- ospfd/ospf_routemap.c.orig 2015-03-02 23:50:57 UTC
+++ ospfd/ospf_routemap.c
@@ -531,6 +531,62 @@
@@ -531,6 +531,62 @@ struct route_map_rule_cmd route_set_metr
route_set_metric_type_free,
};
@ -103,7 +103,7 @@
DEFUN (match_ip_nexthop,
match_ip_nexthop_cmd,
"match ip next-hop (<1-199>|<1300-2699>|WORD)",
@@ -785,6 +841,49 @@
@@ -785,6 +841,49 @@ ALIAS (no_set_metric_type,
"OSPF[6] external type 1 metric\n"
"OSPF[6] external type 2 metric\n")
@ -153,7 +153,7 @@
/* Route-map init */
void
ospf_route_map_init (void)
@@ -804,6 +903,7 @@
@@ -804,6 +903,7 @@ ospf_route_map_init (void)
route_map_install_set (&route_set_metric_cmd);
route_map_install_set (&route_set_metric_type_cmd);
@ -161,7 +161,7 @@
install_element (RMAP_NODE, &match_ip_nexthop_cmd);
install_element (RMAP_NODE, &no_match_ip_nexthop_cmd);
@@ -827,4 +927,7 @@
@@ -827,4 +927,7 @@ 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);

11
net/quagga/files/patch-configure
View File

@ -1,11 +0,0 @@
--- configure.orig 2014-08-25 17:02:06 UTC
+++ configure
@@ -18158,7 +18158,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

11
net/quagga/files/patch-configure.ac Normal file
View File

@ -0,0 +1,11 @@
--- configure.ac.orig 2015-03-02 23:50:57 UTC
+++ configure.ac
@@ -1219,7 +1219,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])

6
net/quagga/files/patch-doc__bgpd.8
View File

@ -1,6 +1,6 @@
--- doc/bgpd.8.orig 2014-08-25 16:56:53 UTC
--- doc/bgpd.8.orig 2015-03-02 23:50:57 UTC
+++ doc/bgpd.8
@@ -28,6 +28,8 @@
@@ -28,6 +28,8 @@ software
] [
.B \-g
.I group
@ -9,7 +9,7 @@
]
.SH DESCRIPTION
.B bgpd
@@ -76,6 +78,9 @@
@@ -76,6 +78,9 @@ When the program terminates, retain rout
.TP
\fB\-v\fR, \fB\-\-version\fR
Print the version and exit.

12
net/quagga/files/patch-lib__zebra.h
View File

@ -1,12 +0,0 @@
--- 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
*/
-#if defined(__NetBSD__) || defined(__FreeBSD__) \
+#if defined(__NetBSD__) \
+ || (defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) \
|| (defined(__OpenBSD__) && (OpenBSD < 200311)) \
|| (defined(__APPLE__)) \
|| (defined(SUNOS_5) && defined(WORDS_BIGENDIAN))

4
net/quagga/files/patch-vtysh__extract.pl.in
View File

@ -1,6 +1,6 @@
--- vtysh/extract.pl.in.orig 2014-08-25 16:56:53 UTC
--- vtysh/extract.pl.in.orig 2015-03-02 23:50:57 UTC
+++ vtysh/extract.pl.in
@@ -63,7 +63,7 @@
@@ -63,7 +63,7 @@ $ignore{'"show history"'} = "ignore";
foreach (@ARGV) {
$file = $_;

70
net/quagga/pkg-plist
View File

@ -1,26 +1,5 @@
sbin/babeld
sbin/bgpd
%%ISISD%%sbin/isisd
sbin/ospf6d
%%OSPF_OPAQUE_LSA%%sbin/ospfclient
sbin/ospfd
sbin/ripd
sbin/ripngd
sbin/watchquagga
sbin/zebra
%%PIMD%%bin/test_igmpv3_join
bin/vtysh
lib/libospf.a
lib/libospf.so
lib/libospf.so.0
lib/libospf.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
lib/libzebra.so.0.0.0
include/quagga/buffer.h
include/quagga/checksum.h
include/quagga/command.h
@ -53,8 +32,8 @@ include/quagga/plist.h
include/quagga/pqueue.h
include/quagga/prefix.h
include/quagga/privs.h
include/quagga/routemap.h
include/quagga/route_types.h
include/quagga/routemap.h
include/quagga/sigevent.h
include/quagga/smux.h
include/quagga/sockopt.h
@ -70,25 +49,50 @@ include/quagga/workqueue.h
include/quagga/zassert.h
include/quagga/zclient.h
include/quagga/zebra.h
lib/libospf.a
lib/libospf.so
lib/libospf.so.0
lib/libospf.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
lib/libzebra.so.0.0.0
man/man1/vtysh.1.gz
man/man8/bgpd.8.gz
%%ISISD%%man/man8/isisd.8.gz
man/man8/ospf6d.8.gz
%%OSPF_OPAQUE_LSA%%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/babeld
sbin/bgpd
%%ISISD%%sbin/isisd
sbin/ospf6d
%%OSPF_OPAQUE_LSA%%sbin/ospfclient
sbin/ospfd
%%PIMD%%sbin/pimd
sbin/ripd
sbin/ripngd
sbin/watchquagga
sbin/zebra
%%EXAMPLESDIR%%/babeld.conf.sample
%%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
%%EXAMPLESDIR%%/ripd.conf.sample
%%EXAMPLESDIR%%/ripngd.conf.sample
%%EXAMPLESDIR%%/vtysh.conf.sample
%%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
%%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
@dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%LOCALSTATE_DIR%%
@dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%ETCDIR%%