[Pkg-utopia-commits] r1340 - in packages/unstable/avahi/debian: .
patches
Sjoerd Simons
sjoerd at alioth.debian.org
Mon Apr 9 20:37:48 UTC 2007
Author: sjoerd
Date: 2007-04-09 20:37:47 +0000 (Mon, 09 Apr 2007)
New Revision: 1340
Added:
packages/unstable/avahi/debian/libavahi-core5.install
packages/unstable/avahi/debian/libavahi-core5.shlibs
packages/unstable/avahi/debian/patches/12_avahi-generic-records.patch
packages/unstable/avahi/debian/patches/13_avahi_big_dns_records.patch
Removed:
packages/unstable/avahi/debian/libavahi-core4.install
packages/unstable/avahi/debian/libavahi-core4.shlibs
packages/unstable/avahi/debian/patches/02_avahi-init-warn.patch
packages/unstable/avahi/debian/patches/04_function_return.patch
packages/unstable/avahi/debian/patches/05_dns_sd_dont_bump_soname.patch
packages/unstable/avahi/debian/patches/06_dont_log_broken_packets.patch
packages/unstable/avahi/debian/patches/07_ia64_unaligned_access.patch
packages/unstable/avahi/debian/patches/08_unicast_ipv6_only.patch
packages/unstable/avahi/debian/patches/09_fionread.patch
packages/unstable/avahi/debian/patches/10_widearea_socket_types.patch
packages/unstable/avahi/debian/patches/12_bogus_static_host_error_message.patch
packages/unstable/avahi/debian/patches/13_NULL_dns_service_refs.patch
Modified:
packages/unstable/avahi/debian/avahi-daemon.ifupdown
packages/unstable/avahi/debian/avahi-daemon.install
packages/unstable/avahi/debian/changelog
packages/unstable/avahi/debian/control
packages/unstable/avahi/debian/python-avahi.install
packages/unstable/avahi/debian/rules
Log:
* Upload to unstable
* Merge experimental branch
* debian/patches/12_avahi-generic-records.patch
+ Added. Fixes the resolving of generic dns records.
Patch from http://avahi.org/ticket/130
* debian/patches/13_avahi_big_dns_records.patch
+ Added. Fixes publishing of big dns records.
Patch from http://avahi.org/ticket/131
* New upstream release:
+ Fix bogus comment in init script (Closes: #399234)
+ debian/patches/02_avahi-init-warn.patch,
debian/patches/04_function_return.patch,
debian/patches/05_dns_sd_dont_bump_soname.patch,
debian/patches/06_dont_log_broken_packets.patch,
debian/patches/07_ia64_unaligned_access.patch,
debian/patches/08_unicast_ipv6_only.patch,
debian/patches/09_fionread.patch,
debian/patches/10_widearea_socket_types.patch,
debian/patches/12_bogus_static_host_error_message.patch,
debian/patches/13_NULL_dns_service_refs.patch:
- Dropped, merged upstream
* debian/control:
+ Updated to use my debian.org mail address
* debian/rules:
+ Fix build failure on GNU/kFreeBSD (Closes: #391298)
+ Install more complex example service in
/usr/share/doc/avahi-daemon/eexamples (Closes: #398623)
* debian/avahi-daemon.ifupdown:
+ Don't run the avahi-daemon unicast local check while bringing up
the loopback device; it's not necessary until we bring up a real network
device, and we do those in the background so they don't hold up the
boot process. Patch by Scott James Remnant, taken from the Ubuntu
package
* debian/python-avahi.install:
+ Ship python module from every python version, not just 2.4. This fixes
python-avahi for non-2.4 default python versions
* debian/libavahi-core5.install, debian/libavahi-core5.shlibs,
debian/control:
+ Updated for new libavahi-core soname
Modified: packages/unstable/avahi/debian/avahi-daemon.ifupdown
===================================================================
--- packages/unstable/avahi/debian/avahi-daemon.ifupdown 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/avahi-daemon.ifupdown 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,5 +1,11 @@
#!/bin/sh
-#
+
+# Don't run the avahi-daemon unicast local check while bringing up
+# the loopback device; it's not necessary until we bring up a real network
+# device, and we do those in the background so they don't hold up the
+# boot process
+[ "$IFACE" != "lo" ] || exit 0
+
# If we have an unicast .local domain, we immediately disable avahi to avoid
# conflicts with the multicast IP4LL .local domain
Modified: packages/unstable/avahi/debian/avahi-daemon.install
===================================================================
--- packages/unstable/avahi/debian/avahi-daemon.install 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/avahi-daemon.install 2007-04-09 20:37:47 UTC (rev 1340)
@@ -5,3 +5,4 @@
debian/tmp/usr/sbin/avahi-daemon
debian/tmp/usr/share/avahi/avahi-service.dtd
debian/tmp/usr/share/avahi/introspection/
+avahi-daemon/example.service /usr/share/doc/avahi-daemon/examples/
Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/changelog 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,3 +1,57 @@
+avahi (0.6.17-3) unstable; urgency=low
+
+ * Upload to unstable
+ * Merge experimental branch
+
+ -- Sjoerd Simons <sjoerd at debian.org> Mon, 09 Apr 2007 22:37:02 +0200
+
+avahi (0.6.17-2) experimental; urgency=low
+
+ * debian/patches/12_avahi-generic-records.patch
+ + Added. Fixes the resolving of generic dns records.
+ Patch from http://avahi.org/ticket/130
+ * debian/patches/13_avahi_big_dns_records.patch
+ + Added. Fixes publishing of big dns records.
+ Patch from http://avahi.org/ticket/131
+
+ -- Sjoerd Simons <sjoerd at debian.org> Wed, 04 Apr 2007 14:40:35 +0200
+
+avahi (0.6.17-1) experimental; urgency=low
+
+ * New upstream release:
+ + Fix bogus comment in init script (Closes: #399234)
+ + debian/patches/02_avahi-init-warn.patch,
+ debian/patches/04_function_return.patch,
+ debian/patches/05_dns_sd_dont_bump_soname.patch,
+ debian/patches/06_dont_log_broken_packets.patch,
+ debian/patches/07_ia64_unaligned_access.patch,
+ debian/patches/08_unicast_ipv6_only.patch,
+ debian/patches/09_fionread.patch,
+ debian/patches/10_widearea_socket_types.patch,
+ debian/patches/12_bogus_static_host_error_message.patch,
+ debian/patches/13_NULL_dns_service_refs.patch:
+ - Dropped, merged upstream
+ * debian/control:
+ + Updated to use my debian.org mail address
+ * debian/rules:
+ + Fix build failure on GNU/kFreeBSD (Closes: #391298)
+ + Install more complex example service in
+ /usr/share/doc/avahi-daemon/eexamples (Closes: #398623)
+ * debian/avahi-daemon.ifupdown:
+ + Don't run the avahi-daemon unicast local check while bringing up
+ the loopback device; it's not necessary until we bring up a real network
+ device, and we do those in the background so they don't hold up the
+ boot process. Patch by Scott James Remnant, taken from the Ubuntu
+ package
+ * debian/python-avahi.install:
+ + Ship python module from every python version, not just 2.4. This fixes
+ python-avahi for non-2.4 default python versions
+ * debian/libavahi-core5.install, debian/libavahi-core5.shlibs,
+ debian/control:
+ + Updated for new libavahi-core soname
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 5 Feb 2007 06:22:21 +0100
+
avahi (0.6.16-5) unstable; urgency=low
* debian/avahi-daemon-check-dns.sh: Run ifconfig with LC_ALL=C to make
Modified: packages/unstable/avahi/debian/control
===================================================================
--- packages/unstable/avahi/debian/control 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/control 2007-04-09 20:37:47 UTC (rev 1340)
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
-Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at ubuntu.com>
+Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.3), libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], libgdbm-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), libglade2-dev, libexpat-dev, libdaemon-dev, libdbus-1-dev (>= 0.60), python-all-dev (>= 2.3.5-11), python-gdbm (>= 2.4.3-1), python-dbus, python-gtk2 (>= 2.8.6-2), libqt3-mt-dev, libqt4-dev, xmltoman
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/avahi
@@ -148,7 +148,7 @@
library, which is a set of common functions and definitions used by many
of Avahis components and client applications.
-Package: libavahi-core4
+Package: libavahi-core5
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -170,7 +170,7 @@
Package: libavahi-core-dev
Section: libdevel
Architecture: any
-Depends: libavahi-core4 (= ${Source-Version}), ${misc:Depends}, libavahi-common-dev
+Depends: libavahi-core5 (= ${Source-Version}), ${misc:Depends}, libavahi-common-dev
Replaces: libavahi-core1 (<< 0.4)
Description: Development files for Avahi's embeddable mDNS/DNS-SD library
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
Deleted: packages/unstable/avahi/debian/libavahi-core4.install
===================================================================
--- packages/unstable/avahi/debian/libavahi-core4.install 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/libavahi-core4.install 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libavahi-core.so.*
Deleted: packages/unstable/avahi/debian/libavahi-core4.shlibs
===================================================================
--- packages/unstable/avahi/debian/libavahi-core4.shlibs 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/libavahi-core4.shlibs 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1 +0,0 @@
-libavahi-core 4 libavahi-core4 (>= 0.6.8)
Copied: packages/unstable/avahi/debian/libavahi-core5.install (from rev 1333, packages/experimental/avahi/debian/libavahi-core5.install)
Copied: packages/unstable/avahi/debian/libavahi-core5.shlibs (from rev 1333, packages/experimental/avahi/debian/libavahi-core5.shlibs)
Deleted: packages/unstable/avahi/debian/patches/02_avahi-init-warn.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_avahi-init-warn.patch 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/patches/02_avahi-init-warn.patch 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,56 +0,0 @@
-diff -uar avahi-0.6.16.orig/initscript/debian/avahi-daemon.in avahi-0.6.16/initscript/debian/avahi-daemon.in
---- avahi-0.6.16.orig/initscript/debian/avahi-daemon.in 2007-01-03 10:57:01.000000000 +0100
-+++ avahi-0.6.16/initscript/debian/avahi-daemon.in 2007-01-03 10:57:20.000000000 +0100
-@@ -75,6 +75,16 @@
- return $1
- }
-
-+ log_warning_msg () {
-+ if log_use_fancy_output; then
-+ YELLOW=`$TPUT setaf 3`
-+ NORMAL=`$TPUT op`
-+ echo "$YELLOW*$NORMAL $@"
-+ else
-+ echo "$@"
-+ fi
-+ }
-+
- fi
-
- #set -e
-@@ -93,6 +103,7 @@
- test -f /etc/default/avahi-daemon && . /etc/default/avahi-daemon
-
- if [ "$AVAHI_DAEMON_START" != "1" -a "$1" != "stop" ]; then
-+ log_warning_msg "Not starting $DESC $NAME, disabled via /etc/default/$NAME"
- exit 0
- fi
-
-diff -uar avahi-0.6.16.orig/initscript/debian/avahi-dnsconfd.in avahi-0.6.16/initscript/debian/avahi-dnsconfd.in
---- avahi-0.6.16.orig/initscript/debian/avahi-dnsconfd.in 2007-01-03 10:57:01.000000000 +0100
-+++ avahi-0.6.16/initscript/debian/avahi-dnsconfd.in 2007-01-03 10:57:20.000000000 +0100
-@@ -75,6 +75,16 @@
- return $1
- }
-
-+ log_warning_msg () {
-+ if log_use_fancy_output; then
-+ YELLOW=`$TPUT setaf 3`
-+ NORMAL=`$TPUT op`
-+ echo "$YELLOW*$NORMAL $@"
-+ else
-+ echo "$@"
-+ fi
-+ }
-+
- fi
-
- #set -e
-@@ -93,6 +103,7 @@
- test -f /etc/default/avahi-dnsconfd && . /etc/default/avahi-dnsconfd
-
- if [ "$AVAHI_DNSCONFD_START" != "1" -a "$1" != "stop" ]; then
-+ log_warning_msg "Not starting $DESC $NAME, disabled via /etc/default/$NAME"
- exit 0
- fi
-
Deleted: packages/unstable/avahi/debian/patches/04_function_return.patch
===================================================================
--- packages/unstable/avahi/debian/patches/04_function_return.patch 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/patches/04_function_return.patch 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,19 +0,0 @@
-------------------------------------------------------------------------
-r1353 | lathiat | 2006-12-29 13:50:03 +0100 (Fri, 29 Dec 2006) | 2 lines
-
- * Make sure we return -1 if we fall of the end of consume_labels()
-
-------------------------------------------------------------------------
-Index: avahi-core/dns.c
-===================================================================
---- avahi-core/dns.c (revision 1352)
-+++ avahi-core/dns.c (revision 1353)
-@@ -400,6 +400,8 @@
- } else
- return -1;
- }
-+
-+ return -1;
- }
-
- int avahi_dns_packet_consume_name(AvahiDnsPacket *p, char *ret_name, size_t l) {
Deleted: packages/unstable/avahi/debian/patches/05_dns_sd_dont_bump_soname.patch
===================================================================
--- packages/unstable/avahi/debian/patches/05_dns_sd_dont_bump_soname.patch 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/patches/05_dns_sd_dont_bump_soname.patch 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,21 +0,0 @@
-------------------------------------------------------------------------
-r1354 | lathiat | 2006-12-29 13:55:23 +0100 (Fri, 29 Dec 2006) | 4 lines
-
- * Un-bump DNS-SD soname, we are following apple's version so we
-shouldn't bump it (woops)
-
-
-------------------------------------------------------------------------
-Index: configure.ac
-===================================================================
---- configure.ac (revision 1353)
-+++ configure.ac (revision 1354)
-@@ -34,7 +34,7 @@
- AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:1:0])
- AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:1:0])
- AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:1:0])
--AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:1:0])
-+AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0])
- AC_SUBST(LIBAVAHI_COMPAT_HOWL_VERSION_INFO, [0:0:0])
- AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8])
-
Deleted: packages/unstable/avahi/debian/patches/06_dont_log_broken_packets.patch
===================================================================
--- packages/unstable/avahi/debian/patches/06_dont_log_broken_packets.patch 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/patches/06_dont_log_broken_packets.patch 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,62 +0,0 @@
-------------------------------------------------------------------------
-r1361 | lennart | 2006-12-31 18:33:57 +0100 (Sun, 31 Dec 2006) | 2 lines
-
-Ignore EAGAIN errors on recvmsg() (Closes #60)
-
-------------------------------------------------------------------------
-Index: avahi-core/socket.c
-===================================================================
---- avahi-core/socket.c (revision 1360)
-+++ avahi-core/socket.c (revision 1361)
-@@ -635,6 +635,9 @@
- goto fail;
- }
-
-+ if (ms <= 0)
-+ goto fail;
-+
- p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
-
- io.iov_base = AVAHI_DNS_PACKET_DATA(p);
-@@ -650,7 +653,14 @@
- msg.msg_flags = 0;
-
- if ((l = recvmsg(fd, &msg, 0)) < 0) {
-- avahi_log_warn("recvmsg(): %s", strerror(errno));
-+ /* Linux returns EAGAIN when an invalid IP packet has been
-+ recieved. We suppress warnings in this case because this might
-+ create quite a bit of log traffic on machines with unstable
-+ links. (See #60) */
-+
-+ if (errno != EAGAIN)
-+ avahi_log_warn("recvmsg(): %s", strerror(errno));
-+
- goto fail;
- }
-
-@@ -768,6 +778,9 @@
- avahi_log_warn("ioctl(): %s", strerror(errno));
- goto fail;
- }
-+
-+ if (ms <= 0)
-+ goto fail;
-
- p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
-
-@@ -785,7 +798,14 @@
- msg.msg_flags = 0;
-
- if ((l = recvmsg(fd, &msg, 0)) < 0) {
-- avahi_log_warn("recvmsg(): %s", strerror(errno));
-+ /* Linux returns EAGAIN when an invalid IP packet has been
-+ recieved. We suppress warnings in this case because this might
-+ create quite a bit of log traffic on machines with unstable
-+ links. (See #60) */
-+
-+ if (errno != EAGAIN)
-+ avahi_log_warn("recvmsg(): %s", strerror(errno));
-+
- goto fail;
- }
-
Deleted: packages/unstable/avahi/debian/patches/07_ia64_unaligned_access.patch
===================================================================
--- packages/unstable/avahi/debian/patches/07_ia64_unaligned_access.patch 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/patches/07_ia64_unaligned_access.patch 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,31 +0,0 @@
-------------------------------------------------------------------------
-r1363 | lennart | 2007-01-05 00:53:39 +0100 (Fri, 05 Jan 2007) | 1 line
-
-Some more ia64 fixes. (Closes #90)
-------------------------------------------------------------------------
-Index: avahi-core/socket.c
-===================================================================
---- avahi-core/socket.c (revision 1362)
-+++ avahi-core/socket.c (revision 1363)
-@@ -475,10 +475,10 @@
- struct iovec io;
- #ifdef IP_PKTINFO
- struct cmsghdr *cmsg;
-- uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_pktinfo))];
-+ size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1];
- #elif defined(IP_SENDSRCADDR)
- struct cmsghdr *cmsg;
-- uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
-+ size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1];
- #endif
-
- assert(fd >= 0);
-@@ -565,7 +565,7 @@
- struct msghdr msg;
- struct iovec io;
- struct cmsghdr *cmsg;
-- uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
-+ size_t cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(size_t)) + 1];
-
- assert(fd >= 0);
- assert(p);
Deleted: packages/unstable/avahi/debian/patches/08_unicast_ipv6_only.patch
===================================================================
--- packages/unstable/avahi/debian/patches/08_unicast_ipv6_only.patch 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/patches/08_unicast_ipv6_only.patch 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,31 +0,0 @@
-------------------------------------------------------------------------
-r1370 | lennart | 2007-01-06 17:10:01 +0100 (Sat, 06 Jan 2007) | 3 lines
-
-* set IPV6_V6ONLY for unicast DNS sockets, too
-
-------------------------------------------------------------------------
-Index: avahi-core/socket.c
-===================================================================
---- avahi-core/socket.c (revision 1369)
-+++ avahi-core/socket.c (revision 1370)
-@@ -912,13 +937,19 @@
-
- int avahi_open_unicast_socket_ipv6(void) {
- struct sockaddr_in6 local;
-- int fd = -1;
-+ int fd = -1, yes;
-
- if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
- avahi_log_warn("socket() failed: %s", strerror(errno));
- goto fail;
- }
-
-+ yes = 1;
-+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) {
-+ avahi_log_warn("IPV6_V6ONLY failed: %s", strerror(errno));
-+ goto fail;
-+ }
-+
- memset(&local, 0, sizeof(local));
- local.sin6_family = AF_INET6;
-
Deleted: packages/unstable/avahi/debian/patches/09_fionread.patch
===================================================================
--- packages/unstable/avahi/debian/patches/09_fionread.patch 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/patches/09_fionread.patch 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,32 +0,0 @@
-r1370 | lennart | 2007-01-06 17:10:01 +0100 (Sat, 06 Jan 2007) | 3 lines
-
-* print a warning when FIONREAD returns an invalid size
-
-Index: avahi-core/socket.c
-===================================================================
---- avahi-core/socket.c (revision 1369)
-+++ avahi-core/socket.c (revision 1370)
-@@ -635,8 +649,10 @@
- goto fail;
- }
-
-- if (ms <= 0)
-+ if (ms < 0) {
-+ avahi_log_warn("FIONREAD returned negative value.");
- goto fail;
-+ }
-
- p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
-
-@@ -779,8 +802,10 @@
- goto fail;
- }
-
-- if (ms <= 0)
-+ if (ms < 0) {
-+ avahi_log_warn("FIONREAD returned negative value.");
- goto fail;
-+ }
-
- p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
-
Deleted: packages/unstable/avahi/debian/patches/10_widearea_socket_types.patch
===================================================================
--- packages/unstable/avahi/debian/patches/10_widearea_socket_types.patch 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/patches/10_widearea_socket_types.patch 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,21 +0,0 @@
-------------------------------------------------------------------------
-r1371 | lennart | 2007-01-06 17:10:47 +0100 (Sat, 06 Jan 2007) | 2 lines
-
-create unicast IPv4 socket oly if IPv4 is enabled, same for unicast IPv6
-
-------------------------------------------------------------------------
-Index: avahi-core/wide-area.c
-===================================================================
---- avahi-core/wide-area.c (revision 1370)
-+++ avahi-core/wide-area.c (revision 1371)
-@@ -579,8 +579,8 @@
- e->cleanup_dead = 0;
-
- /* Create sockets */
-- e->fd_ipv4 = avahi_open_unicast_socket_ipv4();
-- e->fd_ipv6 = avahi_open_unicast_socket_ipv6();
-+ e->fd_ipv4 = s->config.use_ipv4 ? avahi_open_unicast_socket_ipv4() : -1;
-+ e->fd_ipv6 = s->config.use_ipv6 ? avahi_open_unicast_socket_ipv6() : -1;
-
- if (e->fd_ipv4 < 0 && e->fd_ipv6 < 0) {
- avahi_log_error(__FILE__": Failed to create wide area sockets: %s", strerror(errno));
Copied: packages/unstable/avahi/debian/patches/12_avahi-generic-records.patch (from rev 1333, packages/experimental/avahi/debian/patches/12_avahi-generic-records.patch)
Deleted: packages/unstable/avahi/debian/patches/12_bogus_static_host_error_message.patch
===================================================================
--- packages/unstable/avahi/debian/patches/12_bogus_static_host_error_message.patch 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/patches/12_bogus_static_host_error_message.patch 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,20 +0,0 @@
---- avahi-daemon/static-hosts.c.orig 2006-12-26 11:42:17.000000000 +0100
-+++ avahi-daemon/static-hosts.c 2007-01-07 19:18:27.000000000 +0100
-@@ -114,7 +114,7 @@
-
- if (!h->group)
- 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));
-+ avahi_log_error("avahi_s_entry_group_new() failed: %s", avahi_strerror(avahi_server_errno(avahi_server)));
- return;
- }
-
-@@ -123,7 +123,7 @@
- return;
- }
-
-- if ((err = avahi_server_add_address(avahi_server, h->group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, h->host, &a))) {
-+ if ((err = avahi_server_add_address(avahi_server, h->group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, h->host, &a)) < 0) {
- avahi_log_error ("Static host name %s: avahi_server_add_address failure: %s", h->host, avahi_strerror(err));
- return;
- }
Deleted: packages/unstable/avahi/debian/patches/13_NULL_dns_service_refs.patch
===================================================================
--- packages/unstable/avahi/debian/patches/13_NULL_dns_service_refs.patch 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/patches/13_NULL_dns_service_refs.patch 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1,112 +0,0 @@
-------------------------------------------------------------------------
-r1374 | lennart | 2007-01-06 17:51:42 +0100 (Sat, 06 Jan 2007) | 3 lines
-
-* handle NULL sdrefs gracefully.
-* fix mutex locking order in DNSProcessResult
-
-------------------------------------------------------------------------
-Index: avahi-compat-libdns_sd/compat.c
-===================================================================
---- avahi-compat-libdns_sd/compat.c (revision 1373)
-+++ avahi-compat-libdns_sd/compat.c (revision 1374)
-@@ -469,25 +469,26 @@
- }
-
- int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdref) {
-+
-+ AVAHI_WARN_LINKAGE;
-+
- if (!sdref || sdref->n_ref <= 0)
- return -1;
-
-- AVAHI_WARN_LINKAGE;
--
- return sdref->main_fd;
- }
-
- DNSServiceErrorType DNSSD_API DNSServiceProcessResult(DNSServiceRef sdref) {
- DNSServiceErrorType ret = kDNSServiceErr_Unknown;
-
-- assert(sdref);
-- assert(sdref->n_ref >= 1);
--
- AVAHI_WARN_LINKAGE;
-
-+ if (!sdref || sdref->n_ref <= 0)
-+ return kDNSServiceErr_BadParam;
-+
-+ sdref_ref(sdref);
-+
- ASSERT_SUCCESS(pthread_mutex_lock(&sdref->mutex));
--
-- sdref_ref(sdref);
-
- /* Cleanup notification socket */
- if (read_command(sdref->main_fd) != COMMAND_POLL_DONE)
-@@ -512,10 +513,10 @@
-
- finish:
-
-+ ASSERT_SUCCESS(pthread_mutex_unlock(&sdref->mutex));
-+
- sdref_unref(sdref);
-
-- ASSERT_SUCCESS(pthread_mutex_unlock(&sdref->mutex));
--
- return ret;
- }
-
-@@ -613,7 +614,6 @@
-
- if (!ret_sdref)
- return kDNSServiceErr_BadParam;
--
- *ret_sdref = NULL;
-
- assert(regtype);
-@@ -739,7 +739,10 @@
-
- AVAHI_WARN_LINKAGE;
-
-- assert(ret_sdref);
-+ if (!ret_sdref)
-+ return kDNSServiceErr_BadParam;
-+ *ret_sdref = NULL;
-+
- assert(name);
- assert(regtype);
- assert(domain);
-@@ -853,7 +856,10 @@
-
- AVAHI_WARN_LINKAGE;
-
-- assert(ret_sdref);
-+ if (!ret_sdref)
-+ return kDNSServiceErr_BadParam;
-+ *ret_sdref = NULL;
-+
- assert(callback);
-
- if (interface == kDNSServiceInterfaceIndexLocalOnly ||
-@@ -1096,7 +1102,6 @@
-
- if (!ret_sdref)
- return kDNSServiceErr_BadParam;
--
- *ret_sdref = NULL;
-
- if (!regtype)
-@@ -1210,10 +1215,12 @@
-
- int ret = kDNSServiceErr_Unknown;
- AvahiStringList *txt = NULL;
-- assert(sdref);
-
- AVAHI_WARN_LINKAGE;
-
-+ if (!sdref || sdref->n_ref <= 0)
-+ return kDNSServiceErr_BadParam;
-+
- if (flags || rref) {
- AVAHI_WARN_UNSUPPORTED;
- return kDNSServiceErr_Unsupported;
Copied: packages/unstable/avahi/debian/patches/13_avahi_big_dns_records.patch (from rev 1333, packages/experimental/avahi/debian/patches/13_avahi_big_dns_records.patch)
Modified: packages/unstable/avahi/debian/python-avahi.install
===================================================================
--- packages/unstable/avahi/debian/python-avahi.install 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/python-avahi.install 2007-04-09 20:37:47 UTC (rev 1340)
@@ -1 +1 @@
-debian/tmp/usr/lib/python2.4/site-packages/avahi
+debian/tmp/usr/lib/python*/site-packages/avahi
Modified: packages/unstable/avahi/debian/rules
===================================================================
--- packages/unstable/avahi/debian/rules 2007-04-09 20:18:39 UTC (rev 1339)
+++ packages/unstable/avahi/debian/rules 2007-04-09 20:37:47 UTC (rev 1340)
@@ -55,6 +55,8 @@
install -D -o root -g root -m 755 debian/avahi-daemon-check-dns.sh \
debian/$(cdbs_curpkg)/usr/lib/avahi/avahi-daemon-check-dns.sh
+ifeq (linux,$(DEB_HOST_ARCH_OS))
common-install-impl::
mv $(DEB_DESTDIR)/etc/dhcp3/dhclient-exit-hooks.d/avahi-autoipd \
$(DEB_DESTDIR)/etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd
+endif
More information about the Pkg-utopia-commits
mailing list