Date: Sun, 25 Mar 2018 07:44:59 +0000 (UTC) From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465501 - in head: . net/frr net/frr/files Message-ID: <201803250744.w2P7ix7K086286@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Sun Mar 25 07:44:59 2018 New Revision: 465501 URL: https://svnweb.freebsd.org/changeset/ports/465501 Log: Update to 4.0. Removing restricted status because FreeBSD is a downstream distributor of FRRouting and is compliant with the GPLv2 and thus has a valid license per GPLv2 section 4. Added: head/net/frr/files/patch-configure.ac (contents, props changed) head/net/frr/pkg-message (contents, props changed) Deleted: head/net/frr/files/patch-vtysh_vtysh.c Modified: head/LEGAL head/net/frr/Makefile head/net/frr/distinfo head/net/frr/files/frr.in head/net/frr/files/patch-Makefile.am head/net/frr/pkg-plist Modified: head/LEGAL ============================================================================== --- head/LEGAL Sun Mar 25 07:23:23 2018 (r465500) +++ head/LEGAL Sun Mar 25 07:44:59 2018 (r465501) @@ -251,5 +251,4 @@ btsync_* net-p2p/btsync Redistribution forbidden by sas2ircu-* sysutils/sas2ircu May not be redistributed. Must accept license to download. snes9x-* emulators/snes9x-gtk Commercial users must seek permission from copyright holders. rainloop-1.*.zip mail/rainloop Redistribution in any form is prohibited -frr-* net/frr possible GPL violation of Quagga project lha-114i.tar.gz archivers/lha Binary only redistribution is prohibited. Non-network redistribution such as CDROM requires prior notification to author. Commercial use whose main purpose is to provide the functions of this program is prohibited. Modified: head/net/frr/Makefile ============================================================================== --- head/net/frr/Makefile Sun Mar 25 07:23:23 2018 (r465500) +++ head/net/frr/Makefile Sun Mar 25 07:44:59 2018 (r465501) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 3.0.3 +PORTVERSION= 4.0 DISTVERSIONPREFIX= frr- CATEGORIES= net ipv6 @@ -11,25 +11,24 @@ COMMENT= IP routing protocol suite including BGP, IS-I LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= gawk:lang/gawk +BUILD_DEPENDS= gawk:lang/gawk \ + python:lang/python LIB_DEPENDS= libjson-c.so:devel/json-c -RESTRICTED= possible GPL violation of Quagga project - CONFLICTS= openbgpd openospfd zebra quagga-esr quagga -USE_GITHUB= yes -GH_ACCOUNT= FRRouting - GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= autoreconf bison gmake pkgconfig libtool makeinfo readline USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= FRRouting + INFO= frr -OPTIONS_DEFINE= FPM LDPD PAM SHELLACCESS TCPSOCKETS VTYSH MULTIPATH TCMALLOC -OPTIONS_DEFAULT= VTYSH +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 @@ -41,6 +40,7 @@ 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 @@ -60,6 +60,7 @@ CONFIGURE_ARGS= --enable-user=frr \ --enable-vty-group=frrvty \ --sysconfdir=${ETCDIR} \ --localstatedir=/var/run/frr \ + --disable-nhrpd \ --disable-pimd SHELLACCESS_CONFIGURE_ENABLE= shell-access @@ -67,6 +68,9 @@ 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 Modified: head/net/frr/distinfo ============================================================================== --- head/net/frr/distinfo Sun Mar 25 07:23:23 2018 (r465500) +++ head/net/frr/distinfo Sun Mar 25 07:44:59 2018 (r465501) @@ -1,3 +1,3 @@ -TIMESTAMP = 1515855735 -SHA256 (FRRouting-frr-frr-3.0.3_GH0.tar.gz) = c850d6f7ae389e27acb1e808e01e561b0db7e0e35a902ca18ce53839c7906b7b -SIZE (FRRouting-frr-frr-3.0.3_GH0.tar.gz) = 3168397 +TIMESTAMP = 1520970456 +SHA256 (FRRouting-frr-frr-4.0_GH0.tar.gz) = a9932ef116106d56b0e17aa569aa56a458acdd50e0d07c042fd5cc725bf742cc +SIZE (FRRouting-frr-frr-4.0_GH0.tar.gz) = 3989206 Modified: head/net/frr/files/frr.in ============================================================================== --- head/net/frr/files/frr.in Sun Mar 25 07:23:23 2018 (r465500) +++ head/net/frr/files/frr.in Sun Mar 25 07:44:59 2018 (r465501) @@ -4,7 +4,7 @@ # # PROVIDE: frr -# REQUIRE: netif routing +# REQUIRE: netif routing # KEYWORD: nojailvnet shutdown # Add the following line to /etc/rc.conf to enable frr: @@ -43,7 +43,7 @@ command_args="-d" load_rc_config $name : ${frr_enable:="NO"} : ${frr_flags:=""} -: ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd"} +: ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"} : ${frr_vtysh_boot:="NO"} : ${frr_wait_for:=""} : ${frr_wait_seconds:="90"} Modified: head/net/frr/files/patch-Makefile.am ============================================================================== --- head/net/frr/files/patch-Makefile.am Sun Mar 25 07:23:23 2018 (r465500) +++ head/net/frr/files/patch-Makefile.am Sun Mar 25 07:44:59 2018 (r465501) @@ -1,11 +1,11 @@ ---- Makefile.am.orig 2017-03-08 14:59:07 UTC +--- Makefile.am.orig 2018-03-13 22:21:12 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 +@@ -41,7 +41,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 - DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \ - isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \ + include ripd/subdir.am + include ripngd/subdir.am Added: head/net/frr/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/frr/files/patch-configure.ac Sun Mar 25 07:44:59 2018 (r465501) @@ -0,0 +1,11 @@ +--- 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, Added: head/net/frr/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/frr/pkg-message Sun Mar 25 07:44:59 2018 (r465501) @@ -0,0 +1,8 @@ +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 but seems harmless. Modified: head/net/frr/pkg-plist ============================================================================== --- head/net/frr/pkg-plist Sun Mar 25 07:23:23 2018 (r465500) +++ head/net/frr/pkg-plist Sun Mar 25 07:44:59 2018 (r465501) @@ -5,12 +5,21 @@ 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 @@ -18,6 +27,7 @@ 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 @@ -53,9 +63,13 @@ 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 @@ -66,11 +80,15 @@ 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 @@ -84,7 +102,10 @@ lib/libfrrospfapiclient.a lib/libfrrospfapiclient.so lib/libfrrospfapiclient.so.0 lib/libfrrospfapiclient.so.0.0.0 +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 @@ -96,8 +117,10 @@ 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 @@ -106,11 +129,12 @@ sbin/ripngd sbin/zebra sbin/isisd sbin/rfptest -sbin/ssd 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803250744.w2P7ix7K086286>