From 55d8ae748fb40c76a6320663ceaa5a1954f25b13 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Sun, 26 Nov 2017 09:49:30 -0800 Subject: Import mod-dnssd_0.6-3.2.debian.tar.xz [dgit import tarball mod-dnssd 0.6-3.2 mod-dnssd_0.6-3.2.debian.tar.xz] --- changelog | 95 ++++++++++++++++++++++++++++++++++++++++ compat | 1 + control | 17 +++++++ copyright | 14 ++++++ dnssd.conf | 6 +++ dnssd.load | 1 + docs | 1 + libapache2-mod-dnssd.apache2 | 3 ++ libapache2-mod-dnssd.maintscript | 2 + libapache2-mod-dnssd.postinst | 48 ++++++++++++++++++++ patches/port-for-apache2.4.patch | 33 ++++++++++++++ patches/series | 1 + rules | 8 ++++ source/format | 1 + watch | 2 + 15 files changed, 233 insertions(+) create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 dnssd.conf create mode 100644 dnssd.load create mode 100644 docs create mode 100644 libapache2-mod-dnssd.apache2 create mode 100644 libapache2-mod-dnssd.maintscript create mode 100644 libapache2-mod-dnssd.postinst create mode 100644 patches/port-for-apache2.4.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..58eb247 --- /dev/null +++ b/changelog @@ -0,0 +1,95 @@ +mod-dnssd (0.6-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * Modernize packaging (Closes: #882779) + - Convert to simple dh7 style rules + - Bump debhelper compat to 10 + - Bump Standards-Version to 4.1.1 + - Build with all hardening flags + - Use section httpd instead of net + - Use copyright format 1.0 + * Update port-for-apache2.4.patch with version accepted upstream + + -- Jeremy Bicha Sun, 26 Nov 2017 12:49:30 -0500 + +mod-dnssd (0.6-3.1) unstable; urgency=low + + * Non-maintainer upload (Closes: #666829) + * 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 + - Update symlinks when the module was enabled + * Bump debhelper dependency, to make sure its maintscript helper is + supported which aids for the conffile move. + + -- Arno Töll Thu, 30 May 2013 19:33:34 +0200 + +mod-dnssd (0.6-3) unstable; urgency=low + + * Bump Standards-Version to 3.9.2. No other change needed. + * Add dependency on ${misc:Depends}. + * Add build-arch and build-indep targets. + + -- Regis Boudin Tue, 26 Jul 2011 22:50:02 +0100 + +mod-dnssd (0.6-2) unstable; urgency=low + + * Depend on apache2.2-bin instead of apache2.2-common (Closes: #536212). + * Bump Standards-Version to 3.8.3 + * Switch to format 3.0 (quilt) + + -- Regis Boudin Thu, 12 Nov 2009 20:39:34 +0000 + +mod-dnssd (0.6-1) unstable; urgency=low + + * New upstream release (Closes: #513954). + * Bump Standards-Version to 3.8.0 + * Reference the Apache 2.0 License file in + /usr/share/common-licenses/Apache-2.0 instead of having the whole text + copied inside the copyright file. + * Update the long description to make lintian happy. + + -- Regis Boudin Mon, 02 Feb 2009 20:58:26 +0000 + +mod-dnssd (0.5-1) unstable; urgency=low + + * New upstream release (Closes: #426379, #368486). + * Acknowledge NMU. Thanks Joey ! (Closes: #391782, #393012). + * Take over maintainership of the package, as agreed with the previous + maintainer, who becomes uploader. Many thanks to Sebastien Estienne for his + work. + * Set the Homepage field in debian/control. + * Bump the Standards-Version to 3.7.3 + + -- Regis Boudin Thu, 06 Dec 2007 21:55:31 +0000 + +mod-dnssd (0.4-1.1) unstable; urgency=low + + * Non-maintainer upload. + + [ Simon McVittie ] + * Alter source to compile with Apache 2.2 (closes: #391782, #393012) + + -- Joey Hess Sun, 15 Oct 2006 16:35:27 -0400 + +mod-dnssd (0.4-1) unstable; urgency=low + + * New upstream release + + -- Sebastien ESTIENNE Sat, 01 Apr 2006 14:39:10 +0200 + +mod-dnssd (0.3-2) unstable; urgency=low + + * fix prerm and postrm scripts to enable/disable the module + + -- Sebastien ESTIENNE Wed, 01 Mar 2006 17:20:52 +0100 + +mod-dnssd (0.3-1) unstable; urgency=low + + * Initial release (Closes: #349419) + + -- Sebastien ESTIENNE Tue, 31 Jan 2006 00:04:13 +0100 + diff --git a/compat b/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +10 diff --git a/control b/control new file mode 100644 index 0000000..d31ca56 --- /dev/null +++ b/control @@ -0,0 +1,17 @@ +Source: mod-dnssd +Section: httpd +Priority: optional +Maintainer: Regis Boudin +Uploaders: Sebastien ESTIENNE +Build-Depends: debhelper (>= 10), apache2-dev, dh-apache2,libavahi-client-dev (>= 0.6.4), lynx, libapr1-dev +Standards-Version: 4.1.1 +Homepage: http://0pointer.de/lennart/projects/mod_dnssd/ + +Package: libapache2-mod-dnssd +Architecture: any +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 + websites available to clients compatible with the protocol. + diff --git a/copyright b/copyright new file mode 100644 index 0000000..54cb148 --- /dev/null +++ b/copyright @@ -0,0 +1,14 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: mod-dnssd +Source: http://0pointer.de/lennart/projects/mod_dnssd/ + +Files: * +Copyright: 2006-2009 Lennart Poettering +License: Apache-2.0 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 + https://www.apache.org/licenses/ + . + On Debian systems, the complete text of the Apache License can be found in + /usr/share/common-licenses/Apache-2.0'. diff --git a/dnssd.conf b/dnssd.conf new file mode 100644 index 0000000..cfe8b9c --- /dev/null +++ b/dnssd.conf @@ -0,0 +1,6 @@ +# This is the config file for mod_dnssd. + + + DNSSDEnable On + + diff --git a/dnssd.load b/dnssd.load new file mode 100644 index 0000000..bd6913b --- /dev/null +++ b/dnssd.load @@ -0,0 +1 @@ +LoadModule dnssd_module /usr/lib/apache2/modules/mod_dnssd.so diff --git a/docs b/docs new file mode 100644 index 0000000..afe6da2 --- /dev/null +++ b/docs @@ -0,0 +1 @@ +doc/README diff --git a/libapache2-mod-dnssd.apache2 b/libapache2-mod-dnssd.apache2 new file mode 100644 index 0000000..258a376 --- /dev/null +++ b/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/libapache2-mod-dnssd.maintscript b/libapache2-mod-dnssd.maintscript new file mode 100644 index 0000000..1059567 --- /dev/null +++ b/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/libapache2-mod-dnssd.postinst b/libapache2-mod-dnssd.postinst new file mode 100644 index 0000000..5d6edbd --- /dev/null +++ b/libapache2-mod-dnssd.postinst @@ -0,0 +1,48 @@ +#! /bin/sh + +# postinst script +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + if dpkg --compare-versions "$2" lt "0.6-3.1" ; then + for CONF in /etc/apache2/mods-enabled/mod-dnssd.conf /etc/apache2/mods-enabled/mod-dnssd.load ; do + if [ -L $CONF ] ; then + target=$(readlink -e "$CONF") || true + sitename=$(basename "$CONF") + if [ -z "$target" ] ; then + rm -f $CONF + # a2enmod may not be installed. In that case don't bother to enable the link + # again, as the environment is special. + a2enmod -m -q "$sitename" || true + fi + fi + done + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + diff --git a/patches/port-for-apache2.4.patch b/patches/port-for-apache2.4.patch new file mode 100644 index 0000000..01596ee --- /dev/null +++ b/patches/port-for-apache2.4.patch @@ -0,0 +1,33 @@ +From be2fb9f6158f800685de7a1bc01c39b6cf1fa12c Mon Sep 17 00:00:00 2001 +From: Robby Workman +Date: Fri, 8 Feb 2013 14:14:08 -0600 +Subject: mod_dnssd.c: Use ap_unixd_setup_child + +This fixeds an undefined reference to unixd_setup_child in the +compiled module. This looks to have changed in httpd-2.3.2 dev: +20090130.0 (2.3.2-dev) Add ap_ prefix to unixd_setup_child(). +--- + src/mod_dnssd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mod_dnssd.c b/src/mod_dnssd.c +index 6179276..3363701 100644 +--- a/src/mod_dnssd.c ++++ b/src/mod_dnssd.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -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)); diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..533d773 --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +port-for-apache2.4.patch diff --git a/rules b/rules new file mode 100755 index 0000000..0d40890 --- /dev/null +++ b/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ --with apache2 + +override_dh_auto_install: diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/watch b/watch new file mode 100644 index 0000000..234c2d9 --- /dev/null +++ b/watch @@ -0,0 +1,2 @@ +version=2 +http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-(.*)\.tar\.gz -- cgit v1.2.3