diff against current nginx ebuild

nginx-1.21.6-r1.ebuild.diff (text/plain), 3.64 KB, created by Graham E on 2022-07-08 13:49:44 UTC

diff --git a/www-servers/nginx/nginx-1.21.6-r1.ebuild b/www-servers/nginx/nginx-1.21.6-r1.ebuild
index cbd512501e..d28dc2c4d9 100644
--- a/www-servers/nginx/nginx-1.21.6-r1.ebuild
+++ b/www-servers/nginx/nginx-1.21.6-r1.ebuild
@@ -120,6 +120,12 @@ HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
 HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
 HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
 
+# libmodsecurity - standalone update to mod_security (https://github.com/SpiderLabs/ModSecurity, )
+HTTP_LIBMODSECURITY_MODULE_PV="v1.0.3"
+HTTP_LIBMODSECURITY_MODULE_P="modsecurity-nginx-${HTTP_LIBMODSECURITY_MODULE_PV}"
+HTTP_LIBMODSECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/${HTTP_LIBMODSECURITY_MODULE_PV}/${HTTP_LIBMODSECURITY_MODULE_P}.tar.gz"
+HTTP_LIBMODSECURITY_MODULE_WD="${WORKDIR}/${HTTP_LIBMODSECURITY_MODULE_P}"
+
 # push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
 HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
 HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
@@ -182,6 +188,7 @@ SRC_URI="https://nginx.org/download/${P}.tar.gz
 	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
 	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
 	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_libmodsecurity? ( ${HTTP_LIBMODSECURITY_MODULE_URI} -> ${HTTP_LIBMODSECURITY_MODULE_P}.tar.gz )
 	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
 	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
 	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
@@ -200,10 +207,11 @@ SRC_URI="https://nginx.org/download/${P}.tar.gz
 
 LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_libmodsecurity? ( Apache-2.0 )
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="mainline"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
@@ -231,6 +239,7 @@ NGINX_MODULES_3RD="
 	http_geoip2
 	http_headers_more
 	http_javascript
+	http_libmodsecurity
 	http_lua
 	http_memc
 	http_metrics
@@ -313,6 +322,7 @@ CDEPEND="
 		net-misc/curl
 		www-servers/apache
 	)
+	nginx_modules_http_libmodsecurity? ( >=www-misc/libmodsecurity-3.0.7 )
 	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
 	nginx_modules_stream_geoip? ( dev-libs/geoip )
 	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
@@ -551,6 +561,11 @@ src_configure() {
 		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
 	fi
 
+	if use nginx_modules_http_libmodsecurity ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LIBMODSECURITY_MODULE_WD} )
+	fi
+
 	if use nginx_modules_http_push_stream ; then
 		http_enabled=1
 		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
@@ -809,6 +824,11 @@ src_install() {
 		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
 	fi
 
+	if use nginx_modules_http_libmodsecurity; then
+		docinto ${HTTP_LIBMODSECURITY_MODULE_P}
+		dodoc "${HTTP_LIBMODSECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
+	fi
+
 	if use nginx_modules_http_push_stream; then
 		docinto ${HTTP_PUSH_STREAM_MODULE_P}
 		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}