Attachment 200000 Details for Bug 231839 – PYHTON option, default changes

[patch] PYHTON option, default changes

suricata-py.diff (text/plain), 12.95 KB, created by Franco Fichtner on 2018-12-10 07:30:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2018-12-10 07:30:24 UTC

Size: 12.95 KB

patch

obsolete

>diff --git a/security/suricata/Makefile b/security/suricata/Makefile
>index 3e07decd3728..17a42214d95e 100644
>--- a/security/suricata/Makefile
>+++ b/security/suricata/Makefile
>@@ -32,9 +32,9 @@ INSTALL_TARGET=		install-strip
> TEST_TARGET=		check
> 
> OPTIONS_DEFINE=		GEOIP IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE \
>-			REDIS RUST SC TESTS
>+			PYTHON REDIS RUST TESTS
> OPTIONS_DEFINE_amd64=	HYPERSCAN
>-OPTIONS_DEFAULT=	IPFW JSON NETMAP PRELUDE
>+OPTIONS_DEFAULT=	IPFW JSON NETMAP PYTHON RUST
> OPTIONS_SUB=		yes
> 
> OPTIONS_RADIO=		SCRIPTS
>@@ -52,9 +52,9 @@ NETMAP_DESC=		Netmap support for inline IDP
> NSS_DESC=		File checksums and SSL/TLS fingerprinting
> 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
>-SC_DESC=		Suricata socket client (suricatasc)
> TESTS_DESC=		Unit tests in suricata binary
> 
> GEOIP_LIB_DEPENDS=		libGeoIP.so:net/GeoIP
>@@ -102,6 +102,10 @@ PRELUDE_LIB_DEPENDS=		libprelude.so:security/libprelude \
> PRELUDE_CONFIGURE_ENABLE=	prelude
> PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
> 
>+PYTHON_USES=			python:2.7
>+PYTHON_CONFIGURE_ENABLE=	python
>+PYTHON_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
>+
> REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
> REDIS_CONFIGURE_ON=		--enable-hiredis \
> 				--with-libhiredis-includes=${LOCALBASE}/include \
>@@ -110,9 +114,6 @@ REDIS_CONFIGURE_ON=		--enable-hiredis \
> RUST_BUILD_DEPENDS=		rustc:lang/rust
> RUST_CONFIGURE_ENABLE=		rust
> 
>-SC_USES=			python:2.7
>-SC_CONFIGURE_ENABLE=		python
>-
> TESTS_CONFIGURE_ENABLE=		unittests
> 
> SUB_FILES=	pkg-message
>@@ -143,7 +144,7 @@ post-install:
> 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample
> .endfor
> 
>-post-install-SC-on:
>+post-install-PYTHON-on:
> 	(cd ${STAGEDIR}${PREFIX} \
> 	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
> 	-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
>diff --git a/security/suricata/pkg-plist b/security/suricata/pkg-plist
>index 9a81582859fc..74901edc7739 100644
>--- a/security/suricata/pkg-plist
>+++ b/security/suricata/pkg-plist
>@@ -1,7 +1,7 @@
> bin/suricata
>-%%SC%%bin/suricata-update
>-%%SC%%bin/suricatactl
>-%%SC%%bin/suricatasc
>+%%PYTHON%%bin/suricata-update
>+%%PYTHON%%bin/suricatactl
>+%%PYTHON%%bin/suricatasc
> include/htp/bstr.h
> include/htp/bstr_builder.h
> include/htp/htp.h
>@@ -35,90 +35,90 @@ man/man1/suricata.1.gz
> %%DOCSDIR%%/Setting_up_IPSinline_for_Linux.txt
> %%DOCSDIR%%/TODO
> %%DOCSDIR%%/Third_Party_Installation_Guides.txt
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata-4.1.0-py2.7.egg-info
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/config/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/config/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/config/defaults.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/config/defaults.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/ctl/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/ctl/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/ctl/filestore.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/ctl/filestore.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/ctl/loghandler.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/ctl/loghandler.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/ctl/main.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/ctl/main.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/ctl/test_filestore.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/ctl/test_filestore.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/sc/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/sc/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/sc/suricatasc.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/sc/suricatasc.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/addsource.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/addsource.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/disablesource.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/disablesource.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listenabledsources.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listenabledsources.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listsources.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listsources.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/removesource.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/removesource.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/updatesources.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/updatesources.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/argparse.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/argparse.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/ordereddict.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/ordereddict.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/config.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/config.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/configs/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/configs/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/data/__init__.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/data/__init__.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/data/index.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/data/index.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/data/update.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/data/update.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/engine.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/engine.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/exceptions.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/exceptions.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/extract.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/extract.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/loghandler.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/loghandler.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/main.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/main.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/maps.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/maps.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/net.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/net.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/notes.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/notes.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/rule.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/rule.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/sources.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/sources.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/util.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/util.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/version.py
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata/update/version.pyc
>-%%SC%%%%PYTHON_SITELIBDIR%%/suricata_update-1.0.0-py2.7.egg-info
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata-4.1.0-py%%PYTHON_VER%%.egg-info
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/__init__.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/__init__.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/config/__init__.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/config/__init__.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/config/defaults.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/config/defaults.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/ctl/__init__.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/ctl/__init__.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/ctl/filestore.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/ctl/filestore.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/ctl/loghandler.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/ctl/loghandler.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/ctl/main.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/ctl/main.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/ctl/test_filestore.py
>+%%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/suricatasc.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/sc/suricatasc.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/__init__.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/__init__.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/__init__.py
>+%%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/disablesource.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/disablesource.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listenabledsources.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listenabledsources.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listsources.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/listsources.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/removesource.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/removesource.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/updatesources.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/commands/updatesources.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/__init__.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/__init__.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/__init__.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/__init__.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/argparse.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/argparse.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/ordereddict.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/compat/ordereddict.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/config.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/config.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/configs/__init__.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/configs/__init__.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/data/__init__.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/data/__init__.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/data/index.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/data/index.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/data/update.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/data/update.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/engine.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/engine.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/exceptions.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/exceptions.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/extract.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/extract.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/loghandler.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/loghandler.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/main.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/main.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/maps.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/maps.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/net.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/net.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/notes.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/notes.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/rule.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/rule.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/sources.py
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/sources.pyc
>+%%PYTHON%%%%PYTHON_SITELIBDIR%%/suricata/update/util.py
>+%%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.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

Flags:

franco: maintainer-approval+

Actions: View | Diff

Attachments on bug 231839: 197656 | 198715 | 199207 | 200000