Add meta-webserver

Since v1, fix up for feedback from Koen:
* Squash OE-Core add and fixup patches together for apache2/modphp
* Move packaging stuff after do_install
* Add LSB headers to initscript
* Add some comments about autotools_do_configure in xdebug recipe

The following changes since commit 3871d4561464eedc6a9a83b2c682ec7d29682873:

media-ctl: Update to latest upstream to fix build with latest autotools (2012-10-03 12:25:07 +0200)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib paule/meta-webserver-add
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/meta-webserver-add

Paul Eggleton (4):
Add meta-webserver layer
apache2: add from OE-Classic, update to version 2.4.2 and fix
modphp: add from OE-Classic, update to 5.3.14 and fix
xdebug: add new recipe

 meta-webserver/COPYING.MIT                         |   17 +
 meta-webserver/README                              |   37 +++
 meta-webserver/conf/layer.conf                     |   13 +
 .../apache2-2.4.2/apache-configure_perlbin.patch   |   37 +++
 .../apache2-2.4.2/apache-ssl-ltmain-rpath.patch    |   76 +++++
 .../apache2/apache2-2.4.2/fix-libtool-name.patch   |   55 +++
 .../apache2-2.4.2/httpd-2.4.1-corelimit.patch      |   37 +++
 .../apache2/apache2-2.4.2/httpd-2.4.1-export.patch |   22 ++
 .../apache2-2.4.2/httpd-2.4.1-selinux.patch        |   63 ++++
 .../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-r1332643.patch       |  260 +++++++++++++++
 .../apache2-2.4.2/httpd-2.4.2-r1337344+.patch      |  350 ++++++++++++++++++++
 .../apache2-2.4.2/httpd-2.4.2-restart.patch        |   35 ++
 .../replace-lynx-to-curl-in-apachectl-script.patch |   52 +++
 .../apache2/apache2-2.4.2/server-makefile.patch    |   11 +
 .../recipes-httpd/apache2/apache2-native_2.4.2.bb  |   43 +++
 .../recipes-httpd/apache2/apache2_2.4.2.bb         |  130 ++++++++
 meta-webserver/recipes-httpd/apache2/files/init    |   73 ++++
 .../recipes-php/modphp/files/70_mod_php5.conf      |   12 +
 .../recipes-php/modphp/files/configure.patch       |   11 +
 .../recipes-php/modphp/files/pthread-check.patch   |   64 ++++
 meta-webserver/recipes-php/modphp/modphp5.inc      |   90 +++++
 meta-webserver/recipes-php/modphp/modphp_5.3.14.bb |    5 +
 meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb  |   34 ++
 25 files changed, 1688 insertions(+)
 create mode 100644 meta-webserver/COPYING.MIT
 create mode 100644 meta-webserver/README
 create mode 100644 meta-webserver/conf/layer.conf
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-configure_perlbin.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-ssl-ltmain-rpath.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/fix-libtool-name.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-corelimit.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-export.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-selinux.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1326980+.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1327036+.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1332643.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1337344+.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-restart.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/replace-lynx-to-curl-in-apachectl-script.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/server-makefile.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-native_2.4.2.bb
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
 create mode 100755 meta-webserver/recipes-httpd/apache2/files/init
 create mode 100644 meta-webserver/recipes-php/modphp/files/70_mod_php5.conf
 create mode 100644 meta-webserver/recipes-php/modphp/files/configure.patch
 create mode 100644 meta-webserver/recipes-php/modphp/files/pthread-check.patch
 create mode 100644 meta-webserver/recipes-php/modphp/modphp5.inc
 create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.3.14.bb
 create mode 100644 meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb

1.7.9.5

Add a layer for web servers, web-based applications and other related software.

---
 meta-webserver/COPYING.MIT     |   17 +++++++++++++++++
 meta-webserver/README          |   37 +++++++++++++++++++++++++++++++++++++
 meta-webserver/conf/layer.conf |   13 +++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 meta-webserver/COPYING.MIT
 create mode 100644 meta-webserver/README
 create mode 100644 meta-webserver/conf/layer.conf

new file mode 100644
index 0000000..fb950dc
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.

new file mode 100644
index 0000000..47136fb
@@ -0,0 +1,37 @@
+meta-webserver
+==============
+
+This layer provides support for building web servers, web-based
+applications and related software.
+
+
+
+Dependencies
+------------
+
+This layer depends on:
+
+URI: git://git.openembedded.org/openembedded-core
+branch: master
+revision: HEAD
+
+
+
+Maintenance
+-----------
+
+Send patches / pull requests to [email protected]
+with '[meta-webserver]' in the subject.
+
+Layer maintainer: Paul Eggleton <[email protected]>
+
+
+License
+-------
+
+All metadata is MIT licensed unless otherwise stated. Source code included
+in tree for individual recipes is under the LICENSE stated in each recipe
+(.bb file) unless otherwise stated.
+
+This README document is Copyright (C) 2012 Intel Corporation.
+

