diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index cab5cbd9ad..4526fcee6f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -98,6 +98,7 @@ Latest changes * New Patch: Hide update check from cockpit - Packages: + * Apache2 2.4.62 * ACME.sh 3.1.0 * Atop 2.11.0 * AVM-rules 1.00 diff --git a/make/pkgs/apache2/Config.in b/make/pkgs/apache2/Config.in index 01c0b8f905..99667b0309 100644 --- a/make/pkgs/apache2/Config.in +++ b/make/pkgs/apache2/Config.in @@ -1,5 +1,5 @@ config FREETZ_PACKAGE_APACHE2 - bool "Apache2 2.4.62 (binary only)" + bool "Apache2 2.4.63 (binary only)" select FREETZ_LIB_libcrypt if ! FREETZ_PACKAGE_APACHE2_STATIC && FREETZ_TARGET_UCLIBC_HAS_multiple_libs select FREETZ_LIB_libdl if ! FREETZ_PACKAGE_APACHE2_STATIC && FREETZ_TARGET_UCLIBC_HAS_multiple_libs select FREETZ_LIB_libm if ! FREETZ_PACKAGE_APACHE2_STATIC && FREETZ_TARGET_UCLIBC_HAS_multiple_libs diff --git a/make/pkgs/apache2/apache2.mk b/make/pkgs/apache2/apache2.mk index 62fb1dd352..60d90f3ce2 100644 --- a/make/pkgs/apache2/apache2.mk +++ b/make/pkgs/apache2/apache2.mk @@ -1,6 +1,6 @@ -$(call PKG_INIT_BIN, 2.4.62) +$(call PKG_INIT_BIN, 2.4.63) $(PKG)_SOURCE:=httpd-$($(PKG)_VERSION).tar.bz2 -$(PKG)_HASH:=674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec +$(PKG)_HASH:=88fc236ab99b2864b248de7d49a008ec2afd7551e64dce8b95f58f32f94c46ab $(PKG)_SITE:=@APACHE/httpd ### WEBSITE:=https://httpd.apache.org/ ### MANPAGE:=https://httpd.apache.org/docs/2.4/ diff --git a/make/pkgs/apache2/patches/030-apr-util-check.patch b/make/pkgs/apache2/patches/030-apr-util-check.patch index 40169cf11a..d4e3e3158a 100644 --- a/make/pkgs/apache2/patches/030-apr-util-check.patch +++ b/make/pkgs/apache2/patches/030-apr-util-check.patch @@ -1,6 +1,6 @@ --- configure +++ configure -@@ -7992,7 +7992,7 @@ +@@ -7983,7 +7983,7 @@ ap_ckver_CPPFLAGS="$CPPFLAGS" diff --git a/make/pkgs/apache2/patches/040-always-check-for-openssl.patch b/make/pkgs/apache2/patches/040-always-check-for-openssl.patch index 77d68b6962..75fd5a74f9 100644 --- a/make/pkgs/apache2/patches/040-always-check-for-openssl.patch +++ b/make/pkgs/apache2/patches/040-always-check-for-openssl.patch @@ -1,6 +1,6 @@ --- configure +++ configure -@@ -28837,7 +28837,7 @@ +@@ -28828,7 +28828,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL" >&5 printf %s "checking for OpenSSL... " >&6; }