Index: head/LEGAL =================================================================== --- head/LEGAL (revision 465500) +++ head/LEGAL (revision 465501) @@ -1,255 +1,254 @@ # Creator: Jordan Hubbard # $FreeBSD$ # # ********************************************************************** # *** NOTE TO COMMITTERS *** # *** *** # *** If you are adding a port to this list that has previously been *** # *** distributed, please inform portmgr@FreeBSD.org so that the *** # *** distfile/packages can be removed from the FTP site. *** # ********************************************************************** # # Some of the ports in this directory have restrictive copyrights prohibiting # their actual redistribution on mass media. When creating compilations # of FreeBSD on such mass media, you should be sure and NOT distribute # the original source tarballs for such ports in your distfiles directory. # To do so will invite needless problems from the various parties involved. # # Since those connected to the net will also be able to use the ports framework # to automatically fetch their own original sources and thus complete the puzzle, # the hardship is not as severe as it might otherwise be. # # Such ports are listed below: # # Dist Port Why # ------------------------------------------------------------------------------ *-for-1.4.tgz net/dgd-lpmud May not be used for monetary gain *_MegaCLI.zip sysutils/megacli Source recipient must acknowledge license. Reproduction or redistribution prohibited. See http://www.lsi.com/lookup/License.aspx 26410-800.zip audio/libaacplus unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies aacplusenc-* audio/aacplusenc unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies acroread/AdbeRdr8.* print/acroread8 Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html acroread/AdbeRdr9.* print/acroread9 Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html adobesvg-* graphics/linux-adobesvg Redistribution prohibited adom-* games/adom Copy of CD must be sent to author aestats-* games/aestats Commercial use is prohibited agrep-* textproc/agrep No redistribution for profit alephone/M1A1.zip games/alephone-data Bungie/Microsoft do not allow charging for Marathon data files alephone/Marathon*.zip games/alephone-data Bungie/Microsoft do not allow charging for Marathon data files apache2/mod_h264_streaming-* www/mod_h264_streaming No commercial use armyops*-linux.run games/linux-americasarmy Redistribution is limited astah-community-*.zip devel/astah-community License restrictions -- See http://astah.net/faq/community/enduser-license-agreement atari800/* emulators/atari800 xf25 contains copyright ROMs and cannot be distributed baudline_* audio/baudline No redistribution allowed BCWipe-* security/bcwipe Non-commercial distribution and use only bicom* archivers/bicom Contact author personally regarding commercial use boodler-* audio/boodler Not for commercial use Browser*.tar.gz net/ldapbrowser No reply from author regarding redistribution licensing bzip-* archivers/bzip Some algorithms used may infringe certain US patents. Opinions differ. Commercial use could render you liable to unfriendly legal action citrix_ica-* net/citrix_ica License prohibits redistribution arcconf-v* sysutils/arcconf May not be redistributed in binary form clustalw-* biology/clustalw No commercial use consed_linux.tar.gz biology/consed Redistribution is not permitted in any form. You must request access permission via e-mail to get the tarball. Free for academic use. cos-* java/cos Special conditions apply for commercial use cosmo/* games/cosmo Possible copyright infringement CrystalSVGforGnomeIcons* x11-themes/gnome-icons-crystal Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. cyberbit/* x11-fonts/cyberbit-ttfonts Not free for commercial use darwinia-demo* games/linux-darwinia-demo Redistribution is limited, see license datamodeler databases/datamodeler Packaging prohibited by Oracle license dbvis java/dbvis Redistribution is not permitted dcl-*-C.tar.gz science/cdcl No commercial use dcl-*.tar.gz science/dcl No commercial use defcon* games/linux-defcon Redistribution is limited, see license djbdns* dns/djbdns No license -- see http://cr.yp.to/softwarelaw.html djbfft-* math/djbfft No license -- see http://cr.yp.to/softwarelaw.html dlv lang/dlv Not sure if we can redistribute it dmd-* lang/dmd1 No redistribution of non validated binaries dn*.tgz emulators/darcnes Commercial use is restricted doom3-linux-* games/linux-doom3 Redistribution is limited, see license; Requested by id Software doom3-linux-* games/linux-doom3-demo Redistribution is limited, see license; Requested by id Software doomsrc.zip games/doom Redistribution is limited, see license; Requested by id Software dr_freebsd_*.zip sysutils/megarc Must be downloaded directly from the manufacturer eagle-lin-*.run cad/linux-eagle5 Usage permitted for non-commercial purposes only eawpats* audio/eawpats Some of the patches are not for commercial use ecw_jpeg_2000_*.zip graphics/libecwj2 Registration required to download sources, but sources no longer available on ERDAS website edith* editors/edith Redistribution not allowed eijiro* japanese/eijiro-fpw The original dictionary is not free marvel-* textproc/elasticsearch-plugin-marvel Free for development; license required for production use emc2* math/emc2 No resale, contact author for commercial usage et-linux-* games/linux-enemyterritory Redistribution limited etqw* games/linux-etqw-demo-server Redistribution limited etqw* games/linux-etqw-server Redistribution limited ezmlm-* mail/ezmlm No license -- see http://cr.yp.to/softwarelaw.html ezmlm-* mail/ezmlm-idx No license -- see http://cr.yp.to/softwarelaw.html fasta2* biology/fasta May not be sold or incorporated into a commercial product fasta3* biology/fasta3 May not be sold or incorporated into a commercial product festival/festlex_OALD* audio/festlex-oald No commercial use festival/OGIlexicon-* audio/festlex-ogi No commercial use festlex-ogi audio/festlex-ogi No commercial use fmsx*/* emulators/fmsx Legal status of distributed ROM images unclear foiltex* textproc/foiltex Redistribution on a not-for-profit basis only fp-freebsd-ws-* security/f-prot Free for personal users on personal workstations only fuse-emulator-roms* emulators/fuse-roms No explicit permission to redistribute Opus-22.rom emulators/fuse-roms No explicit permission to redistribute freefonts-* x11-fonts/freefonts License prohibits redistribution; see individual .license files fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data Only Unreal Voodoo site is allowed to distribute the music fvcom/sourcecode1.tar.gz science/fvcom Requires (free) registration fvcom/sourcecode1.tar.gz science/fvcom-mpi Requires (free) registration giac-* math/giacxcas The french documentation is for non commercial only use giftool* graphics/giftool Do not redistribute for profit gnome2/mcitymicrogui-default* x11-themes/metacity-theme-microgui Themes may contain artwork not done by the author. Keep FreeBSD safe if the theme author violated copyrights GoogleEarthLinux-* astro/google-earth Not really sure about the redistribution terms groupoffice-com-* www/groupoffice Free for personal use only gsview* print/gsview Can only be distributed for free HeroesOfMightAndMagic-* games/HeroesOfMightAndMagic Software is commercial homard-* french/homard The free downloading of HOMARD software is only allowed for coupling with Code_Aster. For any other use, a license agreement is requested. Please contact HOMARD project: . hplip-*-plugin.run print/hplip-plugin License agreement is required httprint_freebsd_*.zip security/httprint No cost for personal, education and non-commercial use HyperSpec-* devel/clisp-hyperspec Commercial redistribution prohibited HyperSpec-*.tar.gz devel/clisp-hyperspec Commercial redistribution prohibited ICON-AquaFusion.* x11-themes/gnome-icons-aqua-fusion Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. ICON-Gentoo-Test.* x11-themes/gnome-icons-gentoo-test Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. ICON-Gnome-RH8.* x11-themes/gnome-icons-refined Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. ICON-Iris* x11-themes/gnome-icons-iris Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. ICON-Noia.* x11-themes/gnome-icons-noia-full Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. ICON-NoiaWarm.* x11-themes/gnome-icons-noia-warm Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. ICON-Slick.* x11-themes/gnome-icons-slick Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. ICON-Snow-Apple.* x11-themes/gnome-icons-snow-apple Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. ICON-Stylish.* x11-themes/gnome-icons-stylish Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. ICON-Ximian-South-* x11-themes/gnome-icons-ximian-south Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights. jaf-*.zip java/jaf See the license jai-*-lib-linux-i586.* java/jai Redistribution is not permitted java3d-sdk-*-linux-i386* java/java3d License does not allow distribution javax_comm-*-solsparc.* comms/java-commapi No commercial use jdk-8*-apidocs.zip java/jdk8-doc This documentation is under license and export control jdk-8*-i586.tar.gz java/linux-oracle-jdk18 Redistribution of repackaged binaries not permitted jdk-9*-x64_bin.tar.gz java/linux-oracle-jdk9 Redistribution of repackaged binaries not permitted jfbuild-* games/jfsw Must be distributed only through the Internet and free of charge jmf-*-alljava.zip java/jmf Redistribution of pre-compiled binaries is not permitted jpgraph-2.* graphics/jpgraph2 The free version cannot be used in a commercial context jre-8*-i586.tar.gz java/linux-oracle-jre18 License does not allow distribution with fee jre-9*-x64_bin.tar.gz java/linux-oracle-jre9 Redistribution of repackaged binaries not permitted jta-*.zip java/jta See the license komodo-* editors/komodo-edit Distribution not permitted kye-data_nuke_levels.20121101.tar.gz games/kye kye-data_nuke_levels is charityware kzip-* archivers/kzip License does not allow redistribution l0phtcrack/* security/l0phtcrack Parts are under GPL, so binaries should not be distributed. Contains crypto code from OpenSSL ladder.tar games/ladder Possible copyright problems lame* audio/lame patent issues, see http://www.mp3licensing.com/ lha-1.14i-ac* archivers/lha-ac No redistribution allowed libaacplus-* audio/libaacplus Unclear legal status libamrnb/26104-*.zip audio/libamrnb unclear legal status, probably need licenses from 3GPP and more libamrwb/26204-*.zip audio/libamrwb unclear legal status, probably need licenses from 3GPP and more libdvdcss-*.tar.bz2 multimedia/libdvdcss CSS code may violate the DMCA linux-nwnclient/* games/linux-nwnclient Distribution not allowed linux-unrealgold* games/linux-unrealgold Redistribution limited linux-ut/* games/linux-ut Redistribution is limited, see license linuxq3ademo-* games/linux-quake3 Restrictive license by Loki Software linuxq3ademo-* games/linux-quake3-demo Restrictive license by Loki Software linuxsampler-* audio/linuxsampler Commercial use is prohibited lpac-* audio/lpac No commercial use l_cc_p*_*.*.*.tar.gz lang/icc No redistribution allowed l_fc_p*_*.*.*.tar.gz lang/ifc Intel forbids any redistribution macopix-*.tar.gz games/macopix Contains commercial character data madfufw-* audio/madfufw No redistribution of firmware files malo-fw-*.tar.gz net/malo-firmware-kmod Marvell refuses to grant distribution rights mb339pan_* games/flightgear-mb339-pan Redistribution prohibited mikachan-ttfonts/ver*.* japanese/mikachan-ttfonts Do not sell distfile mindfocus-* games/mindfocus Contains commercial character data mindterm-* security/mindterm-binary Do not sell for profit molden* biology/molden Free for academic, non-profit usage; do not redistribute source and executable ncftpd-* ftp/ncftpd 30 day evaluation license nero2_linux_* games/linux-nerogame Freeware, but license terms are unclear NetComponents-* java/netcomponents No redistribution except as part of a substantially different product nntpcache-* news/nntpcache Free for individuals and non-military, non-profit organisations only nttcp-* benchmarks/nttcp No commercial use nwresources*.tar.gz games/nwndata Distribution not allowed oneko-*.tar.gz games/oneko-sakura Including derivatives from CARDCAPTOR SAKURA OptimFROG* audio/optimfrog No commercial use oracle/* databases/jdbc-oracle11g This software is under license and export controls oracle/sqldeveloper* databases/sqldeveloper This software is under license and export controls oracle/instantclient-basic-linux* databases/linux-oracle-instantclient-basic Packaging prohibited by Oracle license oracle/instantclient-sqlplus-linux* databases/linux-oracle-instantclient-sqlplus Packaging prohibited by Oracle license pcsv*fb.tar.gz lang/petite-chez User must accept license terms before installation PDFlib-Lite-*.tar.gz print/pdflib Many odd restrictions on usage and distribution perforce/*/p4d devel/p4d Restricted distribution perforce/*/p4ftpd devel/p4ftpd Restricted distribution perforce/*/p4p devel/p4p Restricted distribution perforce/*/p4web devel/p4web Restricted distribution ppsmall-* archivers/ppunpack No commercial redistribution qtools-* mail/qtools No license -- see http://cr.yp.to/softwarelaw.html quake4-linux-* games/linux-quake4 Redistribution is limited; see the license quake4-linux-* games/linux-quake4-demo Redistribution is limited; see the license Radiator/* net/radiator Commercial software RakNet-* devel/raknet Special authorization granted to distribute version 3.x under GPLv3 rapid-* math/rapid For any commercial purpose, you must request a license from http://www.cs.unc.edu/~geom/OBB/OBBT.html rarbsd-* archivers/rar only unmodified original package can be distributed ricty-* japanese/font-ricty Redistribution not allowed ringtonetools-* misc/ringtonetools Not free for commercial organizations savage/SFE* games/linux-savage Freeware, but license terms are unclear seatools_cli.tar sysutils/seatools Redistribution is not permitted serialmail-* mail/serialmail No license -- see http://cr.yp.to/softwarelaw.html serious.sam* games/linux-ssamtfe Redistribution limited serious.sam* games/linux-ssamtse Redistribution limited sharefonts-* x11-fonts/sharefonts Shareware: cannot be distributed without prior authorization shorten-* audio/shorten May not be sold. May not be distributed if modified shoutcast audio/shoutcast Personal use only. See tos.txt in this port for full details sid-milter-* mail/sid-milter May incorporate intellectual property, possible patent issues simian-* devel/simian Have to agree to license before download skype* net-im/skype Redistribution prohibited squeezeboxserver-* audio/squeezeboxserver Contains non-redistributable firmware, documentation, and images stardict-longman-* textproc/stardict-longman Possible copyright infringement STonX-* emulators/stonx Contains ROM (C) by Atari stuffit* archivers/stuffit Only unmodified original package can be distributed susv2.tar.bz2 misc/susv2 Redistribution of the documents is not permitted susv3.tar.bz2 misc/susv3 Redistribution of the documents is not permitted susv4tc1.tar.bz2 misc/susv4 Redistribution of the documents is not permitted svm_light.tar.gz science/svmlight The software must not be further distributed without prior permission of the author taetgen-* math/tetgen Academic or personal use only tarsnap-* sysutils/tarsnap license restricts redistribution of source and binaries tcetest_* games/linux-enemyterritory-tce Redistribution limited teamspeak* audio/teamspeak3-server No redistribution thundercache www/thundercache Commercial software with shareware license to 50 threads tinker* biology/tinker Distribution is prohibited triangle-*/* math/triangle No commercial use without prior arrangement with the author Tripwire-*-1.tar.gz security/tripwire-131 Cannot be redistributed for more than the cost of duplication tripwire-*.tar.gz security/tripwire12 Cannot be redistributed for more than the cost of duplication TrueCrypt* security/truecrypt May not be redistributed. Must accept license to download. tuc-* converters/tuc Author does not allow CD-ROM distribution tw_cli-* sysutils/tw_cli Redistribution forbidden by license ue*dev.zip editors/uemacs Resale allowed for media cost only unifi-5*/UniFi.unix.zip net-mgmt/unifi5 Redistribution of bundled firmware images is not permitted uplink-demo* games/linux-uplink-demo Redistribution is limited, see license uzap.tar.gz editors/uzap This software may not be used to make a profit in any way. vdr-markad-* multimedia/vdr-plugin-markad Installs station logos vice-* emulators/vice ROMs are copyrighted by Commodore Business Machines VMware-vSphere-Perl* net/vmware-vsphere-cli May not be redistributed. Must accept license to download. vpnc-* security/vpnc Redistribution is not allowed if linked against OpenSSL vwnc7.3.1/* lang/visualworks Do not redistribute waeijiro-fpw-* japanese/waeijiro-fpw The original dictionary is not free webcopy-* www/webcopy This program cannot be distributed if modified in any way. Don't sell for profit without written permission webfonts/* x11-fonts/webfonts Restrictive copyright win32/* multimedia/win32-codecs Licensing status of the codecs is unknown xanim-* multimedia/xanim Must be redistributed without fee xchada01.lzh games/xchadance Contains commercial character data xephem-* astro/xephem Personal use only XFrisk-*.tar.gz games/xfrisk Possible trademark infringement xGate/* japanese/xgate Requested by Orangesoft Inc. xhime*.tgz games/xhime Contains commercial character data xinvaders-* games/xinvaders Do not sell for profit xmdiary-* deskutils/xmdiary Do not sell for profit xrisk-* games/xrisk Possible copyright/trademark violation xtr1.50e* japanese/xtr Need to obtain permission for commercial redistribution xtris-*.tar.gz games/xtris Possible trademark infringement xzx-pro-*.tar.gz emulators/xzx Redistribution forbidden by license yasou-fpw* japanese/yasou-fpw No commercial use, and no redistribution allowed with fee except media and/or shipping cost yEd* graphics/yed Downloading requires acceptance of license agreement zh-moettf/* chinese/moettf Contact Taiwan's Ministry of Education for commercial use UrbanTerror*.zip games/urbanterror-data The mod files may not be sold or distributed on physical media unless with permission from id Software. gmsh-* cad/gmsh Contact appropriate authors for commercial purposes if including Tetgen or Metis gmsh-occ-* cad/gmsh-occ Contact appropriate authors for commercial purposes if including Tetgen or Metis btsync_* net-p2p/btsync Redistribution forbidden by license 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. Index: head/net/frr/Makefile =================================================================== --- head/net/frr/Makefile (revision 465500) +++ head/net/frr/Makefile (revision 465501) @@ -1,82 +1,86 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 3.0.3 +PORTVERSION= 4.0 DISTVERSIONPREFIX= frr- CATEGORIES= net ipv6 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 +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 # 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 INSTALL_TARGET= install-strip # 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 Index: head/net/frr/distinfo =================================================================== --- head/net/frr/distinfo (revision 465500) +++ head/net/frr/distinfo (revision 465501) @@ -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 Index: head/net/frr/files/patch-vtysh_vtysh.c =================================================================== --- head/net/frr/files/patch-vtysh_vtysh.c (revision 465500) +++ head/net/frr/files/patch-vtysh_vtysh.c (nonexistent) @@ -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. */ Property changes on: head/net/frr/files/patch-vtysh_vtysh.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr/files/frr.in =================================================================== --- head/net/frr/files/frr.in (revision 465500) +++ head/net/frr/files/frr.in (revision 465501) @@ -1,154 +1,154 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: frr -# REQUIRE: netif routing +# 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 deamons 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_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 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) 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 Index: head/net/frr/files/patch-Makefile.am =================================================================== --- head/net/frr/files/patch-Makefile.am (revision 465500) +++ head/net/frr/files/patch-Makefile.am (revision 465501) @@ -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 Index: head/net/frr/files/patch-configure.ac =================================================================== --- head/net/frr/files/patch-configure.ac (nonexistent) +++ head/net/frr/files/patch-configure.ac (revision 465501) @@ -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, Property changes on: head/net/frr/files/patch-configure.ac ___________________________________________________________________ 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/frr/pkg-message =================================================================== --- head/net/frr/pkg-message (nonexistent) +++ head/net/frr/pkg-message (revision 465501) @@ -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. Property changes on: head/net/frr/pkg-message ___________________________________________________________________ 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/frr/pkg-plist =================================================================== --- head/net/frr/pkg-plist (revision 465500) +++ head/net/frr/pkg-plist (revision 465501) @@ -1,122 +1,146 @@ 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 +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/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 %%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