packages: avahi/avahi-autoipd-sbin_ip.patch, avahi/avahi-destdir.patch, ava...

lisu lisu at pld-linux.org
Wed Jul 7 12:21:57 CEST 2010 

Author: lisu                         Date: Wed Jul  7 10:21:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.6.26

---- Files affected:
packages/avahi:
   avahi-autoipd-sbin_ip.patch (1.1 -> 1.2) , avahi-destdir.patch (1.3 -> 1.4) , avahi-dhclient_hooks.patch (1.1 -> 1.2) , avahi-glade.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/avahi/avahi-autoipd-sbin_ip.patch
diff -u packages/avahi/avahi-autoipd-sbin_ip.patch:1.1 packages/avahi/avahi-autoipd-sbin_ip.patch:1.2
--- packages/avahi/avahi-autoipd-sbin_ip.patch:1.1	Sun May  2 15:25:38 2010
+++ packages/avahi/avahi-autoipd-sbin_ip.patch	Wed Jul  7 12:21:51 2010
@@ -1,8 +1,8 @@
---- 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
+--- avahi-0.6.26/avahi-autoipd/avahi-autoipd.action.linux~	2010-06-25 20:50:59.000000000 +0200
++++ avahi-0.6.26/avahi-autoipd/avahi-autoipd.action.linux	2010-07-07 11:18:35.704019843 +0200
+@@ -35,19 +35,19 @@
+ 
+ METRIC=$((1000 + `cat "/sys/class/net/$2/ifindex" 2>/dev/null || echo 0`))
  
 -if [ -x /bin/ip -o -x /sbin/ip ] ; then
 +if [ -x /sbin/ip ] ; then
@@ -11,13 +11,17 @@
  
      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" 
+-            ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
+-            ip route add default dev "$2" metric "$METRIC" scope link ||:
++            /sbin/ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
++            /sbin/ip route add default dev "$2" metric "$METRIC" scope link ||:
              ;;
  
          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" 
+-            ip route del default dev "$2" metric "$METRIC" scope link ||:
+-            ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
++            /sbin/ip route del default dev "$2" metric "$METRIC" scope link ||:
++            /sbin/ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
              ;;
  
          *)