new file mode 100644
index 0000000..6f1855b
@@ -0,0 +1,13 @@
+# Layer configuration for meta-webserver layer
+# Copyright 2012 Intel Corporation
+
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have various recipe-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "webserver"
+BBFILE_PATTERN_webserver := "^${LAYERDIR}/"
+BBFILE_PRIORITY_webserver = "6"
+

1.7.9.5

* 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

---
 .../apache2-2.4.2/apache-configure_perlbin.patch   |   37 +++
 .../apache2-2.4.2/apache-ssl-ltmain-rpath.patch    |   76 +++++
 .../apache2/apache2-2.4.2/fix-libtool-name.patch   |   55 +++
 .../apache2-2.4.2/httpd-2.4.1-corelimit.patch      |   37 +++
 .../apache2/apache2-2.4.2/httpd-2.4.1-export.patch |   22 ++
 .../apache2-2.4.2/httpd-2.4.1-selinux.patch        |   63 ++++
 .../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-r1332643.patch       |  260 +++++++++++++++
 .../apache2-2.4.2/httpd-2.4.2-r1337344+.patch      |  350 ++++++++++++++++++++
 .../apache2-2.4.2/httpd-2.4.2-restart.patch        |   35 ++
 .../replace-lynx-to-curl-in-apachectl-script.patch |   52 +++
 .../apache2/apache2-2.4.2/server-makefile.patch    |   11 +
 .../recipes-httpd/apache2/apache2-native_2.4.2.bb  |   43 +++
 .../recipes-httpd/apache2/apache2_2.4.2.bb         |  130 ++++++++
 meta-webserver/recipes-httpd/apache2/files/init    |   73 ++++
 16 files changed, 1405 insertions(+)
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-configure_perlbin.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-ssl-ltmain-rpath.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/fix-libtool-name.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-corelimit.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-export.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-selinux.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1326980+.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1327036+.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1332643.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1337344+.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-restart.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/replace-lynx-to-curl-in-apachectl-script.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/server-makefile.patch
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-native_2.4.2.bb
 create mode 100644 meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb
 create mode 100755 meta-webserver/recipes-httpd/apache2/files/init

new file mode 100644
index 0000000..baa739f
@@ -0,0 +1,37 @@
+# Author: echo <[email protected]>
+# Date: April 28 2009
+# Summary:Fix perl install directory to /usr/bin
+#
+# Upstream-Status: Inappropriate [configuration]
+
+--- a/configure
++++ b/configure
+@@ -22365,13 +22365,7 @@
+ #define APACHE_MPM_DIR "$MPM_DIR"
+ _ACEOF
+
+-
+-perlbin=`$ac_aux_dir/PrintPath perl`
+-if test "x$perlbin" = "x"; then
+-    perlbin="/replace/with/path/to/perl/interpreter"
+-fi
+-
+-
++perlbin='/usr/bin/perl'
+
+ BSD_MAKEFILE=no
+ ap_make_include=include
+--- a/configure.in
++++ b/configure.in
+@@ -638,10 +638,7 @@
+ AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
+ 	[Location of the source for the current MPM])
+ 
+-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.

new file mode 100644
index 0000000..18e4107
@@ -0,0 +1,37 @@
+
+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.
+
+--- httpd-2.4.1/server/core.c.corelimit
++++ httpd-2.4.1/server/core.c
+@@ -4433,6 +4433,25 @@ static int core_post_config(apr_pool_t *
+     }
+     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;
+ }
+ 

