--- a/ChangeLog	Fri Jun 22 16:20:07 2007 +0000
+++ b/ChangeLog	Mon Jun 25 09:57:42 2007 +0000
@@ -1,3 +1,11 @@
+2007-06-25  Padraig O'Briain  <[email protected]>
+
+	* SUNWlibdaemon.spec: Update to 0.11
+	* SUNWavahi.spec: Update to 0.6.20
+	* patches/avahi-08-man-page.diff: Update for avahi 0.6.20
+	* patches/avahi-13-remove-debug-trap.diff: Update for avahi 0.6.20
+	* patches/avahi-01-config-bonjour.diff: Update for avahi 0.6.20
+
 2007-06-22  Damien Carbery <[email protected]>
 
 	* base-specs/gthumb.spec: Add patch, 02-html-page-begin, to fix 450110.

--- a/SUNWavahi.spec	Fri Jun 22 16:20:07 2007 +0000
+++ b/SUNWavahi.spec	Mon Jun 25 09:57:42 2007 +0000
@@ -47,7 +47,7 @@
 PKG_CONFIG_DISABLE_UNISTALLED=
 unset PKG_CONFIG_DISABLE_UNISTALLED
 export PKG_CONFIG_PATH=../avahi-%{avahi.version}:%{_pkg_config_path}
-export CFLAGS="%optflags -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ -I/usr/sfw/include"
+export CFLAGS="%optflags -I/usr/sfw/include"
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="%_ldflags -L/usr/lib/mdns -R/usr/lib/mdns -ldns_sd -lsocket -lnsl -L/usr/sfw/lib -R/usr/sfw/lib -lexpat"
 

--- a/base-specs/avahi.spec	Fri Jun 22 16:20:07 2007 +0000
+++ b/base-specs/avahi.spec	Mon Jun 25 09:57:42 2007 +0000
@@ -8,7 +8,7 @@
 Name:         avahi
 License:      Other
 Group:        System/Libraries
-Version:      0.6.19
+Version:      0.6.20
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.

--- a/base-specs/libdaemon.spec	Fri Jun 22 16:20:07 2007 +0000
+++ b/base-specs/libdaemon.spec	Mon Jun 25 09:57:42 2007 +0000
@@ -8,7 +8,7 @@
 Name:         libdaemon
 License:      Other
 Group:        System/Libraries
-Version:      0.10
+Version:      0.11
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.

--- a/patches/avahi-01-config-bonjour.diff	Fri Jun 22 16:20:07 2007 +0000
+++ b/patches/avahi-01-config-bonjour.diff	Mon Jun 25 09:57:42 2007 +0000
@@ -1,6 +1,6 @@
---- /usr/tmp/clean/avahi-0.6.16/configure.ac	Thu Dec 28 16:32:16 2006
-+++ avahi-0.6.16/configure.ac	Mon Jan  8 16:46:40 2007
-@@ -59,6 +59,17 @@
+--- /usr/tmp/clean/avahi-0.6.20/configure.ac	Fri Jun 22 17:37:52 2007
++++ avahi-0.6.20/configure.ac	Mon Jun 25 10:23:49 2007
+@@ -145,6 +145,17 @@
  ACX_PTHREAD(,AC_MSG_ERROR([Missing POSIX Threads support]))
  
  #
@@ -18,3 +18,12 @@
  # Check for netlink.h
  #
  AC_CHECK_HEADER(linux/netlink.h, 
+@@ -341,7 +352,7 @@
+  # Solaris stuff 
+  AC_SEARCH_LIBS([inet_ntop],[nsl]) 
+  AC_SEARCH_LIBS([recv],[socket]) 
+- AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D__EXTENSIONS__") 
++ AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__") 
+ 
+ # Checks for library functions.
+ AC_FUNC_MEMCMP

--- a/patches/avahi-08-man-page.diff	Fri Jun 22 16:20:07 2007 +0000
+++ b/patches/avahi-08-man-page.diff	Mon Jun 25 09:57:42 2007 +0000
@@ -40,7 +40,7 @@
  avahi-browse.1: avahi-browse.1.xml Makefile
  	xmltoman $< > $@
  
-@@ -230,13 +249,18 @@
+@@ -230,6 +249,10 @@
  	xmltoman.xsl \
  	xmltoman.dtd
  
@@ -49,7 +49,6 @@
 +	avahi-daemon.1.xml.in
 +endif
  
-+
  if HAVE_DBUS
  
  install-exec-local:

--- a/patches/avahi-13-remove-debug-trap.diff	Fri Jun 22 16:20:07 2007 +0000
+++ b/patches/avahi-13-remove-debug-trap.diff	Mon Jun 25 09:57:42 2007 +0000
@@ -170,14 +170,3 @@
  timeeventq_test_SOURCES = \
  	timeeventq-test.c \
  	timeeventq.h timeeventq.c \
---- /usr/tmp/clean/avahi-0.6.19/avahi-utils/stdb.c	Thu Apr 12 23:14:48 2007
-+++ avahi-0.6.19/avahi-utils/stdb.c	Wed Jun  6 13:42:14 2007
-@@ -190,7 +190,7 @@
-             key = gdbm_nextkey(gdbm_file, key);
- #endif
- #ifdef HAVE_DBM
--            key = dbm_nextkey(dbm_file, key);
-+            key = dbm_nextkey(dbm_file);
- #endif
-         }
-