================================================================
Index: packages/avahi/avahi-destdir.patch
diff -u packages/avahi/avahi-destdir.patch:1.3 packages/avahi/avahi-destdir.patch:1.4
--- packages/avahi/avahi-destdir.patch:1.3	Mon Jun 18 17:40:56 2007
+++ packages/avahi/avahi-destdir.patch	Wed Jul  7 12:21:51 2010
@@ -1,19 +1,3 @@
-diff -urN avahi-0.6.19/avahi-sharp/Makefile.am avahi-0.6.19.new/avahi-sharp/Makefile.am
---- avahi-0.6.19/avahi-sharp/Makefile.am	2006-08-22 01:31:59.000000000 +0200
-+++ avahi-0.6.19.new/avahi-sharp/Makefile.am	2007-06-18 16:51:04.095104810 +0200
-@@ -75,10 +75,10 @@
- endif
- 
- install-data-hook: $(ASSEMBLY)
--	$(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
-+	$(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(prefix)/lib
- 
- uninstall-hook: $(ASSEMBLY)
--	$(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
-+	$(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(prefix)/lib
- 
- endif
- endif
 diff -urN avahi-0.6.19/avahi-ui-sharp/Makefile.am avahi-0.6.19.new/avahi-ui-sharp/Makefile.am
 --- avahi-0.6.19/avahi-ui-sharp/Makefile.am	2007-04-21 20:47:16.000000000 +0200
 +++ avahi-0.6.19.new/avahi-ui-sharp/Makefile.am	2007-06-18 17:27:08.498654208 +0200
@@ -27,6 +11,21 @@
  uninstall-hook: $(ASSEMBLY)
 -	$(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
 +	$(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(prefix)/lib
+ 
+ endif
+ endif
+--- avahi-0.6.26/avahi-sharp/Makefile.am~	2010-06-25 20:45:23.000000000 +0200
++++ avahi-0.6.26/avahi-sharp/Makefile.am	2010-07-07 11:12:57.330099139 +0200
+@@ -73,10 +73,10 @@
+ endif
+ 
+ install-data-hook: $(ASSEMBLY)
+-	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(prefix)/lib
+ 
+ uninstall-hook: $(ASSEMBLY)
+-	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(prefix)/lib
  
  endif
  endif

================================================================
Index: packages/avahi/avahi-dhclient_hooks.patch
diff -u packages/avahi/avahi-dhclient_hooks.patch:1.1 packages/avahi/avahi-dhclient_hooks.patch:1.2
--- packages/avahi/avahi-dhclient_hooks.patch:1.1	Sun May  2 15:25:38 2010
+++ packages/avahi/avahi-dhclient_hooks.patch	Wed Jul  7 12:21:51 2010
@@ -1,7 +1,7 @@
---- 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 $< $@
+--- avahi-0.6.26/avahi-autoipd/Makefile.am~	2010-06-28 18:23:15.000000000 +0200
++++ avahi-0.6.26/avahi-autoipd/Makefile.am	2010-07-07 11:15:32.407583823 +0200
+@@ -58,8 +58,6 @@
+ 	$(AM_V_GEN)cp $< $@
  endif
  
 -if TARGET_DEBIAN
@@ -9,18 +9,18 @@
  noinst_SCRIPTS = dhclient-enter-hook dhclient-exit-hook
  
  dhclient-enter-hook: dhclient-enter-hook.in
-@@ -74,8 +72,8 @@
+@@ -72,8 +70,8 @@
  
  BUILD = dhclient-exit-hook dhclient-enter-hook
  
--dhcliententerdir = $(sysconfdir)/dhcp3/dhclient-enter-hooks.d
--dhclientexitdir = $(sysconfdir)/dhcp3/dhclient-exit-hooks.d
+-dhcliententerdir = $(sysconfdir)/dhcp/dhclient-enter-hooks.d
+-dhclientexitdir = $(sysconfdir)/dhcp/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 @@
+@@ -83,7 +81,6 @@
  uninstall-hook:
  	rm -f $(DESTDIR)$(dhcliententerdir)/avahi-autoipd $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
  

================================================================
Index: packages/avahi/avahi-glade.patch
diff -u packages/avahi/avahi-glade.patch:1.1 packages/avahi/avahi-glade.patch:1.2
--- packages/avahi/avahi-glade.patch:1.1	Thu Jan 26 16:53:14 2006
+++ packages/avahi/avahi-glade.patch	Wed Jul  7 12:21:51 2010
@@ -1,14 +1,13 @@
-diff -aurN avahi-0.6.5.orig/avahi-discover-standalone/Makefile.am avahi-0.6.5/avahi-discover-standalone/Makefile.am
---- avahi-0.6.5.orig/avahi-discover-standalone/Makefile.am	2005-09-25 22:34:48.000000000 +0200
-+++ avahi-0.6.5/avahi-discover-standalone/Makefile.am	2006-01-26 16:41:42.000341000 +0100
-@@ -20,7 +20,8 @@
+--- avahi-0.6.26/avahi-discover-standalone/Makefile.am~ 2010-06-25 05:25:11.000000000 +0200
++++ avahi-0.6.26/avahi-discover-standalone/Makefile.am  2010-07-07 11:03:44.306813189 +0200
+@@ -18,7 +18,8 @@
  AM_CFLAGS=-I$(top_srcdir)
- 
+
  interfaces = \
--        avahi-discover.glade
-+	avahi-discover.glade \
-+	avahi-discover-standalone.glade
- 
+-        avahi-discover.ui
++        avahi-discover.ui \
++       avahi-discover-standalone.glade
+
  # This cool debug trap works on i386/gcc only
  AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 diff -aurN avahi-0.6.5.orig/avahi-discover-standalone/avahi-discover-standalone.glade avahi-0.6.5/avahi-discover-standalone/avahi-discover-standalone.glade
@@ -106,15 +105,13 @@
 +</widget>
 +
 +</glade-interface>
-diff -aurN avahi-0.6.5.orig/avahi-discover-standalone/main.c avahi-0.6.5/avahi-discover-standalone/main.c
---- avahi-0.6.5.orig/avahi-discover-standalone/main.c	2005-11-04 00:36:41.000000000 +0100
-+++ avahi-0.6.5/avahi-discover-standalone/main.c	2006-01-26 16:35:46.100341000 +0100
-@@ -333,7 +333,7 @@
- 
+--- avahi-0.6.26/avahi-discover-standalone/main.c~      2010-06-25 02:41:25.000000000 +0200
++++ avahi-0.6.26/avahi-discover-standalone/main.c       2010-07-07 11:06:22.006805326 +0200
+@@ -330,7 +330,7 @@
      poll_api = avahi_glib_poll_new(NULL, G_PRIORITY_DEFAULT);
- 
--    xml = glade_xml_new(AVAHI_INTERFACES_DIR"avahi-discover.glade", NULL, NULL);
-+    xml = glade_xml_new(AVAHI_INTERFACES_DIR"avahi-discover-standalone.glade", NULL, NULL);
-     main_window = glade_xml_get_widget(xml, "main_window");
+
+     ui = gtk_builder_new();
+-    gtk_builder_add_from_file(ui, AVAHI_INTERFACES_DIR"avahi-discover.ui", NULL);
++    gtk_builder_add_from_file(ui, AVAHI_INTERFACES_DIR"avahi-discover-standalone.glade", NULL);
+     main_window = GTK_WIDGET(gtk_builder_get_object(ui, "main_window"));
      g_signal_connect(main_window, "delete-event", (GCallback) main_window_on_delete_event, NULL);
-     
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi-autoipd-sbin_ip.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi-destdir.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi-dhclient_hooks.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi-glade.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list