Accepting request 70602 from home:dimstar:branches:GNOME:Factory

Update to 0.6.30

OBS-URL: https://build.opensuse.org/request/show/70602
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=57

avahi-0.6.28.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac7309cd1469988f4ddd8be6b0d67b6e6b4180fe0b7c62fa83b8f1be24589535
-size 906458

avahi-0.6.30.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08f4a748dd3364ba498abda305b29863b68df90e1581a8663188c675542101bf
+size 897168

avahi-fix-howl.pc.patch

@@ -1,12 +0,0 @@
-Index: avahi-0.6.27/Makefile.am
-===================================================================
---- avahi-0.6.27.orig/Makefile.am
-+++ avahi-0.6.27/Makefile.am
-@@ -155,6 +155,7 @@ pkgconfigdir = $(libdir)/pkgconfig
- %.pc: %.pc.in
- 	$(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \
- 	    -e 's,@libdir\@,$(libdir),g' \
-+	    -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \
- 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
- 
- pkgconfig_DATA = avahi-core.pc

avahi-glib2.spec

@@ -30,8 +30,8 @@ Name:           avahi-glib2
 %define         build_mono 0
 %define         build_qt3 0
 %define         build_qt4 0
-Version:        0.6.28
+Version:        0.6.30
-Release:        5
+Release:        1
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -65,18 +65,10 @@ Source4:        avahi-glib-gettext.m4
 Patch0:         avahi-gacdir.patch
 #PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de
 Patch1:         avahi-desktop.patch
-#PATCH-FIX-UPSTREAM avahi-init-lsb.patch -- committed after 0.6.22 release upstream
-Patch2:         avahi-init-lsb.patch
 #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
 Patch3:         avahi-empty-share-dir.patch
-# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
-Patch4:         avahi-init-dnsconfd-fix-status.patch
-# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
-Patch5:         avahi-fix-howl.pc.patch
 #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
 Patch10:        avahi-unicastdomains.patch
-# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325
-Patch11:        avahi-null-packet-infinite-loop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
 # Even if we are not building python bindings, we need python to build service types database:
@@ -672,12 +664,8 @@ things, like correct mDNS reflection across LAN segments.
 translation-update-upstream
 %patch0
 %patch1 -p1
-%patch2
 %patch3
-%patch4 -p1
-%patch5 -p1
 %patch10 -p1
-%patch11 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.

avahi-init-dnsconfd-fix-status.patch

@@ -1,25 +0,0 @@
-From bd76c886b4bd44abad745b4b3c4bb99fe752c8f0 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@opensuse.org>
-Date: Wed, 13 Oct 2010 16:36:35 +0200
-Subject: [PATCH] init: suse, avahi-dnsconfd status reports dead instead of unused
-
----
- initscript/suse/avahi-dnsconfd.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/initscript/suse/avahi-dnsconfd.in b/initscript/suse/avahi-dnsconfd.in
-index e633b8d..4169737 100644
---- a/initscript/suse/avahi-dnsconfd.in
-+++ b/initscript/suse/avahi-dnsconfd.in
-@@ -37,7 +37,7 @@ case "$1" in
- 		;;
- 	status)
- 		echo -n "Checking for Avahi DNS Configuration daemon: "
--		$AVAHI_BIN -c
-+		$AVAHI_BIN -c || _rc_status=3
- 		rc_status -v
- 		;;
- 	*)
--- 
-1.7.3.1
-

avahi-init-lsb.patch

