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

avahi-allocsize.patch

@@ -0,0 +1,73 @@
+--- avahi-common/gccmacro.h
++++ avahi-common/gccmacro.h
+@@ -28,6 +28,15 @@
+ 
+ AVAHI_C_DECL_BEGIN
+ 
++#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 3)
++#define AVAHI_GCC_ALLOC_SIZE(x) __attribute__ ((__alloc_size__(x)))
++#define AVAHI_GCC_ALLOC_SIZE2(x,y) __attribute__ ((__alloc_size__(x,y)))
++#else
++/** Macro for usage of GCC's alloc_size attribute */
++#define AVAHI_GCC_ALLOC_SIZE(x)
++#define AVAHI_GCC_ALLOC_SIZE2(x,y)
++#endif
++
+ #if defined(__GNUC__) && (__GNUC__ >= 4)
+ #define AVAHI_GCC_SENTINEL __attribute__ ((sentinel))
+ #else
+--- avahi-common/malloc.h
++++ avahi-common/malloc.h
+@@ -35,19 +35,19 @@
+ AVAHI_C_DECL_BEGIN
+ 
+ /** Allocate some memory, just like the libc malloc() */
+-void *avahi_malloc(size_t size);
++void *avahi_malloc(size_t size) AVAHI_GCC_ALLOC_SIZE(1);
+ 
+ /** Similar to avahi_malloc() but set the memory to zero */
+-void *avahi_malloc0(size_t size);
++void *avahi_malloc0(size_t size) AVAHI_GCC_ALLOC_SIZE(1);
+ 
+ /** Free some memory */
+ void avahi_free(void *p);
+ 
+ /** Similar to libc's realloc() */
+-void *avahi_realloc(void *p, size_t size);
++void *avahi_realloc(void *p, size_t size) AVAHI_GCC_ALLOC_SIZE(2);
+ 
+ /** Internal helper for avahi_new() */
+-static inline void* avahi_new_internal(unsigned n, size_t k) {
++static inline void* AVAHI_GCC_ALLOC_SIZE2(1,2) avahi_new_internal(unsigned n, size_t k) {
+     assert(n < INT_MAX/k);
+     return avahi_malloc(n*k);
+ }
+@@ -56,7 +56,7 @@
+ #define avahi_new(type, n) ((type*) avahi_new_internal((n), sizeof(type)))
+ 
+ /** Internal helper for avahi_new0() */
+-static inline void* avahi_new0_internal(unsigned n, size_t k) {
++static inline void* AVAHI_GCC_ALLOC_SIZE2(1,2) avahi_new0_internal(unsigned n, size_t k) {
+     assert(n < INT_MAX/k);
+     return avahi_malloc0(n*k);
+ }
+@@ -71,14 +71,14 @@
+ char *avahi_strndup(const char *s, size_t l);
+ 
+ /** Duplicate the given memory block into a new one allocated with avahi_malloc() */
+-void *avahi_memdup(const void *s, size_t l);
++void *avahi_memdup(const void *s, size_t l) AVAHI_GCC_ALLOC_SIZE(2);
+ 
+ /** Wraps allocator functions */
+ typedef struct AvahiAllocator {
+-    void* (*malloc)(size_t size);     
+-    void (*free)(void *p);           
+-    void* (*realloc)(void *p, size_t size);
+-    void* (*calloc)(size_t nmemb, size_t size);   /**< May be NULL */
++    void* (*malloc)(size_t size) AVAHI_GCC_ALLOC_SIZE(1);
++    void (*free)(void *p);
++    void* (*realloc)(void *p, size_t size) AVAHI_GCC_ALLOC_SIZE(2);
++    void* (*calloc)(size_t nmemb, size_t size) AVAHI_GCC_ALLOC_SIZE2(1,2);   /**< May be NULL */
+ } AvahiAllocator;
+ 
+ /** Change the allocator. May be NULL to return to default (libc)

avahi-bookmarks.init

@@ -2,6 +2,7 @@
 ### BEGIN INIT INFO
 # Provides:       avahi-bookmarks
 # Required-Start: $network $remote_fs avahi-dnsconfd
+# Required-Stop:  $network $remote_fs avahi-dnsconfd
 # Default-Start:  3 5
 # Default-Stop:
 # Short-Description: ZeroConf Bookmarks server

avahi-glib2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  1 10:22:46 CEST 2008 - meissner@suse.de
+
+- Added GCC attribute alloc_size markup for allocator functions
+
 -------------------------------------------------------------------
 Mon Aug  4 01:09:38 CEST 2008 - ro@suse.de
 

avahi-glib2.spec

@@ -2,9 +2,16 @@
 # spec file for package avahi-glib2 (Version 0.6.23)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -24,7 +31,7 @@ Name:           avahi-glib2
 %define         build_qt3 0
 %define         build_qt4 0
 Version:        0.6.23
-Release:        3
+Release:        4
 %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})
@@ -66,6 +73,8 @@ Patch5:         avahi-no-gtk-no-interfaces.patch
 Patch6:         avahi-bookmarks-no-pygtk.patch
 #PATCH-FIX-UPSTREAM avahi-no-gtk-python.patch avahi222 sbrabec@suse.cz -- build python module if gtk is disabled
 Patch7:         avahi-no-gtk-python.patch
+#PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute
+Patch8:         avahi-allocsize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config
 # Even if we are not building python bindings, we need python to build service types database:
@@ -804,6 +813,7 @@ Authors:
 %patch5
 %patch6
 %patch7
+%patch8
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
@@ -1280,6 +1290,8 @@ fi
 %endif
 
 %changelog
+* Mon Sep 01 2008 meissner@suse.de
+- Added GCC attribute alloc_size markup for allocator functions
 * Mon Aug 04 2008 ro@suse.de
 - move fix further up in specfile
 * Fri Aug 01 2008 ro@suse.de

avahi-init-lsb.patch

@@ -1,6 +1,14 @@
 --- initscript/suse/avahi-daemon.in
 +++ initscript/suse/avahi-daemon.in
-@@ -25,6 +25,18 @@
+@@ -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
  		;;
@@ -19,7 +27,7 @@
  	restart)
  		$0 stop
  		$0 start
-@@ -41,7 +53,7 @@
+@@ -41,7 +54,7 @@
  		rc_status -v
  		;;
  	*)
@@ -30,7 +38,15 @@
  esac
 --- initscript/suse/avahi-dnsconfd.in
 +++ initscript/suse/avahi-dnsconfd.in
-@@ -30,6 +30,18 @@
+@@ -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
  		;;
@@ -49,7 +65,7 @@
  	force-reload|reload)
  		echo -n "Reloading Avahi DNS Configuration daemon "
  		$AVAHI_BIN -r
-@@ -41,7 +53,7 @@
+@@ -41,7 +54,7 @@
  		rc_status -v
  		;;
  	*)

avahi-mono.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  1 10:22:46 CEST 2008 - meissner@suse.de
+
+- Added GCC attribute alloc_size markup for allocator functions
+
 -------------------------------------------------------------------
 Fri Jul 18 17:18:20 CEST 2008 - sbrabec@suse.cz
 

avahi-mono.spec

@@ -2,9 +2,16 @@
 # spec file for package avahi-mono (Version 0.6.23)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -24,7 +31,7 @@ Name:           avahi-mono
 %define         build_qt3 0
 %define         build_qt4 0
 Version:        0.6.23
-Release:        19
+Release:        48
 %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})
@@ -66,6 +73,8 @@ Patch5:         avahi-no-gtk-no-interfaces.patch
 Patch6:         avahi-bookmarks-no-pygtk.patch
 #PATCH-FIX-UPSTREAM avahi-no-gtk-python.patch avahi222 sbrabec@suse.cz -- build python module if gtk is disabled
 Patch7:         avahi-no-gtk-python.patch
+#PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute
+Patch8:         avahi-allocsize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config
 # Even if we are not building python bindings, we need python to build service types database:
@@ -803,6 +812,7 @@ Authors:
 %patch5
 %patch6
 %patch7
+%patch8
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
@@ -1279,6 +1289,8 @@ fi
 %endif
 
 %changelog
+* Mon Sep 01 2008 meissner@suse.de
+- Added GCC attribute alloc_size markup for allocator functions
 * Fri Jul 18 2008 sbrabec@suse.cz
 - Updated to version 0.6.23:
   * A lot of translation updates

avahi-qt4.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  1 10:22:46 CEST 2008 - meissner@suse.de
+
+- Added GCC attribute alloc_size markup for allocator functions
+
 -------------------------------------------------------------------
 Fri Jul 18 17:18:20 CEST 2008 - sbrabec@suse.cz
 

avahi-qt4.spec

@@ -2,9 +2,16 @@
 # spec file for package avahi-qt4 (Version 0.6.23)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -24,7 +31,7 @@ Name:           avahi-qt4
 %define         build_qt3 0
 %define         build_qt4 1
 Version:        0.6.23
-Release:        3
+Release:        4
 %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})
@@ -66,6 +73,8 @@ Patch5:         avahi-no-gtk-no-interfaces.patch
 Patch6:         avahi-bookmarks-no-pygtk.patch
 #PATCH-FIX-UPSTREAM avahi-no-gtk-python.patch avahi222 sbrabec@suse.cz -- build python module if gtk is disabled
 Patch7:         avahi-no-gtk-python.patch
+#PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute
+Patch8:         avahi-allocsize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config
 # Even if we are not building python bindings, we need python to build service types database:
@@ -806,6 +815,7 @@ Authors:
 %patch5
 %patch6
 %patch7
+%patch8
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
@@ -1282,6 +1292,8 @@ fi
 %endif
 
 %changelog
+* Mon Sep 01 2008 meissner@suse.de
+- Added GCC attribute alloc_size markup for allocator functions
 * Fri Jul 18 2008 sbrabec@suse.cz
 - Updated to version 0.6.23:
   * A lot of translation updates

avahi.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Sep  5 00:58:19 CEST 2008 - ro@suse.de
+
+- add Required-Stop to initscripts 
+
+-------------------------------------------------------------------
+Mon Sep  1 10:22:46 CEST 2008 - meissner@suse.de
+
+- Added GCC attribute alloc_size markup for allocator functions
+
 -------------------------------------------------------------------
 Fri Jul 18 17:18:20 CEST 2008 - sbrabec@suse.cz
 

avahi.spec

@@ -2,9 +2,16 @@
 # spec file for package avahi (Version 0.6.23)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -26,7 +33,7 @@ Name:           avahi
 %define         build_qt3 0
 %define         build_qt4 0
 Version:        0.6.23
-Release:        13
+Release:        30
 %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})
@@ -68,6 +75,8 @@ Patch5:         avahi-no-gtk-no-interfaces.patch
 Patch6:         avahi-bookmarks-no-pygtk.patch
 #PATCH-FIX-UPSTREAM avahi-no-gtk-python.patch avahi222 sbrabec@suse.cz -- build python module if gtk is disabled
 Patch7:         avahi-no-gtk-python.patch
+#PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute
+Patch8:         avahi-allocsize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config
 # Even if we are not building python bindings, we need python to build service types database:
@@ -806,6 +815,7 @@ Authors:
 %patch5
 %patch6
 %patch7
+%patch8
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
@@ -1282,6 +1292,10 @@ fi
 %endif
 
 %changelog
+* Fri Sep 05 2008 ro@suse.de
+- add Required-Stop to initscripts
+* Mon Sep 01 2008 meissner@suse.de
+- Added GCC attribute alloc_size markup for allocator functions
 * Fri Jul 18 2008 sbrabec@suse.cz
 - Build glib2, gobject and python stuff separately to break build
   loop cups -> gtk2 -> avahi -> cups.