diff --git a/security/modsecurity3-nginx/Makefile b/security/modsecurity3-nginx/Makefile index 7b821bc986e8..fe3d9256fb57 100644 --- a/security/modsecurity3-nginx/Makefile +++ b/security/modsecurity3-nginx/Makefile @@ -1,92 +1,95 @@ PORTNAME= modsecurity3-nginx DISTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security www MASTER_SITES= https://nginx.org/download/ DISTFILES= ${_NGINX_DISTNAME}${EXTRACT_SUFX} MAINTAINER= joneum@FreeBSD.org COMMENT= Instruction detection and prevention engine / nginx Wrapper WWW= https://github.com/SpiderLabs/ModSecurity-nginx LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv6= ./configure: error: ngx_http_modsecurity_module requires the ModSecurity library. LIB_DEPENDS= libmodsecurity.so:security/modsecurity3 USES= compiler:c11 USE_GITHUB= nodefault -GH_TUPLE= SpiderLabs:ModSecurity-nginx:b94f2d3:modsecurity3 +GH_TUPLE= SpiderLabs:ModSecurity-nginx:e6a568a:modsecurity3 HAS_CONFIGURE= yes # Most arguments should be derived from www/nginx's Makefile to be in sync CONFIGURE_ARGS+= --prefix=${PREFIX}/etc/nginx \ --with-cc-opt="-I ${LOCALBASE}/include" \ --with-ld-opt="-L ${LOCALBASE}/lib" \ --conf-path=${PREFIX}/etc/nginx.conf \ --sbin-path=${PREFIX}/sbin/nginx \ --pid-path=${_NGINX_RUNDIR}/nginx.pid \ --error-log-path=${_NGINX_ERRORLOG} \ --user=${WWWOWN} --group=${WWWGRP} \ --modules-path=${_MODULESDIR} \ --with-file-aio \ --http-client-body-temp-path=${_NGINX_TMPDIR}/client_body_temp \ --http-fastcgi-temp-path=${_NGINX_TMPDIR}/fastcgi_temp \ --http-proxy-temp-path=${_NGINX_TMPDIR}/proxy_temp \ --http-scgi-temp-path=${_NGINX_TMPDIR}/scgi_temp \ --http-uwsgi-temp-path=${_NGINX_TMPDIR}/uwsgi_temp \ --http-log-path=${_NGINX_ACCESSLOG} \ + --with-compat \ --with-http_v2_module \ + --with-http_v3_module \ --with-http_addition_module \ --with-http_auth_request_module \ --with-http_dav_module \ --with-http_flv_module \ --with-http_gunzip_module \ --with-http_gzip_static_module \ --with-http_mp4_module \ --with-http_random_index_module \ --with-http_realip_module \ --with-pcre \ --with-http_secure_link_module \ --with-http_slice_module \ --with-http_ssl_module \ + --with-stream_realip_module \ --with-http_stub_status_module \ --with-http_sub_module \ --without-mail_imap_module \ --without-mail_pop3_module \ --without-mail_smtp_module \ --with-mail_ssl_module \ --with-stream_ssl_module \ --with-stream_ssl_preread_module \ --with-threads \ --with-mail=dynamic \ --with-stream=dynamic \ --add-dynamic-module=${WRKSRC_modsecurity3} ALL_TARGET= WRKSRC= ${WRKDIR}/${_NGINX_DISTNAME} PLIST_FILES= ${_MODULESDIR}/ngx_http_modsecurity_module.so # These variables should be derived from www/nginx's Makefile _MODULESDIR= ${PREFIX}/libexec/nginx _NGINX_ACCESSLOG= ${_NGINX_LOGDIR}/access.log _NGINX_ERRORLOG= ${_NGINX_LOGDIR}/error.log _NGINX_LOGDIR= ${_NGINX_VARDIR}/log/nginx _NGINX_RUNDIR= ${_NGINX_VARDIR}/run _NGINX_TMPDIR= ${_NGINX_VARDIR}/tmp/nginx _NGINX_VARDIR= /var _NGINX_PORTNAME= nginx -_NGINX_PORTVERSION= 1.28.0 +_NGINX_PORTVERSION= 1.28.2 _NGINX_DISTNAME= ${_NGINX_PORTNAME}-${_NGINX_PORTVERSION} do-install: @${MKDIR} ${STAGEDIR}${_MODULESDIR} ${INSTALL_PROGRAM} ${WRKSRC}/objs/ngx_http_modsecurity_module.so \ ${STAGEDIR}${_MODULESDIR} .include diff --git a/security/modsecurity3-nginx/distinfo b/security/modsecurity3-nginx/distinfo index 50615422f50c..9cbf095fc6f0 100644 --- a/security/modsecurity3-nginx/distinfo +++ b/security/modsecurity3-nginx/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1767869688 -SHA256 (nginx-1.28.0.tar.gz) = c6b5c6b086c0df9d3ca3ff5e084c1d0ef909e6038279c71c1c3e985f576ff76a -SIZE (nginx-1.28.0.tar.gz) = 1280111 -SHA256 (SpiderLabs-ModSecurity-nginx-b94f2d3_GH0.tar.gz) = 1859bc882520684bb44ffc314c566f8113a3a6070c194b8326d57fbdd1848c49 -SIZE (SpiderLabs-ModSecurity-nginx-b94f2d3_GH0.tar.gz) = 1160828 +TIMESTAMP = 1771870809 +SHA256 (nginx-1.28.2.tar.gz) = 20e5e0f2c917acfb51120eec2fba9a4ba4e1e10fd28465067cc87a7d81a829a3 +SIZE (nginx-1.28.2.tar.gz) = 1282351 +SHA256 (SpiderLabs-ModSecurity-nginx-e6a568a_GH0.tar.gz) = 0680f0c025b91e0f233cd908eac7da0f08ff5042f941c570d4ad8c8a94eea533 +SIZE (SpiderLabs-ModSecurity-nginx-e6a568a_GH0.tar.gz) = 1161281 diff --git a/security/modsecurity3/Makefile b/security/modsecurity3/Makefile index 186cfe1dc959..08a688bfd536 100644 --- a/security/modsecurity3/Makefile +++ b/security/modsecurity3/Makefile @@ -1,47 +1,47 @@ PORTNAME= modsecurity DISTVERSIONPREFIX= v DISTVERSION= 3.0.14 PORTREVISION= 1 CATEGORIES= security www -MASTER_SITES= https://github.com/owasp-modsecurity/ModSecurity/releases/download/v${PORTVERSION}/ +MASTER_SITES= https://github.com/owasp-modsecurity/ModSecurity/releases/download/v${DISTVERSION}/ PKGNAMESUFFIX= 3 MAINTAINER= marius.halden@modirum.com COMMENT= Intrusion detection and prevention engine WWW= https://www.modsecurity.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcurl.so:ftp/curl \ - libpcre.so:devel/pcre \ + libpcre2-8.so:devel/pcre2 \ libyajl.so:devel/yajl \ libmaxminddb.so:net/libmaxminddb USES= cpe gmake gnome libtool pkgconfig:build CPE_VENDOR= trustwave USE_GNOME= libxml2 # GCC because of https://github.com/SpiderLabs/ModSecurity/issues/1411 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-lmdb --without-ssdeep --without-lua +CONFIGURE_ARGS= --without-lmdb --without-ssdeep --without-lua --with-pcre2 INSTALL_TARGET= install-strip CONFLICTS_INSTALL= ap??-mod_security mod_security3 ETCDIR= ${PREFIX}/etc/modsecurity PLIST_SUB= SHLIBVER=${DISTVERSION} post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/modsecurity.conf-recommended \ ${STAGEDIR}${ETCDIR}/modsecurity.conf.sample ${INSTALL_DATA} ${WRKSRC}/unicode.mapping \ ${STAGEDIR}${ETCDIR}/unicode.mapping .include