[Pkg-utopia-commits] r1036 - in packages/unstable/avahi/debian: .
patches
Sebastian Dröge
slomo-guest at costa.debian.org
Wed Sep 27 18:50:26 UTC 2006
Author: slomo-guest
Date: 2006-09-27 18:50:21 +0000 (Wed, 27 Sep 2006)
New Revision: 1036
Added:
packages/unstable/avahi/debian/avahi-autoipd.install
packages/unstable/avahi/debian/avahi-autoipd.manpages
packages/unstable/avahi/debian/avahi-autoipd.postinst
packages/unstable/avahi/debian/avahi-autoipd.postrm
packages/unstable/avahi/debian/avahi-autoipd.prerm
packages/unstable/avahi/debian/patches/02_local-service.patch
Removed:
packages/unstable/avahi/debian/patches/02_static-hosts.patch
Modified:
packages/unstable/avahi/debian/avahi-daemon.postinst
packages/unstable/avahi/debian/changelog
packages/unstable/avahi/debian/control
packages/unstable/avahi/debian/rules
Log:
* first avahi-autoipd addition, not tested yet!
Added: packages/unstable/avahi/debian/avahi-autoipd.install
===================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.install (rev 0)
+++ packages/unstable/avahi/debian/avahi-autoipd.install 2006-09-27 18:50:21 UTC (rev 1036)
@@ -0,0 +1,3 @@
+debian/tmp/usr/sbin/avahi-autoipd
+debian/tmp/etc/avahi/avahi-autoipd.action
+debian/tmp/etc/dhcp3/
Added: packages/unstable/avahi/debian/avahi-autoipd.manpages
===================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.manpages (rev 0)
+++ packages/unstable/avahi/debian/avahi-autoipd.manpages 2006-09-27 18:50:21 UTC (rev 1036)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man8/avahi-autoipd.8
+debian/tmp/usr/share/man/man8/avahi-autoipd.action.8
Added: packages/unstable/avahi/debian/avahi-autoipd.postinst
===================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.postinst (rev 0)
+++ packages/unstable/avahi/debian/avahi-autoipd.postinst 2006-09-27 18:50:21 UTC (rev 1036)
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+ configure)
+ if ! getent passwd avahi-autoipd >/dev/null; then
+ adduser --disabled-password --quiet --system \
+ --home /var/lib/avahi-autoipd \
+ --gecos "Avahi autoip daemon" --group avahi-autoipd
+ fi
+ # FIXME: restart it somehow... SIGHUP?
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/unstable/avahi/debian/avahi-autoipd.postrm
===================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.postrm (rev 0)
+++ packages/unstable/avahi/debian/avahi-autoipd.postrm 2006-09-27 18:50:21 UTC (rev 1036)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ] ; then
+ deluser --quiet --system avahi-autoipd > /dev/null || true
+ delgroup --quiet --system avahi-autoipd > /dev/null || true
+fi
+
+exit 0
Added: packages/unstable/avahi/debian/avahi-autoipd.prerm
===================================================================
--- packages/unstable/avahi/debian/avahi-autoipd.prerm (rev 0)
+++ packages/unstable/avahi/debian/avahi-autoipd.prerm 2006-09-27 18:50:21 UTC (rev 1036)
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" ]; then
+ avahi-autoipd --kill || true
+fi
+
+#DEBHELPER#
+
+exit 0
Modified: packages/unstable/avahi/debian/avahi-daemon.postinst
===================================================================
--- packages/unstable/avahi/debian/avahi-daemon.postinst 2006-09-27 15:45:34 UTC (rev 1035)
+++ packages/unstable/avahi/debian/avahi-daemon.postinst 2006-09-27 18:50:21 UTC (rev 1036)
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for avai
+# postinst script for avahi
set -e
Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog 2006-09-27 15:45:34 UTC (rev 1035)
+++ packages/unstable/avahi/debian/changelog 2006-09-27 18:50:21 UTC (rev 1036)
@@ -1,3 +1,20 @@
+avahi (0.6.14-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/patches/02_static-hosts.patch:
+ + Dropped, merged upstream
+ * debian/patches/02_local-service.patch:
+ + Fix detection whether a service is from the local machine. Patch from
+ upstream SVN (r1329)
+ * debian/control,
+ debian/avahi-autoipd.postinst:
+ debian/avahi-autoipd.postrm:
+ debian/avahi-autoipd.prerm,
+ debian/avahi-autoipd.install:
+ + Add new avahi-autoipd package
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Tue, 26 Sep 2006 23:55:31 +0200
+
avahi (0.6.13-3) unstable; urgency=low
[ Sebastian Dröge ]
Modified: packages/unstable/avahi/debian/control
===================================================================
--- packages/unstable/avahi/debian/control 2006-09-27 15:45:34 UTC (rev 1035)
+++ packages/unstable/avahi/debian/control 2006-09-27 18:50:21 UTC (rev 1036)
@@ -11,6 +11,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, dbus (>= 0.60)
Recommends: libnss-mdns
+Suggests: avahi-autoipd
Conflicts: mdnsresponder
Description: Avahi mDNS/DNS-SD daemon
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
@@ -39,6 +40,25 @@
them to resolvconf so it can use them. This is very useful on autoconfigured
IPv6 networks.
+Package: avahi-autoipd
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Recommends: dhclient, iproute
+Conflicts: zeroconf
+Description: Avahi DNS configuration tool
+ Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
+ It allows programs to publish and discover services and hosts
+ running on a local network with no specific configuration. For
+ example you can plug into a network and instantly find printers to
+ print to, files to look at and people to talk to.
+ .
+ This tool implements IPv4LL, "Dynamic Configuration of IPv4 Link-Local
+ Addresses" (IETF RFC3927), a protocol for automatic IP address
+ configuration from the link-local 169.254.0.0/16 range without the
+ need for a central server. It is primarily intended to be used in
+ ad-hoc networks which lack a DHCP server.
+
Package: python-avahi
Section: python
Architecture: all
Added: packages/unstable/avahi/debian/patches/02_local-service.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_local-service.patch (rev 0)
+++ packages/unstable/avahi/debian/patches/02_local-service.patch 2006-09-27 18:50:21 UTC (rev 1036)
@@ -0,0 +1,23 @@
+Index: trunk/avahi-daemon/dbus-service-browser.c
+===================================================================
+--- trunk/avahi-daemon/dbus-service-browser.c (revision 1235)
++++ trunk/avahi-daemon/dbus-service-browser.c (revision 1329)
+@@ -106,8 +106,4 @@
+ assert(i);
+
+- i_interface = (int32_t) interface;
+- i_protocol = (int32_t) protocol;
+- u_flags = (uint32_t) flags;
+-
+ m = dbus_message_new_signal(i->path, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, avahi_dbus_map_browse_signal_name(event));
+
+@@ -118,4 +114,8 @@
+ flags |= AVAHI_LOOKUP_RESULT_OUR_OWN;
+ }
++
++ i_interface = (int32_t) interface;
++ i_protocol = (int32_t) protocol;
++ u_flags = (uint32_t) flags;
+
+ if (event == AVAHI_BROWSER_NEW || event == AVAHI_BROWSER_REMOVE) {
+
Deleted: packages/unstable/avahi/debian/patches/02_static-hosts.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_static-hosts.patch 2006-09-27 15:45:34 UTC (rev 1035)
+++ packages/unstable/avahi/debian/patches/02_static-hosts.patch 2006-09-27 18:50:21 UTC (rev 1036)
@@ -1,31 +0,0 @@
-Index: trunk/avahi-daemon/static-hosts.c
-===================================================================
---- trunk/avahi-daemon/static-hosts.c (revision 1167)
-+++ trunk/avahi-daemon/static-hosts.c (revision 1285)
-@@ -99,5 +99,6 @@
- AVAHI_LLIST_REMOVE(StaticHost, hosts, hosts, s);
-
-- avahi_s_entry_group_free (s->group);
-+ if (s->group)
-+ avahi_s_entry_group_free (s->group);
-
- avahi_free(s->host);
-@@ -113,5 +114,8 @@
-
- if (!h->group)
-- h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h);
-+ if (!(h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h))) {
-+ avahi_log_error("avahi_s_entry_group_new() failed: %s", avahi_strerror(err));
-+ return;
-+ }
-
- if (!avahi_address_parse (h->ip, AVAHI_PROTO_UNSPEC, &a)) {
-@@ -130,5 +134,6 @@
- static void remove_static_host_from_server(StaticHost *h)
- {
-- avahi_s_entry_group_reset (h->group);
-+ if (h->group)
-+ avahi_s_entry_group_reset (h->group);
- }
-
-
Modified: packages/unstable/avahi/debian/rules
===================================================================
--- packages/unstable/avahi/debian/rules 2006-09-27 15:45:34 UTC (rev 1035)
+++ packages/unstable/avahi/debian/rules 2006-09-27 18:50:21 UTC (rev 1036)
@@ -14,7 +14,7 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1
DEB_CONFIGURE_EXTRA_FLAGS += --enable-compat-libdns_sd --enable-compat-howl \
- --disable-mono --disable-monodoc
+ --disable-mono --disable-monodoc
DEB_INSTALL_DOCS_ALL += docs/README docs/NEWS
More information about the Pkg-utopia-commits
mailing list