From owner-svn-ports-head@freebsd.org Thu Jul 23 20:16:31 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8F20B362A62; Thu, 23 Jul 2020 20:16:31 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BCNrv3M11z46CX; Thu, 23 Jul 2020 20:16:31 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 578DE1E844; Thu, 23 Jul 2020 20:16:31 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06NKGVpS033983; Thu, 23 Jul 2020 20:16:31 GMT (envelope-from olivier@FreeBSD.org) Received: (from olivier@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06NKGUfT033980; Thu, 23 Jul 2020 20:16:30 GMT (envelope-from olivier@FreeBSD.org) Message-Id: <202007232016.06NKGUfT033980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivier set sender to olivier@FreeBSD.org using -f From: Olivier Cochard Date: Thu, 23 Jul 2020 20:16:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542959 - head/net/frr7 X-SVN-Group: ports-head X-SVN-Commit-Author: olivier X-SVN-Commit-Paths: head/net/frr7 X-SVN-Commit-Revision: 542959 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jul 2020 20:16:31 -0000 Author: olivier Date: Thu Jul 23 20:16:30 2020 New Revision: 542959 URL: https://svnweb.freebsd.org/changeset/ports/542959 Log: - Update to 7.4 - Prepare to add frr-pythontools - Fix some dependencies PR: 247993 Reported by: garga Modified: head/net/frr7/Makefile head/net/frr7/distinfo head/net/frr7/pkg-plist Modified: head/net/frr7/Makefile ============================================================================== --- head/net/frr7/Makefile Thu Jul 23 20:11:53 2020 (r542958) +++ head/net/frr7/Makefile Thu Jul 23 20:16:30 2020 (r542959) @@ -1,23 +1,42 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 7.3.1 +PORTVERSION= 7.4 DISTVERSIONPREFIX= frr- CATEGORIES= net +.if defined(PYTHONTOOLS) +PKGNAMESUFFIX= 7-pythontool +.else PKGNAMESUFFIX= 7 +.endif MAINTAINER= olivier@FreeBSD.org -COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP +COMMENT?= IP routing protocol suite including BGP, IS-IS, OSPF and RIP + LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +.if defined(PYTHONTOOLS) +RUN_DEPENDS= frr-reload:net/frr7 + +USES= python:run shebangfix + +post-patch: + @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/tools/frr-reload.py + @${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' ${WRKSRC}/tools/frr-reload.py + +do-install: + ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/frr + ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload.py ${STAGEDIR}/${PREFIX}/lib/frr/ +.else + BUILD_DEPENDS= gawk:lang/gawk LIB_DEPENDS= libjson-c.so:devel/json-c \ libyang.so:net/libyang USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ - makeinfo python:build readline + makeinfo python:build readline shebangfix BINARY_ALIAS= python=${PYTHON_VERSION} @@ -26,10 +45,19 @@ CONFLICTS= openbgpd openospfd zebra quagga frr5 frr6 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes +.endif USE_GITHUB= yes GH_ACCOUNT= FRRouting +.if defined(PYTHONTOOLS) +NO_BUILD= yes +NO_ARCH= yes + +SHEBANG_FILES= tools/frr-reload.py +PLIST= ${.CURDIR}/pkg-plist +PKGMESSAGE= "" +.else INFO= frr OPTIONS_DEFINE= CONFIGROLLBACKS FPM DATACENTER LDPD PAM SHELLACCESS \ @@ -63,13 +91,14 @@ CONFIGURE_ARGS= --enable-user=frr \ --disable-doc-html \ --sysconfdir=${ETCDIR} \ --localstatedir=/var/run/frr \ + --disable-backtrace \ --disable-nhrpd \ --disable-pimd \ --disable-vrrpd \ --with-vtysh-pager=cat -MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} -MANPAGES_CONFIGURE_OFF= --disable-doc +MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} +MANPAGES_CONFIGURE_OFF= --disable-doc CONFIGROLLBACKS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 CONFIGROLLBACKS_CONFIGURE_ENABLE= config-rollbacks DATACENTER_CONFIGURE_ENABLE= datacenter @@ -86,6 +115,7 @@ TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-per SNMP_CONFIGURE_ENABLE= snmp SNMP_CFLAGS= "-std=gnu99" SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp +SNMP_USES= ssl TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra VTYSH_CONFIGURE_ENABLE= vtysh @@ -93,7 +123,14 @@ USE_RC_SUBR= frr watchfrr SHEBANG_FILES= yang/embedmodel.py +post-patch: + @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/tools/frr-reload + @${REINPLACE_CMD} -e 's|/usr/lib/|${PREFIX}/lib/|g' ${WRKSRC}/tools/frr-reload + @${REINPLACE_CMD} -e 's|frr-pythontools|frr7-pythontools|g' ${WRKSRC}/tools/frr-reload + post-install: ${MKDIR} ${STAGEDIR}/var/run/frr + ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload ${STAGEDIR}${PREFIX}/sbin +.endif .include Modified: head/net/frr7/distinfo ============================================================================== --- head/net/frr7/distinfo Thu Jul 23 20:11:53 2020 (r542958) +++ head/net/frr7/distinfo Thu Jul 23 20:16:30 2020 (r542959) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589228942 -SHA256 (FRRouting-frr-frr-7.3.1_GH0.tar.gz) = 81129f83ce9ae31c983bb02b3d8e3e457604bab46f01411c945d9c2cfef1f5c8 -SIZE (FRRouting-frr-frr-7.3.1_GH0.tar.gz) = 5785833 +TIMESTAMP = 1595492688 +SHA256 (FRRouting-frr-frr-7.4_GH0.tar.gz) = 3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a +SIZE (FRRouting-frr-frr-7.4_GH0.tar.gz) = 6074854 Modified: head/net/frr7/pkg-plist ============================================================================== --- head/net/frr7/pkg-plist Thu Jul 23 20:11:53 2020 (r542958) +++ head/net/frr7/pkg-plist Thu Jul 23 20:16:30 2020 (r542959) @@ -98,6 +98,7 @@ include/frr/skiplist.h include/frr/sockopt.h include/frr/sockunion.h include/frr/srcdest_table.h +include/frr/srv6.h include/frr/stream.h include/frr/systemd.h include/frr/table.h @@ -117,6 +118,8 @@ include/frr/workqueue.h include/frr/zassert.h include/frr/zclient.h include/frr/zebra.h +include/frr/zlog.h +include/frr/zlog_targets.h lib/libfrr.a lib/libfrr.so lib/libfrr.so.0 @@ -157,6 +160,7 @@ sbin/bgpd %%LDPD%%sbin/ldpd sbin/eigrpd sbin/fabricd +sbin/frr-reload sbin/ospf6d sbin/ospfd sbin/pbrd @@ -175,6 +179,17 @@ share/yang/frr-ripd.yang share/yang/frr-ripngd.yang share/yang/frr-route-types.yang share/yang/frr-test-module.yang +share/yang/frr-filter.yang +share/yang/frr-igmp.yang +share/yang/frr-nexthop.yang +share/yang/frr-pim-rp.yang +share/yang/frr-pim.yang +share/yang/frr-route-map.yang +share/yang/frr-routing.yang +share/yang/frr-staticd.yang +share/yang/frr-vrf.yang +share/yang/frr-zebra.yang +share/yang/ietf-interfaces.yang share/yang/ietf-routing-types.yang %%ETCDIR%%/babeld.conf.sample %%ETCDIR%%/bfdd.conf.sample