[Pkg-utopia-commits] r3584 - /packages/unstable/avahi/debian/patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Jun 25 09:33:34 UTC 2010 

Author: biebl
Date: Fri Jun 25 09:33:32 2010
New Revision: 3584

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3584
Log:
Refresh all patches so dpkg-source applies them correctly.

Modified:
    packages/unstable/avahi/debian/patches/01_avahi-daemon.conf.patch
    packages/unstable/avahi/debian/patches/11_avahi-autoipd.action-add-routes.patch
    packages/unstable/avahi/debian/patches/15-manpage-typo-fixes.patch
    packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch
    packages/unstable/avahi/debian/patches/25_check_net_if_dl_h_for_pfroute.patch
    packages/unstable/avahi/debian/patches/26_am_maintainer_mode.patch
    packages/unstable/avahi/debian/patches/30_dont_reflect_link-local_addresses.patch

Modified: packages/unstable/avahi/debian/patches/01_avahi-daemon.conf.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/01_avahi-daemon.conf.patch?rev=3584&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/01_avahi-daemon.conf.patch (original)
+++ packages/unstable/avahi/debian/patches/01_avahi-daemon.conf.patch Fri Jun 25 09:33:32 2010
@@ -1,7 +1,7 @@
-diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
-index ad69c73..737a3b2 100644
---- a/avahi-daemon/avahi-daemon.conf
-+++ b/avahi-daemon/avahi-daemon.conf
+Index: b/avahi-daemon/avahi-daemon.conf
+===================================================================
+--- a/avahi-daemon/avahi-daemon.conf	2010-06-25 11:30:47.202932592 +0200
++++ b/avahi-daemon/avahi-daemon.conf	2010-06-25 11:30:50.982931931 +0200
 @@ -23,9 +23,9 @@
  [server]
  #host-name=foo

Modified: packages/unstable/avahi/debian/patches/11_avahi-autoipd.action-add-routes.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/11_avahi-autoipd.action-add-routes.patch?rev=3584&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/11_avahi-autoipd.action-add-routes.patch (original)
+++ packages/unstable/avahi/debian/patches/11_avahi-autoipd.action-add-routes.patch Fri Jun 25 09:33:32 2010
@@ -1,7 +1,7 @@
-Index: avahi-0.6.24/avahi-autoipd/avahi-autoipd.action.linux
+Index: b/avahi-autoipd/avahi-autoipd.action.linux
 ===================================================================
---- avahi-0.6.24.orig/avahi-autoipd/avahi-autoipd.action.linux	2008-06-18 01:13:44.000000000 +0200
-+++ avahi-0.6.24/avahi-autoipd/avahi-autoipd.action.linux	2009-03-29 21:54:11.000000000 +0200
+--- a/avahi-autoipd/avahi-autoipd.action.linux	2010-06-25 11:30:47.150934621 +0200
++++ b/avahi-autoipd/avahi-autoipd.action.linux	2010-06-25 11:30:57.862935929 +0200
 @@ -36,11 +36,13 @@
  
      case "$1" in

Modified: packages/unstable/avahi/debian/patches/15-manpage-typo-fixes.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/15-manpage-typo-fixes.patch?rev=3584&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/15-manpage-typo-fixes.patch (original)
+++ packages/unstable/avahi/debian/patches/15-manpage-typo-fixes.patch Fri Jun 25 09:33:32 2010
@@ -1,7 +1,7 @@
-diff --git a/man/avahi-browse.1.xml.in b/man/avahi-browse.1.xml.in
-index 90b2d35..df4924b 100644
---- a/man/avahi-browse.1.xml.in
-+++ b/man/avahi-browse.1.xml.in
+Index: b/man/avahi-browse.1.xml.in
+===================================================================
+--- a/man/avahi-browse.1.xml.in	2010-06-25 11:30:47.106935157 +0200
++++ b/man/avahi-browse.1.xml.in	2010-06-25 11:31:01.050935003 +0200
 @@ -93,7 +93,7 @@
  
  	  <option>
@@ -11,10 +11,10 @@
  	  </option>
  
  	  <option>
-diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
-index 08992fa..baa9a21 100644
---- a/man/avahi-daemon.conf.5.xml.in
-+++ b/man/avahi-daemon.conf.5.xml.in
+Index: b/man/avahi-daemon.conf.5.xml.in
+===================================================================
+--- a/man/avahi-daemon.conf.5.xml.in	2010-06-25 11:30:47.090929208 +0200
++++ b/man/avahi-daemon.conf.5.xml.in	2010-06-25 11:31:01.050935003 +0200
 @@ -48,13 +48,13 @@
        </option>
  

