summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--groups/241.native_packages_inet.group8
-rw-r--r--patches/httpd-2.4.25.local.patch62
-rw-r--r--patches/httpd-2.4.52.local.patch82
-rw-r--r--patches/httpd-2.4.52_pre.local.patch140
4 files changed, 226 insertions, 66 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 22e8c63a..7081f7b8 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -85,12 +85,12 @@ gl_cv_func_working_getdelim=yes
gl_cv_ld_output_def=no"};
: ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="--disable-static --disable-ssl3-support --disable-ssl2-support --disable-cxx --enable-local-libopts --without-p11-kit --disable-hardware-acceleration --enable-guile=no --with-default-trust-store-dir=/etc/ssl/certs"};
: ${PKG_GNUTLS_LIBTOOL:=rdlibtool};
-: ${PKG_HTTPD_SHA256SUM:=f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2};
-: ${PKG_HTTPD_VERSION:=2.4.25};
+: ${PKG_HTTPD_SHA256SUM:=0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9};
+: ${PKG_HTTPD_VERSION:=2.4.52};
: ${PKG_HTTPD_URL:=https://archive.apache.org/dist/httpd/httpd-${PKG_HTTPD_VERSION}.tar.bz2};
: ${PKG_HTTPD_CONFIG_CACHE_EXTRA:="ap_cv_void_ptr_lt_long=no"};
-: ${PKG_HTTPD_CONFIGURE_ARGS_EXTRA:="--with-pcre=${PREFIX_NATIVE}/bin/pcre-config --with-apr=${PREFIX_NATIVE}/bin/${DEFAULT_TARGET}-apr-1-config --with-apr-util=${PREFIX_NATIVE}/bin/apu-1-config"};
-: ${PKG_HTTPD_ENV_VARS_EXTRA:="PCRE_LIBS=-L${PREFIX_NATIVE}/lib -lpcre"};
+: ${PKG_HTTPD_CONFIGURE_ARGS_EXTRA:="--with-apr=${PREFIX_NATIVE}/bin/${DEFAULT_TARGET}-apr-1-config --with-apr-util=${PREFIX_NATIVE}/bin/apu-1-config --with-z=${PREFIX_NATIVE} --with-ssl=${PREFIX_NATIVE} --with-pcre=${PREFIX}/bin/pcre-config --enable-mods-static=all --disable-ext-filter --disable-lua --sysconfdir=/etc/apache2 --localstatedir=/var/lib/apache2 --datadir=/srv/www"};
+: ${PKG_HTTPD_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/lua5.4"};
: ${PKG_HTTPD_DISABLED:=1};
: ${PKG_ICECAST_DEPENDS:="curl expat libvorbis libxml2 libxslt wolfssl"};
: ${PKG_ICECAST_SHA256SUM:=49b5979f9f614140b6a38046154203ee28218d8fc549888596a683ad604e4d44};
diff --git a/patches/httpd-2.4.25.local.patch b/patches/httpd-2.4.25.local.patch
deleted file mode 100644
index 6e76d75f..00000000
--- a/patches/httpd-2.4.25.local.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ru --new-file httpd-2.4.25.orig/build/rules.mk.in httpd-2.4.25/build/rules.mk.in
---- httpd-2.4.25.orig/build/rules.mk.in 2012-09-26 16:30:31.000000000 +0200
-+++ httpd-2.4.25/build/rules.mk.in 2017-01-27 02:10:20.539967531 +0100
-@@ -50,7 +50,7 @@
- # Link-related commands
-
- LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(PILDFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
--SH_LINK = $(SH_LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
-+SH_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
- MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-
- # Cross compile commands
-diff -ru --new-file httpd-2.4.25.orig/server/test_char.h httpd-2.4.25/server/test_char.h
---- httpd-2.4.25.orig/server/test_char.h 1970-01-01 01:00:00.000000000 +0100
-+++ httpd-2.4.25/server/test_char.h 2017-01-26 20:25:06.654810000 +0100
-@@ -0,0 +1,45 @@
-+/* generated natively */
-+#define T_ESCAPE_SHELL_CMD (1)
-+#define T_ESCAPE_PATH_SEGMENT (2)
-+#define T_OS_ESCAPE_PATH (4)
-+#define T_HTTP_TOKEN_STOP (8)
-+#define T_ESCAPE_LOGITEM (16)
-+#define T_ESCAPE_FORENSIC (32)
-+#define T_ESCAPE_URLENCODED (64)
-+#define T_HTTP_CTRLS (128)
-+#define T_VCHAR_OBSTEXT (256)
-+
-+static const unsigned short test_char_table[256] = {
-+ 0x0a8,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,
-+ 0x0fe,0x07e,0x0ff,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,
-+ 0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,
-+ 0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,
-+ 0x00e,0x140,0x15f,0x146,0x141,0x166,0x141,0x141,
-+ 0x149,0x149,0x101,0x140,0x148,0x100,0x100,0x14a,
-+ 0x100,0x100,0x100,0x100,0x100,0x100,0x100,0x100,
-+ 0x100,0x100,0x168,0x14b,0x14f,0x148,0x14f,0x14f,
-+ 0x148,0x100,0x100,0x100,0x100,0x100,0x100,0x100,
-+ 0x100,0x100,0x100,0x100,0x100,0x100,0x100,0x100,
-+ 0x100,0x100,0x100,0x100,0x100,0x100,0x100,0x100,
-+ 0x100,0x100,0x100,0x14f,0x15f,0x14f,0x147,0x100,
-+ 0x147,0x100,0x100,0x100,0x100,0x100,0x100,0x100,
-+ 0x100,0x100,0x100,0x100,0x100,0x100,0x100,0x100,
-+ 0x100,0x100,0x100,0x100,0x100,0x100,0x100,0x100,
-+ 0x100,0x100,0x100,0x14f,0x167,0x14f,0x141,0x0fe,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
-+ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e
-+};
-
diff --git a/patches/httpd-2.4.52.local.patch b/patches/httpd-2.4.52.local.patch
new file mode 100644
index 00000000..d6c162c3
--- /dev/null
+++ b/patches/httpd-2.4.52.local.patch
@@ -0,0 +1,82 @@
+diff -Nru httpd-2.4.52.orig/build/rules.mk.in httpd-2.4.52/build/rules.mk.in
+--- httpd-2.4.52.orig/build/rules.mk.in 2012-09-26 16:30:31.000000000 +0200
++++ httpd-2.4.52/build/rules.mk.in 2022-02-18 18:06:00.504146481 +0100
+@@ -26,6 +26,10 @@
+ # (per-subdirectory) settings through definitions in modules.mk, with highest
+ # precedence.
+ #
++
++# Always link modules w/ apr and aprutil
++MOD_LIBS = -lapr-1 -laprutil-1
++
+ ALL_CFLAGS = $(MOD_CFLAGS) $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
+ ALL_CPPFLAGS = $(DEFS) $(INTERNAL_CPPFLAGS) $(MOD_CPPFLAGS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
+ ALL_CXXFLAGS = $(MOD_CXXFLAGS) $(EXTRA_CXXFLAGS) $(NOTEST_CXXFLAGS) $(CXXFLAGS)
+@@ -50,8 +54,8 @@
+ # Link-related commands
+
+ LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(PILDFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
+-SH_LINK = $(SH_LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
+-MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
++SH_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
++MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) $(MOD_LIBS)
+
+ # Cross compile commands
+
+diff -Nru httpd-2.4.52.orig/server/test_char.h httpd-2.4.52/server/test_char.h
+--- httpd-2.4.52.orig/server/test_char.h 1970-01-01 01:00:00.000000000 +0100
++++ httpd-2.4.52/server/test_char.h 2022-02-18 18:02:05.446590626 +0100
+@@ -0,0 +1,53 @@
++/* this file is automatically generated by gen_test_char, do not edit */
++#define T_ESCAPE_SHELL_CMD (1)
++#define T_ESCAPE_PATH_SEGMENT (2)
++#define T_OS_ESCAPE_PATH (4)
++#define T_HTTP_TOKEN_STOP (8)
++#define T_ESCAPE_LOGITEM (16)
++#define T_ESCAPE_FORENSIC (32)
++#define T_ESCAPE_URLENCODED (64)
++#define T_HTTP_CTRLS (128)
++#define T_VCHAR_OBSTEXT (256)
++#define T_URI_UNRESERVED (512)
++
++static const unsigned short test_char_table[256] = {
++ 0x0a8,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,
++ 0x0fe,0x07e,0x0ff,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,
++ 0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,
++ 0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,0x0fe,
++ 0x00e,0x140,0x15f,0x146,0x141,0x166,0x141,0x141,
++ 0x149,0x149,0x101,0x140,0x148,0x300,0x300,0x14a,
++ 0x300,0x300,0x300,0x300,0x300,0x300,0x300,0x300,
++ 0x300,0x300,0x168,0x14b,0x14f,0x148,0x14f,0x14f,
++ 0x148,0x300,0x300,0x300,0x300,0x300,0x300,0x300,
++ 0x300,0x300,0x300,0x300,0x300,0x300,0x300,0x300,
++ 0x300,0x300,0x300,0x300,0x300,0x300,0x300,0x300,
++ 0x300,0x300,0x300,0x14f,0x15f,0x14f,0x147,0x300,
++ 0x147,0x300,0x300,0x300,0x300,0x300,0x300,0x300,
++ 0x300,0x300,0x300,0x300,0x300,0x300,0x300,0x300,
++ 0x300,0x300,0x300,0x300,0x300,0x300,0x300,0x300,
++ 0x300,0x300,0x300,0x14f,0x167,0x14f,0x341,0x0fe,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,
++ 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e
++};
++
++/* we assume the folks using this ensure 0 <= c < 256... which means
++ * you need a cast to (unsigned char) first, you can't just plug a
++ * char in here and get it to work, because if char is signed then it
++ * will first be sign extended.
++ */
++#define TEST_CHAR(c, f) (test_char_table[(unsigned char)(c)] & (f))
diff --git a/patches/httpd-2.4.52_pre.local.patch b/patches/httpd-2.4.52_pre.local.patch
new file mode 100644
index 00000000..c0e75d14
--- /dev/null
+++ b/patches/httpd-2.4.52_pre.local.patch
@@ -0,0 +1,140 @@
+diff -ru httpd-2.4.52.orig/configure httpd-2.4.52/configure
+--- httpd-2.4.52.orig/configure 2021-12-16 14:49:07.000000000 +0100
++++ httpd-2.4.52/configure 2022-02-18 17:49:53.294104051 +0100
+@@ -6530,123 +6530,7 @@
+ export CC; export CPP
+ fi
+
+-
+-# Check whether --with-pcre was given.
+-if test ${with_pcre+y}
+-then :
+- withval=$with_pcre;
+-fi
+-
+-
+-# Extract the first word of "pcre-config", so it can be a program name with args.
+-set dummy pcre-config; ac_word=$2
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_path_PCRE_CONFIG+y}
+-then :
+- printf %s "(cached) " >&6
+-else $as_nop
+- case $PCRE_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PCRE_CONFIG="$PCRE_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- case $as_dir in #(((
+- '') as_dir=./ ;;
+- */) ;;
+- *) as_dir=$as_dir/ ;;
+- esac
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+- ac_cv_path_PCRE_CONFIG="$as_dir$ac_word$ac_exec_ext"
+- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PCRE_CONFIG" && ac_cv_path_PCRE_CONFIG="false"
+- ;;
+-esac
+-fi
+-PCRE_CONFIG=$ac_cv_path_PCRE_CONFIG
+-if test -n "$PCRE_CONFIG"; then
+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PCRE_CONFIG" >&5
+-printf "%s\n" "$PCRE_CONFIG" >&6; }
+-else
+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
+-fi
+-
+-
+-if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then
+- PCRE_CONFIG=$with_pcre/bin/pcre-config
+-elif test -x "$with_pcre"; then
+- PCRE_CONFIG=$with_pcre
+-fi
+-
+-if test "$PCRE_CONFIG" != "false"; then
+- if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
+- as_fn_error $? "Did not find pcre-config script at $PCRE_CONFIG" "$LINENO" 5
+- fi
+- case `$PCRE_CONFIG --version` in
+- [1-5].*)
+- as_fn_error $? "Need at least pcre version 6.0" "$LINENO" 5
+- ;;
+- esac
+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using external PCRE library from $PCRE_CONFIG" >&5
+-printf "%s\n" "$as_me: Using external PCRE library from $PCRE_CONFIG" >&6;}
+-
+- if test "x$PCRE_INCLUDES" = "x"; then
+- test "x$silent" != "xyes" && echo " setting PCRE_INCLUDES to \"`$PCRE_CONFIG --cflags`\""
+- PCRE_INCLUDES="`$PCRE_CONFIG --cflags`"
+- else
+- apr_addto_bugger="`$PCRE_CONFIG --cflags`"
+- for i in $apr_addto_bugger; do
+- apr_addto_duplicate="0"
+- for j in $PCRE_INCLUDES; do
+- if test "x$i" = "x$j"; then
+- apr_addto_duplicate="1"
+- break
+- fi
+- done
+- if test $apr_addto_duplicate = "0"; then
+- test "x$silent" != "xyes" && echo " adding \"$i\" to PCRE_INCLUDES"
+- PCRE_INCLUDES="$PCRE_INCLUDES $i"
+- fi
+- done
+- fi
+-
+-
+- if test "x$PCRE_LIBS" = "x"; then
+- test "x$silent" != "xyes" && echo " setting PCRE_LIBS to \"`$PCRE_CONFIG --libs`\""
+- PCRE_LIBS="`$PCRE_CONFIG --libs`"
+- else
+- apr_addto_bugger="`$PCRE_CONFIG --libs`"
+- for i in $apr_addto_bugger; do
+- apr_addto_duplicate="0"
+- for j in $PCRE_LIBS; do
+- if test "x$i" = "x$j"; then
+- apr_addto_duplicate="1"
+- break
+- fi
+- done
+- if test $apr_addto_duplicate = "0"; then
+- test "x$silent" != "xyes" && echo " adding \"$i\" to PCRE_LIBS"
+- PCRE_LIBS="$PCRE_LIBS $i"
+- fi
+- done
+- fi
+-
+-else
+- as_fn_error $? "pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/" "$LINENO" 5
+-fi
+-
++ PCRE_LIBS=-lpcre
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST PCRE_LIBS"
+
+
+@@ -41250,9 +41134,9 @@
+
+
+ if test x${apu_found} != xobsolete; then
+- AP_LIBS="$AP_LIBS `$apu_config --avoid-ldap --link-libtool --libs`"
++ AP_LIBS="$AP_LIBS \-lapr-1 \-laprutil-1"
+ fi
+-AP_LIBS="$AP_LIBS `$apr_config --link-libtool --libs`"
++AP_LIBS="$AP_LIBS \-lapr-1 \-laprutil-1"
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST AP_LIBS"
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 14:18:15 +0000