From e8b46fe4f1c4e37f573cdcf55d760b6a381bcd63 Mon Sep 17 00:00:00 2001 From: Jochen Neumeister Date: Sat, 24 Mar 2018 18:26:34 +0000 Subject: www/apache24: Update to 2.4.33 - Add new uwsgi and md modules - Fix LibreSSL 2.7.x builds - Remove conflicts for non-existent ports - There are no slave-ports - Coalesce .if WITH_DEBUG blocks - Use OPTIONS where possible - Remove dead code - Actually enable/disable modules in ALL_MODULES loop - Add suexec warning - Move Makefile.options to Makefile (too small) PR: 226647 With hat: apache Approved by: brnrd (apache) MFH: MFH2018Q1 Security: f38187e7-2f6e-11e8-8f07-b499baebfeaf --- www/apache24/files/patch-configure.in | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'www/apache24/files/patch-configure.in') diff --git a/www/apache24/files/patch-configure.in b/www/apache24/files/patch-configure.in index c4ae71082ad9..9bf66c4915c2 100644 --- a/www/apache24/files/patch-configure.in +++ b/www/apache24/files/patch-configure.in @@ -1,23 +1,5 @@ --- configure.in.orig 2016-12-02 11:36:06 UTC +++ configure.in -@@ -111,7 +111,7 @@ fi - - if test "$apr_found" = "reconfig"; then - APR_SUBDIR_CONFIG(srclib/apr, -- [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir], -+ [$apache_apr_flags --prefix=$prefix], - [--enable-layout=*|\'--enable-layout=*]) - dnl We must be the first to build and the last to be cleaned - AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS" -@@ -177,7 +177,7 @@ esac - - if test "$apu_found" = "reconfig"; then - APR_SUBDIR_CONFIG(srclib/apr-util, -- [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir], -+ [--with-apr=../apr --prefix=$prefix], - [--enable-layout=*|\'--enable-layout=*]) - dnl We must be the last to build and the first to be cleaned - AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util" @@ -838,8 +837,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre [Root directory of the Apache install area]) AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", -- cgit v1.2.3