git: 4a23ccad1887 - main - www/apache24: Update to 2.4.63
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 25 Jan 2025 12:11:02 UTC
The branch main has been updated by brnrd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4a23ccad18878cedfd16466801e57bcd1c84d5dc
commit 4a23ccad18878cedfd16466801e57bcd1c84d5dc
Author: Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2025-01-25 12:10:19 +0000
Commit: Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2025-01-25 12:10:19 +0000
www/apache24: Update to 2.4.63
* This removes the experimental mod_tls module,
use www/mod_tls instead.
Differential Revision: https://reviews.freebsd.org/D48514
---
UPDATING | 11 +++++++++++
www/apache24/Makefile | 5 ++---
www/apache24/distinfo | 6 +++---
www/apache24/pkg-message | 11 ++++++++++-
www/apache24/pkg-plist | 1 -
5 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/UPDATING b/UPDATING
index 8576c308d025..db617a99b66b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20250125:
+ AFFECTS: users of www/apache24
+ AUTHOR: brnrd@FreeBSD.org
+
+ Apache 2.4.63 removed the (experimental, non-default) mod_tls module due
+ to rustls-ffi API instability and it was moved to a standalone module.
+
+ Users of the TLS option can use the new www/mod_tls port as a replacement.
+
+ # pkg install ap24-mod_tls
+
20250111:
AFFECTS: users of net/onedrive
AUTHOR: hiroo.ono+freebsd@gmail.com
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 506942ab9d55..2de058d2e090 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,5 +1,5 @@
PORTNAME= apache24
-PORTVERSION= 2.4.62
+PORTVERSION= 2.4.63
CATEGORIES= www
MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}
@@ -92,8 +92,7 @@ SOCACHE_DC_LIB_DEPENDS= libdistcache.so:security/distcache
# apu-1-config --(includes|ldflags) and apr_rules.mk
SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}
SSL_USES= ssl
-TLS_CONFIGURE_ON= --with-rustls=${LOCALBASE}
-TLS_LIB_DEPENDS= librustls.so:security/rustls-ffi
+TLS_BROKEN= Module removed upstream, replaced by security/mod_tls
SUEXEC_SYSLOG_CONFIGURE_ON= --without-suexec-logfile --with-suexec-syslog
XML2ENC_USE= GNOME=libxml2
XML2ENC_USES= gnome
diff --git a/www/apache24/distinfo b/www/apache24/distinfo
index 29a85e3b9826..1bed753883c2 100644
--- a/www/apache24/distinfo
+++ b/www/apache24/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1721241412
-SHA256 (apache24/httpd-2.4.62.tar.bz2) = 674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec
-SIZE (apache24/httpd-2.4.62.tar.bz2) = 7521661
+TIMESTAMP = 1737742760
+SHA256 (apache24/httpd-2.4.63.tar.bz2) = 88fc236ab99b2864b248de7d49a008ec2afd7551e64dce8b95f58f32f94c46ab
+SIZE (apache24/httpd-2.4.63.tar.bz2) = 7517972
diff --git a/www/apache24/pkg-message b/www/apache24/pkg-message
index d1600b6f123e..1dca15b7bc1f 100644
--- a/www/apache24/pkg-message
+++ b/www/apache24/pkg-message
@@ -13,7 +13,7 @@ have issues starting depending on the modules you are using.
- more modules are now enabled per default in the port
- icons and error pages moved from WWWDIR to DATADIR
- If build with modular MPM and no MPM is activated in
+ If built with modular MPM and no MPM is activated in
httpd.conf, then mpm_prefork will be activated as default
MPM in etc/apache24/modules.d to keep compatibility with
existing php/perl/python modules!
@@ -22,4 +22,13 @@ Please compare the existing httpd.conf with httpd.conf.sample
and merge missing modules/instructions into httpd.conf!
EOM
}
+{ type: upgrade
+ message: <<EOM
+The default database format was changed from BerkeleyDB 5
+(deprecated) from ports to BerkeleyDB 1 from base libc.
+
+You must rebuild all your (RewriteMap) databases once after
+upgrading from 2.4.62 to 2.4.62_1 or later.
+EOM
+}
]
diff --git a/www/apache24/pkg-plist b/www/apache24/pkg-plist
index 3f6ff3ed9e99..43774e51f601 100644
--- a/www/apache24/pkg-plist
+++ b/www/apache24/pkg-plist
@@ -209,7 +209,6 @@ libexec/apache24/mod_log_config.so
%%STATUS%%libexec/apache24/mod_status.so
%%SUBSTITUTE%%libexec/apache24/mod_substitute.so
%%SUEXEC%%libexec/apache24/mod_suexec.so
-%%TLS%%libexec/apache24/mod_tls.so
%%UNIQUE_ID%%libexec/apache24/mod_unique_id.so
libexec/apache24/mod_unixd.so
%%USERDIR%%libexec/apache24/mod_userdir.so