Modified: packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch?rev=3584&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch (original)
+++ packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch Fri Jun 25 09:33:32 2010
@@ -2,8 +2,10 @@
 Author: Julien BLACHE <jblache at debian.org>
 Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564607
 Bug: http://avahi.org/ticket/299
---- avahi-0.6.25.orig/avahi-daemon/main.c
-+++ avahi-0.6.25/avahi-daemon/main.c
+Index: b/avahi-daemon/main.c
+===================================================================
+--- a/avahi-daemon/main.c	2010-06-25 11:30:47.046932265 +0200
++++ b/avahi-daemon/main.c	2010-06-25 11:31:03.698935981 +0200
 @@ -1307,7 +1307,7 @@
  #endif
  

Modified: packages/unstable/avahi/debian/patches/25_check_net_if_dl_h_for_pfroute.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/25_check_net_if_dl_h_for_pfroute.patch?rev=3584&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/25_check_net_if_dl_h_for_pfroute.patch (original)
+++ packages/unstable/avahi/debian/patches/25_check_net_if_dl_h_for_pfroute.patch Fri Jun 25 09:33:32 2010
@@ -13,9 +13,11 @@
 Author: Pino Toscano <pino at kde.org>
 Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558975
 Bug: http://avahi.org/ticket/298
-Index: avahi-0.6.25/configure.ac
+Index: b/configure.ac
 ===================================================================
-@@ -169,6 +170,7 @@
+--- a/configure.ac	2010-06-25 11:30:46.990932953 +0200
++++ b/configure.ac	2010-06-25 11:31:06.274935613 +0200
+@@ -169,6 +169,7 @@
  , [], [
  #include <sys/types.h>
  #include <sys/socket.h>

Modified: packages/unstable/avahi/debian/patches/26_am_maintainer_mode.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/26_am_maintainer_mode.patch?rev=3584&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/26_am_maintainer_mode.patch (original)
+++ packages/unstable/avahi/debian/patches/26_am_maintainer_mode.patch Fri Jun 25 09:33:32 2010
@@ -1,7 +1,7 @@
-Index: avahi-0.6.25/configure.ac
+Index: b/configure.ac
 ===================================================================
---- avahi-0.6.25.orig/configure.ac	2010-01-13 22:29:48.352301588 +0100
-+++ avahi-0.6.25/configure.ac	2010-01-13 22:30:21.288302354 +0100
+--- a/configure.ac	2010-06-25 11:31:06.274935613 +0200
++++ b/configure.ac	2010-06-25 11:31:08.842935333 +0200
 @@ -25,6 +25,7 @@
  AC_CONFIG_SRCDIR([avahi-core/server.c])
  AC_CONFIG_HEADERS([config.h])

Modified: packages/unstable/avahi/debian/patches/30_dont_reflect_link-local_addresses.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/30_dont_reflect_link-local_addresses.patch?rev=3584&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/30_dont_reflect_link-local_addresses.patch (original)
+++ packages/unstable/avahi/debian/patches/30_dont_reflect_link-local_addresses.patch Fri Jun 25 09:33:32 2010
@@ -10,11 +10,11 @@
 responses.
 ---
 
-diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
-index d190c66..3062cc6 100644
---- a/avahi-core/Makefile.am
-+++ b/avahi-core/Makefile.am
-@@ -143,7 +143,8 @@ dns_test_SOURCES = \
+Index: b/avahi-core/Makefile.am
+===================================================================
+--- a/avahi-core/Makefile.am	2010-06-25 11:29:43.278934191 +0200
++++ b/avahi-core/Makefile.am	2010-06-25 11:31:12.882930102 +0200
+@@ -143,7 +143,8 @@
  	util.c util.h \
  	rr.c rr.h \
  	hashmap.c hashmap.h \
@@ -24,11 +24,11 @@
  dns_test_CFLAGS = $(AM_CFLAGS)
  dns_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
  
-diff --git a/avahi-core/addr-util.c b/avahi-core/addr-util.c
-index 9e2d1e9..22a2714 100644
---- a/avahi-core/addr-util.c
-+++ b/avahi-core/addr-util.c
-@@ -75,5 +75,22 @@ int avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a) {
+Index: b/avahi-core/addr-util.c
+===================================================================
+--- a/avahi-core/addr-util.c	2010-06-25 11:29:43.246930671 +0200
++++ b/avahi-core/addr-util.c	2010-06-25 11:31:12.882930102 +0200
+@@ -75,5 +75,22 @@
      return memcmp(a->data.ipv6.address, ipv4_in_ipv6, sizeof(ipv4_in_ipv6)) == 0;
  }
  
