4 files changed, 14 insertions, 51 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 35c8ab87..b1c41135 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -19,13 +19,15 @@ zstd")";
 : ${PKG_APR_SHA256SUM:=a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105};
 : ${PKG_APR_VERSION:=1.6.5};
 : ${PKG_APR_URL:=http://ftp.fau.de/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};
+: ${PKG_APR_CONFIGURE_ARGS_EXTRA:="--with-devrandom=/dev/urandom"};
 : ${PKG_APR_LIBTOOL:=rdlibtool};
+: ${PKG_APR_NO_CLEAN:=1};
 : ${PKG_APR_UTIL_DEPENDS:="apr expat sqlite3"};
 : ${PKG_APR_UTIL_SHA256SUM:=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b};
 : ${PKG_APR_UTIL_VERSION:=1.6.1};
 : ${PKG_APR_UTIL_URL:=https://archive.apache.org/dist/apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2};
-: ${PKG_APR_UTIL_ENV_VARS_EXTRA:="LDADD_dbd_sqlite3=-lsqlite3 -lapr-1 -L.libs -laprutil-1"};
-: ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"};
+: ${PKG_APR_UTIL_ENV_VARS_EXTRA:="LDADD_dbd_sqlite3=-lsqlite3 -lapr-1 -L.libs -laprutil-1:LDADD_crypto_openssl=-lcrypto -lssl -lapr-1 -L.libs -laprutil-1"};
+: ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-crypto --with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"};
 : ${PKG_APR_UTIL_INSTALL_FILES:=bin/apu-1-config=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config};
 : ${PKG_APR_UTIL_MAKEFLAGS_BUILD:="-j1"};
 : ${PKG_BDWGC_DEPENDS:="libatomic_ops"};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 65a8b223..c009f08a 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -65,8 +65,8 @@ pacman rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_GNUTLS_LIBTOOL:=rdlibtool};
 : ${PKG_HTTPD_SHA256SUM:=f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2};
 : ${PKG_HTTPD_VERSION:=2.4.25};
-: ${PKG_HTTPD_URL:=https://xyinn.org/gentoo/distfiles/httpd-${PKG_HTTPD_VERSION}.tar.bz2};
-: ${PKG_HTTPD_CONFIGURE_ARGS_EXTRA:="--with-apr=${PREFIX}/bin/${DEFAULT_TARGET}-apr-1-config --with-apr-util=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config"};
+: ${PKG_HTTPD_URL:=https://archive.apache.org/dist/httpd/httpd-${PKG_HTTPD_VERSION}.tar.bz2};
+: ${PKG_HTTPD_CONFIGURE_ARGS_EXTRA:="--with-apr=${PREFIX_NATIVE}/bin/${DEFAULT_TARGET}-apr-1-config --with-apr-util=${PREFIX_NATIVE}/bin/apu-1-config"};
 : ${PKG_HTTPD_DISABLED:=1};
 : ${PKG_ICECAST_DEPENDS:="curl expat libressl libvorbis libxml2 libxslt"};
 : ${PKG_ICECAST_SHA256SUM:=eee7644a6bc703f5705ebe6b79c8d20a66a13cc577c60665e2bc2c34e3a0536d};
diff --git a/patches/httpd-2.4.25.local.patch b/patches/httpd-2.4.25.local.patch
index d4c23438..32b5abfb 100644
--- a/patches/httpd-2.4.25.local.patch
+++ b/patches/httpd-2.4.25.local.patch
@@ -10,53 +10,6 @@ diff -ru --new-file httpd-2.4.25.orig/build/rules.mk.in httpd-2.4.25/build/rules
  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/configure httpd-2.4.25/configure
---- httpd-2.4.25.orig/configure	2016-12-16 19:24:48.000000000 +0100
-+++ httpd-2.4.25/configure	2017-01-27 01:11:14.103967531 +0100
-@@ -8828,13 +8828,6 @@
- CPPFLAGS=$apr_old_cppflags
- 
- 
--  if test $ac_cv_define_APR_HAS_DSO = "no"; then
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Missing DSO support - building static modules by default." >&5
--$as_echo "$as_me: WARNING: Missing DSO support - building static modules by default." >&2;}
--    module_default=static
--  fi
--
--
-   # Check whether --enable-modules was given.
- if test "${enable_modules+set}" = set; then :
-   enableval=$enable_modules;
-@@ -13645,9 +13638,9 @@
- 
- case "x$enable_so" in
-     "xyes")
--        if test $ac_cv_define_APR_HAS_DSO = "no"; then
--            as_fn_error $? "mod_so has been requested but cannot be built on your system" "$LINENO" 5
--        fi
-+        #if test $ac_cv_define_APR_HAS_DSO = "no"; then
-+        #    as_fn_error $? "mod_so has been requested but cannot be built on your system" "$LINENO" 5
-+        #fi
-         ;;
-     "xshared")
-         as_fn_error $? "mod_so can not be built as a shared DSO" "$LINENO" 5
-@@ -13693,16 +13686,6 @@
-   APACHE_VAR_SUBST="$APACHE_VAR_SUBST INSTALL_DSO"
- 
- 
--
--if test "$sharedobjs" = "yes"; then
--    if test $ac_cv_define_APR_HAS_DSO = "no"; then
--        as_fn_error $? "shared objects have been requested but cannot be built since mod_so cannot be built" "$LINENO" 5
--    elif test $enable_so = "no"; then
--        as_fn_error $? "shared objects have been requested but cannot be built since mod_so was disabled" "$LINENO" 5
--    fi
--fi
--
--
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_so" >&5
- $as_echo_n "checking whether to enable mod_so... " >&6; }
-     # Check whether --enable-so was given.
 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
diff --git a/vars/httpd.vars b/vars/httpd.vars
new file mode 100644
index 00000000..7735e2d4
--- /dev/null
+++ b/vars/httpd.vars
@@ -0,0 +1,8 @@
+#
+# set +o errexit -o noglob -o nounset is assumed.
+#
+
+: ${PKG_HTTPD_CONFIG_CACHE_EXTRA:="
+ap_cv_void_ptr_lt_long=no"};
+
+# vim:filetype=sh textwidth=0