Date: Fri, 2 Mar 2018 00:38:45 +0000 (UTC) From: Craig Leres <leres@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463362 - in branches/2018Q1: mail/imapsync security/bro sysutils/cmockery2 Message-ID: <201803020038.w220cj4t003683@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: leres Date: Fri Mar 2 00:38:45 2018 New Revision: 463362 URL: https://svnweb.freebsd.org/changeset/ports/463362 Log: MFH: r461924 r462351 r462460 Use USE_GITHUB instead of hand crafting urls. Sponsored by: Absolight Add a NETMAP option to build and install the bro netmap plugin. PR: 224918 Reported by: Shane Peters Reviewed by: matthew (mentor) Approved by: matthew (mentor) Differential Revision: https://reviews.freebsd.org/D14378 Update to 2.5.3 which fixes an integer overflow: http://blog.bro.org/2018/02/bro-253-released-security-update.html Note that a CVE has not been assigned yet. Reviewed by: matthew (mentor) Approved by: matthew (mentor) Differential Revision: https://reviews.freebsd.org/D14444 Approved by: ports-secteam (swills) Modified: branches/2018Q1/mail/imapsync/Makefile branches/2018Q1/mail/imapsync/distinfo branches/2018Q1/security/bro/Makefile branches/2018Q1/security/bro/distinfo branches/2018Q1/security/bro/pkg-plist branches/2018Q1/sysutils/cmockery2/Makefile branches/2018Q1/sysutils/cmockery2/distinfo Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/mail/imapsync/Makefile ============================================================================== --- branches/2018Q1/mail/imapsync/Makefile Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/mail/imapsync/Makefile Fri Mar 2 00:38:45 2018 (r463362) @@ -3,9 +3,8 @@ PORTNAME= imapsync PORTVERSION= 1.836 -DISTVERSIONPREFIX= v +DISTVERSIONPREFIX= imapsync- CATEGORIES= mail perl5 -MASTER_SITES= https://codeload.github.com/imapsync/imapsync/tar.gz/imapsync-${PORTVERSION}?dummy=/ MAINTAINER= pi@FreeBSD.org COMMENT= IMAP synchronization, copy or migration tool @@ -25,10 +24,9 @@ RUN_DEPENDS= p5-Mail-IMAPClient>0:mail/p5-Mail-IMAPCli p5-Sys-MemInfo>0:devel/p5-Sys-MemInfo \ p5-IO-Socket-INET6>0:net/p5-IO-Socket-INET6 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION} - USES= cpe perl5 tar:tgz shebangfix SHEBANG_FILES= ${PORTNAME} +USE_GITHUB= yes CPE_VENDOR= gilles_lamiral NO_BUILD= yes Modified: branches/2018Q1/mail/imapsync/distinfo ============================================================================== --- branches/2018Q1/mail/imapsync/distinfo Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/mail/imapsync/distinfo Fri Mar 2 00:38:45 2018 (r463362) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509971458 -SHA256 (imapsync-v1.836.tgz) = 544b8394df6db8722bfd02c8150f3dc5ca48900605efc7f965c1968ce64f3d0a -SIZE (imapsync-v1.836.tgz) = 1741595 +TIMESTAMP = 1518701382 +SHA256 (imapsync-imapsync-imapsync-1.836_GH0.tar.gz) = 544b8394df6db8722bfd02c8150f3dc5ca48900605efc7f965c1968ce64f3d0a +SIZE (imapsync-imapsync-imapsync-1.836_GH0.tar.gz) = 1741595 Modified: branches/2018Q1/security/bro/Makefile ============================================================================== --- branches/2018Q1/security/bro/Makefile Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/security/bro/Makefile Fri Mar 2 00:38:45 2018 (r463362) @@ -2,12 +2,10 @@ # $FreeBSD$ PORTNAME= bro -PORTVERSION= 2.5.2 +PORTVERSION= 2.5.3 CATEGORIES= security -MASTER_SITES= https://www.bro.org/downloads/:source1 \ - https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${PORTVERSION2}?dummy=/:source2 -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:source1 \ - ${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION2}_GH0${EXTRACT_SUFX}:source2 +MASTER_SITES= https://www.bro.org/downloads/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= leres@FreeBSD.org COMMENT= System for detecting network intruders in real-time @@ -18,16 +16,11 @@ BROKEN_powerpc64= Does not build: error: zero-size arr LIB_DEPENDS= libGeoIP.so:net/GeoIP -GH_ACCOUNT= actor-framework -GH_PROJECT= ${GH_ACCOUNT} - USES= bison cmake:outsource compiler:c++11-lang ninja perl5 python shebangfix ssl CMAKE_ARGS+= -DPYTHON_EXECUTABLE:PATH=${PYTHON_CMD} CXXFLAGS+= -std=c++11 -Wall -PORTVERSION2= 0.14.6 -WRKSRC2= ${WRKDIR}/${GH_PROJECT}-${PORTVERSION2} STAGEDIR2= ${STAGEDIR}-caf SHEBANG_FILES= aux/broctl/aux/trace-summary/trace-summary @@ -51,14 +44,17 @@ CMAKE_ARGS+= -GNinja \ BROUSER?= bro BROGROUP?= bro -PLIST_SUB+= BROUSER=${BROUSER} \ - BROGROUP=${BROGROUP} +PLIST_SUB+= ARCH=${ARCH} \ + BROUSER=${BROUSER} \ + BROGROUP=${BROGROUP} \ + LCASE_OPSYS=${OPSYS:tl} USERS= ${BROUSER} GROUPS= ${BROGROUP} -OPTIONS_DEFINE= BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS -OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF +OPTIONS_DEFINE= BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF \ + NETMAP PERFTOOLS +OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF NETMAP OPTIONS_SUB= yes BROCCOLI_DESC= Build support for libbroccoli communications @@ -81,12 +77,16 @@ BROCTL_CMAKE_BOOL= INSTALL_BROCTL BROCTL_USE= LDCONFIG=yes IPSUMDUMP_BUILD_DEPENDS=ipsumdump:net/ipsumdump IPSUMDUMP_RUN_DEPENDS= ipsumdump:net/ipsumdump -BROKER_CMAKE_BOOL= ENABLE_BROKER BROKER_BUILD_DEPENDS= swig3.0:devel/swig30 +BROKER_CMAKE_BOOL= ENABLE_BROKER BROKER_CMAKE_ON+= -DCAF_ROOT_DIR=${STAGEDIR2}${PREFIX} +BROKER_GH_TUPLE= actor-framework:actor-framework:0.14.6:actor_framework +BROKER_USE= GITHUB=nodefault DEBUG_CMAKE_BOOL= ENABLE_DEBUG LBL_HF_RUN_DEPENDS= ${LOCALBASE}/bin/hf:sysutils/lbl-hf LBL_CF_RUN_DEPENDS= ${LOCALBASE}/bin/cf:sysutils/lbl-cf +NETMAP_GH_TUPLE= bro:bro-netmap:cf88debf487b31ab30dc3b5bac64783b4e49997e:bro_netmap +NETMAP_USE= GITHUB=nodefault PERFTOOLS_CMAKE_BOOL= ENABLE_PERFTOOLS PERFTOOLS_RUN_DEPENDS= ${LOCALBASE}/bin/pprof:devel/google-perftools PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 @@ -105,8 +105,6 @@ CMAKE_ARGS2= -GNinja \ -D CAF_NO_OPENCL:BOOL=yes \ -D CAF_NO_UNIT_TESTS:BOOL=yes -CMAKE_SOURCE_PATH2= ${WRKSRC2} - CONFIGURE_WRKSRC2= ${WRKDIR}/.build-caf BUILD_WRKSRC2= ${CONFIGURE_WRKSRC2} INSTALL_WRKSRC2= ${CONFIGURE_WRKSRC2} @@ -115,7 +113,7 @@ INSTALL_WRKSRC2= ${CONFIGURE_WRKSRC2} pre-configure-BROKER-on: ${MKDIR} ${CONFIGURE_WRKSRC2} (cd ${CONFIGURE_WRKSRC2} && \ - ${CMAKE_BIN} ${CMAKE_ARGS2} ${CMAKE_SOURCE_PATH2}) + ${CMAKE_BIN} ${CMAKE_ARGS2} ${WRKSRC_actor_framework}) ${MKDIR} ${STAGEDIR2} (cd ${BUILD_WRKSRC2} && \ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} install) @@ -133,5 +131,11 @@ post-install-BROCTL-on: pre-install-BROCTL-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d + +post-build-NETMAP-on: + ${LN} -s ../.build ${WRKSRC}/build + (cd ${WRKSRC_bro_netmap} && ./configure --bro-dist=${WRKSRC} \ + --install-root=${STAGEDIR}${PREFIX}/lib/bro/plugins && \ + make && make install) .include <bsd.port.mk> Modified: branches/2018Q1/security/bro/distinfo ============================================================================== --- branches/2018Q1/security/bro/distinfo Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/security/bro/distinfo Fri Mar 2 00:38:45 2018 (r463362) @@ -1,5 +1,7 @@ -TIMESTAMP = 1508621466 -SHA256 (bro-2.5.2.tar.gz) = ab95b1bc376282919e5fa6b25b5ef8864e2e7bd5efe842db35d4a223b8f5b970 -SIZE (bro-2.5.2.tar.gz) = 18512696 +TIMESTAMP = 1518744511 +SHA256 (bro-2.5.3.tar.gz) = 7384fa14e6cebc86488040877fc0bfd50868e969f0fa05178cef0116e4116225 +SIZE (bro-2.5.3.tar.gz) = 18514905 SHA256 (actor-framework-actor-framework-0.14.6_GH0.tar.gz) = cbc2033896fe41e42604de2f74673971718a40684996650157484485755f7720 SIZE (actor-framework-actor-framework-0.14.6_GH0.tar.gz) = 1239451 +SHA256 (bro-bro-netmap-cf88debf487b31ab30dc3b5bac64783b4e49997e_GH0.tar.gz) = 383423f92932c3ef244194954708b3a237b4f37ebc358014f51dcb3b9786896b +SIZE (bro-bro-netmap-cf88debf487b31ab30dc3b5bac64783b4e49997e_GH0.tar.gz) = 24630 Modified: branches/2018Q1/security/bro/pkg-plist ============================================================================== --- branches/2018Q1/security/bro/pkg-plist Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/security/bro/pkg-plist Fri Mar 2 00:38:45 2018 (r463362) @@ -56,6 +56,12 @@ bin/bro-cut %%BROKER%%include/broker/util/operators.hh %%BROKER%%include/broker/util/optional.hh %%BROKER%%include/broker/util/variant.hh +%%NETMAP%%lib/bro/plugins/Bro_Netmap/COPYING +%%NETMAP%%lib/bro/plugins/Bro_Netmap/__bro_plugin__ +%%NETMAP%%lib/bro/plugins/Bro_Netmap/broctl/netmap.py +%%NETMAP%%lib/bro/plugins/Bro_Netmap/lib/Bro-Netmap.%%LCASE_OPSYS%%-%%ARCH%%.so +%%NETMAP%%lib/bro/plugins/Bro_Netmap/scripts/__load__.bro +%%NETMAP%%lib/bro/plugins/Bro_Netmap/scripts/init.bro %%BROCTL%%lib/broctl/BroControl/__init__.py %%BROCTL%%@preunexec rm -f %D/lib/broctl/BroControl/__init__.pyc %%BROCTL%%lib/broctl/BroControl/brocmd.py @@ -780,5 +786,9 @@ man/man8/bro.8.gz %%BROCTL%%@dir lib/broctl/plugins %%BROCTL%%@dir lib/broctl/BroControl %%BROCTL%%@dir lib/broctl +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/scripts +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/lib +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap/broctl +%%NETMAP%%@dir lib/bro/plugins/Bro_Netmap @dir lib/bro/plugins %%BROCTL%%@postexec su -fm %%BROUSER%% -c '%D/bin/broctl install; rm -f %D/spool/debug.log' Modified: branches/2018Q1/sysutils/cmockery2/Makefile ============================================================================== --- branches/2018Q1/sysutils/cmockery2/Makefile Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/sysutils/cmockery2/Makefile Fri Mar 2 00:38:45 2018 (r463362) @@ -4,21 +4,19 @@ PORTNAME= cmockery2 PORTVERSION= 1.3.8 +DISTVERSIONPREFIX= v CATEGORIES= sysutils -MASTER_SITES= https://codeload.github.com/lpabon/cmockery2/tar.gz/ -DISTNAME= v1.3.8 -EXTRACT_SUFX= MAINTAINER= harsha@harshavardhana.net COMMENT= Cmockery2 revival of Cmockery unit test framework from Google LICENSE= APACHE20 -WRKSRC= ${WRKDIR}/cmockery2-${PORTVERSION} - -GNU_CONFIGURE= yes USES= autoreconf libtool pkgconfig USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= lpabon +GNU_CONFIGURE= yes INSTALL_TARGET= install-strip # Disable gcov on FreeBSD Modified: branches/2018Q1/sysutils/cmockery2/distinfo ============================================================================== --- branches/2018Q1/sysutils/cmockery2/distinfo Fri Mar 2 00:01:09 2018 (r463361) +++ branches/2018Q1/sysutils/cmockery2/distinfo Fri Mar 2 00:38:45 2018 (r463362) @@ -1,2 +1,3 @@ -SHA256 (v1.3.8) = 6178e2fc51653d1b15f5d7cc10e0f48adcbf6cd07c1acf793ea26bfa789e7ef7 -SIZE (v1.3.8) = 54110 +TIMESTAMP = 1518701569 +SHA256 (lpabon-cmockery2-v1.3.8_GH0.tar.gz) = 6178e2fc51653d1b15f5d7cc10e0f48adcbf6cd07c1acf793ea26bfa789e7ef7 +SIZE (lpabon-cmockery2-v1.3.8_GH0.tar.gz) = 54110
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803020038.w220cj4t003683>