From owner-svn-ports-all@freebsd.org Sat Nov 2 13:25:01 2019 Return-Path: Delivered-To: svn-ports-all@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 5248E1A57B7; Sat, 2 Nov 2019 13:25:01 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) 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 4750Cx1VWDz4g6B; Sat, 2 Nov 2019 13:25:01 +0000 (UTC) (envelope-from tcberner@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 17A4C240DB; Sat, 2 Nov 2019 13:25:01 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA2DP0Mv021508; Sat, 2 Nov 2019 13:25:00 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA2DP0Vn021506; Sat, 2 Nov 2019 13:25:00 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201911021325.xA2DP0Vn021506@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 2 Nov 2019 13:25:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516319 - head/security/suricata X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/security/suricata X-SVN-Commit-Revision: 516319 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Nov 2019 13:25:01 -0000 Author: tcberner Date: Sat Nov 2 13:25:00 2019 New Revision: 516319 URL: https://svnweb.freebsd.org/changeset/ports/516319 Log: security/suricata: update to 5.0.0 PR: 241452 Submitted by: Franco Fichtner (maintainer) Modified: head/security/suricata/Makefile head/security/suricata/distinfo head/security/suricata/pkg-plist Modified: head/security/suricata/Makefile ============================================================================== --- head/security/suricata/Makefile Sat Nov 2 13:08:07 2019 (r516318) +++ head/security/suricata/Makefile Sat Nov 2 13:25:00 2019 (r516319) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= suricata -DISTVERSION= 4.1.5 -PORTREVISION= 1 +DISTVERSION= 5.0.0 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ @@ -13,6 +12,8 @@ COMMENT= High Performance Network IDS, IPS and Securit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= rustc:lang/${RUST_DEFAULT} + LIB_DEPENDS= libpcre.so:devel/pcre \ libnet.so:net/libnet \ liblz4.so:archivers/liblz4 \ @@ -24,7 +25,7 @@ CONFLICTS_INSTALL= libhtp suricata5 USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= PORTVERSION=${DISTVERSION:C/-/_/g} GNU_CONFIGURE= yes @@ -34,16 +35,14 @@ INSTALL_TARGET= install-strip TEST_TARGET= check OPTIONS_DEFINE= GEOIP IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE \ - PYTHON REDIS RUST TESTS + PYTHON REDIS TESTS OPTIONS_DEFINE_amd64= HYPERSCAN -OPTIONS_DEFAULT= IPFW JSON NETMAP PYTHON RUST +OPTIONS_DEFAULT= IPFW JSON NETMAP PYTHON OPTIONS_SUB= yes OPTIONS_RADIO= SCRIPTS OPTIONS_RADIO_SCRIPTS= LUA LUAJIT -SCRIPTS_DESC= Scripting - GEOIP_DESC= GeoIP support HYPERSCAN_DESC= Hyperscan support IPFW_DESC= IPFW and IP Divert support for inline IDP @@ -56,7 +55,7 @@ PORTS_PCAP_DESC= Use libpcap from ports PRELUDE_DESC= Prelude support for NIDS alerts PYTHON_DESC= Python-based update and control utilities REDIS_DESC= Redis output support -RUST_DESC= Rust parser support +SCRIPTS_DESC= Scripting TESTS_DESC= Unit tests in suricata binary GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb @@ -115,9 +114,6 @@ REDIS_CONFIGURE_ON= --enable-hiredis \ --with-libhiredis-includes=${LOCALBASE}/include \ --with-libhiredis-libraries=${LOCALBASE}/lib -RUST_BUILD_DEPENDS= rustc:lang/${RUST_DEFAULT} -RUST_CONFIGURE_ENABLE= rust - TESTS_CONFIGURE_ENABLE= unittests SUB_FILES= pkg-message @@ -134,10 +130,6 @@ CONFIGURE_ARGS+=--enable-gccprotect \ --with-libhtp-libraries=${LOCALBASE}/lib \ --disable-gccmarch-native -CONFIG_DIR?= ${ETCDIR} -CONFIG_FILES= suricata.yaml classification.config reference.config threshold.config -LOGS_DIR?= /var/log/${PORTNAME} - pre-patch: @${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4 @@ -146,10 +138,12 @@ post-patch-PYTHON-on: ${WRKSRC}/configure.ac post-install: - @${MKDIR} ${STAGEDIR}${CONFIG_DIR} - @${MKDIR} ${STAGEDIR}${LOGS_DIR} -.for f in ${CONFIG_FILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample + @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/log/${PORTNAME} +.for f in classification.config reference.config + @${MV} ${STAGEDIR}${DATADIR}/${f} ${STAGEDIR}${DATADIR}/${f}.sample +.endfor +.for f in suricata.yaml threshold.config + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor post-install-PYTHON-on: Modified: head/security/suricata/distinfo ============================================================================== --- head/security/suricata/distinfo Sat Nov 2 13:08:07 2019 (r516318) +++ head/security/suricata/distinfo Sat Nov 2 13:25:00 2019 (r516319) @@ -1,3 +1,3 @@ -TIMESTAMP = 1569423715 -SHA256 (suricata-4.1.5.tar.gz) = cee5f6535cd7fe63fddceab62eb3bc66a63fc464466c88ec7a41b7a1331ac74b -SIZE (suricata-4.1.5.tar.gz) = 15729747 +TIMESTAMP = 1571820976 +SHA256 (suricata-5.0.0.tar.gz) = 6a3dcc427196927a5cdefd32c290fa352d6405e9bb6d3fe12c71f47d31d98a63 +SIZE (suricata-5.0.0.tar.gz) = 23689051 Modified: head/security/suricata/pkg-plist ============================================================================== --- head/security/suricata/pkg-plist Sat Nov 2 13:08:07 2019 (r516318) +++ head/security/suricata/pkg-plist Sat Nov 2 13:25:00 2019 (r516319) @@ -56,6 +56,8 @@ man/man1/suricata.1.gz %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/ctl/test_filestore.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/sc/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/sc/__init__.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/sc/specs.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/sc/specs.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/sc/suricatasc.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/sc/suricatasc.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/__init__.py @@ -64,6 +66,8 @@ man/man1/suricata.1.gz %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/addsource.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/addsource.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/checkversions.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/checkversions.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/disablesource.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/disablesource.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.py @@ -124,15 +128,14 @@ man/man1/suricata.1.gz %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/util.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/version.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/version.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata_update-1.0.5-py%%PYTHON_VER%%.egg-info +%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata_update-1.1.0-py%%PYTHON_VER%%.egg-info %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc -@sample %%ETCDIR%%/classification.config.sample -@sample %%ETCDIR%%/reference.config.sample -@sample %%ETCDIR%%/suricata.yaml.sample -@sample %%ETCDIR%%/threshold.config.sample +@sample %%DATADIR%%/classification.config.sample +@sample %%DATADIR%%/reference.config.sample %%DATADIR%%/rules/app-layer-events.rules %%DATADIR%%/rules/decoder-events.rules +%%DATADIR%%/rules/dhcp-events.rules %%DATADIR%%/rules/dnp3-events.rules %%DATADIR%%/rules/dns-events.rules %%DATADIR%%/rules/files.rules @@ -146,9 +149,11 @@ man/man1/suricata.1.gz %%DATADIR%%/rules/smtp-events.rules %%DATADIR%%/rules/stream-events.rules %%DATADIR%%/rules/tls-events.rules +@sample %%ETCDIR%%/suricata.yaml.sample +@sample %%ETCDIR%%/threshold.config.sample @dir %%DATADIR%% +@dir %%DOCSDIR%% @dir %%ETCDIR%% @dir include/htp @dir(root,wheel,0700) /var/log/suricata @postunexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, run ``rm -rf ${PKG_PREFIX}/%%ETCDIR%%`` to remove configuration files."; fi -@dir %%DOCSDIR%%