[Pkg-utopia-commits] r1193 - in packages/unstable/avahi/debian: .
patches
Sjoerd Simons
sjoerd at alioth.debian.org
Thu Dec 28 20:02:13 CET 2006
Author: sjoerd
Date: 2006-12-28 20:02:12 +0100 (Thu, 28 Dec 2006)
New Revision: 1193
Added:
packages/unstable/avahi/debian/patches/02_avahi-daemon-init-unicast-disable.patch
Removed:
packages/unstable/avahi/debian/patches/09_initscripts-default.patch
packages/unstable/avahi/debian/patches/10_initscripts-scriptname.patch
packages/unstable/avahi/debian/patches/12_dbus1.0.patch
Modified:
packages/unstable/avahi/debian/changelog
Log:
* New upstream release
* Uses a SO_PASSCRED-based check of the sending UID on netlink messages
(Closes: #399766)
* Removed patches which were merged upstream:
- debian/patches/09_initscripts-default.patch
- debian/patches/10_initscripts-scriptname.patch
- debian/patches/12_dbus1.0.patch
* debian/patches/02_avahi-daemon-init-unicast-disable.patch
- Added. Prevent avahi from starting when there is a unicast .local domain
Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog 2006-12-27 22:23:25 UTC (rev 1192)
+++ packages/unstable/avahi/debian/changelog 2006-12-28 19:02:12 UTC (rev 1193)
@@ -1,9 +1,18 @@
-avahi (0.6.15-3) unstable; urgency=low
+avahi (0.6.16-1) unstable; urgency=low
+ * New upstream release
+ * Uses a SO_PASSCRED-based check of the sending UID on netlink messages
+ (Closes: #399766)
+ * Removed patches which were merged upstream:
+ - debian/patches/09_initscripts-default.patch
+ - debian/patches/10_initscripts-scriptname.patch
+ - debian/patches/12_dbus1.0.patch
* Add ifupdown up and post-down hooks to disable avahi if there is a .local
unicast domain. Based on work from the Ubuntu package by Martin Pitt.
+ * debian/patches/02_avahi-daemon-init-unicast-disable.patch
+ - Added. Prevent avahi from starting when there is a unicast .local domain
- -- Sjoerd Simons <sjoerd at debian.org> Wed, 27 Dec 2006 22:09:03 +0100
+ -- Sjoerd Simons <sjoerd at debian.org> Thu, 28 Dec 2006 20:02:27 +0100
avahi (0.6.15-2) unstable; urgency=low
Added: packages/unstable/avahi/debian/patches/02_avahi-daemon-init-unicast-disable.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_avahi-daemon-init-unicast-disable.patch 2006-12-27 22:23:25 UTC (rev 1192)
+++ packages/unstable/avahi/debian/patches/02_avahi-daemon-init-unicast-disable.patch 2006-12-28 19:02:12 UTC (rev 1193)
@@ -0,0 +1,23 @@
+--- /etc/init.d/avahi-daemon 2006-12-28 18:40:14.000000000 +0100
++++ /tmp/avahi-daemon 2006-12-28 19:57:12.000000000 +0100
+@@ -26,6 +26,8 @@
+ # Authors: <sebastien.estienne at gmail.com>
+ #
+
++DISABLE_TAG="/var/run/avahi-daemon/disabled-for-unicast-local"
++
+ if [ -f /lib/lsb/init-functions ]
+ then
+ . /lib/lsb/init-functions
+@@ -103,6 +105,11 @@
+ modprobe capability >/dev/null 2>&1 || true
+
+ $DAEMON -c && return 0
++
++ if [ -e ${DISABLE_TAG} ]; then
++ # Disabled because of the existance of an unicast .local domain
++ return 1;
++ fi;
+
+ if [ -s /etc/localtime ]; then
+ if [ ! -d /etc/avahi/etc ]; then
Deleted: packages/unstable/avahi/debian/patches/09_initscripts-default.patch
===================================================================
--- packages/unstable/avahi/debian/patches/09_initscripts-default.patch 2006-12-27 22:23:25 UTC (rev 1192)
+++ packages/unstable/avahi/debian/patches/09_initscripts-default.patch 2006-12-28 19:02:12 UTC (rev 1193)
@@ -1,34 +0,0 @@
---- initscript/debian/avahi-daemon.in.old 2006-06-28 00:49:27.989393500 +0200
-+++ initscript/debian/avahi-daemon.in 2006-06-28 01:11:54.653554750 +0200
-@@ -87,6 +87,14 @@
- # Gracefully exit if the package has been removed.
- test -x $DAEMON || exit 0
-
-+# don't start if /etc/avahi-daemon says so.
-+AVAHI_DAEMON_START=1
-+test -f /etc/default/avahi-daemon && . /etc/default/avahi-daemon
-+
-+if [ "$AVAHI_DAEMON_START" != "1" -a "$1" != "stop" ]; then
-+ exit 0
-+fi
-+
- #
- # Function that starts the daemon/service.
- #
---- initscript/debian/avahi-dnsconfd.in.old 2006-06-28 01:10:09.702995750 +0200
-+++ initscript/debian/avahi-dnsconfd.in 2006-06-28 01:11:30.364036750 +0200
-@@ -87,6 +87,14 @@
- # Gracefully exit if the package has been removed.
- test -x $DAEMON || exit 0
-
-+# don't start if /etc/default/avahi-dnsconfd says so.
-+AVAHI_DNSCONFD_START=1
-+test -f /etc/default/avahi-dnsconfd && . /etc/default/avahi-dnsconfd
-+
-+if [ "$AVAHI_DNSCONFD_START" != "1" -a "$1" != "stop" ]; then
-+ exit 0
-+fi
-+
- #
- # Function that starts the daemon/service.
- #
Deleted: packages/unstable/avahi/debian/patches/10_initscripts-scriptname.patch
===================================================================
--- packages/unstable/avahi/debian/patches/10_initscripts-scriptname.patch 2006-12-27 22:23:25 UTC (rev 1192)
+++ packages/unstable/avahi/debian/patches/10_initscripts-scriptname.patch 2006-12-28 19:02:12 UTC (rev 1193)
@@ -1,20 +0,0 @@
---- initscript/debian/avahi-daemon.in.old 2006-10-17 18:58:43.005681000 +0200
-+++ initscript/debian/avahi-daemon.in 2006-10-17 18:58:59.382704500 +0200
-@@ -83,6 +83,7 @@
- DESC="Avahi mDNS/DNS-SD Daemon"
- NAME="avahi-daemon"
- DAEMON="@sbindir@/$NAME"
-+SCRIPTNAME=/etc/init.d/$NAME
-
- # Gracefully exit if the package has been removed.
- test -x $DAEMON || exit 0
---- initscript/debian/avahi-dnsconfd.in.old 2006-10-17 18:58:47.705974750 +0200
-+++ initscript/debian/avahi-dnsconfd.in 2006-10-17 18:58:53.890361250 +0200
-@@ -83,6 +83,7 @@
- DESC="Avahi Unicast DNS Configuration Daemon"
- NAME="avahi-dnsconfd"
- DAEMON="@sbindir@/$NAME"
-+SCRIPTNAME=/etc/init.d/$NAME
-
- # Gracefully exit if the package has been removed.
- test -x $DAEMON || exit 0
Deleted: packages/unstable/avahi/debian/patches/12_dbus1.0.patch
===================================================================
--- packages/unstable/avahi/debian/patches/12_dbus1.0.patch 2006-12-27 22:23:25 UTC (rev 1192)
+++ packages/unstable/avahi/debian/patches/12_dbus1.0.patch 2006-12-28 19:02:12 UTC (rev 1193)
@@ -1,47 +0,0 @@
-Index: trunk/avahi-daemon/dbus-protocol.c
-===================================================================
---- trunk/avahi-daemon/dbus-protocol.c (revision 1299)
-+++ trunk/avahi-daemon/dbus-protocol.c (revision 1333)
-@@ -1068,8 +1068,8 @@
- server->bus,
- AVAHI_DBUS_NAME,
--#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
-+#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
-+ DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
-+#else
- DBUS_NAME_FLAG_DO_NOT_QUEUE,
--#else
-- DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
- #endif
- &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-@@ -1107,9 +1107,4 @@
-
- if (server->bus) {
--#ifdef HAVE_DBUS_CONNECTION_CLOSE
-- dbus_connection_close(server->bus);
--#else
-- dbus_connection_disconnect(server->bus);
--#endif
- dbus_connection_unref(server->bus);
- server->bus = NULL;
-@@ -1128,9 +1123,4 @@
-
- if (server->bus) {
--#ifdef HAVE_DBUS_CONNECTION_CLOSE
-- dbus_connection_close(server->bus);
--#else
-- dbus_connection_disconnect(server->bus);
--#endif
- dbus_connection_unref(server->bus);
- server->bus = NULL;
-@@ -1167,9 +1157,4 @@
- fail:
- if (server->bus) {
--#ifdef HAVE_DBUS_CONNECTION_CLOSE
-- dbus_connection_close(server->bus);
--#else
-- dbus_connection_disconnect(server->bus);
--#endif
- dbus_connection_unref(server->bus);
- }
-
More information about the Pkg-utopia-commits
mailing list