Fix line endings.

Package-Manager: portage-2.1.1

3 files changed, 46 insertions, 42 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 34509eca5203..09c36790a722 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.55 2006/09/10 17:22:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.56 2006/09/12 18:55:15 swegener Exp $
+
+  12 Sep 2006; Sven Wegener <swegener@gentoo.org>
+  files/0.6.13-svn-fixes.patch:
+  Fix line endings.
 
 *avahi-0.6.13 (10 Sep 2006)
 
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 6760108a66a5..ed2cc13c40c5 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.6.13-svn-fixes.patch 1064 RMD160 e80a515a1918e7c5f46c34a52223e69c34ba91d8 SHA1 1e5aad45e402732058cc836a5c14890d492d0b29 SHA256 758355433bbcd074e210868e8c96d236e15ce50c47854513517b92144b0d7ac5
-MD5 09ab402d6a8024a70c344c95c9e70f8d files/0.6.13-svn-fixes.patch 1064
-RMD160 e80a515a1918e7c5f46c34a52223e69c34ba91d8 files/0.6.13-svn-fixes.patch 1064
-SHA256 758355433bbcd074e210868e8c96d236e15ce50c47854513517b92144b0d7ac5 files/0.6.13-svn-fixes.patch 1064
+AUX 0.6.13-svn-fixes.patch 1034 RMD160 fb59a184c6fd4830ed043dc1ffe003525b408f82 SHA1 e0fcb5f0de04dd775911e01a1a1171976520b9ac SHA256 1a548cd6ea608c9fd79dfeac93bdb9d89791b845531b515eeab04997a2237e86
+MD5 3f0ccefbf52f5844f7cea07a0fcb87d2 files/0.6.13-svn-fixes.patch 1034
+RMD160 fb59a184c6fd4830ed043dc1ffe003525b408f82 files/0.6.13-svn-fixes.patch 1034
+SHA256 1a548cd6ea608c9fd79dfeac93bdb9d89791b845531b515eeab04997a2237e86 files/0.6.13-svn-fixes.patch 1034
 AUX avahi-0.6.1-no-ipv6.patch 362 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 SHA1 97126f8035616821e9dc937c9b741316e7222fe2 SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4
 MD5 317c28eba6516a18140aa8e2cb26d618 files/avahi-0.6.1-no-ipv6.patch 362
 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 files/avahi-0.6.1-no-ipv6.patch 362
@@ -29,10 +29,10 @@ EBUILD avahi-0.6.13.ebuild 3485 RMD160 f74f1ecd1e3e9a951651ccb2487f2eb019f7a9c2
 MD5 75204d2ae35bdddf49e3a9c127051564 avahi-0.6.13.ebuild 3485
 RMD160 f74f1ecd1e3e9a951651ccb2487f2eb019f7a9c2 avahi-0.6.13.ebuild 3485
 SHA256 9e39d6deae6de237dddcc8dd1c76b9da25937b690513828cd5202ccab728c87e avahi-0.6.13.ebuild 3485
-MISC ChangeLog 7473 RMD160 3492cd275e5e22b0b08762b01c18e92ddc8c9697 SHA1 060281e2ea7f288533272d8e60d24962cd286205 SHA256 1c595ab502d25a906d5dfd4829a1c87dda6ad5944594280adca35f942aa12b24
-MD5 d75ab7b2ba39f2fbaff79e68431e9a34 ChangeLog 7473
-RMD160 3492cd275e5e22b0b08762b01c18e92ddc8c9697 ChangeLog 7473
-SHA256 1c595ab502d25a906d5dfd4829a1c87dda6ad5944594280adca35f942aa12b24 ChangeLog 7473
+MISC ChangeLog 7576 RMD160 c10dc8807b5a6b5dcafe2ec0e9e72ca65a54de65 SHA1 d162647bf555ddb9cc43dae55db85ded106528c7 SHA256 5275bd7e9cc6f680a9afb5e4ee9a5c09cf740b7c79f20c0679e1eb30a1b06e57
+MD5 2c3566b9a7b9475e64f4190ca7a1e52b ChangeLog 7576
+RMD160 c10dc8807b5a6b5dcafe2ec0e9e72ca65a54de65 ChangeLog 7576
+SHA256 5275bd7e9cc6f680a9afb5e4ee9a5c09cf740b7c79f20c0679e1eb30a1b06e57 ChangeLog 7576
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -52,7 +52,7 @@ SHA256 87b11bd274b1cf12c3fbea98889f1611f65477fb495442b04b8fc02727219eb8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFBEnVI1lqEGTUzyQRAv+lAKCukZuQovfdikND7fVUYWRe1JC3/gCfaoSx
-ve5urL/OG2hqxE/xUhoV9c8=
-=GG+v
+iD8DBQFFBwKdI1lqEGTUzyQRAkHgAJ9TlFdB/luHYTVwC8teHINNDvtaeACcDvIi
+fPXDbpR0cjIQ/t9fjbURL9M=
+=r9Zj
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/files/0.6.13-svn-fixes.patch b/net-dns/avahi/files/0.6.13-svn-fixes.patch
index ffc7260197c1..f379f261d846 100644
--- a/net-dns/avahi/files/0.6.13-svn-fixes.patch
+++ b/net-dns/avahi/files/0.6.13-svn-fixes.patch
@@ -1,30 +1,30 @@
-Index: trunk/avahi-daemon/static-hosts.c

-===================================================================

---- trunk/avahi-daemon/static-hosts.c (revision 1167)

-+++ trunk/avahi-daemon/static-hosts.c (revision 1285)

-@@ -99,5 +99,6 @@

-     AVAHI_LLIST_REMOVE(StaticHost, hosts, hosts, s);

- 

--    avahi_s_entry_group_free (s->group);

-+    if (s->group)

-+        avahi_s_entry_group_free (s->group);

- 

-     avahi_free(s->host);

-@@ -113,5 +114,8 @@

- 

-     if (!h->group)

--        h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h);

-+        if (!(h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h))) {

-+            avahi_log_error("avahi_s_entry_group_new() failed: %s", avahi_strerror(err));

-+            return;

-+        }

- 

-     if (!avahi_address_parse (h->ip, AVAHI_PROTO_UNSPEC, &a)) {

-@@ -130,5 +134,6 @@

- static void remove_static_host_from_server(StaticHost *h)

- {

--    avahi_s_entry_group_reset (h->group);

-+    if (h->group)

-+        avahi_s_entry_group_reset (h->group);

- }

-  

+Index: trunk/avahi-daemon/static-hosts.c
+===================================================================
+--- trunk/avahi-daemon/static-hosts.c (revision 1167)
++++ trunk/avahi-daemon/static-hosts.c (revision 1285)
+@@ -99,5 +99,6 @@
+     AVAHI_LLIST_REMOVE(StaticHost, hosts, hosts, s);
+ 
+-    avahi_s_entry_group_free (s->group);
++    if (s->group)
++        avahi_s_entry_group_free (s->group);
+ 
+     avahi_free(s->host);
+@@ -113,5 +114,8 @@
+ 
+     if (!h->group)
+-        h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h);
++        if (!(h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h))) {
++            avahi_log_error("avahi_s_entry_group_new() failed: %s", avahi_strerror(err));
++            return;
++        }
+ 
+     if (!avahi_address_parse (h->ip, AVAHI_PROTO_UNSPEC, &a)) {
+@@ -130,5 +134,6 @@
+ static void remove_static_host_from_server(StaticHost *h)
+ {
+-    avahi_s_entry_group_reset (h->group);
++    if (h->group)
++        avahi_s_entry_group_reset (h->group);
+ }
+