diff -Nur make/apache2/apache2.mk make/apache2/apache2.mk
--- make/apache2/apache2.mk 2012-07-19 08:11:28.000000000 +0200
+++ make/apache2/apache2.mk 2012-07-19 08:26:22.000000000 +0200
@@ -1,15 +1,12 @@
-$(call PKG_INIT_BIN, 2.4.3)
+$(call PKG_INIT_BIN, 2.2.22)
$(PKG)_SOURCE:=httpd-$($(PKG)_VERSION).tar.bz2
-$(PKG)_SOURCE_MD5:=87aaf7bc7e8715f0455997bb8c6791aa
+$(PKG)_SOURCE_MD5:=9fe3093194c8a57f085ff7c3fc43715f
$(PKG)_SITE:=@APACHE/httpd
$(PKG)_DIR:=$($(PKG)_SOURCE_DIR)/httpd-$($(PKG)_VERSION)
$(PKG)_BINARY:=$($(PKG)_DIR)/$(pkg)
$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/sbin/$(pkg)
-$(PKG)_APXS_SCRIPT:=$($(PKG)_DIR)/support/apxs
-$(PKG)_APXS_SCRIPT_STAGING_DIR:=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/apxs
-
$(PKG)_DEPENDS_ON := apr apr-util pcre
ifeq ($(strip $(FREETZ_PACKAGE_APACHE2_DEFLATE)),y)
$(PKG)_DEPENDS_ON += zlib
diff -Nur make/apache2/Config.in make/apache2/Config.in
--- make/apache2/Config.in 2012-07-19 08:11:28.000000000 +0200
+++ make/apache2/Config.in 2012-07-19 08:26:22.000000000 +0200
@@ -1,5 +1,5 @@
config FREETZ_PACKAGE_APACHE2
- bool "Apache HTTP Server 2.4.3 (binary only)"
+ bool "Apache HTTP Server 2.2.22 (binary only)"
select FREETZ_LIB_libcrypt if ! FREETZ_PACKAGE_APACHE2_STATIC
select FREETZ_LIB_libdl if ! FREETZ_PACKAGE_APACHE2_STATIC
select FREETZ_LIB_libm if ! FREETZ_PACKAGE_APACHE2_STATIC
diff -Nur make/apache2/external.files make/apache2/external.files
--- make/apache2/external.files 2012-07-19 08:11:28.000000000 +0200
+++ make/apache2/external.files 2012-07-19 08:26:22.000000000 +0200
@@ -1,4 +1,4 @@
if [ "$EXTERNAL_FREETZ_PACKAGE_APACHE2" = y ]; then
- APACHE2_ROOT="$PACKAGES_DIR/apache2-2.4.3/root"
+ APACHE2_ROOT="$PACKAGES_DIR/apache2-2.2.22/root"
EXTERNAL_FILES+="$(test -d "$APACHE2_ROOT" && find "$APACHE2_ROOT" -type f -printf ' /%P')"
fi
diff -Nur make/apache2/patches/100-hostmake.patch make/apache2/patches/100-hostmake.patch
--- make/apache2/patches/100-hostmake.patch 2012-04-03 11:53:08.000000000 +0200
+++ make/apache2/patches/100-hostmake.patch 2012-07-19 08:26:22.000000000 +0200
@@ -3,7 +3,7 @@
--- server/Makefile.in
+++ server/Makefile.in
-@@ -23,8 +23,8 @@
+@@ -22,8 +22,8 @@
include $(top_srcdir)/build/library.mk
gen_test_char_OBJECTS = gen_test_char.lo
--- make/apache2/patches/040-always-check-for-openssl.patch 2012-04-03 11:53:08.000000000 +0200
+++ make/apache2/patches/040-always-check-for-openssl.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -23465,7 +23465,7 @@
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL" >&5
- $as_echo_n "checking for OpenSSL... " >&6; }
--if ${ac_cv_openssl+:} false; then :
-+if false; then :
- $as_echo_n "(cached) " >&6
- else
-
--- make/apache2/patches/050-fix_pcre_info.patch 1970-01-01 01:00:00.000000000 +0100
+++ make/apache2/patches/050-fix_pcre_info.patch 2012-07-19 10:03:26.000000000 +0200
@@ -0,0 +1,28 @@
+Index: server/util_pcre.c
+===================================================================
+--- server/util_pcre.c 2005-11-10 16:20:05.000000000 +0100
++++ server/util_pcre.c 2012-07-19 10:00:31.000000000 +0200
+@@ -137,7 +137,8 @@
+
+ if (preg->re_pcre == NULL) return AP_REG_INVARG;
+
+-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
++pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
++ PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub));
+ return 0;
+ }
+
+Index: include/ap_regex.h
+===================================================================
+--- include/ap_regex.h
++++ include/ap_regex.h
+@@ -84,7 +84,7 @@
+ /* The structure representing a compiled regular expression. */
+ typedef struct {
+ void *re_pcre;
+- apr_size_t re_nsub;
++ int re_nsub;
+ apr_size_t re_erroffset;
+ } ap_regex_t;
+
+