diff options
author | 2008-05-30 21:05:55 +0000 | |
---|---|---|
committer | 2008-05-30 21:05:55 +0000 | |
commit | bdcb940e2b6461118bee88f11617f2d32e93d19d (patch) | |
tree | 9acced4692425eded000b5616ae00079201ae548 /net-dns/avahi/files | |
parent | Version bump. (diff) | |
download | gentoo-2-bdcb940e2b6461118bee88f11617f2d32e93d19d.tar.gz gentoo-2-bdcb940e2b6461118bee88f11617f2d32e93d19d.tar.bz2 gentoo-2-bdcb940e2b6461118bee88f11617f2d32e93d19d.zip |
Cleanup.
(Portage version: 2.1.5.2)
Diffstat (limited to 'net-dns/avahi/files')
8 files changed, 0 insertions, 211 deletions
diff --git a/net-dns/avahi/files/avahi-0.6.20-cleanup-dns-compression-table.patch b/net-dns/avahi/files/avahi-0.6.20-cleanup-dns-compression-table.patch deleted file mode 100644 index 67c9cb66ed72..000000000000 --- a/net-dns/avahi/files/avahi-0.6.20-cleanup-dns-compression-table.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: avahi-core/dns.c -=================================================================== ---- avahi-core/dns.c (revision 1492) -+++ avahi-core/dns.c (revision 1497) -@@ -153,6 +153,19 @@ - avahi_dns_packet_set_field(p, idx, avahi_dns_packet_get_field(p, idx) + 1); - } - -+ -+static void name_table_cleanup(void *key, void *value, void *user_data) { -+ AvahiDnsPacket *p = user_data; -+ -+ if ((uint8_t*) value >= AVAHI_DNS_PACKET_DATA(p) + p->size) -+ avahi_hashmap_remove(p->name_table, key); -+} -+ -+void avahi_dns_packet_cleanup_name_table(AvahiDnsPacket *p) { -+ if (p->name_table) -+ avahi_hashmap_foreach(p->name_table, name_table_cleanup, p); -+} -+ - uint8_t* avahi_dns_packet_append_name(AvahiDnsPacket *p, const char *name) { - uint8_t *d, *saved_ptr = NULL; - size_t saved_size; -@@ -216,6 +229,8 @@ - - fail: - p->size = saved_size; -+ avahi_dns_packet_cleanup_name_table(p); -+ - return NULL; - } - -@@ -685,6 +700,8 @@ - !avahi_dns_packet_append_uint16(p, k->type) || - !avahi_dns_packet_append_uint16(p, k->clazz | (unicast_response ? AVAHI_DNS_UNICAST_RESPONSE : 0))) { - p->size = size; -+ avahi_dns_packet_cleanup_name_table(p); -+ - return NULL; - } - -@@ -799,6 +816,8 @@ - - fail: - p->size = size; -+ avahi_dns_packet_cleanup_name_table(p); -+ - return NULL; - } - -Index: avahi-core/dns.h -=================================================================== ---- avahi-core/dns.h (revision 1492) -+++ avahi-core/dns.h (revision 1497) -@@ -52,6 +52,8 @@ - - uint8_t *avahi_dns_packet_extend(AvahiDnsPacket *p, size_t l); - -+void avahi_dns_packet_cleanup_name_table(AvahiDnsPacket *p); -+ - uint8_t *avahi_dns_packet_append_uint16(AvahiDnsPacket *p, uint16_t v); - uint8_t *avahi_dns_packet_append_uint32(AvahiDnsPacket *p, uint32_t v); - uint8_t *avahi_dns_packet_append_name(AvahiDnsPacket *p, const char *name); 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 deleted file mode 100644 index 314a5791dd1c..000000000000 --- a/net-dns/avahi/files/avahi-0.6.20-make-known-answers-not-conflict.patch +++ /dev/null @@ -1,17 +0,0 @@ -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); diff --git a/net-dns/avahi/files/avahi-0.6.20-ui-sharp-gtk.patch b/net-dns/avahi/files/avahi-0.6.20-ui-sharp-gtk.patch deleted file mode 100644 index 9d6def5b8c80..000000000000 --- a/net-dns/avahi/files/avahi-0.6.20-ui-sharp-gtk.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur avahi-0.6.20.orig/avahi-ui-sharp/Makefile.am avahi-0.6.20/avahi-ui-sharp/Makefile.am ---- avahi-0.6.20.orig/avahi-ui-sharp/Makefile.am 2007-05-10 20:10:30.000000000 +0000 -+++ avahi-0.6.20/avahi-ui-sharp/Makefile.am 2007-06-29 18:12:38.686167585 +0000 -@@ -44,6 +44,7 @@ - - if HAVE_MONO - if HAVE_DBUS -+if HAVE_GTK - all: $(ASSEMBLY) $(ASSEMBLY).config bssh.exe - - if HAVE_MONODOC -@@ -68,3 +69,4 @@ - - endif - endif -+endif diff --git a/net-dns/avahi/files/avahi-0.6.21-browse-help.patch b/net-dns/avahi/files/avahi-0.6.21-browse-help.patch deleted file mode 100644 index 238f3cc67c36..000000000000 --- a/net-dns/avahi/files/avahi-0.6.21-browse-help.patch +++ /dev/null @@ -1,20 +0,0 @@ -fix avahi-browse --help - -Index: trunk/avahi-utils/avahi-browse.c -=================================================================== ---- trunk/avahi-utils/avahi-browse.c (revision 1518) -+++ trunk/avahi-utils/avahi-browse.c (revision 1519) -@@ -586,9 +586,12 @@ - "%s [options] -a\n" - "%s [options] -D\n" - #if defined(HAVE_GDBM) || defined(HAVE_DBM) -- "%s [options] -b\n", -+ "%s [options] -b\n" - #endif - "\n", -+#if defined(HAVE_GDBM) || defined(HAVE_DBM) -+ argv0, -+#endif - argv0, argv0, argv0); - - fprintf(f, diff --git a/net-dns/avahi/files/avahi-0.6.21-dbus-compat.patch b/net-dns/avahi/files/avahi-0.6.21-dbus-compat.patch deleted file mode 100644 index fc0d7983f0b4..000000000000 --- a/net-dns/avahi/files/avahi-0.6.21-dbus-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -use dbus_watch_get_unix_fd() only in dbus >= 1.1.1 - -Index: trunk/avahi-common/dbus-watch-glue.c -=================================================================== ---- trunk/avahi-common/dbus-watch-glue.c (revision 1517) -+++ trunk/avahi-common/dbus-watch-glue.c (revision 1518) -@@ -134,7 +134,11 @@ - - if (!(avahi_watch = poll_api->watch_new( - poll_api, -+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1) - dbus_watch_get_unix_fd(dbus_watch), -+#else -+ dbus_watch_get_fd(dbus_watch), -+#endif - translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)), - watch_callback, - dbus_watch))) diff --git a/net-dns/avahi/files/avahi-0.6.21-no-browse-domains-segfault.patch b/net-dns/avahi/files/avahi-0.6.21-no-browse-domains-segfault.patch deleted file mode 100644 index 0eca3329672f..000000000000 --- a/net-dns/avahi/files/avahi-0.6.21-no-browse-domains-segfault.patch +++ /dev/null @@ -1,18 +0,0 @@ -Don't segfault when no browse domains are configured in resolv.conf. Original patch from zml. Closes #162 - -Index: avahi-daemon/main.c -=================================================================== ---- avahi-daemon/main.c (revision 1524) -+++ avahi-daemon/main.c (revision 1525) -@@ -317,6 +317,11 @@ - int n; - char **p; - -+ if (!resolv_conf_search_domains) { -+ avahi_server_set_browse_domains(avahi_server, NULL); -+ return; -+ } -+ - l = avahi_string_list_copy(config.server_config.browse_domains); - - for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) { diff --git a/net-dns/avahi/files/avahi-0.6.21-no-ipv6.patch b/net-dns/avahi/files/avahi-0.6.21-no-ipv6.patch deleted file mode 100644 index ef7c33caa5f6..000000000000 --- a/net-dns/avahi/files/avahi-0.6.21-no-ipv6.patch +++ /dev/null @@ -1,35 +0,0 @@ -uClibc systems dont define IPV6_V6ONLY when USE=-ipv6 - ---- avahi-core/socket.c -+++ avahi-core/socket.c -@@ -372,6 +372,7 @@ - } - - int avahi_open_socket_ipv6(int no_reuse) { -+#ifdef IPV6_V6ONLY - struct sockaddr_in6 sa, local; - int fd = -1, yes, r; - int ttl; -@@ -437,6 +438,7 @@ - fail: - if (fd >= 0) - close(fd); -+#endif - - return -1; - } -@@ -936,6 +938,7 @@ - } - - int avahi_open_unicast_socket_ipv6(void) { -+#ifdef IPV6_V6ONLY - struct sockaddr_in6 local; - int fd = -1, yes; - -@@ -977,5 +980,6 @@ - if (fd >= 0) - close(fd); - -+#endif - return -1; - } diff --git a/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch b/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch deleted file mode 100644 index 67dfdb8b25d7..000000000000 --- a/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix a segfault when registering services with libdns_sd before the avahi daemon finished starting up; Closes rhbz 251700; Original patch from Tim Waugh - -Index: trunk/avahi-compat-libdns_sd/compat.c -=================================================================== ---- trunk/avahi-compat-libdns_sd/compat.c (revision 1535) -+++ trunk/avahi-compat-libdns_sd/compat.c (revision 1536) -@@ -990,6 +990,16 @@ - return; - } - } -+ -+ if (!sdref->service_name_chosen) { -+ -+ assert(sdref->service_name); -+ -+ if (!(sdref->service_name_chosen = avahi_strdup(sdref->service_name))) { -+ reg_report_error(sdref, kDNSServiceErr_NoMemory); -+ return; -+ } -+ } - - /* Register the service */ - |