Support apache 2.4 (#532820)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 79 insertions, 7 deletions

diff --git a/www-apache/mod_dnssd/ChangeLog b/www-apache/mod_dnssd/ChangeLog
index 0952cefca634..2436f0681314 100644
--- a/www-apache/mod_dnssd/ChangeLog
+++ b/www-apache/mod_dnssd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_dnssd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnssd/ChangeLog,v 1.10 2014/06/22 18:47:53 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnssd/ChangeLog,v 1.11 2015/05/09 08:21:38 pacho Exp $
+
+*mod_dnssd-0.6-r1 (09 May 2015)
+
+  09 May 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/mod_dnssd-0.6-httpd24.patch, +mod_dnssd-0.6-r1.ebuild:
+  Support apache 2.4 (#532820)
 
   22 Jun 2014; Markus Meier <maekke@gentoo.org> mod_dnssd-0.6.ebuild:
   add ~arm, bug #512046
diff --git a/www-apache/mod_dnssd/Manifest b/www-apache/mod_dnssd/Manifest
index 44229fe1e137..43cc9c95cdfa 100644
--- a/www-apache/mod_dnssd/Manifest
+++ b/www-apache/mod_dnssd/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA256
 
 AUX 80_mod_dnssd.conf 118 SHA256 578105c2e7aac757101853945bce59a9033c0fe7a642762bc439b60cc887d489 SHA512 ef13ddde307b6e4c8e48727d1d2145ca3ae99f8e105d4606628edd86576fde0ba4dd3cb6fb71a95d66a523e90cf30e5a3608d581760038f147f137fa5c6c4e28 WHIRLPOOL ac125ec4042b281fb394bcf52b984d752befccef075ed2965a2621ab533053457dfd9a62c72131f39304aa38b85caa54dbd5de49204afa41982fe767eb1fbe3e
+AUX mod_dnssd-0.6-httpd24.patch 603 SHA256 a12265e9397204ab078b133da01770acfd69ad3f7abb4b1bec9e8ec83e5c6e21 SHA512 c8e3428a1b4dfe0a24ed244ed30eb8b1181642a05d75de2b2b61ea48168f881b026d6c3fd0fbdfcc344736a1d93e4458853853e335076e498d6df091ccdde228 WHIRLPOOL 9e41382e124e05626052c4997f62f85cd31569c7897536e7ffe218c3a2dda67574786c7fbac5bdb96370317f4c8d6de36e70176d48fce9004e19ccf160ae8261
 AUX mod_dnssd-0.6-ldflags.patch 571 SHA256 d9375c3a536cea1413b108a7b7281d4772fa3cb68d0a57f7ec1a3b4b90bdf831 SHA512 419c9565ac03a352568b3ab97e03e6878b5721a455fdd8f07f328d4a64ab401776f3a5ccd2a31e10b64fbbf334693c8f6e3636ed65f9f06f6f83d433f6366d6c WHIRLPOOL e48c58a8a2f670902fc5427e1b8221befb5f4edab288a19a4055fec65eeae4cef465129810b49896d2c6977167ff48e836d40f92eadaed34ece8ae0fcf3c7866
 DIST mod_dnssd-0.6.tar.gz 86417 SHA256 2cd171d76eba398f03c1d5bcc468a1756f4801cd8ed5bd065086e4374997c5aa SHA512 c3eacd2065f996ace76496b828a5be4b735225782c88ed0fba00c37ffed91af7c81cef755556968880e11e05fbaf65a4326728cb82abcad03ccaf925be1f29d3 WHIRLPOOL aa27272b8e35fcc492e7265171ce720f9cefc157fdb9f4997474f669e97d168ce851f6351c8857dd8bf01d3e0ea2c87085de1aa2ddb114317d0649b84a2717ba
+EBUILD mod_dnssd-0.6-r1.ebuild 992 SHA256 e3cba5f416568f1e00eb3c7f55826b4473034adac021ecd6a0f5c62dae7a572f SHA512 049b9e941a3da208e40670d9f758d0ac6c63621b5b674d09cb5f2e903c4c976d071560c1ca2bd507ed3ada40e6221b589dcc1dac8bedd19b96232b12901b69e1 WHIRLPOOL dc7ef67c8764d505a610699ede283448864209108bbbd032e934eebfcaed8bcc3876086ef1ce0b94f03fa975ccdb6aac70b33e61e24dcd10526774ac71055e5c
 EBUILD mod_dnssd-0.6.ebuild 943 SHA256 12eaa119963f03581e76d0d05d7c8cd31fa923485acbfc112653d0b79638742d SHA512 b186d1f54efc9f3e6c1d60b134eaf54e4a6aa114146be26e6b237e2c097f4af613390c7b01ea05c83ecea56df1d69b618b46f3bbfca4292c09ead78af0a66e6c WHIRLPOOL b6124b9e2e5209fb28c85f51f985657b5926c8c11a6b1d3071663f71723b0d21bf76a4a35a4c7d87b0a62a82efb8ae16027845d316e211b52377289d0377f84f
-MISC ChangeLog 1586 SHA256 b61ff49ef30506b0028801824b5817091c7f96f9899f31d41121152b1817a752 SHA512 fed14b54bb38998bed08f267ee788d5fe07082d96bfbefb3abc9ccbd63f3e2bc686610f690513af1b20f3bcb4f18ce889b90c987f4ce9ef504c0dbbcc5b20db9 WHIRLPOOL 6a0d68c73511111443aaec0a0b93221acbf9793e7d648d04f6571aa4a92297a9226f4d76e125517033cbf06782f7a9d206f4aee802fd1c1dff1b0149501a888d
+MISC ChangeLog 1760 SHA256 2e158409dcbf30f79b79db281169111c76c4e9a3ba75f34f7a71f31633615269 SHA512 73a73ea805673f0b5f90517cad9f08f8dfff29de9d31df1ef89b9f4567e0d626ed5903b06d8638323775aeb2f8c84985f1b5b20c04109c478a851152f17d8ff1 WHIRLPOOL 658ea59e52b60f41eda538ba8baa3b4b9a8176e52225c35e3d8bd83f5977b0f8630facbcd9cc6cc1c990e35bef8203a349665bdf0f70911977c0ecd1a257668c
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOnJtEACgkQkKaRLQcq0GJcrQCgsfoGq6ugHqb68fmOh3FA1MfB
-PFEAn0oFNcCZp4bJgD6+ujBxBFRb9+YB
-=ny7m
+iEYEAREIAAYFAlVNw5MACgkQCaWpQKGI+9RHGwCcD4X2XiHRun7pHicEFOS6vk7g
+aIgAnAxqLenlhKyMAW2IG8V6x0IaWSLd
+=8enx
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch b/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch
new file mode 100644
index 000000000000..6eb505810405
--- /dev/null
+++ b/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch
@@ -0,0 +1,24 @@
+--- mod_dnssd-0.6/src/mod_dnssd.c.httpd24
++++ mod_dnssd-0.6/src/mod_dnssd.c
+@@ -26,6 +26,9 @@
+ #include <unixd.h>
+ #include <apr_signal.h>
+ #include <mpm_common.h>
++#if AP_MODULE_MAGIC_AT_LEAST(20090130,0)
++#include <mod_unixd.h>
++#endif
+ 
+ #include <unistd.h>
+ 
+@@ -576,7 +579,11 @@ static void child_process(apr_pool_t *p,
+ 
+     ap_assert(d);
+ 
++#if AP_MODULE_MAGIC_AT_LEAST(20090130,0)
++    ap_unixd_setup_child();
++#else
+     unixd_setup_child();
++#endif
+ 
+     if (pipe(sigterm_pipe_fds) < 0) {
+         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r.main_server, "pipe() failed: %s", strerror(errno));
diff --git a/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild b/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
new file mode 100644
index 000000000000..386728af1474
--- /dev/null
+++ b/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild,v 1.1 2015/05/09 08:21:38 pacho Exp $
+
+EAPI=5
+inherit apache-module eutils
+
+DESCRIPTION="mod_dnssd is an Apache module which adds Zeroconf support via DNS-SD using Avahi"
+HOMEPAGE="http://0pointer.de/lennart/projects/mod_dnssd/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="net-dns/avahi[dbus]"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="80_${PN}"
+APACHE2_MOD_DEFINE="DNSSD"
+
+need_apache2
+
+src_prepare() {
+	# Respect LDFLAGS and use LIBS properly.
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+
+	# Fedora patch for apache 2.4
+	epatch "${FILESDIR}/${P}-httpd24.patch"
+}
+
+src_configure() {
+	econf --with-apxs=${APXS} --disable-lynx
+}
+
+# Do not use inherited src_compile since it doesn't do what we want
+src_compile() {
+	emake
+}