new file mode 100644
index 0000000..ed629bf
@@ -0,0 +1,22 @@
+
+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-HEAD: needed
+Upstream-2.0: omit
+Upstream-Status: Pending
+
+Note: EXPORT_DIRS change is conditional on using shared apr
+
+--- httpd-2.4.1/server/Makefile.in.export
++++ httpd-2.4.1/server/Makefile.in
+@@ -57,9 +57,6 @@ export_files:
+ 	( for dir in $(EXPORT_DIRS); do \
+ 	      ls $$dir/*.h ; \
+ 	  done; \
+-	  for dir in $(EXPORT_DIRS_APR); do \
+-	      ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \
+-	  done; \
+ 	) | sort -u > $@
+ 
+ exports.c: export_files

new file mode 100644
index 0000000..42254d2
@@ -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) {

new file mode 100644
index 0000000..f1349cb
@@ -0,0 +1,11 @@
+--- http-2.0.54/server/Makefile.in-old	2005-12-20 13:26:56.000000000 -0500
++++ http-2.0.54/server/Makefile.in	2005-12-20 13:27:22.000000000 -0500
+@@ -27,7 +27,7 @@
+ 	$(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
+ 

1.7.9.5

* Use working SRC_URI
* Fix to use correct headers and apxs script for cross-compiling
* Enable threading
* Install headers and scripts for building extension modules
* Use proper variables instead of /etc, /usr/lib etc.
* Fix rpath QA issues
* Add LIC_FILES_CHKSUM
* Put apache config file into SRC_URI instead of referring to it using FILESDIR

---
 .../recipes-php/modphp/files/70_mod_php5.conf      |   12 +++
 .../recipes-php/modphp/files/configure.patch       |   11 +++
 .../recipes-php/modphp/files/pthread-check.patch   |   64 ++++++++++++++
 meta-webserver/recipes-php/modphp/modphp5.inc      |   90 ++++++++++++++++++++
 meta-webserver/recipes-php/modphp/modphp_5.3.14.bb |    5 ++
 5 files changed, 182 insertions(+)
 create mode 100644 meta-webserver/recipes-php/modphp/files/70_mod_php5.conf
 create mode 100644 meta-webserver/recipes-php/modphp/files/configure.patch
 create mode 100644 meta-webserver/recipes-php/modphp/files/pthread-check.patch
 create mode 100644 meta-webserver/recipes-php/modphp/modphp5.inc
 create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.3.14.bb

new file mode 100644
index 0000000..1de6fb1
@@ -0,0 +1,12 @@
+# vim: ft=apache sw=4 ts=4
+<IfDefine PHP5>
+	# Load the module first
+	<IfModule !sapi_apache2.c>
+		LoadModule php5_module    lib/apache2/modules/libphp5.so
+	</IfModule>
+
+	# Set it to handle the files
+	AddHandler php5-script .php .phtml .php3 .php4 .php5
+	AddType application/x-httpd-php-source .phps
+	DirectoryIndex index.html index.html.var index.php index.phtml
+</IfDefine>

new file mode 100644
index 0000000..c5334c7
@@ -0,0 +1,11 @@
+--- php-5.1.6/configure.old	2006-09-12 07:54:14.000000000 -0700
++++ php-5.1.6/configure	2006-09-12 07:54:37.000000000 -0700
+@@ -14715,8 +14715,6 @@
+ 
+ 
+ 
+-  unset ac_cv_func_dlopen
+-  unset ac_cv_func___dlopen
+   unset found
+   
+   echo $ac_n "checking for dlopen""... $ac_c" 1>&6

new file mode 100644
index 0000000..b6a5126
@@ -0,0 +1,5 @@
+include modphp5.inc
+PR = "r0"
+
+SRC_URI[md5sum] = "7caac4f71e2f21426c11ac153e538392"
+SRC_URI[sha256sum] = "c8075b6e83c5db0d26cc8426a7456856421089a76c963813b1fcac3ced041cb3"

1.7.9.5

Add new recipe for the Xdebug PHP debugger/profiler.

---
 meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb |   34 +++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb

new file mode 100644
index 0000000..48e1f8e
@@ -0,0 +1,34 @@
+SUMMARY = "Debugging and profiling extension for PHP"
+LICENSE = "Xdebug"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16"
+
+DEPENDS = "modphp"
+
+PR = "r0"
+
+SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz"
+
+SRC_URI[md5sum] = "5e5c467e920240c20f165687d7ac3709"
+SRC_URI[sha256sum] = "11d340eb7f87909a596bac054cc927df757dc2fc7c90b50a832c30e9bf84c9ad"
+
+inherit autotools
+
+EXTRA_OECONF += "--enable-xdebug -with-php-config=${STAGING_BINDIR_CROSS}/php-config"
+
+do_configure() {
+	${STAGING_BINDIR_CROSS}/phpize
+
+	# Running autoreconf as autotools_do_configure would do here
+	# breaks the libtool configuration resulting in a failure later
+	# in do_compile. It's possible this may be fixable, however the
+	# easiest course of action for the moment is to avoid doing that.
+	oe_runconf
+}
+
+do_install() {
+	oe_runmake install INSTALL_ROOT=${D}
+}
+
+FILES_${PN} += "${libdir}/php5/extensions/*/*.so"
+FILES_${PN}-dbg += "${libdir}/php5/extensions/*/.debug"
+

1.7.9.5

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 03-10-12 19:08, Paul Eggleton schreef:

^^^^^^^^^^^

Missed some "packaging stuff" to move below do_install

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQbIt2MkyGM64RGpERAkP6AJ9OUNRyfLyE7XgSscK8wuKvAyvqnwCgnhOX fZZRGu5Klw+O8reOcuwfb8k=
=mg1u
-----END PGP SIGNATURE-----