From 056d35f9f0e8a9eb0901dd9d4743104f83f03559 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 31 Mar 2008 19:56:58 +0000
Subject: avahi: bump version

---
 package/avahi/avahi.mk     |  3 ++-
 package/avahi/uclibc.patch | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index db00fb58f..8359ea9d8 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -10,7 +10,7 @@
 # either version 2.1 of the License, or (at your option) any
 # later version.
 
-AVAHI_VERSION:=0.6.21
+AVAHI_VERSION:=0.6.22
 AVAHI_DIR:=$(BUILD_DIR)/avahi-$(AVAHI_VERSION)
 AVAHI_SITE:=http://www.avahi.org/download/
 AVAHI_SOURCE:=avahi-$(AVAHI_VERSION).tar.gz
@@ -120,6 +120,7 @@ $(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXTRA_DEPS)
 		$(DISABLE_NLS) \
 		$(DISABLE_LARGEFILE) \
 		--disable-glib \
+		--disable-gobject \
 		--disable-qt3 \
 		--disable-qt4 \
 		--disable-gtk \
diff --git a/package/avahi/uclibc.patch b/package/avahi/uclibc.patch
index 5b2e17022..8cc3cb944 100644
--- a/package/avahi/uclibc.patch
+++ b/package/avahi/uclibc.patch
@@ -1,11 +1,11 @@
-diff -urN avahi-0.6.14-orig/avahi-core/socket.c avahi-0.6.14/avahi-core/socket.c
---- avahi-0.6.14-orig/avahi-core/socket.c	2006-08-31 10:18:03.000000000 -0700
-+++ avahi-0.6.14/avahi-core/socket.c	2006-09-21 19:01:31.000000000 -0700
-@@ -394,13 +394,13 @@
+diff -urpN avahi-0.6.22.orig/avahi-core/socket.c avahi-0.6.22/avahi-core/socket.c
+--- avahi-0.6.22.orig/avahi-core/socket.c	2007-12-16 22:03:08.000000000 +0100
++++ avahi-0.6.22/avahi-core/socket.c	2008-03-31 17:13:24.000000000 +0200
+@@ -394,13 +394,13 @@ int avahi_open_socket_ipv6(int no_reuse)
          avahi_log_warn("IPV6_UNICAST_HOPS failed: %s", strerror(errno));
          goto fail;
      }
--    
+-
 +#ifdef IPV6_V6ONLY
      yes = 1;
      if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) {
-- 
cgit v1.2.3