avahi: bump version

This commit is contained in:
Peter Korsgaard 2008-03-31 19:56:58 +00:00
parent bd6561e781
commit 056d35f9f0
2 changed files with 7 additions and 6 deletions

View File

@ -10,7 +10,7 @@
# either version 2.1 of the License, or (at your option) any # either version 2.1 of the License, or (at your option) any
# later version. # later version.
AVAHI_VERSION:=0.6.21 AVAHI_VERSION:=0.6.22
AVAHI_DIR:=$(BUILD_DIR)/avahi-$(AVAHI_VERSION) AVAHI_DIR:=$(BUILD_DIR)/avahi-$(AVAHI_VERSION)
AVAHI_SITE:=http://www.avahi.org/download/ AVAHI_SITE:=http://www.avahi.org/download/
AVAHI_SOURCE:=avahi-$(AVAHI_VERSION).tar.gz AVAHI_SOURCE:=avahi-$(AVAHI_VERSION).tar.gz
@ -120,6 +120,7 @@ $(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXTRA_DEPS)
$(DISABLE_NLS) \ $(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \ $(DISABLE_LARGEFILE) \
--disable-glib \ --disable-glib \
--disable-gobject \
--disable-qt3 \ --disable-qt3 \
--disable-qt4 \ --disable-qt4 \
--disable-gtk \ --disable-gtk \

View File

@ -1,11 +1,11 @@
diff -urN avahi-0.6.14-orig/avahi-core/socket.c avahi-0.6.14/avahi-core/socket.c diff -urpN avahi-0.6.22.orig/avahi-core/socket.c avahi-0.6.22/avahi-core/socket.c
--- avahi-0.6.14-orig/avahi-core/socket.c 2006-08-31 10:18:03.000000000 -0700 --- avahi-0.6.22.orig/avahi-core/socket.c 2007-12-16 22:03:08.000000000 +0100
+++ avahi-0.6.14/avahi-core/socket.c 2006-09-21 19:01:31.000000000 -0700 +++ avahi-0.6.22/avahi-core/socket.c 2008-03-31 17:13:24.000000000 +0200
@@ -394,13 +394,13 @@ @@ -394,13 +394,13 @@ int avahi_open_socket_ipv6(int no_reuse)
avahi_log_warn("IPV6_UNICAST_HOPS failed: %s", strerror(errno)); avahi_log_warn("IPV6_UNICAST_HOPS failed: %s", strerror(errno));
goto fail; goto fail;
} }
- -
+#ifdef IPV6_V6ONLY +#ifdef IPV6_V6ONLY
yes = 1; yes = 1;
if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) { if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) {