This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
25ab3ff72f
commit
38121c562e
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3357550ec0477c813fa1a1928e4507a40b21cf1c382c9f7b88118b84557cee94
|
||||
size 802719
|
||||
3
avahi-0.6.24.tar.bz2
Normal file
3
avahi-0.6.24.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:935c3e37c2a79d05120ef051b8f2be3e98fb5ee05a01417ea0dd3fefa072e9b8
|
||||
size 835693
|
||||
@ -1,73 +0,0 @@
|
||||
--- 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)
|
||||
@ -1,26 +0,0 @@
|
||||
--- avahi-python/Makefile.am
|
||||
+++ avahi-python/Makefile.am
|
||||
@@ -29,7 +29,6 @@
|
||||
|
||||
if HAVE_PYTHON
|
||||
if HAVE_PYTHON_DBUS
|
||||
-if HAVE_PYGTK
|
||||
|
||||
pythonscripts = \
|
||||
avahi-bookmarks
|
||||
@@ -43,4 +42,3 @@
|
||||
|
||||
endif
|
||||
endif
|
||||
-endif
|
||||
--- avahi-python/avahi-bookmarks.in
|
||||
+++ avahi-python/avahi-bookmarks.in
|
||||
@@ -24,7 +24,7 @@
|
||||
try:
|
||||
import avahi, gobject, dbus
|
||||
except ImportError:
|
||||
- print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus."
|
||||
+ print "Sorry, to use this tool you need to install Avahi and python-dbus."
|
||||
sys.exit(1)
|
||||
|
||||
try:
|
||||
@ -1,8 +1,8 @@
|
||||
Index: avahi-0.6.22/avahi-ui/bssh.desktop.in
|
||||
Index: avahi-0.6.24/avahi-ui/bssh.desktop.in.in
|
||||
===================================================================
|
||||
--- avahi-0.6.22.orig/avahi-ui/bssh.desktop.in
|
||||
+++ avahi-0.6.22/avahi-ui/bssh.desktop.in
|
||||
@@ -6,7 +6,8 @@ Comment=Browse for Zeroconf-enabled SSH
|
||||
--- avahi-0.6.24.orig/avahi-ui/bssh.desktop.in.in
|
||||
+++ avahi-0.6.24/avahi-ui/bssh.desktop.in.in
|
||||
@@ -6,7 +6,7 @@ _Comment=Browse for Zeroconf-enabled SSH
|
||||
Exec=@bindir@/bssh
|
||||
Terminal=false
|
||||
Type=Application
|
||||
@ -12,12 +12,11 @@ Index: avahi-0.6.22/avahi-ui/bssh.desktop.in
|
||||
+Categories=GNOME;System;Monitor;
|
||||
StartupNotify=false
|
||||
GenericName=
|
||||
+X-SuSE-translate=true
|
||||
Index: avahi-0.6.22/avahi-ui/bvnc.desktop.in
|
||||
Index: avahi-0.6.24/avahi-ui/bvnc.desktop.in.in
|
||||
===================================================================
|
||||
--- avahi-0.6.22.orig/avahi-ui/bvnc.desktop.in
|
||||
+++ avahi-0.6.22/avahi-ui/bvnc.desktop.in
|
||||
@@ -6,7 +6,8 @@ Comment=Browse for Zeroconf-enabled VNC
|
||||
--- avahi-0.6.24.orig/avahi-ui/bvnc.desktop.in.in
|
||||
+++ avahi-0.6.24/avahi-ui/bvnc.desktop.in.in
|
||||
@@ -6,7 +6,7 @@ _Comment=Browse for Zeroconf-enabled VNC
|
||||
Exec=@bindir@/bvnc
|
||||
Terminal=false
|
||||
Type=Application
|
||||
@ -27,12 +26,11 @@ Index: avahi-0.6.22/avahi-ui/bvnc.desktop.in
|
||||
+Categories=GNOME;System;Monitor;
|
||||
StartupNotify=false
|
||||
GenericName=
|
||||
+X-SuSE-translate=true
|
||||
Index: avahi-0.6.22/avahi-python/avahi-discover/avahi-discover.desktop.in
|
||||
Index: avahi-0.6.24/avahi-python/avahi-discover/avahi-discover.desktop.in.in
|
||||
===================================================================
|
||||
--- avahi-0.6.22.orig/avahi-python/avahi-discover/avahi-discover.desktop.in
|
||||
+++ avahi-0.6.22/avahi-python/avahi-discover/avahi-discover.desktop.in
|
||||
@@ -6,7 +6,7 @@ Comment=Browse for Zeroconf services ava
|
||||
--- avahi-0.6.24.orig/avahi-python/avahi-discover/avahi-discover.desktop.in.in
|
||||
+++ avahi-0.6.24/avahi-python/avahi-discover/avahi-discover.desktop.in.in
|
||||
@@ -6,7 +6,7 @@ _Comment=Browse for Zeroconf services av
|
||||
Exec=@bindir@/avahi-discover
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From 729b213763a261cb41499c501b09a790afd1073c Mon Sep 17 00:00:00 2001
|
||||
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
Date: Wed, 1 Oct 2008 14:31:08 +0200
|
||||
Subject: [PATCH] avahi-dnsconfd: add support for SUSE's resolv.conf tools
|
||||
|
||||
Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
---
|
||||
avahi-dnsconfd/avahi-dnsconfd.action | 22 +++++++++++++++++++++-
|
||||
1 files changed, 21 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/avahi-dnsconfd/avahi-dnsconfd.action b/avahi-dnsconfd/avahi-dnsconfd.action
|
||||
index 9337a6d..f7d3aa4 100755
|
||||
--- a/avahi-dnsconfd/avahi-dnsconfd.action
|
||||
+++ b/avahi-dnsconfd/avahi-dnsconfd.action
|
||||
@@ -35,7 +35,27 @@ test "x$AVAHI_INTERFACE" != "x"
|
||||
# $AVAHI_INTERFACE_DNS_SERVERS A whitespace seperated list of DNS servers on $AVAHI_INTERFACE
|
||||
# $AVAHI_DNS_SERVERS The complete list of all DNS servers found on all interfaces
|
||||
|
||||
-if [ -x /sbin/resolvconf ] ; then
|
||||
+if [ -x /sbin/netconfig ]; then
|
||||
+ # SUSE method on 11.1+
|
||||
+ if [ -n "$AVAHI_INTERFACE_DNS_SERVERS" ]; then
|
||||
+ /sbin/netconfig modify -s avahi -i "$AVAHI_INTERFACE" <<-EOF
|
||||
+ INTERFACE='$AVAHI_INTERFACE'
|
||||
+ DNSSERVERS='$AVAHI_INTERFACE_DNS_SERVERS'
|
||||
+ EOF
|
||||
+ else
|
||||
+ /sbin/netconfig remove -s avahi -i "$AVAHI_INTERFACE"
|
||||
+ fi
|
||||
+elif [ -x /sbin/modify_resolvconf ] ; then
|
||||
+ # method for SUSE <= 11.0
|
||||
+ if [ -n "$AVAHI_DNS_SERVERS" ]; then
|
||||
+ /sbin/modify_resolvconf modify -s avahi -t - -p avahi-dnsconfd -n "$AVAHI_DNS_SERVERS" <<-EOF
|
||||
+ if you don't like avahi to update your Nameservers
|
||||
+ disable the avahi-dnsconfd init script
|
||||
+ EOF
|
||||
+ else
|
||||
+ /sbin/modify_resolvconf restore -s avahi
|
||||
+ fi
|
||||
+elif [ -x /sbin/resolvconf ] ; then
|
||||
|
||||
# We have Debian's resolvconf tool
|
||||
|
||||
--
|
||||
1.5.6
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package avahi-glib2 (Version 0.6.23)
|
||||
# spec file for package avahi-glib2 (Version 0.6.24)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -30,15 +30,15 @@ Name: avahi-glib2
|
||||
%define build_mono 0
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.23
|
||||
Release: 12
|
||||
Version: 0.6.24
|
||||
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})
|
||||
%endif
|
||||
%define avahi_client_soname 3
|
||||
%define avahi_common_soname 3
|
||||
%define avahi_core_soname 5
|
||||
%define avahi_core_soname 6
|
||||
%define avahi_ui_soname 0
|
||||
%define avahi_glib_soname 1
|
||||
%define avahi_gobject_soname 0
|
||||
@ -65,18 +65,6 @@ Patch1: avahi-desktop.patch
|
||||
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-man-link.patch avahi222 sbrabec@suse.cz -- link man page only if it is installed
|
||||
Patch4: avahi-man-selection.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-no-gtk-no-interfaces.patch avahi222 sbrabec@suse.cz -- if gtk is disabled do not install glade files
|
||||
Patch5: avahi-no-gtk-no-interfaces.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-no-gtk-no-interfaces.patch avahi222 sbrabec@suse.cz -- build avahi-bookmarks even without python-gtk
|
||||
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
|
||||
#PATCH-FIX-UPSTREAM avahi-dnsconfd-netconfig.patch bnc431240 lnussel@suse.de -- use netconfig for dnsconfd
|
||||
Patch9: avahi-dnsconfd-netconfig.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 bnc_459007.patch bnc#459007 mauro@suse.de -- fix CVE-2008-5081
|
||||
@ -198,12 +186,12 @@ Authors:
|
||||
Trent Lloyd <lathiat@freedesktop.org>
|
||||
Sebastien Estienne <sebastien.estienne@gmail.com>
|
||||
|
||||
%package -n libavahi-core5
|
||||
%package -n libavahi-core6
|
||||
License: LGPL v2.1 or later
|
||||
Summary: D-BUS Service for Zeroconf and Bonjour
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libavahi-core5
|
||||
%description -n libavahi-core6
|
||||
Avahi is an implementation of the DNS Service Discovery and Multicast
|
||||
DNS specifications for Zeroconf Computing. It uses D-BUS for
|
||||
communication between user applications and a system daemon. The daemon
|
||||
@ -364,7 +352,7 @@ Authors:
|
||||
License: LGPL v2.1 or later
|
||||
Summary: Include Files and Libraries Mandatory for Development
|
||||
#
|
||||
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
|
||||
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
|
||||
Group: Development/Libraries/C and C++
|
||||
# Last appeared in OpenSUSE 10.3:
|
||||
Provides: avahi-devel = %{version}
|
||||
@ -831,12 +819,6 @@ Authors:
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%if !%build_core
|
||||
@ -1012,6 +994,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
|
||||
%if %build_glib2
|
||||
# FIXME: There are no better Categories in the spec (Monitor is not allowed in Network).
|
||||
%suse_update_desktop_file -r avahi-discover GNOME System Monitor
|
||||
%suse_update_desktop_file bvnc
|
||||
%suse_update_desktop_file bssh
|
||||
%endif
|
||||
%fdupes $RPM_BUILD_ROOT%{_libdir}
|
||||
|
||||
@ -1046,9 +1030,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%postun -n libavahi-common3 -p /sbin/ldconfig
|
||||
|
||||
%post -n libavahi-core5 -p /sbin/ldconfig
|
||||
%post -n libavahi-core6 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libavahi-core5 -p /sbin/ldconfig
|
||||
%postun -n libavahi-core6 -p /sbin/ldconfig
|
||||
|
||||
%post -n libdns_sd -p /sbin/ldconfig
|
||||
|
||||
@ -1150,7 +1134,7 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libavahi-common*.so.*
|
||||
|
||||
%files -n libavahi-core5
|
||||
%files -n libavahi-core6
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libavahi-core*.so.*
|
||||
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
--- man/Makefile.am
|
||||
+++ man/Makefile.am
|
||||
@@ -65,8 +65,11 @@
|
||||
|
||||
if HAVE_PYTHON
|
||||
man_MANS += \
|
||||
- avahi-discover.1 \
|
||||
avahi-bookmarks.1
|
||||
+if HAVE_GTK
|
||||
+man_MANS += \
|
||||
+ avahi-discover.1
|
||||
+endif
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -233,16 +236,22 @@
|
||||
|
||||
if HAVE_DBUS
|
||||
|
||||
+BSSH_LN =
|
||||
+if HAVE_GTK
|
||||
+if HAVE_GLIB
|
||||
+BSSH_LN += $(LN_S) bssh.1 bvnc.1 &&
|
||||
+endif
|
||||
+endif
|
||||
install-exec-local:
|
||||
mkdir -p $(DESTDIR)/$(mandir)/man1 && \
|
||||
cd $(DESTDIR)/$(mandir)/man1 && \
|
||||
rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 avahi-browse-domains.1 avahi-publish-address.1 avahi-publish-service.1 bvnc.1 && \
|
||||
+ $(BSSH_LN) \
|
||||
$(LN_S) avahi-resolve.1 avahi-resolve-host-name.1 && \
|
||||
$(LN_S) avahi-resolve.1 avahi-resolve-address.1 && \
|
||||
$(LN_S) avahi-browse.1 avahi-browse-domains.1 && \
|
||||
$(LN_S) avahi-publish.1 avahi-publish-address.1 && \
|
||||
- $(LN_S) avahi-publish.1 avahi-publish-service.1 && \
|
||||
- $(LN_S) bssh.1 bvnc.1
|
||||
+ $(LN_S) avahi-publish.1 avahi-publish-service.1
|
||||
|
||||
|
||||
endif
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package avahi-mono (Version 0.6.23)
|
||||
# spec file for package avahi-mono (Version 0.6.24)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -30,15 +30,15 @@ Name: avahi-mono
|
||||
%define build_mono 1
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.23
|
||||
Release: 60
|
||||
Version: 0.6.24
|
||||
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})
|
||||
%endif
|
||||
%define avahi_client_soname 3
|
||||
%define avahi_common_soname 3
|
||||
%define avahi_core_soname 5
|
||||
%define avahi_core_soname 6
|
||||
%define avahi_ui_soname 0
|
||||
%define avahi_glib_soname 1
|
||||
%define avahi_gobject_soname 0
|
||||
@ -65,18 +65,6 @@ Patch1: avahi-desktop.patch
|
||||
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-man-link.patch avahi222 sbrabec@suse.cz -- link man page only if it is installed
|
||||
Patch4: avahi-man-selection.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-no-gtk-no-interfaces.patch avahi222 sbrabec@suse.cz -- if gtk is disabled do not install glade files
|
||||
Patch5: avahi-no-gtk-no-interfaces.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-no-gtk-no-interfaces.patch avahi222 sbrabec@suse.cz -- build avahi-bookmarks even without python-gtk
|
||||
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
|
||||
#PATCH-FIX-UPSTREAM avahi-dnsconfd-netconfig.patch bnc431240 lnussel@suse.de -- use netconfig for dnsconfd
|
||||
Patch9: avahi-dnsconfd-netconfig.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 bnc_459007.patch bnc#459007 mauro@suse.de -- fix CVE-2008-5081
|
||||
@ -197,12 +185,12 @@ Authors:
|
||||
Trent Lloyd <lathiat@freedesktop.org>
|
||||
Sebastien Estienne <sebastien.estienne@gmail.com>
|
||||
|
||||
%package -n libavahi-core5
|
||||
%package -n libavahi-core6
|
||||
License: LGPL v2.1 or later
|
||||
Summary: D-BUS Service for Zeroconf and Bonjour
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libavahi-core5
|
||||
%description -n libavahi-core6
|
||||
Avahi is an implementation of the DNS Service Discovery and Multicast
|
||||
DNS specifications for Zeroconf Computing. It uses D-BUS for
|
||||
communication between user applications and a system daemon. The daemon
|
||||
@ -363,7 +351,7 @@ Authors:
|
||||
License: LGPL v2.1 or later
|
||||
Summary: Include Files and Libraries Mandatory for Development
|
||||
#
|
||||
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
|
||||
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
|
||||
Group: Development/Libraries/C and C++
|
||||
# Last appeared in OpenSUSE 10.3:
|
||||
Provides: avahi-devel = %{version}
|
||||
@ -830,12 +818,6 @@ Authors:
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%if !%build_core
|
||||
@ -1011,6 +993,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
|
||||
%if %build_glib2
|
||||
# FIXME: There are no better Categories in the spec (Monitor is not allowed in Network).
|
||||
%suse_update_desktop_file -r avahi-discover GNOME System Monitor
|
||||
%suse_update_desktop_file bvnc
|
||||
%suse_update_desktop_file bssh
|
||||
%endif
|
||||
%fdupes $RPM_BUILD_ROOT%{_libdir}
|
||||
|
||||
@ -1045,9 +1029,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%postun -n libavahi-common3 -p /sbin/ldconfig
|
||||
|
||||
%post -n libavahi-core5 -p /sbin/ldconfig
|
||||
%post -n libavahi-core6 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libavahi-core5 -p /sbin/ldconfig
|
||||
%postun -n libavahi-core6 -p /sbin/ldconfig
|
||||
|
||||
%post -n libdns_sd -p /sbin/ldconfig
|
||||
|
||||
@ -1149,7 +1133,7 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libavahi-common*.so.*
|
||||
|
||||
%files -n libavahi-core5
|
||||
%files -n libavahi-core6
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libavahi-core*.so.*
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- avahi-discover-standalone/Makefile.am
|
||||
+++ avahi-discover-standalone/Makefile.am
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
if HAVE_PYTHON_DBUS
|
||||
|
||||
-interfaces_DATA = $(interfaces)
|
||||
+interfaces_DATA =
|
||||
|
||||
endif
|
||||
endif
|
||||
@ -1,16 +0,0 @@
|
||||
--- avahi-python/avahi/Makefile.am
|
||||
+++ avahi-python/avahi/Makefile.am
|
||||
@@ -52,13 +52,11 @@
|
||||
|
||||
avahi_PYTHON = $(avahi_SCRIPTS)
|
||||
|
||||
-if HAVE_PYGTK
|
||||
if HAVE_PYTHON_DBUS
|
||||
|
||||
avahi_PYTHON += __init__.py
|
||||
|
||||
endif
|
||||
endif
|
||||
-endif
|
||||
|
||||
CLEANFILES=*.pyc *.pyo ServiceTypeDatabase.py
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package avahi-qt4 (Version 0.6.23)
|
||||
# spec file for package avahi-qt4 (Version 0.6.24)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -30,15 +30,15 @@ Name: avahi-qt4
|
||||
%define build_mono 0
|
||||
%define build_qt3 0
|
||||
%define build_qt4 1
|
||||
Version: 0.6.23
|
||||
Release: 12
|
||||
Version: 0.6.24
|
||||
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})
|
||||
%endif
|
||||
%define avahi_client_soname 3
|
||||
%define avahi_common_soname 3
|
||||
%define avahi_core_soname 5
|
||||
%define avahi_core_soname 6
|
||||
%define avahi_ui_soname 0
|
||||
%define avahi_glib_soname 1
|
||||
%define avahi_gobject_soname 0
|
||||
@ -65,18 +65,6 @@ Patch1: avahi-desktop.patch
|
||||
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-man-link.patch avahi222 sbrabec@suse.cz -- link man page only if it is installed
|
||||
Patch4: avahi-man-selection.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-no-gtk-no-interfaces.patch avahi222 sbrabec@suse.cz -- if gtk is disabled do not install glade files
|
||||
Patch5: avahi-no-gtk-no-interfaces.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-no-gtk-no-interfaces.patch avahi222 sbrabec@suse.cz -- build avahi-bookmarks even without python-gtk
|
||||
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
|
||||
#PATCH-FIX-UPSTREAM avahi-dnsconfd-netconfig.patch bnc431240 lnussel@suse.de -- use netconfig for dnsconfd
|
||||
Patch9: avahi-dnsconfd-netconfig.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 bnc_459007.patch bnc#459007 mauro@suse.de -- fix CVE-2008-5081
|
||||
@ -200,12 +188,12 @@ Authors:
|
||||
Trent Lloyd <lathiat@freedesktop.org>
|
||||
Sebastien Estienne <sebastien.estienne@gmail.com>
|
||||
|
||||
%package -n libavahi-core5
|
||||
%package -n libavahi-core6
|
||||
License: LGPL v2.1 or later
|
||||
Summary: D-BUS Service for Zeroconf and Bonjour
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libavahi-core5
|
||||
%description -n libavahi-core6
|
||||
Avahi is an implementation of the DNS Service Discovery and Multicast
|
||||
DNS specifications for Zeroconf Computing. It uses D-BUS for
|
||||
communication between user applications and a system daemon. The daemon
|
||||
@ -366,7 +354,7 @@ Authors:
|
||||
License: LGPL v2.1 or later
|
||||
Summary: Include Files and Libraries Mandatory for Development
|
||||
#
|
||||
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
|
||||
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
|
||||
Group: Development/Libraries/C and C++
|
||||
# Last appeared in OpenSUSE 10.3:
|
||||
Provides: avahi-devel = %{version}
|
||||
@ -833,12 +821,6 @@ Authors:
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%if !%build_core
|
||||
@ -1014,6 +996,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
|
||||
%if %build_glib2
|
||||
# FIXME: There are no better Categories in the spec (Monitor is not allowed in Network).
|
||||
%suse_update_desktop_file -r avahi-discover GNOME System Monitor
|
||||
%suse_update_desktop_file bvnc
|
||||
%suse_update_desktop_file bssh
|
||||
%endif
|
||||
%fdupes $RPM_BUILD_ROOT%{_libdir}
|
||||
|
||||
@ -1048,9 +1032,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%postun -n libavahi-common3 -p /sbin/ldconfig
|
||||
|
||||
%post -n libavahi-core5 -p /sbin/ldconfig
|
||||
%post -n libavahi-core6 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libavahi-core5 -p /sbin/ldconfig
|
||||
%postun -n libavahi-core6 -p /sbin/ldconfig
|
||||
|
||||
%post -n libdns_sd -p /sbin/ldconfig
|
||||
|
||||
@ -1152,7 +1136,7 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libavahi-common*.so.*
|
||||
|
||||
%files -n libavahi-core5
|
||||
%files -n libavahi-core6
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libavahi-core*.so.*
|
||||
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 2 01:26:26 CET 2009 - vuntz@novell.com
|
||||
|
||||
- Call %suse_update_desktop_file on bssh and bvnc.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 1 23:36:41 CET 2009 - vuntz@novell.com
|
||||
|
||||
- Update avahi-desktop.patch to not add X-SuSE-translate=true in
|
||||
.desktop files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 16 12:01:12 CET 2009 - ro@suse.de
|
||||
|
||||
@ -15,6 +26,23 @@ Tue Jan 13 12:34:56 CET 2009 - olh@suse.de
|
||||
|
||||
- obsolete old -XXbit packages (bnc#437293)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 6 12:57:35 EST 2009 - mboman@suse.de
|
||||
|
||||
- Update to version 0.6.24:
|
||||
+ A huge number of bug fixes, including a security relavant one
|
||||
(low risk)
|
||||
+ Add two new configuration directives "allow-interfaces" and
|
||||
"deny-interfaces" which can be used to make Avahi ignore certain
|
||||
network interfaces or only use certain network interfaces
|
||||
+ Translation updates
|
||||
- Remove avahi-man-selection.patch. Fixed upstream
|
||||
- Remove avahi-no-gtk-no-interfaces.patch. Fixed upstream.
|
||||
- Remove avahi-bookmarks-no-pygtk.patch. Fixed upstream
|
||||
- Remove avahi-no-gtk-python.patch. Fixed upstream
|
||||
- Remove avahi-allocsize.patch. Fixed upstream
|
||||
- Remove avahi-dnsconfd-netconfig.patch. Fixed upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 17 09:10:32 CET 2008 - mauro@suse.de
|
||||
|
||||
|
||||
59
avahi.spec
59
avahi.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package avahi (Version 0.6.23)
|
||||
# spec file for package avahi (Version 0.6.24)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -32,15 +32,15 @@ Name: avahi
|
||||
%define build_mono 0
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.23
|
||||
Release: 41
|
||||
Version: 0.6.24
|
||||
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})
|
||||
%endif
|
||||
%define avahi_client_soname 3
|
||||
%define avahi_common_soname 3
|
||||
%define avahi_core_soname 5
|
||||
%define avahi_core_soname 6
|
||||
%define avahi_ui_soname 0
|
||||
%define avahi_glib_soname 1
|
||||
%define avahi_gobject_soname 0
|
||||
@ -67,18 +67,6 @@ Patch1: avahi-desktop.patch
|
||||
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-man-link.patch avahi222 sbrabec@suse.cz -- link man page only if it is installed
|
||||
Patch4: avahi-man-selection.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-no-gtk-no-interfaces.patch avahi222 sbrabec@suse.cz -- if gtk is disabled do not install glade files
|
||||
Patch5: avahi-no-gtk-no-interfaces.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-no-gtk-no-interfaces.patch avahi222 sbrabec@suse.cz -- build avahi-bookmarks even without python-gtk
|
||||
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
|
||||
#PATCH-FIX-UPSTREAM avahi-dnsconfd-netconfig.patch bnc431240 lnussel@suse.de -- use netconfig for dnsconfd
|
||||
Patch9: avahi-dnsconfd-netconfig.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 bnc_459007.patch bnc#459007 mauro@suse.de -- fix CVE-2008-5081
|
||||
@ -200,12 +188,12 @@ Authors:
|
||||
Trent Lloyd <lathiat@freedesktop.org>
|
||||
Sebastien Estienne <sebastien.estienne@gmail.com>
|
||||
|
||||
%package -n libavahi-core5
|
||||
%package -n libavahi-core6
|
||||
License: LGPL v2.1 or later
|
||||
Summary: D-BUS Service for Zeroconf and Bonjour
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libavahi-core5
|
||||
%description -n libavahi-core6
|
||||
Avahi is an implementation of the DNS Service Discovery and Multicast
|
||||
DNS specifications for Zeroconf Computing. It uses D-BUS for
|
||||
communication between user applications and a system daemon. The daemon
|
||||
@ -366,7 +354,7 @@ Authors:
|
||||
License: LGPL v2.1 or later
|
||||
Summary: Include Files and Libraries Mandatory for Development
|
||||
#
|
||||
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core5 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
|
||||
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
|
||||
Group: Development/Libraries/C and C++
|
||||
# Last appeared in OpenSUSE 10.3:
|
||||
Provides: avahi-devel = %{version}
|
||||
@ -833,12 +821,6 @@ Authors:
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%if !%build_core
|
||||
@ -1014,6 +996,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
|
||||
%if %build_glib2
|
||||
# FIXME: There are no better Categories in the spec (Monitor is not allowed in Network).
|
||||
%suse_update_desktop_file -r avahi-discover GNOME System Monitor
|
||||
%suse_update_desktop_file bvnc
|
||||
%suse_update_desktop_file bssh
|
||||
%endif
|
||||
%fdupes $RPM_BUILD_ROOT%{_libdir}
|
||||
|
||||
@ -1048,9 +1032,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%postun -n libavahi-common3 -p /sbin/ldconfig
|
||||
|
||||
%post -n libavahi-core5 -p /sbin/ldconfig
|
||||
%post -n libavahi-core6 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libavahi-core5 -p /sbin/ldconfig
|
||||
%postun -n libavahi-core6 -p /sbin/ldconfig
|
||||
|
||||
%post -n libdns_sd -p /sbin/ldconfig
|
||||
|
||||
@ -1152,7 +1136,7 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libavahi-common*.so.*
|
||||
|
||||
%files -n libavahi-core5
|
||||
%files -n libavahi-core6
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libavahi-core*.so.*
|
||||
|
||||
@ -1321,6 +1305,11 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Feb 02 2009 vuntz@novell.com
|
||||
- Call %%suse_update_desktop_file on bssh and bvnc.
|
||||
* Sun Feb 01 2009 vuntz@novell.com
|
||||
- Update avahi-desktop.patch to not add X-SuSE-translate=true in
|
||||
.desktop files.
|
||||
* Fri Jan 16 2009 ro@suse.de
|
||||
- readd libavahi-common.la, breaks > 100 packages if done this way
|
||||
* Wed Jan 14 2009 sbrabec@suse.cz
|
||||
@ -1329,6 +1318,20 @@ fi
|
||||
- Removed pointless libtool .la file.
|
||||
* Tue Jan 13 2009 olh@suse.de
|
||||
- obsolete old -XXbit packages (bnc#437293)
|
||||
* Tue Jan 06 2009 mboman@suse.de
|
||||
- Update to version 0.6.24:
|
||||
+ A huge number of bug fixes, including a security relavant one
|
||||
(low risk)
|
||||
+ Add two new configuration directives "allow-interfaces" and
|
||||
"deny-interfaces" which can be used to make Avahi ignore certain
|
||||
network interfaces or only use certain network interfaces
|
||||
+ Translation updates
|
||||
- Remove avahi-man-selection.patch. Fixed upstream
|
||||
- Remove avahi-no-gtk-no-interfaces.patch. Fixed upstream.
|
||||
- Remove avahi-bookmarks-no-pygtk.patch. Fixed upstream
|
||||
- Remove avahi-no-gtk-python.patch. Fixed upstream
|
||||
- Remove avahi-allocsize.patch. Fixed upstream
|
||||
- Remove avahi-dnsconfd-netconfig.patch. Fixed upstream
|
||||
* Wed Dec 17 2008 mauro@suse.de
|
||||
- Added bnc_459007.patch to fix bnc#459007
|
||||
+ Fixes CVE-2008-5081
|
||||
|
||||
Loading…
Reference in New Issue
Block a user