apache2: add from OE-Classic, update to version 2.4.2 and fix

* Enable threading for PHP
* Backport a number of patches
* Use apachectl in init script
* Install modules into a sane location
* Ensure apxs script is installed into sysroot in crossscripts directory
  and modified so that it works for building PHP
* Install httpd executable for native version so that PHP configure
  script can call it
* Rename server-makefile-patch to server-makefile.patch and drop
  apply=yes
* Add LIC_FILES_CHKSUM
* Fix packaging QA warnings
* Add LSB headers to init script
* Clean out some cruft and move packaging stuff after do_install

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

1 files changed, 35 insertions, 0 deletions

diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-restart.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-restart.patch
new file mode 100644
index 0000000000..42254d2f8c
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-restart.patch
@@ -0,0 +1,35 @@
+
+* server/main.c (main): Bail out *before* signalling the server
+  if the config is bad. (as per the claim in the docs!)
+
+https://bugzilla.redhat.com/show_bug.cgi?id=814645
+http://svn.apache.org/viewvc?view=revision&revision=1328345
+
+Upstream-Status: Backport
+
+--- httpd-2.4.2/server/main.c.restart
++++ httpd-2.4.2/server/main.c
+@@ -671,6 +671,11 @@ int main(int argc, const char * const ar
+         }
+     }
+ 
++    /* If our config failed, deal with that here. */
++    if (rv != OK) {
++        destroy_and_exit_process(process, 1);
++    }
++
+     signal_server = APR_RETRIEVE_OPTIONAL_FN(ap_signal_server);
+     if (signal_server) {
+         int exit_status;
+@@ -680,11 +685,6 @@ int main(int argc, const char * const ar
+         }
+     }
+ 
+-    /* If our config failed, deal with that here. */
+-    if (rv != OK) {
+-        destroy_and_exit_process(process, 1);
+-    }
+-
+     apr_pool_clear(plog);
+ 
+     if ( ap_run_open_logs(pconf, plog, ptemp, ap_server_conf) != OK) {