Index: head/net/frr7/Makefile =================================================================== --- head/net/frr7/Makefile (revision 543377) +++ head/net/frr7/Makefile (revision 543378) @@ -1,136 +1,137 @@ # $FreeBSD$ PORTNAME= frr PORTVERSION= 7.4 DISTVERSIONPREFIX= frr- +PORTREVISION= 1 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 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 shebangfix BINARY_ALIAS= python=${PYTHON_VERSION} 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 \ TCPSOCKETS VTYSH MANPAGES MULTIPATH TCMALLOC RPKI SNMP OPTIONS_DEFAULT= VTYSH RPKI FPM MANPAGES OPTIONS_SUB= yes CONFIGROLLBACKS_DESC= Enable configuration rollback support FPM_DESC= Enable Forwarding Plane Manager support DATACENTER_DESC= Use reduced BGP timers 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 \ --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 CONFIGROLLBACKS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 CONFIGROLLBACKS_CONFIGURE_ENABLE= config-rollbacks DATACENTER_CONFIGURE_ENABLE= datacenter 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_CFLAGS= "-std=gnu99" SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_USES= ssl TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra VTYSH_CONFIGURE_ENABLE= vtysh 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 Index: head/net/frr7/files/patch-lib_zlog.c =================================================================== --- head/net/frr7/files/patch-lib_zlog.c (nonexistent) +++ head/net/frr7/files/patch-lib_zlog.c (revision 543378) @@ -0,0 +1,16 @@ +--- lib/zlog.c.orig 2020-06-30 11:08:57 UTC ++++ lib/zlog.c +@@ -246,10 +246,10 @@ void zlog_tls_buffer_init(void) + fchown(mmfd, zlog_uid, zlog_gid); + + #ifdef HAVE_POSIX_FALLOCATE +- if (posix_fallocate(mmfd, 0, TLS_LOG_BUF_SIZE) < 0) { +-#else +- if (ftruncate(mmfd, TLS_LOG_BUF_SIZE) < 0) { ++ if (posix_fallocate(mmfd, 0, TLS_LOG_BUF_SIZE) != 0) ++ /* note next statement is under above if() */ + #endif ++ if (ftruncate(mmfd, TLS_LOG_BUF_SIZE) < 0) { + zlog_err("failed to allocate thread log buffer \"%s\": %s", + mmpath, strerror(errno)); + goto out_anon_unlink; Property changes on: head/net/frr7/files/patch-lib_zlog.c ___________________________________________________________________ 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