Fix line endings, bug #185036.

(Portage version: 2.1.3_rc7)

2 files changed, 22 insertions, 18 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index d17fd60022d7..c7e976feea57 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.116 2007/07/11 23:04:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.117 2007/07/12 17:35:57 swegener Exp $
+
+  12 Jul 2007; Sven Wegener <swegener@gentoo.org>
+  files/avahi-0.6.20-make-known-answers-not-conflict.patch:
+  Fix line endings, bug #185036.
 
 *avahi-0.6.20-r1 (11 Jul 2007)
 
diff --git a/net-dns/avahi/files/avahi-0.6.20-make-known-answers-not-conflict.patch b/net-dns/avahi/files/avahi-0.6.20-make-known-answers-not-conflict.patch
index 70859a051e65..314a5791dd1c 100644
--- a/net-dns/avahi/files/avahi-0.6.20-make-known-answers-not-conflict.patch
+++ b/net-dns/avahi/files/avahi-0.6.20-make-known-answers-not-conflict.patch
@@ -1,17 +1,17 @@
-Index: /trunk/avahi-core/server.c

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

---- /trunk/avahi-core/server.c (revision 1463)

-+++ /trunk/avahi-core/server.c (revision 1496)

-@@ -611,9 +611,7 @@

-             }

-             

--            if (handle_conflict(s, i, record, unique)) {

--                avahi_response_scheduler_suppress(i->response_scheduler, record, a);

--                avahi_record_list_drop(s->record_list, record);

--                avahi_cache_stop_poof(i->cache, record, a);

--            }

-+            avahi_response_scheduler_suppress(i->response_scheduler, record, a);

-+            avahi_record_list_drop(s->record_list, record);

-+            avahi_cache_stop_poof(i->cache, record, a);

-             

-             avahi_record_unref(record);

+Index: /trunk/avahi-core/server.c
+===================================================================
+--- /trunk/avahi-core/server.c (revision 1463)
++++ /trunk/avahi-core/server.c (revision 1496)
+@@ -611,9 +611,7 @@
+             }
+             
+-            if (handle_conflict(s, i, record, unique)) {
+-                avahi_response_scheduler_suppress(i->response_scheduler, record, a);
+-                avahi_record_list_drop(s->record_list, record);
+-                avahi_cache_stop_poof(i->cache, record, a);
+-            }
++            avahi_response_scheduler_suppress(i->response_scheduler, record, a);
++            avahi_record_list_drop(s->record_list, record);
++            avahi_cache_stop_poof(i->cache, record, a);
+             
+             avahi_record_unref(record);