added my Recipes
This commit is contained in:
@@ -0,0 +1,52 @@
|
||||
From ba9015386cbc044e111d7c266f13e2be045e4bf1 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
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
|
||||
---
|
||||
configure.in | 26 +++++---------------------
|
||||
1 file changed, 5 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 38c1d0a..c799aec 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -221,27 +221,11 @@ else if which $with_pcre 2>/dev/null; then :; else
|
||||
fi
|
||||
fi
|
||||
|
||||
-AC_CHECK_TARGET_TOOLS(PCRE_CONFIG, [pcre2-config pcre-config],
|
||||
- [`which $with_pcre 2>/dev/null`], $with_pcre)
|
||||
-
|
||||
-if test "x$PCRE_CONFIG" != "x"; then
|
||||
- if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
|
||||
- AC_MSG_ERROR([Did not find working script at $PCRE_CONFIG])
|
||||
- fi
|
||||
- case `$PCRE_CONFIG --version` in
|
||||
- [1[0-9].*])
|
||||
- AC_DEFINE(HAVE_PCRE2, 1, [Detected PCRE2])
|
||||
- ;;
|
||||
- [[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 --libs8 2>/dev/null || $PCRE_CONFIG --libs`])
|
||||
-else
|
||||
- AC_MSG_ERROR([pcre(2)-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([])
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 5b5eae9cdf3bae91756c717349f2f33a31888f24 Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Wed, 3 Aug 2022 12:35:16 +0800
|
||||
Subject: [PATCH] make_exports.awk: not expose the path
|
||||
|
||||
Don't print the full path in the comment line.
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
build/make_exports.awk | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/make_exports.awk b/build/make_exports.awk
|
||||
index 1cf0568..44d93c5 100644
|
||||
--- a/build/make_exports.awk
|
||||
+++ b/build/make_exports.awk
|
||||
@@ -47,7 +47,9 @@ function push(line) {
|
||||
|
||||
function do_output() {
|
||||
printf("/*\n")
|
||||
- printf(" * %s\n", FILENAME)
|
||||
+ file = FILENAME
|
||||
+ sub("([^/]*[/])*", "", file)
|
||||
+ printf(" * %s\n", file)
|
||||
printf(" */\n")
|
||||
|
||||
for (i = 0; i < stackptr; i++) {
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
From 5074ab3425e5f1e01fd9cfa2d9b7300ea1b3f38f Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Date: Tue, 17 Jul 2012 11:27:39 +0100
|
||||
Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory is
|
||||
configured
|
||||
|
||||
Bump up the core size limit if CoreDumpDirectory is
|
||||
configured.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Note: upstreaming was discussed but there are competing desires;
|
||||
there are portability oddities here too.
|
||||
---
|
||||
server/core.c | 19 +++++++++++++++++++
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
diff --git a/server/core.c b/server/core.c
|
||||
index 090e397..3020090 100644
|
||||
--- a/server/core.c
|
||||
+++ b/server/core.c
|
||||
@@ -5107,6 +5107,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
|
||||
}
|
||||
apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper,
|
||||
apr_pool_cleanup_null);
|
||||
+
|
||||
+#ifdef RLIMIT_CORE
|
||||
+ if (ap_coredumpdir_configured) {
|
||||
+ struct rlimit lim;
|
||||
+
|
||||
+ if (getrlimit(RLIMIT_CORE, &lim) == 0 && lim.rlim_cur == 0) {
|
||||
+ lim.rlim_cur = lim.rlim_max;
|
||||
+ if (setrlimit(RLIMIT_CORE, &lim) == 0) {
|
||||
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
|
||||
+ "core dump file size limit raised to %lu bytes",
|
||||
+ lim.rlim_cur);
|
||||
+ } else {
|
||||
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, errno, NULL,
|
||||
+ "core dump file size is zero, setrlimit failed");
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
return OK;
|
||||
}
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 9c03ed909b8da0e1a288f53fda535a3f15bcf791 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Date: Tue, 17 Jul 2012 11:27:39 +0100
|
||||
Subject: [PATCH] apache2: do not export apr/apr-util symbols when using shared
|
||||
libapr
|
||||
|
||||
There is no need to "suck in" the apr/apr-util symbols when using
|
||||
a shared libapr{,util}, it just bloats the symbol table; so don't.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Note: EXPORT_DIRS change is conditional on using shared apr
|
||||
---
|
||||
server/Makefile.in | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/server/Makefile.in b/server/Makefile.in
|
||||
index 8111877..8c0c396 100644
|
||||
--- a/server/Makefile.in
|
||||
+++ b/server/Makefile.in
|
||||
@@ -60,9 +60,6 @@ export_files:
|
||||
ls $$dir/*.h ; \
|
||||
done; \
|
||||
echo "$(top_srcdir)/server/mpm_fdqueue.h"; \
|
||||
- for dir in $(EXPORT_DIRS_APR); do \
|
||||
- ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \
|
||||
- done; \
|
||||
) | sed -e s,//,/,g | sort -u > $@
|
||||
|
||||
exports.c: export_files
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
From e47cc405eadcbe37a579c375e824e20a5c53bfad Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Date: Tue, 17 Jul 2012 11:27:39 +0100
|
||||
Subject: [PATCH] Log the SELinux context at startup.
|
||||
|
||||
Log the SELinux context at startup.
|
||||
|
||||
Upstream-Status: Inappropriate [other]
|
||||
|
||||
Note: unlikely to be any interest in this upstream
|
||||
|
||||
---
|
||||
configure.in | 5 +++++
|
||||
server/core.c | 26 ++++++++++++++++++++++++++
|
||||
2 files changed, 31 insertions(+)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index ea6cec3..92b74b7 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -491,6 +491,11 @@ 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])
|
||||
+])
|
||||
+
|
||||
AC_CACHE_CHECK([for gettid()], ac_cv_gettid,
|
||||
[AC_TRY_RUN(#define _GNU_SOURCE
|
||||
#include <unistd.h>
|
||||
diff --git a/server/core.c b/server/core.c
|
||||
index 4da7209..d3ca25b 100644
|
||||
--- a/server/core.c
|
||||
+++ b/server/core.c
|
||||
@@ -65,6 +65,10 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_SELINUX
|
||||
+#include <selinux/selinux.h>
|
||||
+#endif
|
||||
+
|
||||
/* LimitRequestBody handling */
|
||||
#define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1)
|
||||
#define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */
|
||||
@@ -5126,6 +5130,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_SELINUX
|
||||
+ {
|
||||
+ static int already_warned = 0;
|
||||
+ int is_enabled = is_selinux_enabled() > 0;
|
||||
+
|
||||
+ if (is_enabled && !already_warned) {
|
||||
+ security_context_t con;
|
||||
+
|
||||
+ if (getcon(&con) == 0) {
|
||||
+
|
||||
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
|
||||
+ "SELinux policy enabled; "
|
||||
+ "httpd running as context %s", con);
|
||||
+
|
||||
+ already_warned = 1;
|
||||
+
|
||||
+ freecon(con);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
return OK;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
From e59aab44a28c654e518080693d573ca472ca5a08 Mon Sep 17 00:00:00 2001
|
||||
From: Yulong Pei <Yulong.pei@windriver.com>
|
||||
Date: Thu, 1 Sep 2011 01:03:14 +0800
|
||||
Subject: [PATCH] replace lynx to curl in apachectl script
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Yulong Pei <Yulong.pei@windriver.com>
|
||||
---
|
||||
support/apachectl.in | 14 ++++++++++----
|
||||
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/support/apachectl.in b/support/apachectl.in
|
||||
index 3281c2e..6ab4ba5 100644
|
||||
--- a/support/apachectl.in
|
||||
+++ b/support/apachectl.in
|
||||
@@ -52,11 +52,11 @@ fi
|
||||
# a command that outputs a formatted text version of the HTML at the
|
||||
# url given on the command line. Designed for lynx, however other
|
||||
# programs may work.
|
||||
-LYNX="@LYNX_PATH@ -dump"
|
||||
+CURL="/usr/bin/curl"
|
||||
#
|
||||
# the URL to your server's mod_status status page. If you do not
|
||||
# have one, then status and fullstatus will not work.
|
||||
-STATUSURL="http://localhost:@PORT@/server-status"
|
||||
+STATUSURL="http://localhost:@PORT@/"
|
||||
#
|
||||
# Set this variable to a command that increases the maximum
|
||||
# number of file descriptors allowed per child process. This is
|
||||
@@ -92,10 +92,16 @@ configtest)
|
||||
ERROR=$?
|
||||
;;
|
||||
status)
|
||||
- $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
|
||||
+ $CURL -s $STATUSURL | grep -o "It works!"
|
||||
+ if [ $? != 0 ] ; then
|
||||
+ echo The httpd server does not work!
|
||||
+ fi
|
||||
;;
|
||||
fullstatus)
|
||||
- $LYNX $STATUSURL
|
||||
+ $CURL -s $STATUSURL | grep -o "It works!"
|
||||
+ if [ $? != 0 ] ; then
|
||||
+ echo The httpd server does not work!
|
||||
+ fi
|
||||
;;
|
||||
*)
|
||||
$HTTPD "$@"
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From fb09f1fe4525058b16b3d4edb2e3ae693154026e Mon Sep 17 00:00:00 2001
|
||||
From: Zhenhua Luo <zhenhua.luo@freescale.com>
|
||||
Date: Fri, 25 Jan 2013 18:10:50 +0800
|
||||
Subject: [PATCH] apache2: fix the race issue of parallel installation
|
||||
|
||||
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>
|
||||
---
|
||||
build/mkdir.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/mkdir.sh b/build/mkdir.sh
|
||||
index e2d5bb6..dde5ae0 100755
|
||||
--- a/build/mkdir.sh
|
||||
+++ b/build/mkdir.sh
|
||||
@@ -39,7 +39,7 @@ for file in ${1+"$@"} ; do
|
||||
esac
|
||||
if test ! -d "$pathcomp"; then
|
||||
echo "mkdir $pathcomp" 1>&2
|
||||
- mkdir "$pathcomp" || errstatus=$?
|
||||
+ mkdir -p "$pathcomp" || errstatus=$?
|
||||
fi
|
||||
pathcomp="$pathcomp/"
|
||||
done
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 0686564f64130f230870db8b4846973e3edbd646 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 76811e7..4df3ff3 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -491,10 +491,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
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 443d15b91d4e4979d92405610303797663f31102 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
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Add back this patch. Without this patch, apxs's shebang will use
|
||||
perl under hosttools, which can be too long for shebang, and cause
|
||||
error:
|
||||
bad interpreter: No such file or directory
|
||||
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
configure.in | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 4df3ff3..4eeb609 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -903,10 +903,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])
|
||||
|
||||
-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.
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
From 43a4ad04e0d8771267a73f98b5918bcd10b167ec Mon Sep 17 00:00:00 2001
|
||||
From: Trevor Gamblin <trevor.gamblin@windriver.com>
|
||||
Date: Fri, 17 Apr 2020 06:31:35 -0700
|
||||
Subject: [PATCH] support/apxs.in: force destdir to be empty string
|
||||
|
||||
If destdir is assigned to anything other than the empty string, the
|
||||
search path for apache2 config files is appended to itself, and
|
||||
related packages like apache-websocket will be unable to locate them:
|
||||
|
||||
| cannot open
|
||||
/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot//usr/share/apache2/build/config_vars.mk:
|
||||
No such file or directory at
|
||||
/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot/usr/bin/crossscripts/apxs
|
||||
line 213.
|
||||
|
||||
Ensure that it is always the empty string so that apache-websocket
|
||||
is able to find the required config files.
|
||||
|
||||
Upstream-Status: Inappropriate (embedded-specific)
|
||||
|
||||
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
|
||||
---
|
||||
support/apxs.in | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/support/apxs.in b/support/apxs.in
|
||||
index b2705fa..781f2ab 100644
|
||||
--- a/support/apxs.in
|
||||
+++ b/support/apxs.in
|
||||
@@ -28,10 +28,12 @@ package apxs;
|
||||
# is the empty string.
|
||||
|
||||
my $destdir = "";
|
||||
-my $ddi = rindex($0, "@exp_bindir@");
|
||||
-if ($ddi >= 0) {
|
||||
- $destdir = substr($0, 0, $ddi);
|
||||
-}
|
||||
+# Comment out assignment of destdir so that it doesn't affect bitbake
|
||||
+# cross-compilation setup
|
||||
+#my $ddi = rindex($0, "@exp_bindir@");
|
||||
+#if ($ddi >= 0) {
|
||||
+# $destdir = substr($0, 0, $ddi);
|
||||
+#}
|
||||
|
||||
my %config_vars = ();
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
From d9993cbc33565c0acd29b0127d651dafa2a16975 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Date: Tue, 17 Jul 2012 11:27:39 +0100
|
||||
Subject: [PATCH] apache2: do not use relative path for gen_test_char
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
---
|
||||
server/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/server/Makefile.in b/server/Makefile.in
|
||||
index 8c0c396..3544f55 100644
|
||||
--- a/server/Makefile.in
|
||||
+++ b/server/Makefile.in
|
||||
@@ -29,7 +29,7 @@ gen_test_char: $(gen_test_char_OBJECTS)
|
||||
$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
|
||||
|
||||
test_char.h: gen_test_char
|
||||
- ./gen_test_char > test_char.h
|
||||
+ gen_test_char > test_char.h
|
||||
|
||||
util.lo: test_char.h
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 2001
|
||||
From: Valeria Petrov <valeria.petrov@spinetix.com>
|
||||
Date: Tue, 18 Apr 2023 15:38:53 +0200
|
||||
Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory to
|
||||
include path if mod_rewrite is enabled.
|
||||
|
||||
Upstream-Status: Accepted [https://svn.apache.org/viewvc?view=revision&revision=1909241]
|
||||
|
||||
---
|
||||
modules/mappers/config9.m4 | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
|
||||
index 55a97ab993..7120b729b7 100644
|
||||
--- a/modules/mappers/config9.m4
|
||||
+++ b/modules/mappers/config9.m4
|
||||
@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , mos
|
||||
APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , yes)
|
||||
APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
|
||||
|
||||
+if test "x$enable_rewrite" != "xno"; then
|
||||
+ # mod_rewrite needs test_char.h
|
||||
+ APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server])
|
||||
+fi
|
||||
+
|
||||
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
|
||||
|
||||
APACHE_MODPATH_FINISH
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,238 @@
|
||||
DESCRIPTION = "The Apache HTTP Server is a powerful, efficient, and \
|
||||
extensible web server."
|
||||
SUMMARY = "Apache HTTP Server"
|
||||
HOMEPAGE = "http://httpd.apache.org/"
|
||||
SECTION = "net"
|
||||
LICENSE = "Apache-2.0"
|
||||
|
||||
SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
|
||||
file://0001-configure-use-pkg-config-for-PCRE-detection.patch \
|
||||
file://0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch \
|
||||
file://0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch \
|
||||
file://0004-apache2-log-the-SELinux-context-at-startup.patch \
|
||||
file://0005-replace-lynx-to-curl-in-apachectl-script.patch \
|
||||
file://0006-apache2-fix-the-race-issue-of-parallel-installation.patch \
|
||||
file://0007-apache2-allow-to-disable-selinux-support.patch \
|
||||
file://0008-Fix-perl-install-directory-to-usr-bin.patch \
|
||||
file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
|
||||
file://0001-make_exports.awk-not-expose-the-path.patch \
|
||||
file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-target = " \
|
||||
file://0010-apache2-do-not-use-relative-path-for-gen_test_char.patch \
|
||||
file://init \
|
||||
file://apache2-volatile.conf \
|
||||
file://apache2.service \
|
||||
file://volatiles.04_apache2 \
|
||||
"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
|
||||
SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
|
||||
|
||||
S = "${WORKDIR}/httpd-${PV}"
|
||||
|
||||
inherit autotools update-rc.d pkgconfig systemd update-alternatives
|
||||
|
||||
DEPENDS = "openssl expat pcre apr apr-util apache2-native "
|
||||
|
||||
CVE_PRODUCT = "http_server"
|
||||
|
||||
SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice"
|
||||
|
||||
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
|
||||
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
|
||||
PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap"
|
||||
PACKAGECONFIG[zlib] = "--enable-deflate,,zlib,zlib"
|
||||
|
||||
CFLAGS:append = " -DPATH_MAX=4096"
|
||||
|
||||
EXTRA_OECONF:class-target = "\
|
||||
--enable-layout=Debian \
|
||||
--prefix=${base_prefix} \
|
||||
--exec_prefix=${exec_prefix} \
|
||||
--includedir=${includedir}/${BPN} \
|
||||
--sysconfdir=${sysconfdir}/${BPN} \
|
||||
--datadir=${datadir}/${BPN} \
|
||||
--libdir=${libdir} \
|
||||
--libexecdir=${libexecdir}/${BPN}/modules \
|
||||
--localstatedir=${localstatedir} \
|
||||
--enable-ssl \
|
||||
--with-dbm=sdbm \
|
||||
--with-gdbm=no \
|
||||
--with-ndbm=no \
|
||||
--with-berkeley-db=no \
|
||||
--enable-info \
|
||||
--enable-rewrite \
|
||||
--enable-mpms-shared \
|
||||
ap_cv_void_ptr_lt_long=no \
|
||||
ac_cv_have_threadsafe_pollset=no \
|
||||
"
|
||||
|
||||
EXTRA_OECONF:class-native = "\
|
||||
--prefix=${prefix} \
|
||||
--includedir=${includedir}/${BPN} \
|
||||
--sysconfdir=${sysconfdir}/${BPN} \
|
||||
--datadir=${datadir}/${BPN} \
|
||||
--libdir=${libdir} \
|
||||
--libexecdir=${libdir}/${BPN}/modules \
|
||||
--localstatedir=${localstatedir} \
|
||||
"
|
||||
|
||||
do_configure:prepend() {
|
||||
sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout
|
||||
}
|
||||
|
||||
do_install:append:class-target() {
|
||||
install -d ${D}/${sysconfdir}/init.d
|
||||
|
||||
cat ${WORKDIR}/init | \
|
||||
sed -e 's,/usr/sbin/,${sbindir}/,g' \
|
||||
-e 's,/usr/bin/,${bindir}/,g' \
|
||||
-e 's,/usr/lib/,${libdir}/,g' \
|
||||
-e 's,/etc/,${sysconfdir}/,g' \
|
||||
-e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${BPN}
|
||||
|
||||
chmod 755 ${D}/${sysconfdir}/init.d/${BPN}
|
||||
|
||||
# Remove the goofy original files...
|
||||
rm -rf ${D}/${sysconfdir}/${BPN}/original
|
||||
|
||||
install -d ${D}${sysconfdir}/${BPN}/conf.d
|
||||
install -d ${D}${sysconfdir}/${BPN}/modules.d
|
||||
|
||||
# Ensure configuration file pulls in conf.d and modules.d
|
||||
printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
|
||||
printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.load" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
|
||||
printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
|
||||
|
||||
# Match with that is in init script
|
||||
printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
|
||||
|
||||
# Set 'ServerName' to fix error messages when restart apache service
|
||||
sed -i 's/^#ServerName www.example.com/ServerName localhost/' ${D}/${sysconfdir}/${BPN}/httpd.conf
|
||||
|
||||
sed -i 's/^ServerRoot/#ServerRoot/' ${D}/${sysconfdir}/${BPN}/httpd.conf
|
||||
|
||||
sed -i -e 's,${STAGING_DIR_TARGET},,g' \
|
||||
-e 's,${DEBUG_PREFIX_MAP},,g' \
|
||||
-e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \
|
||||
-e 's,${HOSTTOOLS_DIR}/,,g' \
|
||||
-e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \
|
||||
-e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk
|
||||
|
||||
sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
|
||||
-e 's,${DEBUG_PREFIX_MAP},,g' \
|
||||
-e 's,${RECIPE_SYSROOT},,g' \
|
||||
-e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \
|
||||
-e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \
|
||||
-e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||
install -d ${D}${sysconfdir}/tmpfiles.d/
|
||||
install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
|
||||
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system
|
||||
sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service
|
||||
sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service
|
||||
elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
|
||||
install -d ${D}${sysconfdir}/default/volatiles
|
||||
install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2
|
||||
fi
|
||||
|
||||
rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars*
|
||||
chown -R root:root ${D}
|
||||
}
|
||||
|
||||
do_install:append:class-native() {
|
||||
install -d ${D}${bindir} ${D}${libdir}
|
||||
install -m 755 server/gen_test_char ${D}${bindir}
|
||||
}
|
||||
|
||||
SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess"
|
||||
|
||||
apache_sysroot_preprocess() {
|
||||
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
|
||||
install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts}
|
||||
install -d ${SYSROOT_DESTDIR}${sbindir}
|
||||
install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir}
|
||||
sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
|
||||
|
||||
sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
|
||||
sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
|
||||
sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
|
||||
sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
|
||||
sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
|
||||
sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
|
||||
sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
|
||||
}
|
||||
|
||||
# Implications - used by update-rc.d scripts
|
||||
INITSCRIPT_NAME = "apache2"
|
||||
INITSCRIPT_PARAMS = "defaults 91 20"
|
||||
|
||||
SYSTEMD_SERVICE:${PN} = "apache2.service"
|
||||
SYSTEMD_AUTO_ENABLE:${PN} = "enable"
|
||||
|
||||
ALTERNATIVE:${PN}-doc = "htpasswd.1"
|
||||
ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1"
|
||||
|
||||
PACKAGES = "${PN}-utils ${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
|
||||
|
||||
CONFFILES:${PN} = "${sysconfdir}/${BPN}/httpd.conf \
|
||||
${sysconfdir}/${BPN}/magic \
|
||||
${sysconfdir}/${BPN}/mime.types \
|
||||
${sysconfdir}/${BPN}/extra/*"
|
||||
|
||||
FILES:${PN}-utils = "${bindir}/ab \
|
||||
${bindir}/htdbm \
|
||||
${bindir}/htdigest \
|
||||
${bindir}/htpasswd \
|
||||
${bindir}/logresolve \
|
||||
${bindir}/httxt2dbm \
|
||||
${sbindir}/htcacheclean \
|
||||
${sbindir}/fcgistarter \
|
||||
${sbindir}/checkgid \
|
||||
${sbindir}/rotatelogs \
|
||||
"
|
||||
|
||||
# We override here rather than append so that .so links are
|
||||
# included in the runtime package rather than here (-dev)
|
||||
# and to get build, icons, error into the -dev package
|
||||
FILES:${PN}-dev = "${datadir}/${BPN}/build \
|
||||
${datadir}/${BPN}/icons \
|
||||
${datadir}/${BPN}/error \
|
||||
${includedir}/${BPN} \
|
||||
${bindir}/apxs \
|
||||
"
|
||||
|
||||
# Add the manual to -doc
|
||||
FILES:${PN}-doc += " ${datadir}/${BPN}/manual"
|
||||
|
||||
FILES:${PN}-scripts += "${bindir}/dbmmanage"
|
||||
|
||||
# Override this too - here is the default, less datadir
|
||||
FILES:${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir} \
|
||||
${sysconfdir} ${libdir}/${BPN}"
|
||||
|
||||
# We want htdocs and cgi-bin to go with the binary
|
||||
FILES:${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin"
|
||||
|
||||
FILES:${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
|
||||
|
||||
RDEPENDS:${PN} += "openssl libgcc ${PN}-utils"
|
||||
RDEPENDS:${PN}-scripts += "perl ${PN}"
|
||||
RDEPENDS:${PN}-dev = "perl"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
pkg_postinst:${PN}() {
|
||||
if [ -z "$D" ]; then
|
||||
if type systemd-tmpfiles >/dev/null; then
|
||||
systemd-tmpfiles --create
|
||||
elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
|
||||
${sysconfdir}/init.d/populate-volatile.sh update
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
d /run/apache2 0755 root root -
|
||||
d /var/log/apache2 0755 root root -
|
||||
@@ -0,0 +1,14 @@
|
||||
[Unit]
|
||||
Description=The Apache HTTP Server
|
||||
After=network.target remote-fs.target nss-lookup.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
Environment=LANG=C
|
||||
ExecStart=@SBINDIR@/httpd -DFOREGROUND -D SSL -D PHP5 -k start
|
||||
ExecStop=@BASE_BINDIR@/kill -WINCH ${MAINPID}
|
||||
KillSignal=SIGCONT
|
||||
PrivateTmp=true
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -0,0 +1,230 @@
|
||||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: httpd
|
||||
# Required-Start: $local_fs $remote_fs $network $named
|
||||
# Required-Stop: $local_fs $remote_fs $network
|
||||
# Should-Start: distcache
|
||||
# Short-Description: start and stop Apache HTTP Server
|
||||
# Description: The Apache HTTP Server is an extensible server
|
||||
# implementing the current HTTP standards.
|
||||
### END INIT INFO
|
||||
|
||||
ARGS="-D SSL -D PHP5 -k start"
|
||||
NAME=apache2
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
DAEMON=/usr/sbin/httpd
|
||||
SUEXEC=/usr/lib/apache/suexec
|
||||
PIDFILE=/run/httpd.pid
|
||||
CONF=/etc/apache2/httpd.conf
|
||||
APACHECTL=/usr/sbin/apachectl
|
||||
|
||||
trap "" 1
|
||||
export LANG=C
|
||||
export PATH
|
||||
|
||||
test -f $DAEMON || exit 0
|
||||
test -f $APACHECTL || exit 0
|
||||
|
||||
# ensure we don't leak environment vars into apachectl
|
||||
APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL"
|
||||
|
||||
apache_conftest() {
|
||||
if $($APACHECTL configtest > /dev/null 2>&1 ); then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
apache_wait_start() {
|
||||
local STATUS=$1
|
||||
|
||||
if [ $STATUS != 0 ] ; then
|
||||
return $STATUS
|
||||
fi
|
||||
|
||||
local i=0
|
||||
while : ; do
|
||||
PIDTMP=$(pidof $DAEMON | tr ' ' '\n' | grep -w $(cat $PIDFILE))
|
||||
if [ -n "${PIDTMP:-}" ] && kill -0 "${PIDTMP:-}" 2> /dev/null; then
|
||||
return $STATUS
|
||||
fi
|
||||
|
||||
if [ $i = "20" ] ; then
|
||||
return 2
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
i=$(($i+1))
|
||||
done
|
||||
}
|
||||
|
||||
apache_wait_stop() {
|
||||
local STATUS=$1
|
||||
|
||||
if [ $STATUS != 0 ] ; then
|
||||
return $STATUS
|
||||
fi
|
||||
|
||||
PIDTMP=$(pidof $DAEMON | tr ' ' '\n' | grep -w $(cat $PIDFILE))
|
||||
if [ -n "${PIDTMP:-}" ] && kill -0 "${PIDTMP:-}" 2> /dev/null; then
|
||||
local i=0
|
||||
while kill -0 "${PIDTMP:-}" 2> /dev/null; do
|
||||
if [ $i = '60' ]; then
|
||||
STATUS=2
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
i=$(($i+1))
|
||||
done
|
||||
return $STATUS
|
||||
else
|
||||
return $STATUS
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# Function that starts the daemon/service
|
||||
#
|
||||
do_start()
|
||||
{
|
||||
# Return
|
||||
# 0 if daemon has been started
|
||||
# 1 if daemon was already running
|
||||
# 2 if daemon could not be started
|
||||
|
||||
if [ -e $PIDFILE ] && pidof $DAEMON | tr ' ' '\n' | grep -w $(cat $PIDFILE) > /dev/null 2>&1 ; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
if apache_conftest ; then
|
||||
$APACHECTL start
|
||||
apache_wait_start $?
|
||||
return $?
|
||||
else
|
||||
return 2
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# Function that stops the daemon/service
|
||||
#
|
||||
do_stop()
|
||||
{
|
||||
# Return
|
||||
# 0 if daemon has been stopped
|
||||
# 1 if daemon was already stopped
|
||||
# 2 if daemon could not be stopped
|
||||
# other if a failure occurred
|
||||
|
||||
local AP_RET=0
|
||||
|
||||
if pidof $DAEMON > /dev/null 2>&1 ; then
|
||||
if [ -e $PIDFILE ] && pidof $DAEMON | tr ' ' '\n' | grep -w $(cat $PIDFILE) > /dev/null 2>&1 ; then
|
||||
AP_RET=2
|
||||
else
|
||||
AP_RET=1
|
||||
fi
|
||||
else
|
||||
AP_RET=0
|
||||
fi
|
||||
|
||||
# AP_RET is:
|
||||
# 0 if Apache (whichever) is not running
|
||||
# 1 if Apache (whichever) is running
|
||||
# 2 if Apache from the PIDFILE is running
|
||||
|
||||
if [ $AP_RET = 0 ] ; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ $AP_RET = 2 ] && apache_conftest ; then
|
||||
$APACHECTL stop
|
||||
apache_wait_stop $?
|
||||
return $?
|
||||
else
|
||||
if [ $AP_RET = 2 ]; then
|
||||
kill $(pidof $DAEMON | tr ' ' '\n' | grep -w $(cat $PIDFILE))
|
||||
apache_wait_stop $?
|
||||
return $?
|
||||
elif [ $AP_RET = 1 ] ; then
|
||||
return 2
|
||||
fi
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting web server: $NAME"
|
||||
do_start
|
||||
case $? in
|
||||
0|1)
|
||||
echo .
|
||||
exit 0
|
||||
;;
|
||||
2)
|
||||
echo failed
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
stop)
|
||||
echo -n "Stopping web server: $NAME"
|
||||
do_stop
|
||||
case $? in
|
||||
0|1)
|
||||
echo .
|
||||
exit 0
|
||||
;;
|
||||
2)
|
||||
echo failed
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
reload)
|
||||
echo -n "Reloading $NAME configuration"
|
||||
kill -HUP `cat $PIDFILE`
|
||||
;;
|
||||
|
||||
reload-modules)
|
||||
echo -n "Reloading $NAME modules"
|
||||
$APACHECTL restart
|
||||
;;
|
||||
|
||||
restart)
|
||||
echo "Restarting web server: $NAME"
|
||||
do_stop
|
||||
case "$?" in
|
||||
0|1)
|
||||
do_start
|
||||
exit $?
|
||||
;;
|
||||
*)
|
||||
# Failed to stop
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
force-reload)
|
||||
$0 reload-modules
|
||||
exit $?
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ $? = 0 ]; then
|
||||
echo .
|
||||
exit 0
|
||||
else
|
||||
echo failed
|
||||
exit 1
|
||||
fi
|
||||
@@ -0,0 +1,3 @@
|
||||
# <type> <owner> <group> <mode> <path> <linksource>
|
||||
d root root 0755 /var/run/apache2 none
|
||||
d root root 0755 /var/log/apache2 none
|
||||
Reference in New Issue
Block a user