@@ -1,76 +0,0 @@
---- initscript/suse/avahi-daemon.in
-+++ initscript/suse/avahi-daemon.in
-@@ -2,6 +2,7 @@
- ### BEGIN INIT INFO
- # Provides:          avahi
- # Required-Start:    $network $remote_fs dbus
-+# Required-Stop:     $network $remote_fs dbus
- # Default-Start:     3 5
- # Default-Stop:
- # Short-Description: ZeroConf daemon
-@@ -25,6 +26,18 @@
- 		$AVAHI_BIN -k 2>/dev/null || /bin/true
- 		rc_status -v
- 		;;
-+	try-restart|condrestart)
-+		if test "$1" = "condrestart"; then
-+			echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
-+		fi
-+		$0 status
-+		if test $? = 0; then
-+			$0 restart
-+		else
-+			rc_reset
-+		fi
-+		rc_status
-+		;;
- 	restart)
- 		$0 stop
- 		$0 start
-@@ -41,7 +54,7 @@
- 		rc_status -v
- 		;;
- 	*)
--		echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
-+		echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
- 		exit 1
- 		;;
- esac
---- initscript/suse/avahi-dnsconfd.in
-+++ initscript/suse/avahi-dnsconfd.in
-@@ -2,6 +2,7 @@
- ### BEGIN INIT INFO
- # Provides:          avahi-dnsconfd
- # Required-Start:    $remote_fs avahi
-+# Required-Stop:     $remote_fs avahi
- # Default-Start:     3 5
- # Default-Stop:
- # Short-Description: ZeroConf daemon
-@@ -30,6 +31,18 @@
- 		$0 start
- 		rc_status
- 		;;
-+	try-restart|condrestart)
-+		if test "$1" = "condrestart"; then
-+			echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
-+		fi
-+		$0 status
-+		if test $? = 0; then
-+			$0 restart
-+		else
-+			rc_reset
-+		fi
-+		rc_status
-+		;;
- 	force-reload|reload)
- 		echo -n "Reloading Avahi DNS Configuration daemon "
- 		$AVAHI_BIN -r
-@@ -41,7 +54,7 @@
- 		rc_status -v
- 		;;
- 	*)
--		echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
-+		echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
- 		exit 1
- 		;;
- esac

avahi-mono.spec

@@ -30,8 +30,8 @@ Name:           avahi-mono
 %define         build_mono 1
 %define         build_qt3 0
 %define         build_qt4 0
-Version:        0.6.28
+Version:        0.6.30
-Release:        5
+Release:        1
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -65,18 +65,10 @@ Source4:        avahi-glib-gettext.m4
 Patch0:         avahi-gacdir.patch
 #PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de
 Patch1:         avahi-desktop.patch
-#PATCH-FIX-UPSTREAM avahi-init-lsb.patch -- committed after 0.6.22 release upstream
-Patch2:         avahi-init-lsb.patch
 #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
 Patch3:         avahi-empty-share-dir.patch
-# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
-Patch4:         avahi-init-dnsconfd-fix-status.patch
-# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
-Patch5:         avahi-fix-howl.pc.patch
 #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
 Patch10:        avahi-unicastdomains.patch
-# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325
-Patch11:        avahi-null-packet-infinite-loop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
 # Even if we are not building python bindings, we need python to build service types database:
@@ -671,12 +663,8 @@ things, like correct mDNS reflection across LAN segments.
 translation-update-upstream
 %patch0
 %patch1 -p1
-%patch2
 %patch3
-%patch4 -p1
-%patch5 -p1
 %patch10 -p1
-%patch11 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.

avahi-null-packet-infinite-loop.patch

@@ -1,60 +0,0 @@
-commit 10e10a37d13c6c9b8d58a509460ceeaeb59023f0
-Author: Vincent Untz <vuntz@opensuse.org>
-Date:   Thu Feb 17 15:36:37 2011 +0100
-
-    socket: Still read corrupt packets from the sockets
-    
-    Else, we end up with an infinite loop with 100% CPU.
-    
-    http://www.avahi.org/ticket/325
-
-diff --git a/avahi-core/socket.c b/avahi-core/socket.c
-index be62105..e4438eb 100644
---- a/avahi-core/socket.c
-+++ b/avahi-core/socket.c
-@@ -653,10 +653,6 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
-         goto fail;
-     }
- 
--    /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */
--    if (!ms)
--        goto fail;
--
-     p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
- 
-     io.iov_base = AVAHI_DNS_PACKET_DATA(p);
-@@ -683,6 +679,11 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
-         goto fail;
-     }
- 
-+    /* For corrupt packets FIONREAD returns zero size (See rhbz #607297). So
-+     * fail after having read them. */
-+    if (!ms)
-+        goto fail;
-+
-     if (sa.sin_addr.s_addr == INADDR_ANY) {
-         /* Linux 2.4 behaves very strangely sometimes! */
-         goto fail;
-@@ -810,10 +811,6 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
-         goto fail;
-     }
- 
--    /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */
--    if (!ms)
--        goto fail;
--
-     p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
- 
-     io.iov_base = AVAHI_DNS_PACKET_DATA(p);
-@@ -841,6 +838,11 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
-         goto fail;
-     }
- 
-+    /* For corrupt packets FIONREAD returns zero size (See rhbz #607297). So
-+     * fail after having read them. */
-+    if (!ms)
-+        goto fail;
-+
-     assert(!(msg.msg_flags & MSG_CTRUNC));
-     assert(!(msg.msg_flags & MSG_TRUNC));
- 

