diff options
Diffstat (limited to 'www/apache24')
| -rw-r--r-- | www/apache24/Makefile | 7 | ||||
| -rw-r--r-- | www/apache24/distinfo | 6 | ||||
| -rw-r--r-- | www/apache24/files/apache24.in | 3 | ||||
| -rw-r--r-- | www/apache24/files/patch-modules_ssl_ssl__engine__init.c | 11 |
4 files changed, 10 insertions, 17 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 2de058d2e090..ab878e5db287 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,5 +1,6 @@ PORTNAME= apache24 -PORTVERSION= 2.4.63 +PORTVERSION= 2.4.65 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} @@ -33,8 +34,8 @@ SUB_FILES= pkg-install pkg-deinstall # Fallback MPM after switching from static to modular MPM SUB_LIST+= MPMF="000_mpm_prefork_fallback.conf" -USERS= www -GROUPS= www +USERS?= ${WWWOWN} +GROUPS?= ${WWWGRP} .include "${.CURDIR}/Makefile.options" .include "${.CURDIR}/Makefile.options.desc" diff --git a/www/apache24/distinfo b/www/apache24/distinfo index 1bed753883c2..9e46a20d0a0b 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737742760 -SHA256 (apache24/httpd-2.4.63.tar.bz2) = 88fc236ab99b2864b248de7d49a008ec2afd7551e64dce8b95f58f32f94c46ab -SIZE (apache24/httpd-2.4.63.tar.bz2) = 7517972 +TIMESTAMP = 1754748153 +SHA256 (apache24/httpd-2.4.65.tar.bz2) = 58b8be97d9940ec17f7656c0c6b9f41b618aac468b894b534148e3296c53b8b3 +SIZE (apache24/httpd-2.4.65.tar.bz2) = 7506711 diff --git a/www/apache24/files/apache24.in b/www/apache24/files/apache24.in index 0b9c4bd55ba6..d9ced6f55d73 100644 --- a/www/apache24/files/apache24.in +++ b/www/apache24/files/apache24.in @@ -43,6 +43,8 @@ pidfile="${_pidprefix}.pid" required_files=%%PREFIX%%/etc/apache24/httpd.conf envvars="%%PREFIX%%/sbin/envvars" +: ${apache24_svcj_options:="net_basic"} + [ -z "$apache24_enable" ] && apache24_enable="NO" [ -z "$apache24limits_enable" ] && apache24limits_enable="NO" [ -z "$apache24limits_args" ] && apache24limits_args="-e -C daemon" @@ -83,6 +85,7 @@ if [ -n "$2" ]; then eval command="\${apache24_${profile}_command:-${command}}" eval pidfile="\${apache24_${profile}_pidfile:-${pidfile}}" eval apache24_envvars="\${apache24_${profile}_envvars:-${envvars}}" + eval apache24_svcj_options="\${apache24_${profile}_svcj_options:-${apache24_svcj_options}}" apache24_flags="-f ${apache24_configfile} -c \"PidFile ${pidfile}\" ${apache24_flags}" else echo "$0: extra argument ignored" diff --git a/www/apache24/files/patch-modules_ssl_ssl__engine__init.c b/www/apache24/files/patch-modules_ssl_ssl__engine__init.c deleted file mode 100644 index adc7708a98bd..000000000000 --- a/www/apache24/files/patch-modules_ssl_ssl__engine__init.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/ssl/ssl_engine_init.c.orig 2018-02-13 23:43:36 UTC -+++ modules/ssl/ssl_engine_init.c -@@ -547,7 +547,7 @@ static apr_status_t ssl_init_ctx_protoco - char *cp; - int protocol = mctx->protocol; - SSLSrvConfigRec *sc = mySrvConfig(s); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - int prot; - #endif - |