libtevent: Update to version 0.9.30

[people/arne_f/ipfire-3.x.git] / cups / patches / 023_cups-dnssd-deviceid.patch

diff -up cups-1.6b1/backend/dnssd.c.dnssd-deviceid cups-1.6b1/backend/dnssd.c
--- cups-1.6b1/backend/dnssd.c.dnssd-deviceid	2012-05-21 18:05:58.000000000 +0200
+++ cups-1.6b1/backend/dnssd.c	2012-05-25 16:27:49.226874427 +0200
@@ -1181,15 +1181,22 @@ query_callback(
   if (device->device_id)
     free(device->device_id);
 
+  if (device_id[0])
+  {
+    /* Mark this as the real device ID. */
+    ptr = device_id + strlen(device_id);
+    snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;");
+  }
+
   if (!device_id[0] && strcmp(model, "Unknown"))
   {
     if (make_and_model[0])
-      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
+      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
 	       make_and_model, model);
     else if (!_cups_strncasecmp(model, "designjet ", 10))
-      snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10);
+      snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10);
     else if (!_cups_strncasecmp(model, "stylus ", 7))
-      snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7);
+      snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7);
     else if ((ptr = strchr(model, ' ')) != NULL)
     {
      /*
@@ -1199,7 +1206,7 @@ query_callback(
       memcpy(make_and_model, model, ptr - model);
       make_and_model[ptr - model] = '\0';
 
-      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s",
+      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
 	       make_and_model, ptr + 1);
     }
   }