avahi-qt4.spec

@@ -30,8 +30,8 @@ Name:           avahi-qt4
 %define         build_mono 0
 %define         build_qt3 0
 %define         build_qt4 1
-Version:        0.6.28
+Version:        0.6.30
-Release:        5
+Release:        1
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -65,18 +65,10 @@ Source4:        avahi-glib-gettext.m4
 Patch0:         avahi-gacdir.patch
 #PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de
 Patch1:         avahi-desktop.patch
-#PATCH-FIX-UPSTREAM avahi-init-lsb.patch -- committed after 0.6.22 release upstream
-Patch2:         avahi-init-lsb.patch
 #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
 Patch3:         avahi-empty-share-dir.patch
-# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
-Patch4:         avahi-init-dnsconfd-fix-status.patch
-# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
-Patch5:         avahi-fix-howl.pc.patch
 #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
 Patch10:        avahi-unicastdomains.patch
-# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325
-Patch11:        avahi-null-packet-infinite-loop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
 # Even if we are not building python bindings, we need python to build service types database:
@@ -674,12 +666,8 @@ things, like correct mDNS reflection across LAN segments.
 translation-update-upstream
 %patch0
 %patch1 -p1
-%patch2
 %patch3
-%patch4 -p1
-%patch5 -p1
 %patch10 -p1
-%patch11 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.

avahi.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Wed May 18 20:37:41 CEST 2011 - dimstar@opensuse.org
+
+- Update to version 0.6.30:
+  + systemd:
+    - drop ExecReload= line since avahi-dnsconfd -r is not actually
+      a config reload
+    - fix sd_is_socket() invocation
+  + general: various smaller fixes
+  + iface:
+    - look for both IFA_ADDRESS and IFA_LOCAL
+    - use interface values only when valid
+  + socket: minor beautification
+  + Build fixes
+  + Updated translations.
+- Changes from version 0.6.29:
+  + avahi-ui: gtk3 fix
+  + chroot: suppress error messages if the chroot pipe is closed
+  + core: avahi on Linux uses incorrect address for P-t-P interface
+  + daemon: we better stay away from SIGQUIT since it is supposed
+    to cause a core dump
+  + gobject: ga_service_browser_new() should accept const gchar*
+  + howl: fix small issue
+  + init: suse, avahi-dnsconfd status reports dead instead of unused
+  + netlink: fix wrong use of netlink flags for dump operations
+  + reflector: cache entry link-local addresses filter
+  + setproctitle: use defined() around __linux__ in #elif
+  + socket: Still read corrupt packets from the sockets
+- Drop upstream fixed patches:
+  + avahi-init-lsb.patch
+  + avahi-init-dnsconfd-fix-status.patch
+  + avahi-fix-howl.pc.patch
+  + avahi-null-packet-infinite-loop.patch
+
 -------------------------------------------------------------------
 Fri Feb 25 09:56:01 UTC 2011 - fcrozat@novell.com
 

avahi.spec

@@ -32,8 +32,8 @@ Name:           avahi
 %define         build_mono 0
 %define         build_qt3 0
 %define         build_qt4 0
-Version:        0.6.28
+Version:        0.6.30
-Release:        10
+Release:        1
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -67,18 +67,10 @@ Source4:        avahi-glib-gettext.m4
 Patch0:         avahi-gacdir.patch
 #PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de
 Patch1:         avahi-desktop.patch
-#PATCH-FIX-UPSTREAM avahi-init-lsb.patch -- committed after 0.6.22 release upstream
-Patch2:         avahi-init-lsb.patch
 #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
 Patch3:         avahi-empty-share-dir.patch
-# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
-Patch4:         avahi-init-dnsconfd-fix-status.patch
-# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
-Patch5:         avahi-fix-howl.pc.patch
 #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
 Patch10:        avahi-unicastdomains.patch
-# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325
-Patch11:        avahi-null-packet-infinite-loop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
 # Even if we are not building python bindings, we need python to build service types database:
@@ -674,12 +666,8 @@ things, like correct mDNS reflection across LAN segments.
 translation-update-upstream
 %patch0
 %patch1 -p1
-%patch2
 %patch3
-%patch4 -p1
-%patch5 -p1
 %patch10 -p1
-%patch11 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.