diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2006-09-12 18:55:15 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2006-09-12 18:55:15 +0000 |
| commit | d10e4fcd7cd35c0387cabed00418c619053f1059 (patch) | |
| tree | 2d4a5095d4a7ec7157613f5e2d012f798d5db6dd /net-dns | |
| parent | Added ~ppc64 (diff) | |
| download | gentoo-2-d10e4fcd7cd35c0387cabed00418c619053f1059.tar.gz gentoo-2-d10e4fcd7cd35c0387cabed00418c619053f1059.tar.bz2 gentoo-2-d10e4fcd7cd35c0387cabed00418c619053f1059.zip | |
Fix line endings.
(Portage version: 2.1.1)
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/avahi/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/avahi/files/0.6.13-svn-fixes.patch | 60 |
2 files changed, 35 insertions, 31 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/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); + } + |