packages: avahi/avahi.spec, avahi/avahi-autoipd-sbin_ip.patch (NEW), avahi/...

[jajcus]

Author: jajcus                       Date: Sun May  2 13:25:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- provide dhclient hooks in the autoipd package

---- Files affected:
packages/avahi:
   avahi.spec (1.106 -> 1.107) , avahi-autoipd-sbin_ip.patch (NONE -> 1.1)  (NEW), avahi-dhclient_hooks.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/avahi/avahi.spec
diff -u packages/avahi/avahi.spec:1.106 packages/avahi/avahi.spec:1.107
--- packages/avahi/avahi.spec:1.106	Sun May  2 13:41:47 2010
+++ packages/avahi/avahi.spec	Sun May  2 15:25:38 2010
@@ -36,6 +36,8 @@
 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
@@ -550,6 +552,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %{__intltoolize}
@@ -692,11 +696,12 @@
 %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*
@@ -929,6 +934,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107  2010/05/02 13:25:38  jajcus
+- provide dhclient hooks in the autoipd package
+
 Revision 1.106  2010/05/02 11:41:47  jajcus
 - provide the 'avahi' user in the autoipd package too
 

================================================================
Index: packages/avahi/avahi-autoipd-sbin_ip.patch
diff -u /dev/null packages/avahi/avahi-autoipd-sbin_ip.patch:1.1
--- /dev/null	Sun May  2 15:25:44 2010
+++ packages/avahi/avahi-autoipd-sbin_ip.patch	Sun May  2 15:25:38 2010
@@ -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" 
+             ;;
+ 
+         *)

================================================================
Index: packages/avahi/avahi-dhclient_hooks.patch
diff -u /dev/null packages/avahi/avahi-dhclient_hooks.patch:1.1
--- /dev/null	Sun May  2 15:25:44 2010
+++ packages/avahi/avahi-dhclient_hooks.patch	Sun May  2 15:25:38 2010
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi.spec?r1=1.106&r2=1.107&f=u