pool/avahi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2008-10-22 15:39:21 +00:00 committed by Git OBS Bridge
parent 1b13740812
commit cddc72dea1
8 changed files with 105 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
avahi-dnsconfd-netconfig.patch Normal file
View File

@ -0,0 +1,46 @@
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

10
avahi-glib2.spec
View File

@ -31,7 +31,7 @@ Name: avahi-glib2
%define build_qt3 0 %define build_qt3 0
%define build_qt4 0 %define build_qt4 0
Version: 0.6.23 Version: 0.6.23
Release: 5 Release: 6
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes: # Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@ -75,6 +75,10 @@ Patch6: avahi-bookmarks-no-pygtk.patch
Patch7: avahi-no-gtk-python.patch Patch7: avahi-no-gtk-python.patch
#PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute #PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute
Patch8: avahi-allocsize.patch 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config 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: # Even if we are not building python bindings, we need python to build service types database:
@ -814,6 +818,8 @@ Authors:
%patch6 %patch6
%patch7 %patch7
%patch8 %patch8
%patch9 -p1
%patch10 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.
@ -995,7 +1001,7 @@ rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
%{fillup_and_insserv -f -Y avahi-daemon} %{fillup_and_insserv -f -Y avahi-daemon}
%{fillup_and_insserv -f -Y avahi-dnsconfd} %{fillup_and_insserv -f avahi-dnsconfd}
%preun %preun
%{stop_on_removal avahi-daemon} %{stop_on_removal avahi-daemon}

10
avahi-mono.spec
View File

@ -31,7 +31,7 @@ Name: avahi-mono
%define build_qt3 0 %define build_qt3 0
%define build_qt4 0 %define build_qt4 0
Version: 0.6.23 Version: 0.6.23
Release: 51 Release: 54
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes: # Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@ -75,6 +75,10 @@ Patch6: avahi-bookmarks-no-pygtk.patch
Patch7: avahi-no-gtk-python.patch Patch7: avahi-no-gtk-python.patch
#PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute #PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute
Patch8: avahi-allocsize.patch 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config 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: # Even if we are not building python bindings, we need python to build service types database:
@ -813,6 +817,8 @@ Authors:
%patch6 %patch6
%patch7 %patch7
%patch8 %patch8
%patch9 -p1
%patch10 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.
@ -994,7 +1000,7 @@ rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
%{fillup_and_insserv -f -Y avahi-daemon} %{fillup_and_insserv -f -Y avahi-daemon}
%{fillup_and_insserv -f -Y avahi-dnsconfd} %{fillup_and_insserv -f avahi-dnsconfd}
%preun %preun
%{stop_on_removal avahi-daemon} %{stop_on_removal avahi-daemon}

10
avahi-qt4.spec
View File

@ -31,7 +31,7 @@ Name: avahi-qt4
%define build_qt3 0 %define build_qt3 0
%define build_qt4 1 %define build_qt4 1
Version: 0.6.23 Version: 0.6.23
Release: 5 Release: 6
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes: # Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@ -75,6 +75,10 @@ Patch6: avahi-bookmarks-no-pygtk.patch
Patch7: avahi-no-gtk-python.patch Patch7: avahi-no-gtk-python.patch
#PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute #PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute
Patch8: avahi-allocsize.patch 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config 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: # Even if we are not building python bindings, we need python to build service types database:
@ -816,6 +820,8 @@ Authors:
%patch6 %patch6
%patch7 %patch7
%patch8 %patch8
%patch9 -p1
%patch10 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.
@ -997,7 +1003,7 @@ rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
%{fillup_and_insserv -f -Y avahi-daemon} %{fillup_and_insserv -f -Y avahi-daemon}
%{fillup_and_insserv -f -Y avahi-dnsconfd} %{fillup_and_insserv -f avahi-dnsconfd}
%preun %preun
%{stop_on_removal avahi-daemon} %{stop_on_removal avahi-daemon}

13
avahi-unicastdomains.patch Normal file
View File

@ -0,0 +1,13 @@
Index: avahi-0.6.23/avahi-daemon/avahi-daemon.conf
===================================================================
--- avahi-0.6.23.orig/avahi-daemon/avahi-daemon.conf
+++ avahi-0.6.23/avahi-daemon/avahi-daemon.conf
@@ -23,7 +23,7 @@
[server]
#host-name=foo
#domain-name=local
-browse-domains=0pointer.de, zeroconf.org
+#browse-domains=0pointer.de, zeroconf.org
use-ipv4=yes
use-ipv6=no
#check-response-ttl=no

8
avahi.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Oct 17 15:28:25 CEST 2008 - lnussel@suse.de
- use netconfig for avahi-dnsconfd (bnc#431240)
- disable avahi-dnsconfd by default (bnc#431240)
- remove 0pointer.de and zeroconf.org from default config (bnc#433359)
- fix indenting in init script (bnc#435506)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 12 10:09:45 CEST 2008 - aj@suse.de Fri Sep 12 10:09:45 CEST 2008 - aj@suse.de

15
avahi.spec
View File

@ -33,7 +33,7 @@ Name: avahi
%define build_qt3 0 %define build_qt3 0
%define build_qt4 0 %define build_qt4 0
Version: 0.6.23 Version: 0.6.23
Release: 32 Release: 35
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes: # Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@ -77,6 +77,10 @@ Patch6: avahi-bookmarks-no-pygtk.patch
Patch7: avahi-no-gtk-python.patch Patch7: avahi-no-gtk-python.patch
#PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute #PATCH-FIX-UPSTREAM avahi-allocsize.patch none meissner@suse.de -- mark up allocation functions with attribute
Patch8: avahi-allocsize.patch 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel perl-XML-Parser pkg-config 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: # Even if we are not building python bindings, we need python to build service types database:
@ -816,6 +820,8 @@ Authors:
%patch6 %patch6
%patch7 %patch7
%patch8 %patch8
%patch9 -p1
%patch10 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.
@ -997,7 +1003,7 @@ rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
%{fillup_and_insserv -f -Y avahi-daemon} %{fillup_and_insserv -f -Y avahi-daemon}
%{fillup_and_insserv -f -Y avahi-dnsconfd} %{fillup_and_insserv -f avahi-dnsconfd}
%preun %preun
%{stop_on_removal avahi-daemon} %{stop_on_removal avahi-daemon}
@ -1287,6 +1293,11 @@ fi
%endif %endif
%changelog %changelog
* Fri Oct 17 2008 lnussel@suse.de
- use netconfig for avahi-dnsconfd (bnc#431240)
- disable avahi-dnsconfd by default (bnc#431240)
- remove 0pointer.de and zeroconf.org from default config (bnc#433359)
- fix indenting in init script (bnc#435506)
* Fri Sep 12 2008 aj@suse.de * Fri Sep 12 2008 aj@suse.de
- Remove languages directory ownership, it's now part of filesystem. - Remove languages directory ownership, it's now part of filesystem.
* Fri Sep 05 2008 ro@suse.de * Fri Sep 05 2008 ro@suse.de