diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2018-07-06 08:19:38 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-07-05 17:51:15 -0700 |
| commit | a04f595adb3f06a3dec3ae8402341d40869e51ac (patch) | |
| tree | 69d7c8be01548493a82861ccb965b556ea0bc72d /meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch | |
| parent | 7040a7528060b981c7f4c354781813bf5ec63695 (diff) | |
| download | meta-openembedded-a04f595adb3f06a3dec3ae8402341d40869e51ac.tar.gz | |
apache2: upgrade 2.4.29 -> 2.4.33
* License-Update: Correctly identify origin of util_pcre.c/ap_regex.h as
pcreposix[.ch] and correct LICENSE/NOTICE to match.
* Refresh patches with devtool
* Drop useless patch apache-ssl-ltmain-rpath.patch
* Move all patches to one directory
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch b/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch index 92c53f31d7..a2bc6e02c9 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch @@ -1,14 +1,19 @@ -# Author: echo <fei.geng@windriver.com> -# Date: April 28 2009 -# Summary:Fix perl install directory to /usr/bin -# -# Upstream-Status: Inappropriate [configuration] +From 5412077c398dec74321388fe6e593a44c4c80de6 Mon Sep 17 00:00:00 2001 +From: echo <fei.geng@windriver.com> +Date: Tue, 28 Apr 2009 03:11:06 +0000 +Subject: [PATCH] Fix perl install directory to /usr/bin -Index: httpd-2.4.29/configure.in -=================================================================== ---- httpd-2.4.29.orig/configure.in -+++ httpd-2.4.29/configure.in -@@ -855,10 +855,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, " +Upstream-Status: Inappropriate [configuration] + +--- + configure.in | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index d828512..be7bd25 100644 +--- a/configure.in ++++ b/configure.in +@@ -855,10 +855,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", [Location of the MIME types config file, relative to the Apache root directory]) |