From owner-svn-ports-all@freebsd.org Wed Jan 20 14:02:19 2021 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 0B2994F6F9D; Wed, 20 Jan 2021 14:02:19 +0000 (UTC) (envelope-from fernape@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DLRzZ70dhz4mD9; Wed, 20 Jan 2021 14:02:18 +0000 (UTC) (envelope-from fernape@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 E398F1A5BB; Wed, 20 Jan 2021 14:02:18 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10KE2Iso013632; Wed, 20 Jan 2021 14:02:18 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10KE2ISn013630; Wed, 20 Jan 2021 14:02:18 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202101201402.10KE2ISn013630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Wed, 20 Jan 2021 14:02:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562136 - in head/security/suricata: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in head/security/suricata: . files X-SVN-Commit-Revision: 562136 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.34 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: Wed, 20 Jan 2021 14:02:19 -0000 Author: fernape Date: Wed Jan 20 14:02:18 2021 New Revision: 562136 URL: https://svnweb.freebsd.org/changeset/ports/562136 Log: security/suricata: simplify Makefile Add USES=localbase so we can get rid of *-includes and *-libraries. Reorder some variables too. Regenerate patch. PR: 252571 Submitted by: fernape@FreeBSD.org Reviewed by: franco@opnsense.org (maintainer) Modified: head/security/suricata/Makefile head/security/suricata/files/patch-src_suricata-common.h Modified: head/security/suricata/Makefile ============================================================================== --- head/security/suricata/Makefile Wed Jan 20 13:56:14 2021 (r562135) +++ head/security/suricata/Makefile Wed Jan 20 14:02:18 2021 (r562136) @@ -19,30 +19,37 @@ LIB_DEPENDS= libjansson.so:devel/jansson \ liblz4.so:archivers/liblz4 \ libyaml.so:textproc/libyaml -USES= autoreconf cpe gmake iconv:translit libtool pathfix pkgconfig +USES= autoreconf cpe gmake iconv:translit libtool localbase \ + pathfix pkgconfig -CONFLICTS_INSTALL= libhtp +CPE_VENDOR= openinfosecfoundation USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} -PLIST_SUB= PORTVERSION=${DISTVERSION:C/-/_/g} GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--enable-gccprotect \ + --enable-bundled-htp \ + --disable-gccmarch-native -CPE_VENDOR= openinfosecfoundation - INSTALL_TARGET= install-strip TEST_TARGET= check +CONFLICTS_INSTALL= libhtp + +SUB_FILES= pkg-message +PLIST_SUB= PORTVERSION=${DISTVERSION:C/-/_/g} + OPTIONS_DEFINE= GEOIP IPFW NETMAP NSS PORTS_PCAP PRELUDE \ PYTHON REDIS TESTS OPTIONS_DEFINE_amd64= HYPERSCAN OPTIONS_DEFAULT= IPFW NETMAP PYTHON -OPTIONS_SUB= yes OPTIONS_RADIO= SCRIPTS OPTIONS_RADIO_SCRIPTS= LUA LUAJIT +OPTIONS_SUB= yes + GEOIP_DESC= GeoIP support HYPERSCAN_DESC= Hyperscan support IPFW_DESC= IPFW and IP Divert support for inline IDP @@ -61,71 +68,41 @@ GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb GEOIP_CONFIGURE_ON= --enable-geoip HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan -HYPERSCAN_CONFIGURE_ON= --with-libhs-includes=${LOCALBASE}/include \ - --with-libhs-libraries=${LOCALBASE}/lib IPFW_CONFIGURE_ON= --enable-ipfw +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_CONFIGURE_ON= --enable-luajit + LUA_USES= lua:51 LUA_CONFIGURE_ON= --enable-lua \ - --with-liblua-includes=${LUA_INCDIR} \ - --with-liblua-libraries=${LUA_LIBDIR} -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit -LUAJIT_CONFIGURE_ON= --enable-luajit +NETMAP_CONFIGURE_ENABLE= netmap NSS_LIB_DEPENDS= libnss3.so:security/nss \ libnspr4.so:devel/nspr NSS_CONFIGURE_OFF= --disable-nss --disable-nspr -NSS_CONFIGURE_ON= --with-libnss-includes=${LOCALBASE}/include/nss/nss \ - --with-libnss-libraries=${LOCALBASE}/lib \ - --with-libnspr-libraries=${LOCALBASE}/lib \ - --with-libnspr-includes=${LOCALBASE}/include/nspr -NETMAP_CONFIGURE_ENABLE= netmap - PORTS_PCAP_LIB_DEPENDS= libpcap.so.1:net/libpcap -PORTS_PCAP_CONFIGURE_ON= --with-libpcap-includes=${LOCALBASE}/include \ - --with-libpcap-libraries=${LOCALBASE}/lib -PORTS_PCAP_CONFIGURE_OFF= --with-libpcap-includes=/usr/include \ - --with-libpcap-libraries=/usr/lib PRELUDE_LIB_DEPENDS= libprelude.so:security/libprelude \ libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libltdl.so:devel/libltdl -PRELUDE_CONFIGURE_ENABLE= prelude PRELUDE_CONFIGURE_ON= --with-libprelude-prefix=${LOCALBASE} +PRELUDE_CONFIGURE_ENABLE= prelude +PYTHON_BUILD_DEPENDS= ${PYTHON_RUN_DEPENDS} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} PYTHON_USES= python PYTHON_USE= PYTHON=py3kplist PYTHON_CONFIGURE_ENABLE= python -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} -PYTHON_BUILD_DEPENDS= ${PYTHON_RUN_DEPENDS} REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis REDIS_CONFIGURE_ON= --enable-hiredis \ - --with-libhiredis-includes=${LOCALBASE}/include \ - --with-libhiredis-libraries=${LOCALBASE}/lib TESTS_CONFIGURE_ENABLE= unittests - -SUB_FILES= pkg-message - -CONFIGURE_ARGS+=--enable-gccprotect \ - --enable-bundled-htp \ - --with-libjansson-includes=${LOCALBASE}/include \ - --with-libjansson-libraries=${LOCALBASE}/lib \ - --with-libpcre-includes=${LOCALBASE}/include \ - --with-libpcre-libraries=${LOCALBASE}/lib \ - --with-libyaml-includes=${LOCALBASE}/include \ - --with-libyaml-libraries=${LOCALBASE}/lib \ - --with-libnet-includes=${LOCALBASE}/include \ - --with-libnet-libraries=${LOCALBASE}/lib \ - --with-libhtp-includes=${LOCALBASE}/include/ \ - --with-libhtp-libraries=${LOCALBASE}/lib \ - --disable-gccmarch-native pre-patch: @${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4 Modified: head/security/suricata/files/patch-src_suricata-common.h ============================================================================== --- head/security/suricata/files/patch-src_suricata-common.h Wed Jan 20 13:56:14 2021 (r562135) +++ head/security/suricata/files/patch-src_suricata-common.h Wed Jan 20 14:02:18 2021 (r562136) @@ -1,5 +1,5 @@ ---- src/suricata-common.h-orig 2020-10-25 16:56:49.454317000 +0100 -+++ src/suricata-common.h 2020-10-25 16:57:06.035153000 +0100 +--- src/suricata-common.h.orig 2020-12-04 07:11:05 UTC ++++ src/suricata-common.h @@ -36,6 +36,8 @@ #define _GNU_SOURCE #define __USE_GNU