Fri Mar 7 03:48:12 UTC 2014

2 files changed, 35 insertions, 8 deletions

diff --git a/extra/mod_dnssd/PKGBUILD b/extra/mod_dnssd/PKGBUILD
index 52a6e65e5..5eb4afe4f 100644
--- a/extra/mod_dnssd/PKGBUILD
+++ b/extra/mod_dnssd/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 137844 2011-09-12 03:00:03Z eric $
+# $Id: PKGBUILD 207110 2014-03-06 21:41:15Z anatolik $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: tardo <tardo@nagi-fanboi.net>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=mod_dnssd
 pkgver=0.6
-pkgrel=4
+pkgrel=6
 pkgdesc="Zeroconf module for Apache2"
 arch=('i686' 'x86_64')
 url="http://0pointer.de/lennart/projects/mod_dnssd"
 license=('APACHE')
 depends=('avahi' 'apache')
-source=(http://0pointer.de/lennart/projects/$pkgname/${pkgname}-${pkgver}.tar.gz)
-md5sums=('bed3d95a98168bf0515922d1c05020c5')
+source=(http://0pointer.de/lennart/projects/$pkgname/${pkgname}-${pkgver}.tar.gz
+        fix_undefined_reference.patch) # from upstream be2fb9f6158f80068
+md5sums=('bed3d95a98168bf0515922d1c05020c5'
+         'ea6269aa24f8a0eb2d1adb5dd160635a')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 < "${srcdir}/fix_undefined_reference.patch"
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-lynx
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/lib/httpd/modules"
-  install -m755 src/.libs/mod_dnssd.so "${pkgdir}/usr/lib/httpd/modules/"
+  cd ${pkgname}-${pkgver}
+  install -D -m755 src/.libs/mod_dnssd.so "${pkgdir}/usr/lib/httpd/modules/mod_dnssd.so"
 }
diff --git a/extra/mod_dnssd/fix_undefined_reference.patch b/extra/mod_dnssd/fix_undefined_reference.patch
new file mode 100644
index 000000000..e0567c613
--- /dev/null
+++ b/extra/mod_dnssd/fix_undefined_reference.patch
@@ -0,0 +1,21 @@
+diff --git a/src/mod_dnssd.c b/src/mod_dnssd.c
+index 6179276..3363701 100644 (file)
+--- a/src/mod_dnssd.c
++++ b/src/mod_dnssd.c
+@@ -24,6 +24,7 @@
+ #include <ap_config.h>
+ #include <apr_strings.h>
+ #include <unixd.h>
++#include <mod_unixd.h>
+ #include <apr_signal.h>
+ #include <mpm_common.h>
+ 
+@@ -576,7 +577,7 @@ static void child_process(apr_pool_t *p, server_rec *server, struct global_confi
+ 
+     ap_assert(d);
+ 
+-    unixd_setup_child();
++    ap_unixd_setup_child();
+ 
+     if (pipe(sigterm_pipe_fds) < 0) {
+         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r.main_server, "pipe() failed: %s", strerror(errno));