- updated to 2.2.11

[packages/cups.git] / cups-avahi-address.patch

diff --git a/cups-avahi-address.patch b/cups-avahi-address.patch
index b731d8360dc52ec8e8881490de3bfbd7343c21de..b8090ea0cabd9a7e19aa3bb7cbf8b53fc3ff08b6 100644 (file)
--- a/cups-avahi-address.patch
+++ b/cups-avahi-address.patch
@@ -1,7 +1,7 @@
-diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-support.c
---- cups-2.0rc1/cups/http-support.c.avahi-address      2014-08-28 17:37:22.000000000 +0200
-+++ cups-2.0rc1/cups/http-support.c    2014-09-12 15:31:45.062950696 +0200
-@@ -2342,7 +2342,7 @@ http_resolve_cb(
+diff -up cups-2.2b2/cups/http-support.c.avahi-address cups-2.2b2/cups/http-support.c
+--- cups-2.2b2/cups/http-support.c.avahi-address       2016-06-24 17:43:35.000000000 +0200
++++ cups-2.2b2/cups/http-support.c     2016-06-27 15:31:34.201361844 +0200
+@@ -2340,7 +2340,7 @@ http_resolve_cb(
      const char             *type,     /* I - Registration type */
      const char             *domain,   /* I - Domain (unused) */
      const char             *hostTarget,       /* I - Hostname */
@@ -10,7 +10,7 @@ diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-sup
      uint16_t               port,      /* I - Port number */
      AvahiStringList        *txt,      /* I - TXT record */
      AvahiLookupResultFlags flags,     /* I - Lookup flags (unused) */
-@@ -2495,39 +2495,62 @@ http_resolve_cb(
+@@ -2493,39 +2493,62 @@ http_resolve_cb(
      * getting the IP address of the .local name and then do reverse-lookups...
      */
  
@@ -20,7 +20,7 @@ diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-sup
 +    size_t addrlen;
 +    int error;
  
-     DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget));
+     DEBUG_printf(("5http_resolve_cb: Looking up \"%s\".", hostTarget));
  
 -    snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port));
 -    if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL)
@@ -54,7 +54,7 @@ diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-sup
  
 -        if (!error)
 -      {
--        DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
+-        DEBUG_printf(("5http_resolve_cb: Found \"%s\".", fqdn));
 +      if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
 +          _cups_strcasecmp(hostptr, ".local"))
  
@@ -73,7 +73,7 @@ diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-sup
 +
  #ifdef DEBUG
 -      else
--        DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
+-        DEBUG_printf(("5http_resolve_cb: \"%s\" did not resolve: %d",
 -                      httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
 -                      error));
 +      DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",