From 50f28a183f30c82280510988ad456f456e2c82ea Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 12 Jan 2014 16:52:45 +0000 Subject: apache2: update to 2.4.7 * LIC_FILES_CHKSUM changed because of the introduction of an extra blank line in the LICENSE file (!) * Refreshed TLS Next Protocol Negotiation support patch for conflict with 2.4.7. Thanks to Hongxu Jia for doing this work. Signed-off-by: Hongxu Jia Signed-off-by: Paul Eggleton --- .../apache2-2.4.6/apache-configure_perlbin.patch | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch (limited to 'meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch') diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch deleted file mode 100644 index baa739fd44..0000000000 --- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch +++ /dev/null @@ -1,37 +0,0 @@ -# Author: echo -# Date: April 28 2009 -# Summary:Fix perl install directory to /usr/bin -# -# Upstream-Status: Inappropriate [configuration] - ---- a/configure -+++ b/configure -@@ -22365,13 +22365,7 @@ - #define APACHE_MPM_DIR "$MPM_DIR" - _ACEOF - -- --perlbin=`$ac_aux_dir/PrintPath perl` --if test "x$perlbin" = "x"; then -- perlbin="/replace/with/path/to/perl/interpreter" --fi -- -- -+perlbin='/usr/bin/perl' - - BSD_MAKEFILE=no - ap_make_include=include ---- a/configure.in -+++ b/configure.in -@@ -638,10 +638,7 @@ - AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR", - [Location of the source for the current MPM]) - --perlbin=`$ac_aux_dir/PrintPath perl` --if test "x$perlbin" = "x"; then -- perlbin="/replace/with/path/to/perl/interpreter" --fi -+perlbin='/usr/bin/perl' - AC_SUBST(perlbin) - - dnl If we are running on BSD/OS, we need to use the BSD .include syntax. -- cgit v1.2.3-54-g00ecf