Hi, yes, the problem still persists:
./mod_dnssd.c:579:5: warning: implicit declaration of function 'unixd_setup_child' [-Wimplicit-function-declaration] this will fail at runtime because of undefined symbols. I've attached a new patch fixing all the issues and doing the transition work. It's based on Ondřej's work and apart fixes the upstream code, and I do also properly move conffiles. I'll NMU this package unless the maintainer steps in in time, when it is about time to upload Apache 2.4 to Sid. -- with kind regards, Arno Töll IRC: daemonkeeper on Freenode/OFTC GnuPG Key-ID: 0x9D80F36D
diff --git a/debian/changelog b/debian/changelog index 665e894..5bfa4ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +mod-dnssd (0.6-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Add support for Apache 2.4 by using the patch provided by OndÅej Surý. + * Make the module run with the changed Apache 2.4 API + * Rename Apache configuration files to comply with Apache's packaging + policy: + - mod-dnssd.conf -> dnssd.conf + - mod-dnssd.load -> dnssd.load + * Bump debhelper dependency, to make sure its maintscript helper is + supported which aids for the conffile move. + + -- Arno Töll <a...@debian.org> Thu, 09 May 2013 18:52:11 +0200 + mod-dnssd (0.6-3) unstable; urgency=low * Bump Standards-Version to 3.9.2. No other change needed. diff --git a/debian/control b/debian/control index 14783c7..9333fbc 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: net Priority: optional Maintainer: Regis Boudin <re...@debian.org> Uploaders: Sebastien ESTIENNE <sebastien.estie...@gmail.com> -Build-Depends: debhelper (>= 5.0.0), apache2-prefork-dev | apache2-threaded-dev, libavahi-client-dev (>= 0.6.4), lynx, libapr1-dev +Build-Depends: debhelper (>> 8.1.0~), apache2-dev, dh-apache2,libavahi-client-dev (>= 0.6.4), lynx, libapr1-dev Standards-Version: 3.9.2 Homepage: http://0pointer.de/lennart/projects/mod_dnssd/ Package: libapache2-mod-dnssd Architecture: any -Depends: ${shlibs:Depends}, avahi-daemon (>= 0.6.5), apache2.2-bin, ${misc:Depends} +Depends: ${shlibs:Depends}, avahi-daemon (>= 0.6.5), ${misc:Depends} Description: Zeroconf support for Apache 2 via avahi mod_dnssd is an Apache HTTPD module which adds Zeroconf support via DNS-SD using Avahi. This allows Apache to advertise itself and the diff --git a/debian/dnssd.conf b/debian/dnssd.conf new file mode 100644 index 0000000..cfe8b9c --- /dev/null +++ b/debian/dnssd.conf @@ -0,0 +1,6 @@ +# This is the config file for mod_dnssd. + +<IfModule mod_dnssd.c> + DNSSDEnable On +</IfModule> + diff --git a/debian/dnssd.load b/debian/dnssd.load new file mode 100644 index 0000000..bd6913b --- /dev/null +++ b/debian/dnssd.load @@ -0,0 +1 @@ +LoadModule dnssd_module /usr/lib/apache2/modules/mod_dnssd.so diff --git a/debian/libapache2-mod-dnssd.apache2 b/debian/libapache2-mod-dnssd.apache2 new file mode 100644 index 0000000..258a376 --- /dev/null +++ b/debian/libapache2-mod-dnssd.apache2 @@ -0,0 +1,3 @@ +mod src/.libs/mod_dnssd.so +mod debian/dnssd.conf +mod debian/dnssd.load diff --git a/debian/libapache2-mod-dnssd.install b/debian/libapache2-mod-dnssd.install deleted file mode 100644 index 2b056f5..0000000 --- a/debian/libapache2-mod-dnssd.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/mod-dnssd.load /etc/apache2/mods-available -debian/mod-dnssd.conf /etc/apache2/mods-available diff --git a/debian/libapache2-mod-dnssd.maintscript b/debian/libapache2-mod-dnssd.maintscript new file mode 100644 index 0000000..1059567 --- /dev/null +++ b/debian/libapache2-mod-dnssd.maintscript @@ -0,0 +1,2 @@ +mv_conffile /etc/apache2/mods-available/mod-dnssd.conf /etc/apache2/mods-available/dnssd.conf +mv_conffile /etc/apache2/mods-available/mod-dnssd.load /etc/apache2/mods-available/dnssd.load diff --git a/debian/libapache2-mod-dnssd.prerm b/debian/libapache2-mod-dnssd.prerm deleted file mode 100644 index 50db09a..0000000 --- a/debian/libapache2-mod-dnssd.prerm +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e - -#DEBHELPER# - -if [ "$1" != "remove" -a "$1" != "purge" ]; then - exit 0 -fi - -if [ -e /etc/apache2/apache2.conf ]; then - a2dismod mod-dnssd || true -fi - -exit 0 diff --git a/debian/mod-dnssd.conf b/debian/mod-dnssd.conf deleted file mode 100644 index cfe8b9c..0000000 --- a/debian/mod-dnssd.conf +++ /dev/null @@ -1,6 +0,0 @@ -# This is the config file for mod_dnssd. - -<IfModule mod_dnssd.c> - DNSSDEnable On -</IfModule> - diff --git a/debian/mod-dnssd.load b/debian/mod-dnssd.load deleted file mode 100644 index bd6913b..0000000 --- a/debian/mod-dnssd.load +++ /dev/null @@ -1 +0,0 @@ -LoadModule dnssd_module /usr/lib/apache2/modules/mod_dnssd.so diff --git a/debian/patches/port-for-apache2.4.patch b/debian/patches/port-for-apache2.4.patch new file mode 100644 index 0000000..598159d --- /dev/null +++ b/debian/patches/port-for-apache2.4.patch @@ -0,0 +1,26 @@ +Description: Port dnssd to Apache 2.4 API +Forwarded: no +Author: Arno Töll <a...@debian.org> +Last-Update: 2013-05-09 + +--- a/src/mod_dnssd.c ++++ b/src/mod_dnssd.c +@@ -26,6 +26,9 @@ + #include <unixd.h> + #include <apr_signal.h> + #include <mpm_common.h> ++#if MODULE_MAGIC_NUMBER_MAJOR >= 20090209 ++#include "mod_unixd.h" ++#endif + + #include <unistd.h> + +@@ -576,7 +579,7 @@ + + 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)); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..533d773 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +port-for-apache2.4.patch diff --git a/debian/rules b/debian/rules index c1607ec..70be43e 100755 --- a/debian/rules +++ b/debian/rules @@ -48,7 +48,8 @@ install: build dh_testroot dh_prep dh_installdirs - dh_install src/.libs/mod_dnssd.so `apxs2 -q LIBEXECDIR` + dh_install + dh_apache2 # Build architecture-independent files here. binary-indep: build install
signature.asc
Description: OpenPGP digital signature
