diff --git a/packages/apache2/build-instdso.sh.patch b/packages/apache2/build-instdso.sh.patch index e4721f5d4..2f9bb9da8 100644 --- a/packages/apache2/build-instdso.sh.patch +++ b/packages/apache2/build-instdso.sh.patch @@ -1,6 +1,5 @@ -diff -u -r ../httpd-2.4.38/build/instdso.sh ./build/instdso.sh ---- ../httpd-2.4.38/build/instdso.sh 2011-03-04 18:58:38.000000000 +0000 -+++ ./build/instdso.sh 2019-03-17 23:43:43.407027928 +0000 +--- ./build/instdso.sh 2011-03-05 00:28:38.000000000 +0530 ++++ ./build/instdso.sh.mod 2021-06-22 08:37:42.026266930 +0530 @@ -59,6 +59,12 @@ esac diff --git a/packages/apache2/build.sh b/packages/apache2/build.sh index 917503887..a317f4f55 100644 --- a/packages/apache2/build.sh +++ b/packages/apache2/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://httpd.apache.org TERMUX_PKG_DESCRIPTION="Apache Web Server" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1:2.4.46 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1:2.4.48 TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-${TERMUX_PKG_VERSION:2}.tar.bz2 -TERMUX_PKG_SHA256=740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea +TERMUX_PKG_SHA256=1bc826e7b2e88108c7e4bf43c026636f77a41d849cfb667aa7b5c0b86dbf966c TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid, zlib" TERMUX_PKG_BREAKS="apache2-dev" TERMUX_PKG_REPLACES="apache2-dev" diff --git a/packages/apache2/configure.patch b/packages/apache2/configure.patch index 13132d4ed..05032386e 100644 --- a/packages/apache2/configure.patch +++ b/packages/apache2/configure.patch @@ -1,13 +1,13 @@ -diff -u -r ../httpd-2.4.38/configure ./configure ---- ../httpd-2.4.38/configure 2019-01-17 18:46:19.000000000 +0000 -+++ ./configure 2019-03-17 23:05:48.786527661 +0000 -@@ -6401,7 +6401,7 @@ +--- ./configure 2021-05-18 02:51:48.000000000 +0530 ++++ ./configure.mod 2021-06-22 08:32:21.956267052 +0530 +@@ -6412,8 +6412,8 @@ LTFLAGS='--silent' fi my_libtool=`$apr_config --apr-libtool` - LIBTOOL="$my_libtool \$(LTFLAGS)" -+ LIBTOOL="bash $my_libtool \$(LTFLAGS)" - libtoolversion=`$my_libtool --version` ++ LIBTOOL="bash $my_libtool \$(LTFLAGS)" + libtoolversion=`bash $my_libtool --version` case $libtoolversion in *1.[45]* | *[2-9].[0-9]*) + SH_LIBTOOL='$(LIBTOOL)'