- provide dhclient hooks in the autoipd package

Changed files:
    avahi-autoipd-sbin_ip.patch -> 1.1
    avahi-dhclient_hooks.patch -> 1.1
    avahi.spec -> 1.107

diff --git a/avahi-autoipd-sbin_ip.patch b/avahi-autoipd-sbin_ip.patch
new file mode 100644 (file)
index 0000000..5ce63fe
--- /dev/null
+++ b/avahi-autoipd-sbin_ip.patch
@@ -0,0 +1,23 @@
+--- avahi-0.6.25/avahi-autoipd/avahi-autoipd.action.linux.orig 2010-05-02 15:05:38.000000000 +0200
++++ avahi-0.6.25/avahi-autoipd/avahi-autoipd.action.linux      2010-05-02 15:14:46.000000000 +0200
+@@ -30,17 +30,17 @@
+ #   $2 interface name
+ #   $3 IP adddress
+ 
+-if [ -x /bin/ip -o -x /sbin/ip ] ; then
++if [ -x /sbin/ip ] ; then
+ 
+     # We have the Linux ip tool from the iproute package
+ 
+     case "$1" in
+         BIND)
+-            ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" 
++            /sbin/ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" 
+             ;;
+ 
+         CONFLICT|UNBIND|STOP)
+-            ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" 
++            /sbin/ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" 
+             ;;
+ 
+         *)

diff --git a/avahi-dhclient_hooks.patch b/avahi-dhclient_hooks.patch
new file mode 100644 (file)
index 0000000..194917f
--- /dev/null
+++ b/avahi-dhclient_hooks.patch
@@ -0,0 +1,30 @@
+--- avahi-0.6.25/avahi-autoipd/Makefile.am.orig        2008-06-18 01:13:44.000000000 +0200
++++ avahi-0.6.25/avahi-autoipd/Makefile.am     2010-05-02 15:03:02.000000000 +0200
+@@ -60,8 +60,6 @@
+       cp $< $@
+ endif
+ 
+-if TARGET_DEBIAN
+-
+ noinst_SCRIPTS = dhclient-enter-hook dhclient-exit-hook
+ 
+ dhclient-enter-hook: dhclient-enter-hook.in
+@@ -74,8 +72,8 @@
+ 
+ BUILD = dhclient-exit-hook dhclient-enter-hook
+ 
+-dhcliententerdir = $(sysconfdir)/dhcp3/dhclient-enter-hooks.d
+-dhclientexitdir = $(sysconfdir)/dhcp3/dhclient-exit-hooks.d
++dhcliententerdir = $(sysconfdir)/dhclient-enter-hooks.d
++dhclientexitdir = $(sysconfdir)/dhclient-exit-hooks.d
+ 
+ install-exec-hook: dhclient-exit-hook dhclient-enter-hook
+       $(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
+@@ -85,7 +83,6 @@
+ uninstall-hook:
+       rm -f $(DESTDIR)$(dhcliententerdir)/avahi-autoipd $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
+ 
+-endif
+ 
+ 
+ endif

diff --git a/avahi.spec b/avahi.spec
index b0697317f0ff4a698dc0f17d6ab247ca94fbfcf0..a4a126ac11ef6b9d6788a4ec8f463901d33329a2 100644 (file)
--- a/avahi.spec
+++ b/avahi.spec
@@ -35,6 +35,8 @@ Patch1:               %{name}-glade.patch
 Patch2:                %{name}-destdir.patch
 Patch3:                %{name}-mono-dir.patch
 Patch4:                nss-mdns-package.patch
+Patch5:                %{name}-dhclient_hooks.patch
+Patch6:                %{name}-autoipd-sbin_ip.patch
 URL:           http://avahi.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -549,6 +551,8 @@ Narzędzia linii poleceń korzystające z avahi-client.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %{__intltoolize}
@@ -691,11 +695,12 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-daemon
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-dnsconfd
 
-
 %files autoipd
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/avahi
 %attr(755,root,root) %{_sysconfdir}/%{name}/avahi-autoipd.action
+%config(noreplace) %verify(not md5 mtime size) /etc/dhclient-enter-hooks.d/avahi-autoipd
+%config(noreplace) %verify(not md5 mtime size) /etc/dhclient-exit-hooks.d/avahi-autoipd
 %attr(755,root,root) %{_sbindir}/avahi-autoipd
 %{_mandir}/man8/avahi-autoipd.8*
 %{_mandir}/man8/avahi-autoipd.action.8*