From bf90a7d68b0d8794a54a3df183268a70acdd33c8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Eric=20B=C3=A9nard?=
Date: Sun, 25 Nov 2012 18:25:05 +0100
Subject: [PATCH] apache2: upgrade to 2.4.3
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
(From meta-openembedded rev: 5b3749ca143c5e2a957d1509d65164e191a92883)
Signed-off-by: Eric Bénard
Signed-off-by: Patrick Ohly
---
.../apache2-2.4.2/httpd-2.4.2-r1326980+.patch | 74 -----
.../apache2-2.4.2/httpd-2.4.2-r1327036+.patch | 87 -----
.../apache2-2.4.2/httpd-2.4.2-r1337344+.patch | 350 ---------------------
.../apache2-2.4.2/httpd-2.4.2-restart.patch | 35 ---
.../apache-configure_perlbin.patch | 0
.../apache-ssl-ltmain-rpath.patch | 0
.../fix-libtool-name.patch | 0
.../httpd-2.4.1-corelimit.patch | 0
.../httpd-2.4.1-export.patch | 0
.../httpd-2.4.1-selinux.patch | 0
.../httpd-2.4.2-r1332643.patch | 0
.../replace-lynx-to-curl-in-apachectl-script.patch | 0
.../server-makefile.patch | 0
...he2-native_2.4.2.bb => apache2-native_2.4.3.bb} | 4 +-
.../apache2/{apache2_2.4.2.bb => apache2_2.4.3.bb} | 10 +-
15 files changed, 5 insertions(+), 555 deletions(-)
delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1326980+.patch
delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1327036+.patch
delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1337344+.patch
delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-restart.patch
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2-2.4.2 => apache2-2.4.3}/apache-configure_perlbin.patch (100%)
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2-2.4.2 => apache2-2.4.3}/apache-ssl-ltmain-rpath.patch (100%)
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2-2.4.2 => apache2-2.4.3}/fix-libtool-name.patch (100%)
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2-2.4.2 => apache2-2.4.3}/httpd-2.4.1-corelimit.patch (100%)
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2-2.4.2 => apache2-2.4.3}/httpd-2.4.1-export.patch (100%)
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2-2.4.2 => apache2-2.4.3}/httpd-2.4.1-selinux.patch (100%)
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2-2.4.2 => apache2-2.4.3}/httpd-2.4.2-r1332643.patch (100%)
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2-2.4.2 => apache2-2.4.3}/replace-lynx-to-curl-in-apachectl-script.patch (100%)
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2-2.4.2 => apache2-2.4.3}/server-makefile.patch (100%)
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2-native_2.4.2.bb => apache2-native_2.4.3.bb} (89%)
rename meta-openembedded/meta-webserver/recipes-httpd/apache2/{apache2_2.4.2.bb => apache2_2.4.3.bb} (93%)
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1326980+.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1326980+.patch
deleted file mode 100644
index 98b226b..0000000
--- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1326980+.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-
-* modules/loggers/mod_log_debug.c: Mark private globals as static.
-http://svn.apache.org/viewvc?view=revision&revision=1326980
-
-* modules/filters/sed1.c: Mark private globals as static const.
- (command): Change p3 pointer to const.
-http://svn.apache.org/viewvc?view=revision&revision=1326984
-
-* modules/filters/config.m4: Prevent libsed internals from polluting
- the global symbol namespace.
-http://svn.apache.org/viewvc?view=revision&revision=1326991
-
-Upstream-Status: Backport
-
---- httpd-2.4.2/modules/loggers/mod_log_debug.c
-+++ httpd-2.4.2/modules/loggers/mod_log_debug.c
-@@ -35,8 +35,8 @@
- apr_array_header_t *entries;
- } log_debug_dirconf;
-
--const char *allhooks = "all";
--const char * const hooks[] = {
-+static const char *allhooks = "all";
-+static const char * const hooks[] = {
- "log_transaction", /* 0 */
- "quick_handler", /* 1 */
- "handler", /* 2 */
---- httpd-2.4.2/modules/filters/sed1.c
-+++ httpd-2.4.2/modules/filters/sed1.c
-@@ -25,7 +25,7 @@
- #include "apr_strings.h"
- #include "regexp.h"
-
--char *trans[040] = {
-+static const char *const trans[040] = {
- "\\01",
- "\\02",
- "\\03",
-@@ -58,7 +58,7 @@
- "\\36",
- "\\37"
- };
--char rub[] = {"\\177"};
-+static const char rub[] = {"\\177"};
-
- extern int sed_step(char *p1, char *p2, int circf, step_vars_storage *vars);
- static int substitute(sed_eval_t *eval, sed_reptr_t *ipc,
-@@ -692,7 +692,8 @@
- step_vars_storage *step_vars)
- {
- int i;
-- char *p1, *p2, *p3;
-+ char *p1, *p2;
-+ const char *p3;
- int length;
- char sz[32]; /* 32 bytes enough to store 64 bit integer in decimal */
- apr_status_t rv = APR_SUCCESS;
---- httpd-2.4.2/modules/filters/config.m4
-+++ httpd-2.4.2/modules/filters/config.m4
-@@ -16,7 +16,13 @@
- APACHE_MODULE(substitute, response content rewrite-like filtering, , , most)
-
- sed_obj="mod_sed.lo sed0.lo sed1.lo regexp.lo"
--APACHE_MODULE(sed, filter request and/or response bodies through sed, $sed_obj, , most)
-+APACHE_MODULE(sed, filter request and/or response bodies through sed, $sed_obj, , most, [
-+ if test "x$enable_sed" = "xshared"; then
-+ # The only symbol which needs to be exported is the module
-+ # structure, so ask libtool to hide libsed internals:
-+ APR_ADDTO(MOD_SED_LDADD, [-export-symbols-regex sed_module])
-+ fi
-+])
-
- if test "$ac_cv_ebcdic" = "yes"; then
- # mod_charset_lite can be very useful on an ebcdic system,
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1327036+.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1327036+.patch
deleted file mode 100644
index 57b5155..0000000
--- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1327036+.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-
-* server/mpm_unix.c (dummy_connection): Use a TLS 1.0 close_notify
- alert if the chosen listener is configured for https; not perfect
- but better than sending an HTTP request. Adjust comments.
-http://svn.apache.org/viewvc?view=revision&revision=1327036
-
-* server/mpm_unix.c (dummy_connection): Fix spello.
-http://svn.apache.org/viewvc?view=revision&revision=1327080
-
-Upstream-Status: Backport
-
---- httpd-2.4.2/server/mpm_unix.c
-+++ httpd-2.4.2/server/mpm_unix.c
-@@ -501,14 +501,14 @@
- return rv;
- }
-
--/* This function connects to the server, then immediately closes the connection.
-- * This permits the MPM to skip the poll when there is only one listening
-- * socket, because it provides a alternate way to unblock an accept() when
-- * the pod is used.
-- */
-+/* This function connects to the server and sends enough data to
-+ * ensure the child wakes up and processes a new connection. This
-+ * permits the MPM to skip the poll when there is only one listening
-+ * socket, because it provides a alternate way to unblock an accept()
-+ * when the pod is used. */
- static apr_status_t dummy_connection(ap_pod_t *pod)
- {
-- char *srequest;
-+ const char *data;
- apr_status_t rv;
- apr_socket_t *sock;
- apr_pool_t *p;
-@@ -574,24 +574,37 @@
- return rv;
- }
-
-- /* Create the request string. We include a User-Agent so that
-- * adminstrators can track down the cause of the odd-looking
-- * requests in their logs.
-- */
-- srequest = apr_pstrcat(p, "OPTIONS * HTTP/1.0\r\nUser-Agent: ",
-+ if (lp->protocol && strcasecmp(lp->protocol, "https") == 0) {
-+ /* Send a TLS 1.0 close_notify alert. This is perhaps the
-+ * "least wrong" way to open and cleanly terminate an SSL
-+ * connection. It should "work" without noisy error logs if
-+ * the server actually expects SSLv3/TLSv1. With
-+ * SSLv23_server_method() OpenSSL's SSL_accept() fails
-+ * ungracefully on receipt of this message, since it requires
-+ * an 11-byte ClientHello message and this is too short. */
-+ static const unsigned char tls10_close_notify[7] = {
-+ '\x15', /* TLSPlainText.type = Alert (21) */
-+ '\x03', '\x01', /* TLSPlainText.version = {3, 1} */
-+ '\x00', '\x02', /* TLSPlainText.length = 2 */
-+ '\x01', /* Alert.level = warning (1) */
-+ '\x00' /* Alert.description = close_notify (0) */
-+ };
-+ data = (const char *)tls10_close_notify;
-+ len = sizeof(tls10_close_notify);
-+ }
-+ else /* ... XXX other request types here? */ {
-+ /* Create an HTTP request string. We include a User-Agent so
-+ * that adminstrators can track down the cause of the
-+ * odd-looking requests in their logs. A complete request is
-+ * used since kernel-level filtering may require that much
-+ * data before returning from accept(). */
-+ data = apr_pstrcat(p, "OPTIONS * HTTP/1.0\r\nUser-Agent: ",
- ap_get_server_description(),
- " (internal dummy connection)\r\n\r\n", NULL);
-+ len = strlen(data);
-+ }
-
-- /* Since some operating systems support buffering of data or entire
-- * requests in the kernel, we send a simple request, to make sure
-- * the server pops out of a blocking accept().
-- */
-- /* XXX: This is HTTP specific. We should look at the Protocol for each
-- * listener, and send the correct type of request to trigger any Accept
-- * Filters.
-- */
-- len = strlen(srequest);
-- apr_socket_send(sock, srequest, &len);
-+ apr_socket_send(sock, data, &len);
- apr_socket_close(sock);
- apr_pool_destroy(p);
-
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1337344+.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1337344+.patch
deleted file mode 100644
index 646976a..0000000
--- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1337344+.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-
-* support/suexec.c: Add gcc format-string attributes to logging
- functions.
- (main): Always print uid/gid as unsigned long, and cast to avoid
- warnings (which somewhat defeats the point of the format string
- attrs, but is necessary since the size of gid/uid varies).
-http://svn.apache.org/viewvc?view=revision&revision=1337344
-
-
-
-suexec: Add support for logging to syslog as an alternative to a
-logfile.
-
-* support/suexec.c (err_output) [AP_LOG_SYSLOG]: Log to syslog.
- (main): Close syslog fd if open, before execv. Add -V output
- for AP_LOG_SYSLOG.
-
-* configure.in: Add --with-suexec-syslog argument; allow
- --without-suexec-logfile to omit definition of AP_LOG_EXEC.
-
-http://svn.apache.org/viewvc?view=revision&revision=1341905
-
-
-
-suexec: Support use of setgid/setuid capability bits on Linux, a
-weaker set of privileges than the full setuid/setgid root binary.
-
-* configure.in: Add --enable-suexec-capabilites flag.
-
-* Makefile.in: If configured, use setcap instead of chmod 7555 on
- installed suexec binary.
-
-* modules/arch/unix/mod_unixd.c (unixd_pre_config): Drop test for
- setuid bit if capability bits are used.
-
-* docs/manual/: Add docs.
-
-http://svn.apache.org/viewvc?view=revision&revision=1342065
-
-
-
-* docs/manual/suexec.html.en: Update for syslog logging.
-
-http://svn.apache.org/viewvc?view=revision&revision=1341930
-
-
-
-Upstream-Status: Backport
-
---- httpd-2.4.2/configure.in.r1337344+
-+++ httpd-2.4.2/configure.in
-@@ -700,7 +700,24 @@ APACHE_HELP_STRING(--with-suexec-gidmin,
-
- AC_ARG_WITH(suexec-logfile,
- APACHE_HELP_STRING(--with-suexec-logfile,Set the logfile),[
-- AC_DEFINE_UNQUOTED(AP_LOG_EXEC, "$withval", [SuExec log file] ) ] )
-+ if test "x$withval" = "xyes"; then
-+ AC_DEFINE_UNQUOTED(AP_LOG_EXEC, "$withval", [SuExec log file])
-+ fi
-+])
-+
-+AC_ARG_WITH(suexec-syslog,
-+APACHE_HELP_STRING(--with-suexec-syslog,Set the logfile),[
-+ if test $withval = "yes"; then
-+ if test "x${with_suexec_logfile}" != "xno"; then
-+ AC_MSG_NOTICE([hint: use "--without-suexec-logfile --with-suexec-syslog"])
-+ AC_MSG_ERROR([suexec does not support both logging to file and syslog])
-+ fi
-+ AC_CHECK_FUNCS([vsyslog], [], [
-+ AC_MSG_ERROR([cannot support syslog from suexec without vsyslog()])])
-+ AC_DEFINE(AP_LOG_SYSLOG, 1, [SuExec log to syslog])
-+ fi
-+])
-+
-
- AC_ARG_WITH(suexec-safepath,
- APACHE_HELP_STRING(--with-suexec-safepath,Set the safepath),[
-@@ -710,6 +727,15 @@ AC_ARG_WITH(suexec-umask,
- APACHE_HELP_STRING(--with-suexec-umask,umask for suexec'd process),[
- AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )
-
-+INSTALL_SUEXEC=setuid
-+AC_ARG_ENABLE([suexec-capabilities],
-+APACHE_HELP_STRING(--enable-suexec-capabilities,Use Linux capability bits not setuid root suexec), [
-+INSTALL_SUEXEC=caps
-+AC_DEFINE(AP_SUEXEC_CAPABILITIES, 1,
-+ [Enable if suexec is installed with Linux capabilities, not setuid])
-+])
-+APACHE_SUBST(INSTALL_SUEXEC)
-+
- dnl APR should go after the other libs, so the right symbols can be picked up
- if test x${apu_found} != xobsolete; then
- AP_LIBS="$AP_LIBS `$apu_config --avoid-ldap --link-libtool`"
---- httpd-2.4.2/docs/manual/suexec.html.en.r1337344+
-+++ httpd-2.4.2/docs/manual/suexec.html.en
-@@ -369,6 +369,21 @@
- together with the --enable-suexec
option to let
- APACI accept your request for using the suEXEC feature.
-
-+ --enable-suexec-capabilities
-+
-+ Linux specific: Normally,
-+ the suexec
binary is installed "setuid/setgid
-+ root", which allows it to run with the full privileges of the
-+ root user. If this option is used, the suexec
-+ binary will instead be installed with only the setuid/setgid
-+ "capability" bits set, which is the subset of full root
-+ priviliges required for suexec operation. Note that
-+ the suexec
binary may not be able to write to a log
-+ file in this mode; it is recommended that the
-+ --with-suexec-syslog --without-suexec-logfile
-+ options are used in conjunction with this mode, so that syslog
-+ logging is used instead.
-+
- --with-suexec-bin=PATH
-
- The path to the suexec
binary must be hard-coded
-@@ -430,6 +445,12 @@
- "suexec_log
" and located in your standard logfile
- directory (--logfiledir
).
-
-+ --with-suexec-syslog
-+
-+ If defined, suexec will log notices and errors to syslog
-+ instead of a logfile. This option must be combined
-+ with --without-suexec-logfile
.
-+
- --with-suexec-safepath=PATH
-
- Define a safe PATH environment to pass to CGI
-@@ -546,9 +567,12 @@
-
- The suEXEC wrapper will write log information
- to the file defined with the --with-suexec-logfile
-- option as indicated above. If you feel you have configured and
-- installed the wrapper properly, have a look at this log and the
-- error_log for the server to see where you may have gone astray.
-+ option as indicated above, or to syslog if --with-suexec-syslog
-+ is used. If you feel you have configured and
-+ installed the wrapper properly, have a look at the log and the
-+ error_log for the server to see where you may have gone astray.
-+ The output of "suexec -V"
will show the options
-+ used to compile suexec, if using a binary distribution.
-
-
-
-@@ -615,4 +639,4 @@
-
--