tags 666829 + patch thanks Hello maintainer,
you will find attached below a patch porting your module to Apache2 2.4. Please test it and consider its inclusion. Note, I hardly tried more than compiling and loading the module. I didn't test it. -- with kind regards, Arno Töll IRC: daemonkeeper on Freenode/OFTC GnuPG Key-ID: 0x9D80F36D
debian/control | 5 +++-- debian/libapache2-mod-dnssd.apache2 | 2 ++ debian/libapache2-mod-dnssd.install | 2 -- debian/libapache2-mod-dnssd.prerm | 15 --------------- debian/patches/port-24-patch | 11 +++++++++++ debian/patches/series | 1 + debian/rules | 1 + 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/debian/control b/debian/control index 14783c7..5117795 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,14 @@ Section: net Priority: optional Maintainer: Regis Boudin <[email protected]> Uploaders: Sebastien ESTIENNE <[email protected]> -Build-Depends: debhelper (>= 5.0.0), apache2-prefork-dev | apache2-threaded-dev, libavahi-client-dev (>= 0.6.4), lynx, libapr1-dev +Build-Depends: debhelper (>= 5.0.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/libapache2-mod-dnssd.apache2 b/debian/libapache2-mod-dnssd.apache2 new file mode 100644 index 0000000..71fc5ba --- /dev/null +++ b/debian/libapache2-mod-dnssd.apache2 @@ -0,0 +1,2 @@ +mod debian/mod-dnssd.load +mod debian/mod-dnssd.conf 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.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/patches/port-24-patch b/debian/patches/port-24-patch new file mode 100644 index 0000000..6cae648 --- /dev/null +++ b/debian/patches/port-24-patch @@ -0,0 +1,11 @@ +--- a/src/mod_dnssd.c ++++ b/src/mod_dnssd.c +@@ -576,7 +576,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..b0f949d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +port-24-patch diff --git a/debian/rules b/debian/rules index c1607ec..1da64c8 100755 --- a/debian/rules +++ b/debian/rules @@ -60,6 +60,7 @@ binary-arch: build install dh_installchangelogs dh_installdocs dh_install + dh_apache2 dh_link dh_strip dh_compress
signature.asc
Description: OpenPGP digital signature
