diff options
author | olivier <olivier@FreeBSD.org> | 2019-04-16 17:56:53 +0800 |
---|---|---|
committer | olivier <olivier@FreeBSD.org> | 2019-04-16 17:56:53 +0800 |
commit | 195b721ce713b5d608be130985ece6a3ed0d7efb (patch) | |
tree | 129f4135dff25b0002bf0aa0a928afa0ff36e6de | |
parent | 3bdd775164f5f1a2bed894f3d03a99e4ee29205d (diff) | |
download | freebsd-ports-gnome-195b721ce713b5d608be130985ece6a3ed0d7efb.tar.gz freebsd-ports-gnome-195b721ce713b5d608be130985ece6a3ed0d7efb.tar.zst freebsd-ports-gnome-195b721ce713b5d608be130985ece6a3ed0d7efb.zip |
Remove net/frr3 and net/frr4: Upstream no longer maintained
-rw-r--r-- | MOVED | 2 | ||||
-rw-r--r-- | net/Makefile | 2 | ||||
-rw-r--r-- | net/frr3/Makefile | 81 | ||||
-rw-r--r-- | net/frr3/distinfo | 3 | ||||
-rw-r--r-- | net/frr3/files/frr.in | 155 | ||||
-rw-r--r-- | net/frr3/files/patch-Makefile.am | 11 | ||||
-rw-r--r-- | net/frr3/files/patch-vtysh_vtysh.c | 11 | ||||
-rw-r--r-- | net/frr3/files/watchfrr.in | 33 | ||||
-rw-r--r-- | net/frr3/pkg-descr | 5 | ||||
-rw-r--r-- | net/frr3/pkg-plist | 123 | ||||
-rw-r--r-- | net/frr4/Makefile | 87 | ||||
-rw-r--r-- | net/frr4/distinfo | 3 | ||||
-rw-r--r-- | net/frr4/files/frr.in | 155 | ||||
-rw-r--r-- | net/frr4/files/patch-Makefile.am | 11 | ||||
-rw-r--r-- | net/frr4/files/patch-configure.ac | 11 | ||||
-rw-r--r-- | net/frr4/files/watchfrr.in | 33 | ||||
-rw-r--r-- | net/frr4/pkg-descr | 5 | ||||
-rw-r--r-- | net/frr4/pkg-message | 8 | ||||
-rw-r--r-- | net/frr4/pkg-plist | 151 | ||||
-rw-r--r-- | net/frr5/Makefile | 2 | ||||
-rw-r--r-- | net/frr6/Makefile | 2 | ||||
-rw-r--r-- | net/frr7/Makefile | 2 | ||||
-rw-r--r-- | net/quagga/Makefile | 2 |
23 files changed, 6 insertions, 892 deletions
@@ -12178,3 +12178,5 @@ net/rubygem-fog-aliyun02|net/rubygem-fog-aliyun|2019-04-14|Has expired: Use net/ net/rubygem-fog-aws2|net/rubygem-fog-aws|2019-04-14|Has expired: Use net/rubygem-fog-aws instead www/mediawiki127|www/mediawiki131|2019-04-15|Has expired: Upstream no longer maintained www/mediawiki130|www/mediawiki131|2019-04-15|Has expired: Upstream no longer maintained +net/frr3|net/frr7|2019-04-16|Has expired: Upstream no longer maintained +net/frr4|net/frr7|2019-04-16|Has expired: Upstream no longer maintained diff --git a/net/Makefile b/net/Makefile index 8988224a0919..09f557c76624 100644 --- a/net/Makefile +++ b/net/Makefile @@ -167,8 +167,6 @@ SUBDIR += freerdp1 SUBDIR += freeswitch SUBDIR += freevrrpd - SUBDIR += frr3 - SUBDIR += frr4 SUBDIR += frr5 SUBDIR += frr6 SUBDIR += frr7 diff --git a/net/frr3/Makefile b/net/frr3/Makefile deleted file mode 100644 index 14e44b3fe950..000000000000 --- a/net/frr3/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# $FreeBSD$ - -PORTNAME= frr -PORTVERSION= 3.0.4 -PORTREVISION= 1 -DISTVERSIONPREFIX= frr- -CATEGORIES= net ipv6 -PKGNAMESUFFIX= 3 - -MAINTAINER= olivier@FreeBSD.org -COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -BUILD_DEPENDS= gawk:lang/gawk -LIB_DEPENDS= libjson-c.so:devel/json-c - -CONFLICTS= openbgpd openospfd zebra quagga frr4 frr5 frr6 frr7 - -USE_GITHUB= yes -GH_ACCOUNT= FRRouting - -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USES= autoreconf bison gmake pkgconfig libtool makeinfo readline -USE_LDCONFIG= yes - -INFO= frr - -OPTIONS_DEFINE= FPM LDPD PAM SHELLACCESS TCPSOCKETS VTYSH MULTIPATH TCMALLOC -OPTIONS_DEFAULT= VTYSH -OPTIONS_SUB= yes -# SNMP option build failed -# checksum.c:79:21: warning: implicit declaration of function 'typeof' is -# invalid in C99 [-Wimplicit-function-declaration] -# IRDP option needs something freebsd does not seem to have: -# configure: error: 'IRDP requires in_pktinfo at the moment!' - -FPM_DESC= Enable Forwarding Plane Manager support -LDPD_DESC= Build ldpd -MULTIPATH_DESC= Enable multipath function -PAM_DESC= Use libpam for PAM support in vtysh -SHELLACCESS_DESC= Allow users to access shell/telnet/ssh -SNMP_DESC= SNMP support -TCMALLOC_DESC= Use tcmalloc -TCPSOCKETS_DESC= Use TCP/IP sockets for protocol daemons -VTYSH_DESC= Build integrated vty shell - -USERS= frr -GROUPS= frr frrvty - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -# PIM compile but didn't work on FreeBSD -CONFIGURE_ARGS= --enable-user=frr \ - --enable-group=frr \ - --enable-vty-group=frrvty \ - --sysconfdir=${ETCDIR} \ - --localstatedir=/var/run/frr \ - --disable-pimd - -SHELLACCESS_CONFIGURE_ENABLE= shell-access -FPM_CONFIGURE_ENABLE= fpm -PAM_CONFIGURE_WITH= libpam -LDPD_CONFIGURE_ENABLE= ldpd -MULTIPATH_CONFIGURE_ON= --enable-multipath=64 -TCMALLOC_CONFIGURE_ENABLE= tcmalloc -TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools -SNMP_CONFIGURE_ENABLE= snmp -SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp -TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra -VTYSH_CONFIGURE_ENABLE= vtysh - -USE_RC_SUBR= frr watchfrr - -post-install: - ${MKDIR} ${STAGEDIR}/var/run/frr - -.include <bsd.port.mk> diff --git a/net/frr3/distinfo b/net/frr3/distinfo deleted file mode 100644 index c43367b2567e..000000000000 --- a/net/frr3/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546958999 -SHA256 (FRRouting-frr-frr-3.0.4_GH0.tar.gz) = 798037027ba9278b0cae644d97ff512e303e01a990fbf59cc1bf288085a362b4 -SIZE (FRRouting-frr-frr-3.0.4_GH0.tar.gz) = 3168659 diff --git a/net/frr3/files/frr.in b/net/frr3/files/frr.in deleted file mode 100644 index 23f068799cd4..000000000000 --- a/net/frr3/files/frr.in +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: frr -# REQUIRE: netif routing -# KEYWORD: nojailvnet shutdown - -# Add the following line to /etc/rc.conf to enable frr: -# frr_enable="YES" -# -# You may also wish to use the following variables to fine-tune startup: -# frr_flags="" -# frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd" -# frr_vysh_boot="YES" -# Per daemon tuning may be done with daemon_name_flags -# zebra_flags="-P 0" -# bgpd_flags="-nrP 0" and so on -# If you want to give the routing daemons a chance to catchup before -# continueing, set frr_wait_for to a "default" or certain prefix. -# frr_wait_for="default" -# Set the time limit for the wait. -# frr_wait_seconds="90" -# -# If the frr daemons require additional shared libraries to start, -# use the following variable to run ldconfig(8) in advance: -# frr_extralibs_path="/usr/local/lib ..." -# -# This RC script was adapted from the net/quagga port - -. /etc/rc.subr - -name=frr -rcvar=$name_enable - -start_postcmd=start_postcmd -stop_postcmd="rm -f $pidfile" -configtest_cmd=check_config -extra_commands=configtest -command_args="-d" - -load_rc_config $name -: ${frr_enable:="NO"} -: ${frr_flags:=""} -: ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd"} -: ${frr_vtysh_boot:="NO"} -: ${frr_wait_for:=""} -: ${frr_wait_seconds:="90"} - -check_config() -{ - echo "Checking $daemon.conf" - # pimd doesn't support -C - if [ "$daemon" = "pimd" ]; then - echo "Ignored" - else - $command $daemon_flags -C - result=$? - if [ "$result" -eq "0" ]; then - echo "OK" - else - echo "FAILED" - exit - fi - fi -} - -start_postcmd() -{ - local waited_for - waited_for=0 - # Wait only when last daemon has started. - if [ "${frr_daemons}" = "${frr_daemons% ${name}}" ]; then - return; - fi - if [ -n "${frr_wait_for}" ]; then - echo Waiting for ${frr_wait_for} route... - while [ ${waited_for} -lt ${frr_wait_seconds} ]; do - /sbin/route -n get ${frr_wait_for} >/dev/null 2>&1 && break; - waited_for=$((waited_for+1)) - sleep 1; - done - [ ${waited_for} -lt ${frr_wait_seconds} ] || echo Giving up... - fi -} - -do_cmd() -{ - local ret - ret=0 - frr_cmd=$1 - for daemon in ${frr_daemons}; do - command=%%PREFIX%%/sbin/${daemon} - required_files=%%ETCDIR%%/${daemon}.conf - pidfile=/var/run/frr/${daemon}.pid - if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then - check_config - fi - if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then - continue - fi - if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then - continue - fi - eval flags=\$\{${daemon}_flags:-\"${frr_flags}\"\} - name=${daemon} - _rc_restart_done=false - run_rc_command "$1" || ret=1 - done - if checkyesno frr_vtysh_boot; then - echo "Booting for integrated-vtysh-config..." - %%PREFIX%%/bin/vtysh -b - fi - return ${ret} -} - -frr_cmd=$1 - -case "$1" in - force*) - frr_cmd=${frr_cmd#force} - ;; - fast*) - frr_cmd=${frr_cmd#fast} - ;; -esac -shift - -if [ $# -ge 1 ]; then - frr_daemons="$*" -fi - -case "${frr_cmd}" in - start|quietstart) - if [ -n "${frr_extralibs_path}" ]; then - /sbin/ldconfig -m ${frr_extralibs_path} - fi - # Why should I need to add this check ? - checkyesno frr_enable && do_cmd "start" - ;; - stop) - frr_daemons=$(reverse_list ${frr_daemons}) - do_cmd "stop" - ;; - restart) - frr_daemons=$(reverse_list ${frr_daemons}) - do_cmd "stop" - frr_daemons=$(reverse_list ${frr_daemons}) - checkyesno frr_enable && do_cmd "start" - ;; - *) - do_cmd "${frr_cmd}" - ;; -esac diff --git a/net/frr3/files/patch-Makefile.am b/net/frr3/files/patch-Makefile.am deleted file mode 100644 index 662021f2f894..000000000000 --- a/net/frr3/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2017-03-08 14:59:07 UTC -+++ Makefile.am -@@ -4,7 +4,7 @@ SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \ - @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \ - @ISISD@ @PIMD@ @NHRPD@ \ - @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \ -- redhat @SOLARIS@ tests tools cumulus snapcraft -+ redhat @SOLARIS@ tests cumulus snapcraft - - DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \ - isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \ diff --git a/net/frr3/files/patch-vtysh_vtysh.c b/net/frr3/files/patch-vtysh_vtysh.c deleted file mode 100644 index 66fe60cde778..000000000000 --- a/net/frr3/files/patch-vtysh_vtysh.c +++ /dev/null @@ -1,11 +0,0 @@ ---- vtysh/vtysh.c.orig 2017-08-09 12:56:09.000000000 +0200 -+++ vtysh/vtysh.c 2017-08-22 22:04:36.068181000 +0200 -@@ -249,7 +249,7 @@ - if (pager_defined) - vtysh_pager_name = strdup(pager_defined); - else -- vtysh_pager_name = strdup("more"); -+ vtysh_pager_name = strdup("cat"); - } - - /* Command execution over the vty interface. */ diff --git a/net/frr3/files/watchfrr.in b/net/frr3/files/watchfrr.in deleted file mode 100644 index cb3f09a751cd..000000000000 --- a/net/frr3/files/watchfrr.in +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: watchfrr -# REQUIRE: NETWORKING frr -# KEYWORD: nojailvtnet shutdown - -# Add the following line to /etc/rc.conf to enable watchfrr: -# watchfrr_enable="YES" -# -# You may also wish to use the following variables to fine-tune startup: -# watchfrr_flags -# Example of flags usage: -# watchfrr_flags=" -d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30 zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld" - -. /etc/rc.subr - -name=watchfrr -rcvar=${name}_enable - -load_rc_config $name - -stop_postcmd="rm -f $pidfile" - -watchfrr_enable=${watchfrr_enable:-"NO"} -watchfrr_flags=${watchfrr_flags:-"-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30 zebra ripd ripngd ospfd ospf6d bgpd isisd"} - -command=%%PREFIX%%/sbin/watchfrr -pidfile=/var/run/frr/watchfrr.pid - -run_rc_command "$1" diff --git a/net/frr3/pkg-descr b/net/frr3/pkg-descr deleted file mode 100644 index 6ac4ad877355..000000000000 --- a/net/frr3/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -FRRouting (FRR) is an IP routing protocol suite for Linux and Unix platforms -which includes protocol daemons for BGP, IS-IS, OSPF and RIP. FRR has its roots -in the Quagga project. - -WWW: https://frrouting.org/ diff --git a/net/frr3/pkg-plist b/net/frr3/pkg-plist deleted file mode 100644 index b3eba7d998fc..000000000000 --- a/net/frr3/pkg-plist +++ /dev/null @@ -1,123 +0,0 @@ -bin/bgp_btoa -%%VTYSH%%bin/vtysh -include/frr/bfd.h -include/frr/bitfield.h -include/frr/buffer.h -include/frr/checksum.h -include/frr/command.h -include/frr/command_match.h -include/frr/csv.h -include/frr/distribute.h -include/frr/event_counter.h -include/frr/fifo.h -include/frr/filter.h -include/frr/getopt.h -include/frr/graph.h -include/frr/hash.h -include/frr/hook.h -include/frr/if.h -include/frr/if_rmap.h -include/frr/imsg.h -include/frr/jhash.h -include/frr/json.h -include/frr/keychain.h -include/frr/libfrr.h -include/frr/libospf.h -include/frr/linklist.h -include/frr/log.h -include/frr/md5.h -include/frr/memory.h -include/frr/memory_vty.h -include/frr/module.h -include/frr/monotime.h -include/frr/mpls.h -include/frr/network.h -include/frr/nexthop.h -include/frr/ns.h -include/frr/openbsd-queue.h -include/frr/openbsd-tree.h -include/frr/ospfapi/ospf_apiclient.h -include/frr/ospfd/ospf_api.h -include/frr/ospfd/ospf_asbr.h -include/frr/ospfd/ospf_dump.h -include/frr/ospfd/ospf_dump_api.h -include/frr/ospfd/ospf_ism.h -include/frr/ospfd/ospf_lsa.h -include/frr/ospfd/ospf_lsdb.h -include/frr/ospfd/ospf_nsm.h -include/frr/ospfd/ospf_opaque.h -include/frr/ospfd/ospfd.h -include/frr/plist.h -include/frr/pqueue.h -include/frr/prefix.h -include/frr/privs.h -include/frr/ptm_lib.h -include/frr/pw.h -include/frr/qobj.h -include/frr/route_types.h -include/frr/routemap.h -include/frr/sigevent.h -include/frr/spf_backoff.h -include/frr/skiplist.h -include/frr/smux.h -include/frr/sockopt.h -include/frr/sockunion.h -include/frr/srcdest_table.h -include/frr/stream.h -include/frr/systemd.h -include/frr/table.h -include/frr/thread.h -include/frr/vector.h -include/frr/version.h -include/frr/vrf.h -include/frr/vty.h -include/frr/wheel.h -include/frr/workqueue.h -include/frr/zassert.h -include/frr/zclient.h -include/frr/zebra.h -lib/libfrr.a -lib/libfrr.so -lib/libfrr.so.0 -lib/libfrr.so.0.0.0 -lib/libfrrospfapiclient.a -lib/libfrrospfapiclient.so -lib/libfrrospfapiclient.so.0 -lib/libfrrospfapiclient.so.0.0.0 -%%FPM%%lib/frr/modules/zebra_fpm.so -man/man1/frr.1.gz -man/man8/isisd.8.gz -man/man8/watchfrr.8.gz -%%VTYSH%%man/man1/vtysh.1.gz -man/man8/bgpd.8.gz -%%LDPD%%man/man8/ldpd.8.gz -man/man8/ospf6d.8.gz -man/man8/ospfclient.8.gz -man/man8/ospfd.8.gz -man/man8/ripd.8.gz -man/man8/ripngd.8.gz -man/man8/zebra.8.gz -sbin/bgpd -%%LDPD%%sbin/ldpd -sbin/ospf6d -sbin/ospfclient -sbin/ospfd -sbin/ripd -sbin/ripngd -sbin/zebra -sbin/isisd -sbin/rfptest -sbin/ssd -sbin/watchfrr -%%ETCDIR%%/bgpd.conf.sample -%%ETCDIR%%/bgpd.conf.sample2 -%%ETCDIR%%/bgpd.conf.vnc.sample -%%ETCDIR%%/isisd.conf.sample -%%LDPD%%%%ETCDIR%%/ldpd.conf.sample -%%ETCDIR%%/ospf6d.conf.sample -%%ETCDIR%%/ospfd.conf.sample -%%ETCDIR%%/ripd.conf.sample -%%ETCDIR%%/ripngd.conf.sample -%%VTYSH%%%%ETCDIR%%/vtysh.conf.sample -%%ETCDIR%%/zebra.conf.sample -@dir(frr,frr,750) /var/run/frr diff --git a/net/frr4/Makefile b/net/frr4/Makefile deleted file mode 100644 index d9760193ed85..000000000000 --- a/net/frr4/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# $FreeBSD$ - -PORTNAME= frr -PORTVERSION= 4.0.1 -PORTREVISION= 1 -DISTVERSIONPREFIX= frr- -CATEGORIES= net ipv6 -PKGNAMESUFFIX= 4 - -MAINTAINER= olivier@FreeBSD.org -COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -BUILD_DEPENDS= gawk:lang/gawk -LIB_DEPENDS= libjson-c.so:devel/json-c - -CONFLICTS= openbgpd openospfd zebra quagga frr3 frr5 frr6 frr7 - -USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ - makeinfo python:2.7,build readline -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_LDCONFIG= yes - -USE_GITHUB= yes -GH_ACCOUNT= FRRouting - -INFO= frr - -OPTIONS_DEFINE= FPM LDPD PAM SHELLACCESS TCPSOCKETS VTYSH MULTIPATH TCMALLOC RPKI -OPTIONS_DEFAULT= VTYSH RPKI -OPTIONS_SUB= yes -# SNMP option build failed -# checksum.c:79:21: warning: implicit declaration of function 'typeof' is -# invalid in C99 [-Wimplicit-function-declaration] -# IRDP option needs something freebsd does not seem to have: -# configure: error: 'IRDP requires in_pktinfo at the moment!' - -FPM_DESC= Enable Forwarding Plane Manager support -LDPD_DESC= Build ldpd -MULTIPATH_DESC= Enable multipath function -PAM_DESC= Use libpam for PAM support in vtysh -RPKI_DESC= Add BGP RPKI (RFC 6810) support -SHELLACCESS_DESC= Allow users to access shell/telnet/ssh -SNMP_DESC= SNMP support -TCMALLOC_DESC= Use tcmalloc -TCPSOCKETS_DESC= Use TCP/IP sockets for protocol daemons -VTYSH_DESC= Build integrated vty shell - -USERS= frr -GROUPS= frr frrvty - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -# PIM compile but didn't work on FreeBSD -CONFIGURE_ARGS= --enable-user=frr \ - --enable-group=frr \ - --enable-vty-group=frrvty \ - --sysconfdir=${ETCDIR} \ - --localstatedir=/var/run/frr \ - --disable-nhrpd \ - --disable-pimd - -SHELLACCESS_CONFIGURE_ENABLE= shell-access -FPM_CONFIGURE_ENABLE= fpm -PAM_CONFIGURE_WITH= libpam -LDPD_CONFIGURE_ENABLE= ldpd -MULTIPATH_CONFIGURE_ON= --enable-multipath=64 -RPKI_CONFIGURE_ENABLE= rpki -RPKI_LIB_DEPENDS= librtr.so:net-mgmt/rtrlib \ - libssh.so:security/libssh -TCMALLOC_CONFIGURE_ENABLE= tcmalloc -TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools -SNMP_CONFIGURE_ENABLE= snmp -SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp -TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra -VTYSH_CONFIGURE_ENABLE= vtysh - -USE_RC_SUBR= frr watchfrr - -post-install: - ${MKDIR} ${STAGEDIR}/var/run/frr - -.include <bsd.port.mk> diff --git a/net/frr4/distinfo b/net/frr4/distinfo deleted file mode 100644 index 2ca0a60126a0..000000000000 --- a/net/frr4/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1546958139 -SHA256 (FRRouting-frr-frr-4.0.1_GH0.tar.gz) = c897e32604215e4eb3af0bdc908ff3caed7343f0356ca3343d6177418ab0278f -SIZE (FRRouting-frr-frr-4.0.1_GH0.tar.gz) = 3990506 diff --git a/net/frr4/files/frr.in b/net/frr4/files/frr.in deleted file mode 100644 index 2295a6b58768..000000000000 --- a/net/frr4/files/frr.in +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: frr -# REQUIRE: netif routing -# KEYWORD: nojailvnet shutdown - -# Add the following line to /etc/rc.conf to enable frr: -# frr_enable="YES" -# -# You may also wish to use the following variables to fine-tune startup: -# frr_flags="" -# frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd" -# frr_vysh_boot="YES" -# Per daemon tuning may be done with daemon_name_flags -# zebra_flags="-P 0" -# bgpd_flags="-nrP 0" and so on -# If you want to give the routing daemons a chance to catchup before -# continueing, set frr_wait_for to a "default" or certain prefix. -# frr_wait_for="default" -# Set the time limit for the wait. -# frr_wait_seconds="90" -# -# If the frr daemons require additional shared libraries to start, -# use the following variable to run ldconfig(8) in advance: -# frr_extralibs_path="/usr/local/lib ..." -# -# This RC script was adapted from the net/quagga port - -. /etc/rc.subr - -name=frr -rcvar=$name_enable - -start_postcmd=start_postcmd -stop_postcmd="rm -f $pidfile" -configtest_cmd=check_config -extra_commands=configtest -command_args="-d" - -load_rc_config $name -: ${frr_enable:="NO"} -: ${frr_flags:=""} -: ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"} -: ${frr_vtysh_boot:="NO"} -: ${frr_wait_for:=""} -: ${frr_wait_seconds:="90"} - -check_config() -{ - echo "Checking $daemon.conf" - # pimd doesn't support -C - if [ "$daemon" = "pimd" ]; then - echo "Ignored" - else - $command $daemon_flags -C - result=$? - if [ "$result" -eq "0" ]; then - echo "OK" - else - echo "FAILED" - exit - fi - fi -} - -start_postcmd() -{ - local waited_for - waited_for=0 - # Wait only when last daemon has started. - if [ "${frr_daemons}" = "${frr_daemons% ${name}}" ]; then - return; - fi - if [ -n "${frr_wait_for}" ]; then - echo Waiting for ${frr_wait_for} route... - while [ ${waited_for} -lt ${frr_wait_seconds} ]; do - /sbin/route -n get ${frr_wait_for} >/dev/null 2>&1 && break; - waited_for=$((waited_for+1)) - sleep 1; - done - [ ${waited_for} -lt ${frr_wait_seconds} ] || echo Giving up... - fi -} - -do_cmd() -{ - local ret - ret=0 - frr_cmd=$1 - for daemon in ${frr_daemons}; do - command=%%PREFIX%%/sbin/${daemon} - required_files=%%ETCDIR%%/${daemon}.conf - pidfile=/var/run/frr/${daemon}.pid - if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then - check_config - fi - if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then - continue - fi - if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then - continue - fi - eval flags=\$\{${daemon}_flags:-\"${frr_flags}\"\} - name=${daemon} - _rc_restart_done=false - run_rc_command "$1" || ret=1 - done - if checkyesno frr_vtysh_boot; then - echo "Booting for integrated-vtysh-config..." - %%PREFIX%%/bin/vtysh -b - fi - return ${ret} -} - -frr_cmd=$1 - -case "$1" in - force*) - frr_cmd=${frr_cmd#force} - ;; - fast*) - frr_cmd=${frr_cmd#fast} - ;; -esac -shift - -if [ $# -ge 1 ]; then - frr_daemons="$*" -fi - -case "${frr_cmd}" in - start|quietstart) - if [ -n "${frr_extralibs_path}" ]; then - /sbin/ldconfig -m ${frr_extralibs_path} - fi - # Why should I need to add this check ? - checkyesno frr_enable && do_cmd "start" - ;; - stop) - frr_daemons=$(reverse_list ${frr_daemons}) - do_cmd "stop" - ;; - restart) - frr_daemons=$(reverse_list ${frr_daemons}) - do_cmd "stop" - frr_daemons=$(reverse_list ${frr_daemons}) - checkyesno frr_enable && do_cmd "start" - ;; - *) - do_cmd "${frr_cmd}" - ;; -esac diff --git a/net/frr4/files/patch-Makefile.am b/net/frr4/files/patch-Makefile.am deleted file mode 100644 index 351b7335bdc7..000000000000 --- a/net/frr4/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2019-01-08 09:30:08 UTC -+++ Makefile.am -@@ -42,7 +42,7 @@ include zebra/subdir.am - include watchfrr/subdir.am - include qpb/subdir.am - include fpm/subdir.am --include tools/subdir.am -+#include tools/subdir.am - - include ripd/subdir.am - include ripngd/subdir.am diff --git a/net/frr4/files/patch-configure.ac b/net/frr4/files/patch-configure.ac deleted file mode 100644 index 6b59462eead0..000000000000 --- a/net/frr4/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2018-03-14 05:56:44 UTC -+++ configure.ac -@@ -292,7 +292,7 @@ AC_ARG_WITH(pkg-git-version, - [ test "x$withval" != "xno" && with_pkg_git_version="yes" ]) - AC_ARG_WITH(vtysh_pager, - AS_HELP_STRING([--with-vtysh-pager=PAGER], [control what pager is compiled in as default]), -- VTYSH_PAGER=$withval, VTYSH_PAGER="more") -+ VTYSH_PAGER=$withval, VTYSH_PAGER="cat") - AC_ARG_ENABLE(vtysh, - AS_HELP_STRING([--disable-vtysh], [do not build integrated vty shell for FRR])) - AC_ARG_ENABLE(doc, diff --git a/net/frr4/files/watchfrr.in b/net/frr4/files/watchfrr.in deleted file mode 100644 index 253214c8bc8f..000000000000 --- a/net/frr4/files/watchfrr.in +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: watchfrr -# REQUIRE: NETWORKING frr -# KEYWORD: nojailvtnet shutdown - -# Add the following line to /etc/rc.conf to enable watchfrr: -# watchfrr_enable="YES" -# -# You may also wish to use the following variables to fine-tune startup: -# watchfrr_flags -# Example of flags usage: -# watchfrr_flags=" -d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30 zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld" - -. /etc/rc.subr - -name=watchfrr -rcvar=${name}_enable - -load_rc_config $name - -stop_postcmd="rm -f $pidfile" - -watchfrr_enable=${watchfrr_enable:-"NO"} -watchfrr_flags=${watchfrr_flags:-"-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30 zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"} - -command=%%PREFIX%%/sbin/watchfrr -pidfile=/var/run/frr/watchfrr.pid - -run_rc_command "$1" diff --git a/net/frr4/pkg-descr b/net/frr4/pkg-descr deleted file mode 100644 index 6ac4ad877355..000000000000 --- a/net/frr4/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -FRRouting (FRR) is an IP routing protocol suite for Linux and Unix platforms -which includes protocol daemons for BGP, IS-IS, OSPF and RIP. FRR has its roots -in the Quagga project. - -WWW: https://frrouting.org/ diff --git a/net/frr4/pkg-message b/net/frr4/pkg-message deleted file mode 100644 index 2b90176cc40f..000000000000 --- a/net/frr4/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ -FRR's OSPF daemons tries to allocate big socket buffer, so generate warning -messages like: -"setsockopt_so_sendbuf: fd 6: SO_SNDBUF set to 1048576 (requested 8388608)" -To prevent such message kern.ipc.maxsockbuf can be increased: -sysctl kern.ipc.maxsockbuf=16777216 - -Error messages like "if_ioctl(SIOCGIFMEDIA) failed: Invalid argument" are -under investigation. diff --git a/net/frr4/pkg-plist b/net/frr4/pkg-plist deleted file mode 100644 index d1342eef998a..000000000000 --- a/net/frr4/pkg-plist +++ /dev/null @@ -1,151 +0,0 @@ -bin/bgp_btoa -%%VTYSH%%bin/vtysh -include/frr/bfd.h -include/frr/bitfield.h -include/frr/buffer.h -include/frr/checksum.h -include/frr/command.h -include/frr/command_graph.h -include/frr/command_match.h -include/frr/compiler.h -include/frr/csv.h -include/frr/distribute.h -include/frr/eigrpd/eigrp_dump.h -include/frr/eigrpd/eigrp_topology.h -include/frr/eigrpd/eigrpd.h -include/frr/event_counter.h -include/frr/ferr.h -include/frr/fifo.h -include/frr/filter.h -include/frr/freebsd-queue.h -include/frr/frr_pthread.h -include/frr/frratomic.h -include/frr/getopt.h -include/frr/graph.h -include/frr/hash.h -include/frr/hook.h -include/frr/if.h -include/frr/if_rmap.h -include/frr/imsg.h -include/frr/ipaddr.h -include/frr/jhash.h -include/frr/json.h -include/frr/keychain.h -include/frr/libfrr.h -include/frr/libospf.h -include/frr/linklist.h -include/frr/log.h -include/frr/md5.h -include/frr/memory.h -include/frr/memory_vty.h -include/frr/module.h -include/frr/monotime.h -include/frr/mpls.h -include/frr/network.h -include/frr/nexthop.h -include/frr/ns.h -include/frr/openbsd-queue.h -include/frr/openbsd-tree.h -include/frr/ospfapi/ospf_apiclient.h -include/frr/ospfd/ospf_api.h -include/frr/ospfd/ospf_asbr.h -include/frr/ospfd/ospf_dump.h -include/frr/ospfd/ospf_dump_api.h -include/frr/ospfd/ospf_ism.h -include/frr/ospfd/ospf_lsa.h -include/frr/ospfd/ospf_lsdb.h -include/frr/ospfd/ospf_nsm.h -include/frr/ospfd/ospf_opaque.h -include/frr/ospfd/ospfd.h -include/frr/plist.h -include/frr/pqueue.h -include/frr/prefix.h -include/frr/privs.h -include/frr/ptm_lib.h -include/frr/pw.h -include/frr/queue.h -include/frr/qobj.h -include/frr/ringbuf.h -include/frr/route_types.h -include/frr/routemap.h -include/frr/sbuf.h -include/frr/sha256.h -include/frr/sigevent.h -include/frr/spf_backoff.h -include/frr/skiplist.h -include/frr/smux.h -include/frr/sockopt.h -include/frr/sockunion.h -include/frr/srcdest_table.h -include/frr/stream.h -include/frr/systemd.h -include/frr/table.h -include/frr/termtable.h -include/frr/thread.h -include/frr/vector.h -include/frr/version.h -include/frr/vlan.h -include/frr/vrf_int.h -include/frr/vrf.h -include/frr/vty.h -include/frr/vxlan.h -include/frr/wheel.h -include/frr/workqueue.h -include/frr/zassert.h -include/frr/zclient.h -include/frr/zebra.h -lib/libfrr.a -lib/libfrr.so -lib/libfrr.so.0 -lib/libfrr.so.0.0.0 -lib/libfrrospfapiclient.a -lib/libfrrospfapiclient.so -lib/libfrrospfapiclient.so.0 -lib/libfrrospfapiclient.so.0.0.0 -%%FPM%%lib/frr/modules/zebra_fpm.so -%%FPM%%lib/libfrrfpm_pb.a -%%FPM%%lib/libfrrfpm_pb.so -%%FPM%%lib/libfrrfpm_pb.so.0 -%%FPM%%lib/libfrrfpm_pb.so.0.0.0 -%%RPKI%%lib/frr/modules/bgpd_rpki.so -man/man1/frr.1.gz -man/man8/eigrpd.8.gz -man/man8/frr-args.8.gz -man/man8/isisd.8.gz -man/man8/watchfrr.8.gz -%%VTYSH%%man/man1/vtysh.1.gz -man/man8/bgpd.8.gz -%%LDPD%%man/man8/ldpd.8.gz -man/man8/ospf6d.8.gz -man/man8/ospfclient.8.gz -man/man8/ospfd.8.gz -man/man8/ripd.8.gz -man/man8/ripngd.8.gz -man/man8/zebra.8.gz -sbin/babeld -sbin/bgpd -%%LDPD%%sbin/ldpd -sbin/eigrpd -sbin/ospf6d -sbin/ospfclient -sbin/ospfd -sbin/ripd -sbin/ripngd -sbin/zebra -sbin/isisd -sbin/rfptest -sbin/watchfrr -%%ETCDIR%%/babeld.conf.sample -%%ETCDIR%%/bgpd.conf.sample -%%ETCDIR%%/bgpd.conf.sample2 -%%ETCDIR%%/bgpd.conf.vnc.sample -%%ETCDIR%%/eigrpd.conf.sample -%%ETCDIR%%/isisd.conf.sample -%%LDPD%%%%ETCDIR%%/ldpd.conf.sample -%%ETCDIR%%/ospf6d.conf.sample -%%ETCDIR%%/ospfd.conf.sample -%%ETCDIR%%/ripd.conf.sample -%%ETCDIR%%/ripngd.conf.sample -%%VTYSH%%%%ETCDIR%%/vtysh.conf.sample -%%ETCDIR%%/zebra.conf.sample -@dir(frr,frr,750) /var/run/frr diff --git a/net/frr5/Makefile b/net/frr5/Makefile index a2603a92a0c0..bad3308ae8fb 100644 --- a/net/frr5/Makefile +++ b/net/frr5/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk LIB_DEPENDS= libjson-c.so:devel/json-c -CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr6 frr7 +CONFLICTS= openbgpd openospfd zebra quagga frr6 frr7 USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ makeinfo python:2.7,build readline diff --git a/net/frr6/Makefile b/net/frr6/Makefile index 2f9b4d56000d..59d946f1699d 100644 --- a/net/frr6/Makefile +++ b/net/frr6/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libjson-c.so:devel/json-c USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ makeinfo python:2.7,build readline -CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr5 frr7 +CONFLICTS= openbgpd openospfd zebra quagga frr5 frr7 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/net/frr7/Makefile b/net/frr7/Makefile index 3db63d8efa1d..817bf142170b 100644 --- a/net/frr7/Makefile +++ b/net/frr7/Makefile @@ -21,7 +21,7 @@ USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ BINARY_ALIAS= python=${PYTHON_VERSION} -CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr5 frr6 +CONFLICTS= openbgpd openospfd zebra quagga frr5 frr6 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/net/quagga/Makefile b/net/quagga/Makefile index d855113324f2..d24254993362 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk -CONFLICTS= frr3 frr4 frr5 frr6 openbgpd pimd zebra +CONFLICTS= frr5 frr6 frr7 openbgpd pimd zebra USES= compiler:c11 cpe gmake libtool makeinfo \ perl5 readline ssl |