OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=14

avahi-compat-libdns_sd-fixes.patch

@@ -0,0 +1,80 @@
+diff -ur /usr/src/packages/BUILD/avahi-0.6.17/avahi-compat-libdns_sd/compat.c ../avahi-compat-libdns_sd/compat.c
+--- avahi-compat-libdns_sd/compat.c	2007-01-06 13:29:05.000000000 -0500
++++ avahi-compat-libdns_sd/compat.c	2007-03-07 16:32:59.000000000 -0500
+@@ -612,12 +612,10 @@
+     
+     AVAHI_WARN_LINKAGE;
+ 
+-    if (!ret_sdref)
++    if (!ret_sdref || !regtype)
+         return kDNSServiceErr_BadParam;
+     *ret_sdref = NULL;
+ 
+-    assert(regtype);
+-
+     if (interface == kDNSServiceInterfaceIndexLocalOnly || flags != 0) {
+         AVAHI_WARN_UNSUPPORTED;
+         return kDNSServiceErr_Unsupported;
+@@ -739,15 +737,10 @@
+ 
+     AVAHI_WARN_LINKAGE;
+ 
+-    if (!ret_sdref)
++    if (!ret_sdref || !name || !regtype || !domain || !callback)
+         return kDNSServiceErr_BadParam;
+     *ret_sdref = NULL;
+ 
+-    assert(name);
+-    assert(regtype);
+-    assert(domain);
+-    assert(callback);
+-
+     if (interface == kDNSServiceInterfaceIndexLocalOnly || flags != 0) {
+         AVAHI_WARN_UNSUPPORTED;
+         return kDNSServiceErr_Unsupported;
+@@ -795,9 +788,8 @@
+ 
+     AVAHI_WARN_LINKAGE;
+ 
+-    assert(fullName);
+-    assert(regtype);
+-    assert(domain);
++    if (!fullName || !regtype || !domain)
++        return -1;
+ 
+     if (avahi_service_name_join(fullName, kDNSServiceMaxDomainName, service, regtype, domain) < 0)
+         return -1;
+@@ -856,12 +848,10 @@
+ 
+     AVAHI_WARN_LINKAGE;
+ 
+-    if (!ret_sdref)
++    if (!ret_sdref || !callback)
+         return kDNSServiceErr_BadParam;
+     *ret_sdref = NULL;
+ 
+-    assert(callback);
+-
+     if (interface == kDNSServiceInterfaceIndexLocalOnly ||
+         (flags != kDNSServiceFlagsBrowseDomains &&  flags != kDNSServiceFlagsRegistrationDomains)) {
+         AVAHI_WARN_UNSUPPORTED;
+@@ -1100,14 +1090,14 @@
+ 
+     AVAHI_WARN_LINKAGE;
+ 
+-    if (!ret_sdref)
++    if (!ret_sdref || !regtype)
+         return kDNSServiceErr_BadParam;
+     *ret_sdref = NULL;
+     
+-    if (!regtype)
+-	    return kDNSServiceErr_BadParam;
+-	
+-    assert(txtRecord || txtLen == 0);
++    if (!txtRecord) {
++        txtLen = 1;
++        txtRecord = "";
++    }
+ 
+     if (interface == kDNSServiceInterfaceIndexLocalOnly || flags) {
+         AVAHI_WARN_UNSUPPORTED;

avahi.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 27 17:25:07 CEST 2007 - crivera@suse.de
+
+- Improve libdns_sd compat support.  This helps fix 214887. 
+
 -------------------------------------------------------------------
 Mon Mar 26 12:23:04 CEST 2007 - rguenther@suse.de
 

avahi.spec

@@ -18,7 +18,7 @@ BuildRequires:  libqt4-devel python-gtk-devel
 BuildRequires:  python-gtk qt-devel
 %endif
 Version:        0.6.17
-Release:        10
+Release:        12
 URL:            http://www.avahi.org/
 Group:          System/Daemons
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
@@ -30,6 +30,7 @@ Source3:        avahi.firewall
 Patch:          avahi-gacdir.patch
 Patch2:         avahi-discover-icon.patch
 Patch3:         avahi-python-compile.patch
+Patch4:         avahi-compat-libdns_sd-fixes.patch
 # See also http://www.avahi.org/wiki/DownloadAvahi#RequirementsTable
 Requires:       dbus-1 
 # Not really required, but many tools expect nss-mdns installed:
@@ -372,6 +373,7 @@ Authors:
 %patch
 %patch2
 %patch3
+%patch4
 
 %build
 ACLOCAL="aclocal -I common" autoreconf -f -i
@@ -553,6 +555,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/avahi-qt4.pc
 
 %changelog
+* Tue Mar 27 2007 - crivera@suse.de
+- Improve libdns_sd compat support.  This helps fix 214887.
 * Mon Mar 26 2007 - rguenther@suse.de
 - Add gdbm-devel and zlib-devel BuildRequires.
 * Tue Mar 13 2007 - crivera@suse.de