summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd/apache2/files/configure-allow-to-disable-selinux-support.patch
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-07-06 08:19:38 +0800
committerKhem Raj <raj.khem@gmail.com>2018-07-05 17:51:15 -0700
commita04f595adb3f06a3dec3ae8402341d40869e51ac (patch)
tree69d7c8be01548493a82861ccb965b556ea0bc72d /meta-webserver/recipes-httpd/apache2/files/configure-allow-to-disable-selinux-support.patch
parent7040a7528060b981c7f4c354781813bf5ec63695 (diff)
downloadmeta-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/configure-allow-to-disable-selinux-support.patch')
-rw-r--r--meta-webserver/recipes-httpd/apache2/files/configure-allow-to-disable-selinux-support.patch40
1 files changed, 0 insertions, 40 deletions
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 @@
1From d23dd33e373340f6fddf11904839d1a118824401 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Mon, 1 Dec 2014 02:08:27 -0500
4Subject: [PATCH] apache2: allow to disable selinux support
5
6Upstream-Status: Pending
7
8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
9---
10 configure.in | 14 ++++++++++----
11 1 file changed, 10 insertions(+), 4 deletions(-)
12
13diff --git a/configure.in b/configure.in
14index df94ee5..8c3ab21 100644
15--- a/configure.in
16+++ b/configure.in
17@@ -466,10 +466,16 @@ getloadavg
18 dnl confirm that a void pointer is large enough to store a long integer
19 APACHE_CHECK_VOID_PTR_LEN
20
21-AC_CHECK_LIB(selinux, is_selinux_enabled, [
22- AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported])
23- APR_ADDTO(AP_LIBS, [-lselinux])
24-])
25+# SELinux support
26+AC_ARG_ENABLE(selinux,APACHE_HELP_STRING(--enable-selinux,Enable SELinux support [default=auto]),
27+ [],[enable_selinux=auto])
28+
29+if test x$enable_selinux != xno; then
30+ AC_CHECK_LIB(selinux, is_selinux_enabled, [
31+ AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported])
32+ APR_ADDTO(AP_LIBS, [-lselinux])
33+ ])
34+fi
35
36 AC_CACHE_CHECK([for gettid()], ac_cv_gettid,
37 [AC_TRY_RUN(#define _GNU_SOURCE
38--
391.7.9.5
40