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/files | |
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/files')
3 files changed, 0 insertions, 113 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch b/meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch deleted file mode 100644 index 63096db0a3..0000000000 --- a/meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d8837756f2a48adcfe5d645c39cf163d96eac76c Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen.kooi@linaro.org> -Date: Tue, 17 Jun 2014 09:10:57 +0200 -Subject: [PATCH] configure: use pkg-config for PCRE detection - -Signed-off-by: Koen Kooi <koen.kooi@linaro.org> -Upstream-Status: pending ---- - configure.in | 27 +++++---------------------- - 1 file changed, 5 insertions(+), 22 deletions(-) - -diff --git a/configure.in b/configure.in -index 864d7c7..da4138e 100644 ---- a/configure.in -+++ b/configure.in -@@ -215,28 +215,11 @@ fi - AC_ARG_WITH(pcre, - APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library)) - --AC_PATH_PROG(PCRE_CONFIG, pcre-config, false) --if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then -- PCRE_CONFIG=$with_pcre/bin/pcre-config --elif test -x "$with_pcre"; then -- PCRE_CONFIG=$with_pcre --fi -- --if test "$PCRE_CONFIG" != "false"; then -- if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else -- AC_MSG_ERROR([Did not find pcre-config script at $PCRE_CONFIG]) -- fi -- case `$PCRE_CONFIG --version` in -- [[1-5].*]) -- AC_MSG_ERROR([Need at least pcre version 6.0]) -- ;; -- esac -- AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) -- APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`]) -- APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`]) --else -- AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/]) --fi -+PKG_CHECK_MODULES([PCRE], [libpcre], [ -+ AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) -+], [ -+ AC_MSG_ERROR([$PCRE_PKG_ERRORS]) -+]) - APACHE_SUBST(PCRE_LIBS) - - AC_MSG_NOTICE([]) --- -1.9.3 - diff --git a/meta-webserver/recipes-httpd/apache2/files/configure-allow-to-disable-selinux-support.patch b/meta-webserver/recipes-httpd/apache2/files/configure-allow-to-disable-selinux-support.patch deleted file mode 100644 index 5b5c297077..0000000000 --- a/meta-webserver/recipes-httpd/apache2/files/configure-allow-to-disable-selinux-support.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d23dd33e373340f6fddf11904839d1a118824401 Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Mon, 1 Dec 2014 02:08:27 -0500 -Subject: [PATCH] apache2: allow to disable selinux support - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - configure.in | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index df94ee5..8c3ab21 100644 ---- a/configure.in -+++ b/configure.in -@@ -466,10 +466,16 @@ getloadavg - dnl confirm that a void pointer is large enough to store a long integer - APACHE_CHECK_VOID_PTR_LEN - --AC_CHECK_LIB(selinux, is_selinux_enabled, [ -- AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported]) -- APR_ADDTO(AP_LIBS, [-lselinux]) --]) -+# SELinux support -+AC_ARG_ENABLE(selinux,APACHE_HELP_STRING(--enable-selinux,Enable SELinux support [default=auto]), -+ [],[enable_selinux=auto]) -+ -+if test x$enable_selinux != xno; then -+ AC_CHECK_LIB(selinux, is_selinux_enabled, [ -+ AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported]) -+ APR_ADDTO(AP_LIBS, [-lselinux]) -+ ]) -+fi - - AC_CACHE_CHECK([for gettid()], ac_cv_gettid, - [AC_TRY_RUN(#define _GNU_SOURCE --- -1.7.9.5 - diff --git a/meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch b/meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch deleted file mode 100644 index b948753b48..0000000000 --- a/meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Pending - -fix following race issue when do parallel install -| mkdir: cannot create directory `/home/mypc/workspace/poky/build_p4080ds_release/tmp/work/ppce500mc-fsl_networking-linux/apache2/2.4.3-r1/image/usr/share/apache2': File exists -... -| mkdir: cannot create directory `/home/mypc/workspace/poky/build_p4080ds_release/tmp/work/ppce500mc-fsl_networking-linux/apache2/2.4.3-r1/image/usr/share/apache2': File exists -| make[1]: *** [install-man] Error 1 -| make[1]: *** Waiting for unfinished jobs.... - --Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> ---- httpd-2.4.3/build/mkdir.sh.orig 2013-01-25 03:47:21.565255420 -0600 -+++ httpd-2.4.3/build/mkdir.sh 2013-01-25 03:46:17.833051230 -0600 -@@ -39,7 +39,7 @@ - esac - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" 1>&2 -- mkdir "$pathcomp" || errstatus=$? -+ mkdir -p "$pathcomp" || errstatus=$? - fi - pathcomp="$pathcomp/" - done |