@@ -39,7 +39,7 @@
  
 +int avahi_address_is_link_local(const AvahiAddress *a) {
 +    assert(a);
-+
+ 
 +    if (a->proto == AVAHI_PROTO_INET) {
 +        uint32_t n = ntohl(a->data.ipv4.address);
 +        return (n & IPV4LL_NETMASK) == IPV4LL_NETWORK;
@@ -48,14 +48,14 @@
 +        unsigned n = (a->data.ipv6.address[0] << 8) | (a->data.ipv6.address[1] << 0);
 +        return (n & IPV6LL_NETMASK) == IPV6LL_NETWORK;
 +    }
- 
++
 +    return 0;
 +}
-diff --git a/avahi-core/addr-util.h b/avahi-core/addr-util.h
-index 4134de1..b4785d7 100644
---- a/avahi-core/addr-util.h
-+++ b/avahi-core/addr-util.h
-@@ -40,6 +40,10 @@ uint16_t avahi_port_from_sockaddr(const struct sockaddr* sa);
+Index: b/avahi-core/addr-util.h
+===================================================================
+--- a/avahi-core/addr-util.h	2010-06-25 11:29:43.230935615 +0200
++++ b/avahi-core/addr-util.h	2010-06-25 11:31:12.886961621 +0200
+@@ -40,6 +40,10 @@
   * encapsulated IPv4 address, returns 1 if yes, 0 otherwise */
  int avahi_address_is_ipv4_in_ipv6(const AvahiAddress *a);
  
@@ -66,10 +66,10 @@
  AVAHI_C_DECL_END
  
  #endif
-diff --git a/avahi-core/rr.c b/avahi-core/rr.c
-index 8b7fab7..e815a2f 100644
---- a/avahi-core/rr.c
-+++ b/avahi-core/rr.c
+Index: b/avahi-core/rr.c
+===================================================================
+--- a/avahi-core/rr.c	2010-06-25 11:29:43.270930936 +0200
++++ b/avahi-core/rr.c	2010-06-25 11:31:12.886961621 +0200
 @@ -40,6 +40,7 @@
  #include "hashmap.h"
  #include "domain-util.h"
@@ -78,7 +78,7 @@
  
  AvahiKey *avahi_key_new(const char *name, uint16_t class, uint16_t type) {
      AvahiKey *k;
-@@ -698,6 +699,37 @@ int avahi_record_is_valid(AvahiRecord *r) {
+@@ -698,6 +699,37 @@
          }
      }
              
@@ -117,11 +117,11 @@
 +
 +    return avahi_address_is_link_local(&a);
 +}
-diff --git a/avahi-core/rr.h b/avahi-core/rr.h
-index 6bfe0ec..2160507 100644
---- a/avahi-core/rr.h
-+++ b/avahi-core/rr.h
-@@ -169,6 +169,9 @@ int avahi_rdata_parse(AvahiRecord *record, const void* rdata, size_t size);
+Index: b/avahi-core/rr.h
+===================================================================
+--- a/avahi-core/rr.h	2010-06-25 11:29:43.254932528 +0200
++++ b/avahi-core/rr.h	2010-06-25 11:31:12.886961621 +0200
+@@ -169,6 +169,9 @@
  /** Serialize an AvahiRecord object into binary rdata. This function is actually implemented in dns.c */
  size_t avahi_rdata_serialize(AvahiRecord *record, void *rdata, size_t max_size);
  
@@ -131,11 +131,11 @@
  AVAHI_C_DECL_END
  
  #endif
-diff --git a/avahi-core/server.c b/avahi-core/server.c
-index bb625a5..2bbf57d 100644
---- a/avahi-core/server.c
-+++ b/avahi-core/server.c
-@@ -666,7 +666,7 @@ static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInter
+Index: b/avahi-core/server.c
+===================================================================
+--- a/avahi-core/server.c	2010-06-25 11:29:43.298931990 +0200
++++ b/avahi-core/server.c	2010-06-25 11:31:12.886961621 +0200
+@@ -666,7 +666,7 @@
              break;
          }

More information about the Pkg-utopia-commits mailing list