Support apache 2.4 (#532820)

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 72 insertions, 2 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/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
+}