Attachment 199375 Details for Bug 233351 – rename of modsecurity3 (patch-compatible)

[patch] rename of modsecurity3 (patch-compatible)

modsec3.diff (text/plain), 12.33 KB, created by Marie Helene Kvello-Aune on 2018-11-20 11:15:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marie Helene Kvello-Aune

Created: 2018-11-20 11:15:43 UTC

Size: 12.33 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 485315)
>+++ MOVED	(working copy)
>@@ -25,6 +25,7 @@
> # This file can be linted with Tools/scripts/MOVEDlint.awk
> #
> # Port|Moved to|Date|Why
>+www/mod_security3|security/modsecurity3|2018-11-20|Not an Apache module, use correct upstream name 
> audio/polypaudio|audio/pulseaudio|2008-01-01|Project renamed
> audio/akode-plugins-polypaudio||2008-01-01|Polypaudio is obsolete in favor of Pulseaudio
> audio/teknap|net-p2p/teknap|2008-01-09|Moved to net-p2p category
>Index: security/Makefile
>===================================================================
>--- security/Makefile	(revision 485315)
>+++ security/Makefile	(working copy)
>@@ -423,6 +423,7 @@
>     SUBDIR += mhash
>     SUBDIR += mindterm-binary
>     SUBDIR += minisign
>+    SUBDIR += modsecurity3
>     SUBDIR += monkeysphere
>     SUBDIR += morphis
>     SUBDIR += munge
>Index: security/modsecurity3/Makefile
>===================================================================
>--- security/modsecurity3/Makefile	(nonexistent)
>+++ security/modsecurity3/Makefile	(working copy)
>@@ -0,0 +1,42 @@
>+# $FreeBSD$
>+
>+PORTNAME=	modsecurity
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	3.0.2
>+PORTREVISION=	2
>+CATEGORIES=	www security
>+PKGNAMESUFFIX=	3
>+
>+MAINTAINER=	marius.halden@modirum.com
>+COMMENT=	Intrusion detection and prevention engine
>+
>+LICENSE=	APACHE20
>+
>+LIB_DEPENDS=	libcurl.so:ftp/curl \
>+		libpcre.so:devel/pcre \
>+		libyajl.so:devel/yajl \
>+		libGeoIP.so:net/GeoIP
>+
>+USES=		autoreconf compiler:c++11-lang gmake libtool pkgconfig:build
>+USE_GNOME=	libxml2
>+# GCC because of https://github.com/SpiderLabs/ModSecurity/issues/1411
>+USE_GCC=	yes
>+USE_LDCONFIG=	yes
>+GNU_CONFIGURE=	yes
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	SpiderLabs
>+GH_PROJECT=	ModSecurity
>+
>+GH_TUPLE+=	SpiderLabs:secrules-language-tests:add8f63:secrules_language_tests/test/test-cases/secrules-language-tests
>+GH_TUPLE+=	client9:libinjection:da027ab:libinjection/others/libinjection
>+GH_TUPLE+=	SpiderLabs:ModSecurity-Python-bindings:bc625d5:modsecurity_python_bindings/bindings/python
>+
>+ETCDIR=		${PREFIX}/etc/modsecurity
>+
>+post-install:
>+	@${MKDIR}	${STAGEDIR}${ETCDIR}
>+	${INSTALL_DATA}	${WRKSRC}/modsecurity.conf-recommended \
>+		${STAGEDIR}${ETCDIR}/modsecurity.conf.sample
>+
>+.include <bsd.port.mk>
>Index: security/modsecurity3/distinfo
>===================================================================
>--- security/modsecurity3/distinfo	(nonexistent)
>+++ security/modsecurity3/distinfo	(working copy)
>@@ -0,0 +1,9 @@
>+TIMESTAMP = 1524855265
>+SHA256 (SpiderLabs-ModSecurity-v3.0.2_GH0.tar.gz) = a27c48a410870627c5d07aa8822b6459afff925b81b649905c7383bdee8fc1ce
>+SIZE (SpiderLabs-ModSecurity-v3.0.2_GH0.tar.gz) = 550800
>+SHA256 (SpiderLabs-secrules-language-tests-add8f63_GH0.tar.gz) = 18894cf90d6a1ade441053b2aa89fff495a50eec0c632d346cc223c692973cba
>+SIZE (SpiderLabs-secrules-language-tests-add8f63_GH0.tar.gz) = 58901
>+SHA256 (client9-libinjection-da027ab_GH0.tar.gz) = 7eaa6306d13427e002f976d4ce1bf3aaa3f94e7dd4ada02a69354fa482e6afca
>+SIZE (client9-libinjection-da027ab_GH0.tar.gz) = 1656633
>+SHA256 (SpiderLabs-ModSecurity-Python-bindings-bc625d5_GH0.tar.gz) = 7b10d90ec76985ddbdc4ca15c0675254cb6d10af6eaba620d1785d1b24b017eb
>+SIZE (SpiderLabs-ModSecurity-Python-bindings-bc625d5_GH0.tar.gz) = 2647
>Index: security/modsecurity3/pkg-descr
>===================================================================
>--- security/modsecurity3/pkg-descr	(nonexistent)
>+++ security/modsecurity3/pkg-descr	(working copy)
>@@ -0,0 +1,9 @@
>+ModSecurity is an embeddable web application firewall. It provides
>+protection from a range of attacks against web applications and allows
>+for HTTP traffic monitoring and real-time analysis with no changes to
>+existing infrastructure.
>+
>+It is also an open source project that aims to make the web application
>+firewall technology available to everyone.
>+
>+WWW: https://www.modsecurity.org/
>Index: security/modsecurity3/pkg-plist
>===================================================================
>--- security/modsecurity3/pkg-plist	(nonexistent)
>+++ security/modsecurity3/pkg-plist	(working copy)
>@@ -0,0 +1,24 @@
>+bin/modsec-rules-check
>+include/modsecurity/actions/action.h
>+include/modsecurity/anchored_set_variable.h
>+include/modsecurity/anchored_variable.h
>+include/modsecurity/audit_log.h
>+include/modsecurity/collection/collection.h
>+include/modsecurity/collection/collections.h
>+include/modsecurity/debug_log.h
>+include/modsecurity/intervention.h
>+include/modsecurity/modsecurity.h
>+include/modsecurity/reading_logs_via_rule_message.h
>+include/modsecurity/rule.h
>+include/modsecurity/rule_message.h
>+include/modsecurity/rules.h
>+include/modsecurity/rules_exceptions.h
>+include/modsecurity/rules_properties.h
>+include/modsecurity/transaction.h
>+include/modsecurity/variable_origin.h
>+include/modsecurity/variable_value.h
>+lib/libmodsecurity.a
>+lib/libmodsecurity.so
>+lib/libmodsecurity.so.3
>+lib/libmodsecurity.so.3.0.2
>+@sample %%ETCDIR%%/modsecurity.conf.sample
>Index: www/Makefile
>===================================================================
>--- www/Makefile	(revision 485425)
>+++ www/Makefile	(working copy)
>@@ -475,7 +475,6 @@
>     SUBDIR += mod_rpaf2
>     SUBDIR += mod_scgi
>     SUBDIR += mod_security
>-    SUBDIR += mod_security3
>     SUBDIR += mod_setenvifplus
>     SUBDIR += mod_tidy
>     SUBDIR += mod_tsa
>Index: www/mod_security3/Makefile
>===================================================================
>--- www/mod_security3/Makefile	(revision 485425)
>+++ www/mod_security3/Makefile	(nonexistent)
>@@ -1,42 +0,0 @@
>-# $FreeBSD$
>-
>-PORTNAME=	mod_security
>-DISTVERSIONPREFIX=	v
>-DISTVERSION=	3.0.2
>-PORTREVISION=	1
>-CATEGORIES=	www security
>-PKGNAMESUFFIX=	3
>-
>-MAINTAINER=	marius.halden@modirum.com
>-COMMENT=	Intrusion detection and prevention engine
>-
>-LICENSE=	APACHE20
>-
>-LIB_DEPENDS=	libcurl.so:ftp/curl \
>-		libpcre.so:devel/pcre \
>-		libyajl.so:devel/yajl \
>-		libGeoIP.so:net/GeoIP
>-
>-USES=		autoreconf compiler:c++11-lang gmake libtool pkgconfig:build
>-USE_GNOME=	libxml2
>-# GCC because of https://github.com/SpiderLabs/ModSecurity/issues/1411
>-USE_GCC=	yes
>-USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	SpiderLabs
>-GH_PROJECT=	ModSecurity
>-
>-GH_TUPLE+=	SpiderLabs:secrules-language-tests:add8f63:secrules_language_tests/test/test-cases/secrules-language-tests
>-GH_TUPLE+=	client9:libinjection:da027ab:libinjection/others/libinjection
>-GH_TUPLE+=	SpiderLabs:ModSecurity-Python-bindings:bc625d5:modsecurity_python_bindings/bindings/python
>-
>-ETCDIR=		${PREFIX}/etc/modsecurity
>-
>-post-install:
>-	@${MKDIR}	${STAGEDIR}${ETCDIR}
>-	${INSTALL_DATA}	${WRKSRC}/modsecurity.conf-recommended \
>-		${STAGEDIR}${ETCDIR}/modsecurity.conf.sample
>-
>-.include <bsd.port.mk>
>Index: www/mod_security3/distinfo
>===================================================================
>--- www/mod_security3/distinfo	(revision 485425)
>+++ www/mod_security3/distinfo	(nonexistent)
>@@ -1,9 +0,0 @@
>-TIMESTAMP = 1524855265
>-SHA256 (SpiderLabs-ModSecurity-v3.0.2_GH0.tar.gz) = a27c48a410870627c5d07aa8822b6459afff925b81b649905c7383bdee8fc1ce
>-SIZE (SpiderLabs-ModSecurity-v3.0.2_GH0.tar.gz) = 550800
>-SHA256 (SpiderLabs-secrules-language-tests-add8f63_GH0.tar.gz) = 18894cf90d6a1ade441053b2aa89fff495a50eec0c632d346cc223c692973cba
>-SIZE (SpiderLabs-secrules-language-tests-add8f63_GH0.tar.gz) = 58901
>-SHA256 (client9-libinjection-da027ab_GH0.tar.gz) = 7eaa6306d13427e002f976d4ce1bf3aaa3f94e7dd4ada02a69354fa482e6afca
>-SIZE (client9-libinjection-da027ab_GH0.tar.gz) = 1656633
>-SHA256 (SpiderLabs-ModSecurity-Python-bindings-bc625d5_GH0.tar.gz) = 7b10d90ec76985ddbdc4ca15c0675254cb6d10af6eaba620d1785d1b24b017eb
>-SIZE (SpiderLabs-ModSecurity-Python-bindings-bc625d5_GH0.tar.gz) = 2647
>Index: www/mod_security3/pkg-descr
>===================================================================
>--- www/mod_security3/pkg-descr	(revision 485425)
>+++ www/mod_security3/pkg-descr	(nonexistent)
>@@ -1,9 +0,0 @@
>-ModSecurity is an embeddable web application firewall. It provides
>-protection from a range of attacks against web applications and allows
>-for HTTP traffic monitoring and real-time analysis with no changes to
>-existing infrastructure.
>-
>-It is also an open source project that aims to make the web application
>-firewall technology available to everyone.
>-
>-WWW: https://www.modsecurity.org/
>Index: www/mod_security3/pkg-plist
>===================================================================
>--- www/mod_security3/pkg-plist	(revision 485425)
>+++ www/mod_security3/pkg-plist	(nonexistent)
>@@ -1,24 +0,0 @@
>-bin/modsec-rules-check
>-include/modsecurity/actions/action.h
>-include/modsecurity/anchored_set_variable.h
>-include/modsecurity/anchored_variable.h
>-include/modsecurity/audit_log.h
>-include/modsecurity/collection/collection.h
>-include/modsecurity/collection/collections.h
>-include/modsecurity/debug_log.h
>-include/modsecurity/intervention.h
>-include/modsecurity/modsecurity.h
>-include/modsecurity/reading_logs_via_rule_message.h
>-include/modsecurity/rule.h
>-include/modsecurity/rule_message.h
>-include/modsecurity/rules.h
>-include/modsecurity/rules_exceptions.h
>-include/modsecurity/rules_properties.h
>-include/modsecurity/transaction.h
>-include/modsecurity/variable_origin.h
>-include/modsecurity/variable_value.h
>-lib/libmodsecurity.a
>-lib/libmodsecurity.so
>-lib/libmodsecurity.so.3
>-lib/libmodsecurity.so.3.0.2
>-@sample %%ETCDIR%%/modsecurity.conf.sample
>Index: www/nginx/Makefile
>===================================================================
>--- www/nginx/Makefile	(revision 485425)
>+++ www/nginx/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	nginx
> PORTVERSION=	1.14.1
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> PORTEPOCH=	2
> CATEGORIES=	www
> MASTER_SITES=	http://nginx.org/download/ \
>Index: www/nginx/Makefile.extmod
>===================================================================
>--- www/nginx/Makefile.extmod	(revision 485425)
>+++ www/nginx/Makefile.extmod	(working copy)
>@@ -215,7 +215,7 @@
> MODSECURITY_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-modsecurity-configure
> MODSECURITY_VARS=		WRKSRC_modsecurity=${WRKDIR}/modsecurity-2.9.2
> 
>-MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:www/mod_security3
>+MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
> MODSECURITY3_GH_TUPLE=		SpiderLabs:ModSecurity-nginx:e4df1aa:modsec
> MODSECURITY3_CONFIGURE_ON=	--add-module=${WRKSRC_modsec}
> 
>Index: www/nginx/Makefile.options.desc
>===================================================================
>--- www/nginx/Makefile.options.desc	(revision 485425)
>+++ www/nginx/Makefile.options.desc	(working copy)
>@@ -84,7 +84,7 @@
> MAIL_SMTP_DESC=			Enable SMTP proxy module
> MAIL_SSL_DESC=			Enable mail_ssl module
> MEMC_DESC=			3rd party memc (memcached) module
>-MODSECURITY3_DESC=		3rd party mod_security v3 module
>+MODSECURITY3_DESC=		3rd party modsecurity3 module
> MODSECURITY_DESC=		3rd party mod_security module
> NAXSI_DESC=			3rd party naxsi module
> NJS_DESC=			Enable http_javascript module
>Index: www/nginx-devel/Makefile
>===================================================================
>--- www/nginx-devel/Makefile	(revision 485425)
>+++ www/nginx-devel/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	nginx
> PORTVERSION=	1.15.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	http://nginx.org/download/ \
> 		LOCAL/osa
>Index: www/nginx-devel/Makefile.extmod
>===================================================================
>--- www/nginx-devel/Makefile.extmod	(revision 485425)
>+++ www/nginx-devel/Makefile.extmod	(working copy)
>@@ -211,7 +211,7 @@
> MODSECURITY_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-modsecurity-configure
> MODSECURITY_VARS=		WRKSRC_modsecurity=${WRKDIR}/modsecurity-2.9.2
> 
>-MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:www/mod_security3
>+MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
> MODSECURITY3_GH_TUPLE=		SpiderLabs:ModSecurity-nginx:4cde86b:modsec
> MODSECURITY3_CONFIGURE_ON=	--add-module=${WRKSRC_modsec}
> 
>Index: www/nginx-devel/Makefile.options.desc
>===================================================================
>--- www/nginx-devel/Makefile.options.desc	(revision 485425)
>+++ www/nginx-devel/Makefile.options.desc	(working copy)
>@@ -84,7 +84,7 @@
> MAIL_SMTP_DESC=			Enable SMTP proxy module
> MAIL_SSL_DESC=			Enable mail_ssl module
> MEMC_DESC=			3rd party memc (memcached) module
>-MODSECURITY3_DESC=		3rd party mod_security v3 module
>+MODSECURITY3_DESC=		3rd party modsecurity3 module
> MODSECURITY_DESC=		3rd party mod_security module
> NAXSI_DESC=			3rd party naxsi module
> NJS_DESC=			Enable http_javascript module

Flags:

marius.halden: maintainer-approval+

Actions: View | Diff

Attachments on bug 233351: 199374 | 199375 | 199378