Tag 1.7.0

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.7.0@11360 a1ca3aef-8c08-0410-bb20-df032aa958be

CHANGES-IPPTOOL.txt

@@ -1,14 +1,9 @@
-CHANGES-IPPTOOL.txt - 2014-03-28
+CHANGES-IPPTOOL.txt - 2013-07-15
 --------------------------------
 
 This file provides a list of changes to the ipptool binary distribution posted
 on cups.org.
 
-2014-03-28
-
-	- Fixed SSL support on Windows (STR #4358)
-
-
 2013-07-15
 
 	- New ippfind tool now included with ipptool.

CHANGES.txt

@@ -1,91 +1,6 @@
-CHANGES.txt - 1.7.2 - 2014-04-10
+CHANGES.txt - 1.7.0 - 2013-10-18
 --------------------------------
 
-CHANGES IN CUPS V1.7.2
-
-	- Security: The scheduler now blocks URLs containing embedded HTML
-	  (STR #4356)
-	- Documentation fixes (STR #3259, STR #4346, STR #4355)
-	- Fixed the Japanese localization (STR #4385)
-	- Added a German localization (STR #4363)
-	- The cupsfilter command incorrectly read the cupsd.conf file; it now
-	  reads the cups-files.conf file instead.
-	- Fixed OS X builds with Xcode 5.x (<rdar://problem/15914959>)
-	- Fixed SSL support on Windows (STR #4358)
-	- Fixed documentation and naming of Create-Job/Printer-Subscriptions
-	  operations (STR #4389)
-	- Phone numbers in fax jobs were not properly filtered for IPP FaxOut
-	  (<rdar://problem/16351701>)
-	- Fixed a memory leak in the label printer driver (STR #4393)
-	- Updated Linux "relro" support (STR #4349)
-	- cupsEnumDests did not set the "is_default" field (STR #4332)
-	- cupsDoIORequest could miss the server status, causing failed lpadmin
-	  and other administrative commands (STR #4386)
-	- cupsEnumDests didn't always call the callback function (STR #4380)
-	- "lp -i job-id -H hold" did not work (STR #nnn)
-	- CUPS didn't compile on older platforms (STR #4338)
-	- Several libcups files did not have the Apple license exception
-	  notice (STR #4361)
-	- Fixed a D-BUS threading issue that caused the scheduler to crash
-	  (STR #4347)
-	- The scheduler now automatically reconnects to Avahi as needed
-	  (STR #4370, STR #4373)
-	- The scheduler did not handle GET requests for the log files properly
-	  (STR #3265)
-	- The dnssd backend did not always report all discovered printers using
-	  Avahi (STR #4365)
-	- The Zebra printer driver did not properly handle negative "label top"
-	  values (STR #4354)
-	- The scheduler did not always update the MakeModel value in
-	  printers.conf after updating the driver (STR #4264)
-	- The LPD mini daemon did not support print jobs larger than 2GB
-	  (STR #4351)
-	- Fixed a bug in the status reading code when sending a compressed data
-	  stream to an IPP printer/server (<rdar://problem/16019623>)
-	- The IPP backend might not include all job attributes in Validate-Job
-	  operations (<rdar://problem/16025435>)
-	- Fixed some clang-reported issues (<rdar://problem/15936066>)
-
-
-CHANGES IN CUPS V1.7.1
-
-	- Security: the lppasswd program incorrectly used settings from
-	  ~/.cups/client.conf (STR #4319)
-	- Auto debug logging was broken in 1.7.0 (<rdar://problem/15331639>)
-	- Some gzip'd PPD files could not be used (<rdar://problem/15386424>)
-	- Cleaned up some job logging in the scheduler
-	  (<rdar://problem/15332672>)
-	- ATTR messages could cause string pool memory corruption in the
-	  scheduler (<rdar://problem/15382819>)
-	- The RPM spec file did not list the build requirements; this was on
-	  purpose, but now we are listing the Red Hat package names
-	  (<rdar://problem/15375760>, STR #4322)
-	- Printing to a raw queue could result in corrupt output due to
-	  opportunistic compression (<rdar://problem/15008524>)
-	- The GNU TLS support code triggered many compiler warnings due to the
-	  use of old GNU TLS compatibility type names
-	  (<rdar://problem/15392966>)
-	- The "make check" test suite did not work on Linux without the
-	  cups-filters package installed (<rdar://problem/14292998>)
-	- Japanese PPDs using with the Shift-JIS encoding did not work
-	  (<rdar://problem/15427759>)
-	- "tel:" URIs incorrectly had slashes (<rdar://problem/15418463>)
-	- The libusb-based USB backend incorrectly used write timeouts
-	  (<rdar://problem/15564888>)
-	- Shared printers could become inaccessible after a few days on OS X
-	  (<rdar://problem/15426838>)
-	- The IPP backend did not wait for a busy printer to become available
-	  before attempting to print (<rdar://problem/15465667>)
-	- CUPS did not support "auto-monochrome" or "process-monochrome" for the
-	  "print-color-mode" option (<rdar://problem/15482520>)
-	- Using "@IF(name)" in an Allow or Deny rule did not work (STR #4328)
-	- lpq and lpstat did not list jobs in the correct order when priorities
-	  were specified (STR #4326)
-	- The D-BUS notifier did not remove its lockfile (STR #4314)
-	- CUPS incorrectly used the USER environment variable when the name did
-	  not match the user ID (STR #4327)
-
-
 CHANGES IN CUPS V1.7.0
 
 	- Updated Japanese localization.

INSTALL.txt

@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.7.2 - 2014-04-10
+INSTALL - CUPS v1.7.0 - 2013-07-16
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more

IPPTOOL.txt

@@ -1,4 +1,4 @@
-IPPTOOL.txt - 2014-04-10
+IPPTOOL.txt - 2013-07-15
 ------------------------
 
 See the file CHANGES-IPPTOOL.txt for a list of changes to this software.
@@ -220,7 +220,7 @@ REPORTING BUGS
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2014 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2013 by Apple Inc.  CUPS and the CUPS logo are
     trademarks of Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

Makedefs.in

@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in 11154 2013-07-17 15:21:18Z msweet $"
+# "$Id$"
 #
 #   Common makefile definitions for CUPS.
 #
@@ -261,5 +261,5 @@ DBUSDIR		=	@DBUSDIR@
 
 
 #
-# End of "$Id: Makedefs.in 11154 2013-07-17 15:21:18Z msweet $"
+# End of "$Id$"
 #

Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 11370 2013-10-30 15:08:29Z msweet $"
+# "$Id$"
 #
 #   Top-level Makefile for CUPS.
 #
@@ -128,11 +128,8 @@ depend:
 
 
 #
-# Run the Clang static code analysis tool on the sources, available here:
-#
-#    http://clang-analyzer.llvm.org
-#
-# At least checker-231 is required.
+# Run the clang.llvm.org static code analysis tool on the C sources.
+# (at least checker-231 is required for scan-build to work this way)
 #
 
 .PHONY: clang clang-changes
@@ -143,26 +140,6 @@ clang-changes:
 	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) all
 
 
-#
-# Run the STACK tool on the sources, available here:
-#
-#    http://css.csail.mit.edu/stack/
-#
-# Do the following to pass options to configure:
-#
-#    make CONFIGFLAGS="--foo --bar" stack
-#
-
-.PHONY: stack
-stack:
-	stack-build ./configure $(CONFIGFLAGS)
-	stack-build $(MAKE) $(MFLAGS) clean all
-	poptck
-	$(MAKE) $(MFLAGS) distclean
-	$(RM) */*.ll
-	$(RM) */*.ll.out
-
-
 #
 # Generate a ctags file...
 #
@@ -352,5 +329,5 @@ dist:	all
 
 
 #
-# End of "$Id: Makefile 11370 2013-10-30 15:08:29Z msweet $".
+# End of "$Id$".
 #

README.txt

@@ -1,4 +1,4 @@
-README - CUPS v1.7.2 - 2014-04-10
+README - CUPS v1.7.0 - 2013-07-16
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt" instead...
@@ -149,7 +149,7 @@ PRINTING FILES
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2014 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2013 by Apple Inc.  CUPS and the CUPS logo are
     trademarks of Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

backend/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 11154 2013-07-17 15:21:18Z msweet $"
+# "$Id$"
 #
 #   Backend makefile for CUPS.
 #
@@ -301,5 +301,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 11154 2013-07-17 15:21:18Z msweet $".
+# End of "$Id$".
 #

backend/backend-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: backend-private.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Backend support definitions for CUPS.
  *
@@ -334,5 +334,5 @@ extern int		backendWaitLoop(int snmp_fd, http_addr_t *addr,
 
 
 /*
- * End of "$Id: backend-private.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

backend/dnssd.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: dnssd.c 11623 2014-02-19 20:18:10Z msweet $"
+ * "$Id$"
  *
  *   DNS-SD discovery backend for CUPS.
  *
@@ -95,7 +95,6 @@ static int		job_canceled = 0;
 static AvahiSimplePoll	*simple_poll = NULL;
 					/* Poll information */
 static int		got_data = 0;	/* Got data from poll? */
-static int		browsers = 0;	/* Number of running browsers */
 #endif /* HAVE_AVAHI */
 
 
@@ -346,7 +345,6 @@ main(int  argc,				/* I - Number of command-line args */
     return (1);
   }
 
-  browsers = 6;
   avahi_service_browser_new(client, AVAHI_IF_UNSPEC,
 			    AVAHI_PROTO_UNSPEC,
 			    "_fax-ipp._tcp", NULL, 0,
@@ -560,11 +558,7 @@ main(int  argc,				/* I - Number of command-line args */
 
       fprintf(stderr, "DEBUG: sent=%d, count=%d\n", sent, count);
 
-#ifdef HAVE_AVAHI
-      if (sent == cupsArrayCount(devices) && browsers == 0)
-#else
       if (sent == cupsArrayCount(devices))
-#endif /* HAVE_AVAHI */
 	break;
     }
   }
@@ -716,12 +710,9 @@ browse_callback(
 	break;
 
     case AVAHI_BROWSER_REMOVE:
+    case AVAHI_BROWSER_ALL_FOR_NOW:
     case AVAHI_BROWSER_CACHE_EXHAUSTED:
         break;
-
-    case AVAHI_BROWSER_ALL_FOR_NOW:
-	browsers--;
-	break;
   }
 }
 
@@ -1329,5 +1320,5 @@ unquote(char       *dst,		/* I - Destination buffer */
 
 
 /*
- * End of "$Id: dnssd.c 11623 2014-02-19 20:18:10Z msweet $".
+ * End of "$Id$".
  */

backend/ieee1284.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: ieee1284.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   IEEE-1284 support functions for CUPS.
  *
@@ -487,5 +487,5 @@ backendGetMakeModel(
 
 
 /*
- * End of "$Id: ieee1284.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

backend/ipp.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 11779 2014-03-28 20:48:44Z msweet $"
+ * "$Id$"
  *
  * IPP backend for CUPS.
  *
@@ -163,7 +163,7 @@ static ipp_t		*new_request(ipp_op_t op, int version, const char *uri,
 				     ppd_file_t *ppd,
 				     ipp_attribute_t *media_col_sup,
 				     ipp_attribute_t *doc_handling_sup,
-				     ipp_attribute_t *print_color_mode_sup);
+				     int print_color_mode);
 static const char	*password_cb(const char *prompt, http_t *http,
 			             const char *method, const char *resource,
 			             int *user_data);
@@ -250,12 +250,12 @@ main(int  argc,				/* I - Number of command-line args */
   ipp_attribute_t *doc_handling_sup;	/* multiple-document-handling-supported */
   ipp_attribute_t *printer_state;	/* printer-state attribute */
   ipp_attribute_t *printer_accepting;	/* printer-is-accepting-jobs */
-  ipp_attribute_t *print_color_mode_sup;/* Does printer support print-color-mode? */
   int		create_job = 0,		/* Does printer support Create-Job? */
 		get_job_attrs = 0,	/* Does printer support Get-Job-Attributes? */
 		send_document = 0,	/* Does printer support Send-Document? */
 		validate_job = 0,	/* Does printer support Validate-Job? */
-		copies,			/* Number of copies for job */
+		print_color_mode = 0;	/* Does printer support print-color-mode? */
+  int		copies,			/* Number of copies for job */
 		copies_remaining;	/* Number of copies remaining */
   const char	*content_type,		/* CONTENT_TYPE environment variable */
 		*final_content_type,	/* FINAL_CONTENT_TYPE environment var */
@@ -1024,8 +1024,7 @@ main(int  argc,				/* I - Number of command-line args */
 	delay = _cupsNextDelay(delay, &prev_delay);
 
 	ippDelete(supported);
-	supported  = NULL;
-	ipp_status = IPP_STATUS_ERROR_BUSY;
+	supported = NULL;
 	continue;
       }
     }
@@ -1101,7 +1100,9 @@ main(int  argc,				/* I - Number of command-line args */
 	        media_col_sup->values[i].string.text);
     }
 
-    print_color_mode_sup = ippFindAttribute(supported, "print-color-mode-supported", IPP_TAG_KEYWORD);
+    print_color_mode = ippFindAttribute(supported,
+					"print-color-mode-supported",
+					IPP_TAG_KEYWORD) != NULL;
 
     if ((operations_sup = ippFindAttribute(supported, "operations-supported",
 					   IPP_TAG_ENUM)) != NULL)
@@ -1383,7 +1384,7 @@ main(int  argc,				/* I - Number of command-line args */
     request = new_request(IPP_VALIDATE_JOB, version, uri, argv[2],
                           monitor.job_name, num_options, options, compression,
 			  copies_sup ? copies : 1, document_format, pc, ppd,
-			  media_col_sup, doc_handling_sup, print_color_mode_sup);
+			  media_col_sup, doc_handling_sup, print_color_mode);
 
     response = cupsDoRequest(http, request, resource);
 
@@ -1469,7 +1470,7 @@ main(int  argc,				/* I - Number of command-line args */
 			  version, uri, argv[2], monitor.job_name, num_options,
 			  options, compression, copies_sup ? copies : 1,
 			  document_format, pc, ppd, media_col_sup,
-			  doc_handling_sup, print_color_mode_sup);
+			  doc_handling_sup, print_color_mode);
 
    /*
     * Do the request...
@@ -2482,8 +2483,7 @@ new_request(
     ppd_file_t      *ppd,		/* I - PPD file data */
     ipp_attribute_t *media_col_sup,	/* I - media-col-supported values */
     ipp_attribute_t *doc_handling_sup,  /* I - multiple-document-handling-supported values */
-    ipp_attribute_t *print_color_mode_sup)
-					/* I - Printer supports print-color-mode */
+    int             print_color_mode)	/* I - Printer supports print-color-mode */
 {
   int		i;			/* Looping var */
   ipp_t		*request;		/* Request data */
@@ -2658,14 +2658,6 @@ new_request(
                                   strlen(keyword));
                 break;
             default :
-                if (!strcmp(mandatory, "print-color-mode") && !strcmp(keyword, "monochrome"))
-                {
-                  if (ippContainsString(print_color_mode_sup, "auto-monochrome"))
-                    keyword = "auto-monochrome";
-                  else if (ippContainsString(print_color_mode_sup, "process-monochrome") && !ippContainsString(print_color_mode_sup, "monochrome"))
-                    keyword = "process-monochrome";
-                }
-
                 ippAddString(request, IPP_TAG_JOB, value_tag, mandatory,
                              NULL, keyword);
                 break;
@@ -2740,31 +2732,21 @@ new_request(
 	ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-bin",
 		     NULL, keyword);
 
-      color_attr_name = print_color_mode_sup ? "print-color-mode" : "output-mode";
+      color_attr_name = print_color_mode ? "print-color-mode" : "output-mode";
 
       if ((keyword = cupsGetOption("print-color-mode", num_options,
-				   options)) == NULL)
-      {
-	if ((choice = ppdFindMarkedChoice(ppd, "ColorModel")) != NULL)
-	{
-	  if (!_cups_strcasecmp(choice->choice, "Gray"))
-	    keyword = "monochrome";
-	  else
-	    keyword = "color";
-	}
-      }
-
-      if (keyword && !strcmp(keyword, "monochrome"))
-      {
-	if (ippContainsString(print_color_mode_sup, "auto-monochrome"))
-	  keyword = "auto-monochrome";
-	else if (ippContainsString(print_color_mode_sup, "process-monochrome") && !ippContainsString(print_color_mode_sup, "monochrome"))
-	  keyword = "process-monochrome";
-      }
-
-      if (keyword)
+				   options)) != NULL)
 	ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, color_attr_name,
 		     NULL, keyword);
+      else if ((choice = ppdFindMarkedChoice(ppd, "ColorModel")) != NULL)
+      {
+	if (!_cups_strcasecmp(choice->choice, "Gray"))
+	  ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+	               color_attr_name, NULL, "monochrome");
+	else
+	  ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+	               color_attr_name, NULL, "color");
+      }
 
       if ((keyword = cupsGetOption("print-quality", num_options,
 				   options)) != NULL)
@@ -2877,39 +2859,19 @@ new_request(
       if ((keyword = cupsGetOption("phone", num_options, options)) != NULL)
       {
 	ipp_t	*destination;		/* destination collection */
-	char	phone[1024],		/* Phone number string */
-		*ptr,			/* Pointer into string */
-		tel_uri[1024];		/* tel: URI */
-        static const char * const allowed = "0123456789#*-+.()";
-					/* Allowed characters */
+	char	tel_uri[1024];		/* tel: URI */
 
         destination = ippNew();
 
-       /*
-        * Unescape and filter out spaces and other characters that are not
-        * allowed in a tel: URI.
-        */
-
-        _httpDecodeURI(phone, keyword, sizeof(phone));
-        for (ptr = phone; *ptr;)
-	{
-	  if (!strchr(allowed, *ptr))
-	    _cups_strcpy(ptr, ptr + 1);
-	  else
-	    ptr ++;
-        }
-
-        httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel", NULL, NULL, 0, phone);
-        ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri", NULL, tel_uri);
+        httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel",
+                        NULL, NULL, 0, keyword);
+        ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri",
+                     NULL, tel_uri);
 
 	if ((keyword = cupsGetOption("faxPrefix", num_options,
 	                             options)) != NULL && *keyword)
-        {
-	  char	predial[1024];		/* Pre-dial string */
-
-	  _httpDecodeURI(predial, keyword, sizeof(predial));
-	  ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT, "pre-dial-string", NULL, predial);
-	}
+	  ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT,
+	               "pre-dial-string", NULL, keyword);
 
         ippAddCollection(request, IPP_TAG_JOB, "destination-uris", destination);
         ippDelete(destination);
@@ -3005,8 +2967,6 @@ password_cb(const char *prompt,		/* I - Prompt (not used) */
   {
     (*password_tries) ++;
 
-    cupsSetUser(username);
-
     return (password);
   }
   else
@@ -3049,7 +3009,7 @@ quote_string(const char *s,		/* I - String */
   {
     if (*s == '\\' || *s == '\"' || *s == '\'')
     {
-      if (qptr < (qend - 4))
+      if (q < (qend - 3))
       {
 	*qptr++ = '\\';
 	*qptr++ = '\\';
@@ -3702,5 +3662,5 @@ update_reasons(ipp_attribute_t *attr,	/* I - printer-state-reasons or NULL */
 }
 
 /*
- * End of "$Id: ipp.c 11779 2014-03-28 20:48:44Z msweet $".
+ * End of "$Id$".
  */

backend/lpd.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: lpd.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Line Printer Daemon backend for CUPS.
  *
@@ -1331,5 +1331,5 @@ sigterm_handler(int sig)		/* I - Signal */
 
 
 /*
- * End of "$Id: lpd.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

backend/network.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: network.c 3755 2012-03-30 05:59:14Z msweet $"
+ * "$Id$"
  *
  *   Common backend network APIs for CUPS.
  *
@@ -322,5 +322,5 @@ backendNetworkSideCB(
 
 
 /*
- * End of "$Id: network.c 3755 2012-03-30 05:59:14Z msweet $".
+ * End of "$Id$".
  */

backend/runloop.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: runloop.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Common run loop APIs for CUPS backends.
  *
@@ -539,5 +539,5 @@ backendWaitLoop(
 
 
 /*
- * End of "$Id: runloop.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

backend/snmp-supplies.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp-supplies.c 11319 2013-09-27 16:18:26Z msweet $"
+ * "$Id$"
  *
  *   SNMP supplies functions for CUPS.
  *
@@ -1103,5 +1103,5 @@ utf16_to_utf8(
 
 
 /*
- * End of "$Id: snmp-supplies.c 11319 2013-09-27 16:18:26Z msweet $".
+ * End of "$Id$".
  */

backend/snmp.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   SNMP discovery backend for CUPS.
  *
@@ -1391,5 +1391,5 @@ update_cache(snmp_cache_t *device,	/* I - Device */
 
 
 /*
- * End of "$Id: snmp.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

backend/socket.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: socket.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   AppSocket backend for CUPS.
  *
@@ -520,5 +520,5 @@ wait_bc(int device_fd,			/* I - Socket */
 
 
 /*
- * End of "$Id: socket.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

backend/test1284.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: test1284.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   IEEE-1284 support functions test program for CUPS.
  *
@@ -80,5 +80,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id: test1284.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

backend/testbackend.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: testbackend.c 4297 2013-05-10 16:04:59Z msweet $"
+ * "$Id$"
  *
  *   Backend test program for CUPS.
  *
@@ -684,5 +684,5 @@ walk_cb(const char *oid,		/* I - OID */
 
 
 /*
- * End of "$Id: testbackend.c 4297 2013-05-10 16:04:59Z msweet $".
+ * End of "$Id$".
  */

backend/testsupplies.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $"
+ * "$Id$"
  *
  *   SNMP supplies test program for CUPS.
  *
@@ -79,5 +79,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $".
+ * End of "$Id$".
  */

backend/usb-darwin.c

@@ -1,7 +1,7 @@
 /*
-* "$Id: usb-darwin.c 11670 2014-03-04 14:53:59Z msweet $"
+* "$Id$"
 *
-* Copyright 2005-2014 Apple Inc. All rights reserved.
+* Copyright 2005-2013 Apple Inc. All rights reserved.
 *
 * IMPORTANT:  This Apple software is supplied to you by Apple Computer,
 * Inc. ("Apple") in consideration of your agreement to the following
@@ -40,6 +40,35 @@
 * AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
 * STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
+*
+* Contents:
+*
+ *   list_devices()       - List all USB devices.
+ *   print_device()       - Print a file to a USB device.
+ *   read_thread()        - Thread to read the backchannel data on.
+ *   sidechannel_thread() - Handle side-channel requests.
+ *   iterate_printers()   - Iterate over all the printers.
+ *   device_added()       - Device added notifier.
+ *   list_device_cb()     - list_device iterator callback.
+ *   find_device_cb()     - print_device iterator callback.
+ *   status_timer_cb()    - Status timer callback.
+ *   copy_deviceinfo()    - Copy strings from the 1284 device ID.
+ *   release_deviceinfo() - Release deviceinfo strings.
+ *   load_classdriver()   - Load a classdriver.
+ *   unload_classdriver() - Unload a classdriver.
+ *   load_printerdriver() - Load vendor's classdriver.
+ *   registry_open()      - Open a connection to the printer.
+ *   registry_close()     - Close the connection to the printer.
+ *   copy_deviceid()      - Copy the 1284 device id string.
+ *   copy_devicestring()  - Copy the 1284 device id string.
+ *   copy_value_for_key() - Copy value string associated with a key.
+ *   cfstr_create_trim()  - Create CFString and trim whitespace characters.
+ *   parse_options()      - Parse URI options.
+ *   sigterm_handler()    - SIGTERM handler.
+ *   next_line()          - Find the next line in a buffer.
+ *   parse_pserror()      - Scan the backchannel data for postscript errors.
+ *   soft_reset()         - Send a soft reset to the device.
+ *   get_device_id()      - Return IEEE-1284 device ID.
 */
 
 /*
@@ -68,7 +97,7 @@
 #include <IOKit/usb/IOUSBLib.h>
 #include <IOKit/IOCFPlugIn.h>
 #include <libproc.h>
-#include <asl.h>
+
 #include <spawn.h>
 #include <pthread.h>
 
@@ -280,9 +309,6 @@ static void release_deviceinfo(CFStringRef *make, CFStringRef *model, CFStringRe
 static void setup_cfLanguage(void);
 static void soft_reset(void);
 static void status_timer_cb(CFRunLoopTimerRef timer, void *info);
-static void log_usb_class_driver(int is_64bit);
-#define IS_64BIT 1
-#define IS_NOT_64BIT 0
 
 #if defined(__i386__) || defined(__x86_64__)
 static pid_t	child_pid;		/* Child PID */
@@ -451,11 +477,6 @@ print_device(const char *uri,		/* I - Device URI */
       return (CUPS_BACKEND_STOP);
     }
 
-#ifdef __x86_64__
-    if (status == noErr && driverBundlePath != NULL && CFStringCompare(driverBundlePath, kUSBGenericTOPrinterClassDriver, 0) != kCFCompareEqualTo)
-      log_usb_class_driver(IS_64BIT);
-#endif /* __x86_64__ */
-
     if (driverBundlePath)
       CFRelease(driverBundlePath);
 
@@ -1586,7 +1607,7 @@ static OSStatus copy_deviceid(classdriver_t **classdriver,
   CFStringRef deviceMake = NULL;
   CFStringRef deviceModel = NULL;
   CFStringRef deviceSerial = NULL;
-
+  
   *deviceID = NULL;
 
   OSStatus err = (*classdriver)->GetDeviceID(classdriver, &devID, DEFAULT_TIMEOUT);
@@ -1661,13 +1682,13 @@ static OSStatus copy_deviceid(classdriver_t **classdriver,
   CFRange range = (deviceSerial != NULL ? CFStringFind(deviceSerial, CFSTR("+"), 0) : CFRangeMake(0, 0));
   if (range.length == 1) {
       range = CFStringFind(*deviceID, deviceSerial, 0);
-
+      
       CFMutableStringRef deviceIDString = CFStringCreateMutableCopy(NULL, 0, *deviceID);
       CFStringFindAndReplace(deviceIDString, CFSTR("+"), CFSTR(""), range, 0);
       CFRelease(*deviceID);
       *deviceID = deviceIDString;
   }
-
+  
   release_deviceinfo(&deviceMake, &deviceModel, &deviceSerial);
 
   return err;
@@ -1955,8 +1976,6 @@ static void run_legacy_backend(int argc,
 
   if (!usb_legacy_status)
   {
-    log_usb_class_driver(IS_NOT_64BIT);
-
    /*
     * Setup a SIGTERM handler then block it before forking...
     */
@@ -2319,32 +2338,6 @@ static void get_device_id(cups_sc_status_t *status,
 }
 
 
-static void
-log_usb_class_driver(int is_64bit)	/* I - Is the USB class driver 64-bit? */
-{
- /*
-  * Report the usage of legacy USB class drivers to Apple if the user opts into providing
-  * feedback to Apple...
-  */
-
-  aslmsg aslm = asl_new(ASL_TYPE_MSG);
-  if (aslm)
-  {
-    ppd_file_t *ppd = ppdOpenFile(getenv("PPD"));
-    const char *make_model = ppd ? ppd->nickname : NULL;
-    ppd_attr_t *version = ppdFindAttr(ppd, "FileVersion", "");
-
-    asl_set(aslm, "com.apple.message.domain", "com.apple.printing.usb.64bit");
-    asl_set(aslm, "com.apple.message.result", is_64bit ? "yes" : "no");
-    asl_set(aslm, "com.apple.message.signature", make_model ? make_model : "Unknown");
-    asl_set(aslm, "com.apple.message.signature2", version ? version->value : "?.?");
-    asl_set(aslm, "com.apple.message.summarize", "YES");
-    asl_log(NULL, aslm, ASL_LEVEL_NOTICE, "");
-    asl_free(aslm);
-  }
-}
-
-
 /*
- * End of "$Id: usb-darwin.c 11670 2014-03-04 14:53:59Z msweet $".
+ * End of "$Id$".
  */

backend/usb-libusb.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-libusb.c 11456 2013-12-09 19:26:47Z msweet $"
+ * "$Id$"
  *
  *   LIBUSB interface code for CUPS.
  *
@@ -496,7 +496,7 @@ print_device(const char *uri,		/* I - Device URI */
 	iostatus = libusb_bulk_transfer(g.printer->handle,
 					g.printer->write_endp,
 					print_buffer, g.print_bytes,
-					&bytes, 0);
+					&bytes, 60000);
        /*
 	* Ignore timeout errors, but retain the number of bytes written to
 	* avoid sending duplicate data...
@@ -519,7 +519,7 @@ print_device(const char *uri,		/* I - Device URI */
 	  iostatus = libusb_bulk_transfer(g.printer->handle,
 					  g.printer->write_endp,
 					  print_buffer, g.print_bytes,
-					  &bytes, 0);
+					  &bytes, 60000);
 	}
 
        /*
@@ -534,7 +534,7 @@ print_device(const char *uri,		/* I - Device URI */
 	  iostatus = libusb_bulk_transfer(g.printer->handle,
 					  g.printer->write_endp,
 					  print_buffer, g.print_bytes,
-					  &bytes, 0);
+					  &bytes, 60000);
         }
 
 	if (iostatus)
@@ -2021,6 +2021,6 @@ soft_reset_printer(
 
 
 /*
- * End of "$Id: usb-libusb.c 11456 2013-12-09 19:26:47Z msweet $".
+ * End of "$Id$".
  */
 

backend/usb-unix.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-unix.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   USB port backend for CUPS.
  *
@@ -612,5 +612,5 @@ side_cb(int         print_fd,		/* I - Print file */
 
 
 /*
- * End of "$Id: usb-unix.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

backend/usb.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: usb.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   USB port backend for CUPS.
  *
@@ -260,5 +260,5 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id: usb.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

berkeley/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
+# "$Id$"
 #
 #   Berkeley commands makefile for CUPS.
 #
@@ -164,5 +164,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
+# End of "$Id$".
 #

berkeley/lpc.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: lpc.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   "lpc" command for CUPS.
  *
@@ -446,5 +446,5 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpc.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

berkeley/lpq.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: lpq.c 11101 2013-07-08 11:20:33Z msweet $"
+ * "$Id$"
  *
  *   "lpq" command for CUPS.
  *
@@ -679,5 +679,5 @@ usage(void)
 
 
 /*
- * End of "$Id: lpq.c 11101 2013-07-08 11:20:33Z msweet $".
+ * End of "$Id$".
  */

berkeley/lpr.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: lpr.c 11101 2013-07-08 11:20:33Z msweet $"
+ * "$Id$"
  *
  *   "lpr" command for CUPS.
  *
@@ -436,5 +436,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: lpr.c 11101 2013-07-08 11:20:33Z msweet $".
+ * End of "$Id$".
  */

berkeley/lprm.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: lprm.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   "lprm" command for CUPS.
  *
@@ -213,5 +213,5 @@ main(int  argc,			/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: lprm.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
+# "$Id$"
 #
 #   CGI makefile for CUPS.
 #
@@ -380,5 +380,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
+# End of "$Id$".
 #

cgi-bin/admin.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: admin.c 11345 2013-10-18 21:14:52Z msweet $"
+ * "$Id$"
  *
  *   Administration CGI for CUPS.
  *
@@ -4218,5 +4218,5 @@ get_points(double     number,		/* I - Original number */
 
 
 /*
- * End of "$Id: admin.c 11345 2013-10-18 21:14:52Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/cgi-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: cgi-private.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Private CGI definitions for CUPS.
  *
@@ -32,5 +32,5 @@
 
 
 /*
- * End of "$Id: cgi-private.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/cgi.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: cgi.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   CGI support library definitions for CUPS.
  *
@@ -115,5 +115,5 @@ extern const char	*cgiText(const char *message);
 #endif /* !_CUPS_CGI_H_ */
 
 /*
- * End of "$Id: cgi.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/classes.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Class status CGI for CUPS.
  *
@@ -554,5 +554,5 @@ show_class(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id: classes.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/help-index.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: help-index.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Online help index routines for CUPS.
  *
@@ -1324,5 +1324,5 @@ help_sort_words(help_word_t *w1,	/* I - Second word */
 
 
 /*
- * End of "$Id: help-index.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/help-index.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: help-index.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Online help index definitions for CUPS.
  *
@@ -83,5 +83,5 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 #endif /* !_CUPS_HELP_INDEX_H_ */
 
 /*
- * End of "$Id: help-index.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/help.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: help.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Online help CGI for CUPS.
  *
@@ -393,5 +393,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: help.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/html.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   HTML support functions for CUPS.
  *
@@ -235,5 +235,5 @@ cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
 
 
 /*
- * End of "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/ipp-var.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-var.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   CGI <-> IPP variable routines for CUPS.
  *
@@ -1589,5 +1589,5 @@ cgiText(const char *message)		/* I - Message */
 
 
 /*
- * End of "$Id: ipp-var.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/jobs.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: jobs.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Job status CGI for CUPS.
  *
@@ -210,5 +210,5 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
 
 
 /*
- * End of "$Id: jobs.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/makedocset.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $"
+ * "$Id$"
  *
  *   Xcode documentation set generator.
  *
@@ -482,5 +482,5 @@ write_nodes(const char   *path,		/* I - File to write */
 
 
 /*
- * End of "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/printers.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Printer status CGI for CUPS.
  *
@@ -574,5 +574,5 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id: printers.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/search.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: search.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Search routines for CUPS.
  *
@@ -377,5 +377,5 @@ cgiFreeSearch(void *search)		/* I - Search context */
 
 
 /*
- * End of "$Id: search.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/template.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: template.c 11688 2014-03-05 21:11:32Z msweet $"
+ * "$Id$"
  *
  *   CGI template function.
  *
@@ -553,7 +553,7 @@ cgi_copy(FILE *out,			/* I - Output file */
 	      if (regcomp(&re, compare, REG_EXTENDED | REG_ICASE))
 	      {
 	        fprintf(stderr,
-		        "ERROR: Unable to compile regular expression \"%s\"!\n",
+		        "ERROR: Unable to compile regular expresion \"%s\"!\n",
 			compare);
 		result = 0;
 	      }
@@ -729,5 +729,5 @@ cgi_puturi(const char *s,		/* I - String to output */
 
 
 /*
- * End of "$Id: template.c 11688 2014-03-05 21:11:32Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/testcgi.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: testcgi.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   CGI test program for CUPS.
  *
@@ -71,5 +71,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testcgi.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/testhi.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: testhi.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Help index test program for CUPS.
  *
@@ -109,5 +109,5 @@ list_nodes(const char   *title,		/* I - Title string */
 
 
 /*
- * End of "$Id: testhi.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/testtemplate.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: testtemplate.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   CGI template test program for CUPS.
  *
@@ -99,5 +99,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testtemplate.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/var.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: var.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   CGI form variable and array functions for CUPS.
  *
@@ -1307,5 +1307,5 @@ cgi_unlink_file(void)
 
 
 /*
- * End of "$Id: var.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cgi-bin/websearch.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: websearch.c 1531 2009-05-22 21:50:50Z msweet $"
+ * "$Id$"
  *
  *   Web search program for www.cups.org.
  *
@@ -112,5 +112,5 @@ list_nodes(help_index_t *hi,		/* I - Help index */
 
 
 /*
- * End of "$Id: websearch.c 1531 2009-05-22 21:50:50Z msweet $".
+ * End of "$Id$".
  */

conf/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
+# "$Id$"
 #
 #   Configuration file makefile for CUPS.
 #
@@ -139,5 +139,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
+# End of "$Id$".
 #

conf/cups-files.conf.in

@@ -1,5 +1,5 @@
 #
-# "$Id: cups-files.conf.in 11201 2013-07-26 21:27:27Z msweet $"
+# "$Id$"
 #
 # Sample file/directory/user/group configuration file for the CUPS scheduler.
 # See "man cups-files.conf" for a complete description of this file.
@@ -97,5 +97,5 @@ PageLog @CUPS_LOGDIR@/page_log
 #TempDir @CUPS_REQUESTS@/tmp
 
 #
-# End of "$Id: cups-files.conf.in 11201 2013-07-26 21:27:27Z msweet $".
+# End of "$Id$".
 #

conf/cupsd.conf.in

@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf.in 11025 2013-06-07 01:00:33Z msweet $"
+# "$Id$"
 #
 # Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
 # complete description of this file.
@@ -130,5 +130,5 @@ WebInterface @CUPS_WEBIF@
 </Policy>
 
 #
-# End of "$Id: cupsd.conf.in 11025 2013-06-07 01:00:33Z msweet $".
+# End of "$Id$".
 #

conf/mime.convs.in

@@ -1,5 +1,5 @@
 #
-# "$Id: mime.convs.in 11025 2013-06-07 01:00:33Z msweet $"
+# "$Id$"
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
@@ -59,5 +59,5 @@ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 @DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
 
 #
-# End of "$Id: mime.convs.in 11025 2013-06-07 01:00:33Z msweet $".
+# End of "$Id$".
 #

conf/snmp.conf.in

@@ -1,5 +1,5 @@
 #
-# "$Id: snmp.conf.in 11025 2013-06-07 01:00:33Z msweet $"
+# "$Id$"
 #
 #   Sample SNMP configuration file for CUPS.  See "man cups-snmp.conf" for a
 #   complete description of this file.
@@ -9,5 +9,5 @@
 @CUPS_SNMP_COMMUNITY@
 
 #
-# End of "$Id: snmp.conf.in 11025 2013-06-07 01:00:33Z msweet $".
+# End of "$Id$".
 #

config-scripts/cups-common.m4

@@ -1,16 +1,16 @@
 dnl
 dnl "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $"
 dnl
-dnl Common configuration stuff for CUPS.
+dnl   Common configuration stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2013 by Apple Inc.
+dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl We need at least autoconf 2.60...
@@ -20,8 +20,8 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION=1.7.2
-CUPS_REVISION=
+CUPS_VERSION="1.7.0"
+CUPS_REVISION=""
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
 #fi
@@ -303,11 +303,16 @@ fi
 LIBS="$SAVELIBS"
 
 dnl Check for DBUS support
+if test -d /etc/dbus-1; then
+	DBUSDIR="/etc/dbus-1"
+else
+	DBUSDIR=""
+fi
+
 AC_ARG_ENABLE(dbus, [  --disable-dbus           build without DBUS support])
 AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
 	DBUSDIR="$withval")
 
-DBUSDIR=""
 DBUS_NOTIFIER=""
 DBUS_NOTIFIERLIBS=""
 
@@ -324,12 +329,7 @@ if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then
 		LIBS="$LIBS $DBUS_NOTIFIERLIBS"
 		AC_CHECK_FUNC(dbus_message_iter_init_append,
 			      AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND))
-		AC_CHECK_FUNC(dbus_threads_init,
-			      AC_DEFINE(HAVE_DBUS_THREADS_INIT))
 		LIBS="$SAVELIBS"
-		if test -d /etc/dbus-1; then
-			DBUSDIR="/etc/dbus-1"
-		fi
 	else
 		AC_MSG_RESULT(no)
 	fi

config-scripts/cups-compiler.m4

@@ -1,16 +1,16 @@
 dnl
 dnl "$Id: cups-compiler.m4 7871 2008-08-27 21:12:43Z mike $"
 dnl
-dnl Compiler stuff for CUPS.
+dnl   Compiler stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2013 by Apple Inc.
+dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Clear the debugging and non-shared library options unless the user asks
@@ -185,7 +185,7 @@ if test -n "$GCC"; then
 			# The -z relro option is provided by the Linux linker command to
 			# make relocatable data read-only.
 			if test x$enable_relro = xyes; then
-				RELROFLAGS="-Wl,-z,relro,-z,now"
+				RELROFLAGS="-Wl,-z,relro"
 			fi
 			;;
 	esac

config-scripts/cups-gssapi.m4

@@ -1,9 +1,9 @@
 dnl
-dnl   "$Id: cups-gssapi.m4 11324 2013-10-04 03:11:42Z msweet $"
+dnl   "$Id$"
 dnl
 dnl   GSSAPI/Kerberos library detection for CUPS.
 dnl
-dnl   Copyright 2007-2013 by Apple Inc.
+dnl   Copyright 2007-2012 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products.
 dnl
 dnl   This file contains Kerberos support code, copyright 2006 by
@@ -71,9 +71,38 @@ if test x$enable_gssapi != xno; then
 	if test "x$LIBGSSAPI" != x; then
 		AC_CHECK_HEADER(krb5.h, AC_DEFINE(HAVE_KRB5_H))
 		if test -d /System/Library/Frameworks/GSS.framework; then
-			AC_CHECK_HEADER(GSS/gssapi.h, AC_DEFINE(HAVE_GSS_GSSAPI_H))
-			AC_CHECK_HEADER(GSS/gssapi_generic.h, AC_DEFINE(HAVE_GSS_GSSAPI_GENERIC_H))
-			AC_CHECK_HEADER(GSS/gssapi_spi.h, AC_DEFINE(HAVE_GSS_GSSAPI_SPI_H))
+			gssdir="/System/Library/Frameworks/GSS.framework"
+			AC_MSG_CHECKING(for GSS/gssapi.h presence)
+			if test -f $gssdir/Headers/gssapi.h; then
+				AC_DEFINE(HAVE_GSS_GSSAPI_H)
+				AC_MSG_RESULT(yes)
+			else
+				AC_MSG_RESULT(no)
+			fi
+			AC_MSG_CHECKING(for GSS/gssapi_generic.h presence)
+			if test -f $gssdir/Headers/gssapi_generic.h; then
+				AC_DEFINE(HAVE_GSSAPI_GENERIC_H)
+				AC_MSG_RESULT(yes)
+			else
+				AC_MSG_RESULT(no)
+			fi
+			AC_MSG_CHECKING(for GSS/gssapi_spi.h presence)
+			if test -f $gssdir/PrivateHeaders/gssapi_spi.h; then
+				AC_MSG_RESULT(yes)
+				AC_MSG_CHECKING(for GSS/gssapi_spi.h usability)
+				if test -s $gssdir/PrivateHeaders/gssapi_spi.h; then
+					AC_MSG_RESULT(yes)
+					AC_DEFINE(HAVE_GSS_GSSAPI_SPI_H)
+				else
+					AC_MSG_RESULT(no)
+				fi
+			else
+				AC_MSG_RESULT(no)
+				if test $uversion -ge 110 -a $uversion -lt 120; then
+					# Broken public headers in 10.7.x...
+					AC_MSG_ERROR(Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS.)
+				fi
+			fi
 		else
 			AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H))
 			AC_CHECK_HEADER(gssapi/gssapi.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_H))
@@ -129,5 +158,5 @@ AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")
 
 dnl
-dnl End of "$Id: cups-gssapi.m4 11324 2013-10-04 03:11:42Z msweet $".
+dnl End of "$Id$".
 dnl

config.h.in

@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h.in 11642 2014-02-27 15:57:59Z msweet $"
+ * "$Id$"
  *
  *   Configuration file for CUPS.
  *
@@ -535,7 +535,6 @@
 
 #undef HAVE_DBUS
 #undef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND
-#undef HAVE_DBUS_THREADS_INIT
 
 
 /*
@@ -707,5 +706,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h.in 11642 2014-02-27 15:57:59Z msweet $".
+ * End of "$Id$".
  */

configure.in

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in 11109 2013-07-08 21:15:13Z msweet $"
+dnl "$Id$"
 dnl
 dnl   Configuration script for CUPS.
 dnl
@@ -92,5 +92,5 @@ AC_OUTPUT(Makedefs
 chmod +x cups-config
 
 dnl
-dnl End of "$Id: configure.in 11109 2013-07-08 21:15:13Z msweet $".
+dnl End of "$Id$".
 dnl

cups-config.in

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# "$Id: cups-config.in 10996 2013-05-29 11:51:34Z msweet $"
+# "$Id$"
 #
 #   CUPS configuration utility.
 #
@@ -142,5 +142,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id: cups-config.in 10996 2013-05-29 11:51:34Z msweet $".
+# End of "$Id$".
 #

cups/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
+# "$Id$"
 #
 #   API library Makefile for CUPS.
 #
@@ -639,5 +639,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
+# End of "$Id$".
 #

cups/adminutil.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: adminutil.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Administration utility API definitions for CUPS.
  *
@@ -2337,5 +2337,5 @@ write_option(cups_file_t     *dstfp,	/* I - PPD file */
 
 
 /*
- * End of "$Id: adminutil.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/adminutil.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: adminutil.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Administration utility API definitions for CUPS.
  *
@@ -77,5 +77,5 @@ extern int	cupsAdminSetServerSettings(http_t *http,
 #endif /* !_CUPS_ADMINUTIL_H_ */
 
 /*
- * End of "$Id: adminutil.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/api-filter.header

@@ -3,7 +3,7 @@
 
   Filter and backend programming header for CUPS.
 
-  Copyright 2008-2014 by Apple Inc.
+  Copyright 2008-2011 by Apple Inc.
 
   These coded instructions, statements, and computer programs are the
   property of Apple Inc. and are protected by Federal copyright

cups/api-filter.shtml

@@ -237,7 +237,7 @@ prefix strings:</p>
 	<code>marker-types</code>, <code>printer-alert</code>, and
 	<code>printer-alert-description</code> printer attributes. Standard
 	<code>marker-types</code> values are listed in <a href='#TABLE1'>Table
-	1</a>. String values need special handling - see <a href="#ATTR_STRINGS">Reporting Attribute String Values</a> below.</dd>
+	1</a>.</dd>
 
 	<dt>CRIT: message</dt>
 	<dd>Sets the printer-state-message attribute and adds the specified
@@ -320,11 +320,11 @@ the "DEBUG:" prefix string.</p>
 	<td>Fuser unit</td>
 </tr>
 <tr>
-	<td>fuser-cleaning-pad</td>
+	<td>fuserCleaningPad</td>
 	<td>Fuser cleaning pad</td>
 </tr>
 <tr>
-	<td>fuser-oil</td>
+	<td>fuserOil</td>
 	<td>Fuser oil</td>
 </tr>
 <tr>
@@ -336,7 +336,7 @@ the "DEBUG:" prefix string.</p>
 	<td>Photo conductor</td>
 </tr>
 <tr>
-	<td>solid-wax</td>
+	<td>solidWax</td>
 	<td>Wax supply</td>
 </tr>
 <tr>
@@ -348,19 +348,19 @@ the "DEBUG:" prefix string.</p>
 	<td>Toner supply</td>
 </tr>
 <tr>
-	<td>transfer-unit</td>
+	<td>transferUnit</td>
 	<td>Transfer unit</td>
 </tr>
 <tr>
-	<td>waste-ink</td>
+	<td>wasteInk</td>
 	<td>Waste ink tank</td>
 </tr>
 <tr>
-	<td>waste-toner</td>
+	<td>wasteToner</td>
 	<td>Waste toner tank</td>
 </tr>
 <tr>
-	<td>waste-wax</td>
+	<td>wasteWax</td>
 	<td>Waste wax tank</td>
 </tr>
 </tbody>
@@ -440,95 +440,6 @@ the "DEBUG:" prefix string.</p>
 </tbody>
 </table></div>
 
-
-<h4><a name="ATTR_STRINGS">Reporting Attribute String Values</a></h4>
-
-<p>When reporting string values using "ATTR:" messages, a filter or backend must take special care to appropriately quote those values. The scheduler uses the CUPS option parsing code for attributes, so the general syntax is:</p>
-
-<pre class="example">
-name=simple
-name=simple,simple,...
-name='complex value'
-name="complex value"
-name='"complex value"','"complex value"',...
-</pre>
-
-<p>Simple values are strings that do not contain spaces, quotes, backslashes, or the comma and can be placed verbatim in the "ATTR:" message, for example:</p>
-
-<pre class="example">
-int levels[4] = { 40, 50, 60, 70 }; /* CMYK */
-
-fputs("ATTR: marker-colors=#00FFFF,#FF00FF,#FFFF00,#000000\n", stderr);
-fputs("ATTR: marker-high-levels=100,100,100,100\n", stderr);
-fprintf(stderr, "ATTR: marker-levels=%d,%d,%d,%d\n", levels[0], levels[1],
-        levels[2], levels[3], levels[4]);
-fputs("ATTR: marker-low-levels=5,5,5,5\n", stderr);
-fputs("ATTR: marker-types=toner,toner,toner,toner\n", stderr);
-</pre>
-
-<p>Complex values that contains spaces, quotes, backslashes, or the comma must be quoted. For a single value a single set of quotes is sufficient:</p>
-
-<pre class="example">
-fputs("ATTR: marker-message='Levels shown are approximate.'\n", stderr);
-</pre>
-
-<p>When multiple values are reported, each value must be enclosed by a set of single and double quotes:</p>
-
-<pre class="example">
-fputs("ATTR: marker-names='\"Cyan Toner\"','\"Magenta Toner\"',"
-      "'\"Yellow Toner\"','\"Black Toner\"'\n", stderr);
-</pre>
-
-<p>The IPP backend includes a <var>quote_string</var> function that may be used to properly quote a complex value in an "ATTR:" message:</p>
-
-<pre class="example">
-static const char *                     /* O - Quoted string */
-quote_string(const char *s,             /* I - String */
-             char       *q,             /* I - Quoted string buffer */
-             size_t     qsize)          /* I - Size of quoted string buffer */
-{
-  char  *qptr,                          /* Pointer into string buffer */
-        *qend;                          /* End of string buffer */
-
-
-  qptr = q;
-  qend = q + qsize - 5;
-
-  if (qend &lt; q)
-  {
-    *q = '\0';
-    return (q);
-  }
-
-  *qptr++ = '\'';
-  *qptr++ = '\"';
-
-  while (*s && qptr &lt; qend)
-  {
-    if (*s == '\\' || *s == '\"' || *s == '\'')
-    {
-      if (qptr &lt; (qend - 4))
-      {
-        *qptr++ = '\\';
-        *qptr++ = '\\';
-        *qptr++ = '\\';
-      }
-      else
-        break;
-    }
-
-    *qptr++ = *s++;
-  }
-
-  *qptr++ = '\"';
-  *qptr++ = '\'';
-  *qptr   = '\0';
-
-  return (q);
-}
-</pre>
-
-
 <h4><a name="MANAGING_STATE">Managing Printer State in a Filter</a></h4>
 
 <p>Filters are responsible for managing the state keywords they set using

cups/array-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: array-private.h 3933 2012-10-01 03:01:10Z msweet $"
+ * "$Id$"
  *
  *   Private array definitions for CUPS.
  *
@@ -48,5 +48,5 @@ extern cups_array_t	*_cupsArrayNewStrings(const char *s, char delim)
 #endif /* !_CUPS_ARRAY_PRIVATE_H_ */
 
 /*
- * End of "$Id: array-private.h 3933 2012-10-01 03:01:10Z msweet $".
+ * End of "$Id$".
  */

cups/array.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: array.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Sorted array routines for CUPS.
  *
@@ -1362,5 +1362,5 @@ cups_array_find(cups_array_t *a,	/* I - Array */
 
 
 /*
- * End of "$Id: array.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/array.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: array.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Sorted array definitions for CUPS.
  *
@@ -88,5 +88,5 @@ extern void		*cupsArrayUserData(cups_array_t *a) _CUPS_API_1_2;
 #endif /* !_CUPS_ARRAY_H_ */
 
 /*
- * End of "$Id: array.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/attr.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: attr.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   PPD model-specific attribute routines for CUPS.
  *
@@ -331,5 +331,5 @@ _ppdNormalizeMakeAndModel(
 
 
 /*
- * End of "$Id: attr.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/auth.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Authentication functions for CUPS.
  *
@@ -888,5 +888,5 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: auth.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/backchannel.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: backchannel.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Backchannel functions for CUPS.
  *
@@ -195,5 +195,5 @@ cups_setup(fd_set         *set,		/* I - Set for select() */
 
 
 /*
- * End of "$Id: backchannel.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/backend.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: backend.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Backend functions for CUPS.
  *
@@ -150,5 +150,5 @@ quote_string(const char *s)		/* I - String to write */
 
 
 /*
- * End of "$Id: backend.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/backend.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: backend.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Backend definitions for CUPS.
  *
@@ -74,5 +74,5 @@ extern void		cupsBackendReport(const char *device_scheme,
 #endif /* !_CUPS_BACKEND_H_ */
 
 /*
- * End of "$Id: backend.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/conflicts.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: conflicts.c 3933 2012-10-01 03:01:10Z msweet $"
+ * "$Id$"
  *
  *   Option marking routines for CUPS.
  *
@@ -1210,5 +1210,5 @@ ppd_test_constraints(
 
 
 /*
- * End of "$Id: conflicts.c 3933 2012-10-01 03:01:10Z msweet $".
+ * End of "$Id$".
  */

cups/cups-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-private.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Private definitions for CUPS.
  *
@@ -281,5 +281,5 @@ extern char		*_cupsUserDefault(char *name, size_t namesize);
 #endif /* !_CUPS_CUPS_PRIVATE_H_ */
 
 /*
- * End of "$Id: cups-private.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/cups.h

@@ -1,18 +1,18 @@
 /*
- * "$Id: cups.h 11551 2014-01-29 16:31:35Z msweet $"
+ * "$Id$"
  *
- * API definitions for CUPS.
+ *   API definitions for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 2007-2013 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_CUPS_H_
@@ -53,10 +53,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION			1.0702
+#  define CUPS_VERSION			1.0700
 #  define CUPS_VERSION_MAJOR		1
 #  define CUPS_VERSION_MINOR		7
-#  define CUPS_VERSION_PATCH		2
+#  define CUPS_VERSION_PATCH		0
 
 #  define CUPS_BC_FD			3
 					/* Back-channel file descriptor for
@@ -627,5 +627,5 @@ extern const char	*cupsUserAgent(void) _CUPS_API_1_7;
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id: cups.h 11551 2014-01-29 16:31:35Z msweet $".
+ * End of "$Id$".
  */

cups/custom.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: custom.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   PPD custom option routines for CUPS.
  *
@@ -118,5 +118,5 @@ ppdNextCustomParam(ppd_coption_t *opt)	/* I - Custom option */
 
 
 /*
- * End of "$Id: custom.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/debug-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: debug-private.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Private debugging macros for CUPS.
  *
@@ -113,5 +113,5 @@ extern int	_cups_gettimeofday(struct timeval *tv, void *tz);
 #endif /* !_CUPS_DEBUG_PRIVATE_H_ */
 
 /*
- * End of "$Id: debug-private.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/debug.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: debug.c 4027 2012-11-16 01:00:05Z msweet $"
+ * "$Id$"
  *
  *   Debugging functions for CUPS.
  *
@@ -650,5 +650,5 @@ _cups_debug_set(const char *logfile,	/* I - Log file or NULL */
 
 
 /*
- * End of "$Id: debug.c 4027 2012-11-16 01:00:05Z msweet $".
+ * End of "$Id$".
  */

cups/dest-job.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: dest-job.c 4274 2013-04-09 20:10:23Z msweet $"
+ * "$Id$"
  *
  *   Destination job support for CUPS.
  *
@@ -362,5 +362,5 @@ cupsStartDestDocument(
 
 
 /*
- * End of "$Id: dest-job.c 4274 2013-04-09 20:10:23Z msweet $".
+ * End of "$Id$".
  */

cups/dest-localization.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: dest-localization.c 4216 2013-03-11 13:57:36Z msweet $"
+ * "$Id$"
  *
  *   Destination localization support for CUPS.
  *
@@ -383,5 +383,5 @@ cups_scan_strings(char *buffer)		/* I - Start of string */
 
 
 /*
- * End of "$Id: dest-localization.c 4216 2013-03-11 13:57:36Z msweet $".
+ * End of "$Id$".
  */

cups/dest-options.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: dest-options.c 11085 2013-07-03 13:53:05Z msweet $"
+ * "$Id$"
  *
  *   Destination option/media support for CUPS.
  *
@@ -2267,5 +2267,5 @@ cups_update_ready(http_t       *http,	/* I - Connection to destination */
 
 
 /*
- * End of "$Id: dest-options.c 11085 2013-07-03 13:53:05Z msweet $".
+ * End of "$Id$".
  */

cups/dest.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: dest.c 11688 2014-03-05 21:11:32Z msweet $"
+ * "$Id$"
  *
  *   User-defined destination (and option) support for CUPS.
  *
@@ -891,10 +891,6 @@ cupsEnumDests(
 			num_dests;	/* Number of destinations */
   cups_dest_t		*dests = NULL,	/* Destinations */
 			*dest;		/* Current destination */
-  const char		*defprinter;	/* Default printer */
-  char			name[1024],	/* Copy of printer name */
-			*instance,	/* Pointer to instance name */
-			*user_default;	/* User default printer */
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   int			count,		/* Number of queries started */
 			remaining;	/* Remainder of timeout */
@@ -940,31 +936,6 @@ cupsEnumDests(
   num_dests = _cupsGetDests(CUPS_HTTP_DEFAULT, IPP_OP_CUPS_GET_PRINTERS, NULL,
                             &dests, type, mask);
 
-  if ((user_default = _cupsUserDefault(name, sizeof(name))) != NULL)
-    defprinter = name;
-  else if ((defprinter = cupsGetDefault2(CUPS_HTTP_DEFAULT)) != NULL)
-  {
-    strlcpy(name, defprinter, sizeof(name));
-    defprinter = name;
-  }
-
-  if (defprinter)
-  {
-   /*
-    * Separate printer and instance name...
-    */
-
-    if ((instance = strchr(name, '/')) != NULL)
-      *instance++ = '\0';
-
-   /*
-    * Lookup the printer and instance and make it the default...
-    */
-
-    if ((dest = cupsGetDest(name, instance, num_dests, dests)) != NULL)
-      dest->is_default = 1;
-  }
-
   for (i = num_dests, dest = dests;
        i > 0 && (!cancel || !*cancel);
        i --, dest ++)
@@ -982,11 +953,11 @@ cupsEnumDests(
   * Get Bonjour-shared printers...
   */
 
-  data.type      = type;
-  data.mask      = mask;
-  data.cb        = cb;
-  data.user_data = user_data;
-  data.devices   = cupsArrayNew3((cups_array_func_t)cups_dnssd_compare_devices, NULL, NULL, 0, NULL, (cups_afree_func_t)cups_dnssd_free_device);
+  data.type    = type;
+  data.mask    = mask;
+  data.devices = cupsArrayNew3((cups_array_func_t)cups_dnssd_compare_devices,
+                               NULL, NULL, 0, NULL,
+                               (cups_afree_func_t)cups_dnssd_free_device);
 
 #  ifdef HAVE_DNSSD
   if (DNSServiceCreateConnection(&data.main_ref) != kDNSServiceErr_NoError)
@@ -3920,5 +3891,5 @@ cups_make_string(
 
 
 /*
- * End of "$Id: dest.c 11688 2014-03-05 21:11:32Z msweet $".
+ * End of "$Id$".
  */

cups/dir.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: dir.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Directory routines for CUPS.
  *
@@ -468,5 +468,5 @@ cupsDirRewind(cups_dir_t *dp)		/* I - Directory pointer */
 #endif /* WIN32 */
 
 /*
- * End of "$Id: dir.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/dir.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: dir.h 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Public directory definitions for CUPS.
  *
@@ -65,5 +65,5 @@ extern void		cupsDirRewind(cups_dir_t *dp) _CUPS_API_1_2;
 #endif /* !_CUPS_DIR_H_ */
 
 /*
- * End of "$Id: dir.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/emit.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: emit.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   PPD code emission routines for CUPS.
  *
@@ -1225,5 +1225,5 @@ ppd_handle_media(ppd_file_t *ppd)	/* I - PPD file */
 
 
 /*
- * End of "$Id: emit.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/encode.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: encode.c 11734 2014-03-25 18:01:47Z msweet $"
+ * "$Id$"
  *
  *   Option encoding routines for CUPS.
  *
@@ -41,10 +41,7 @@ static const ipp_op_t ipp_job_creation[] =
 {
   IPP_OP_PRINT_JOB,
   IPP_OP_PRINT_URI,
-  IPP_OP_VALIDATE_JOB,
   IPP_OP_CREATE_JOB,
-  IPP_OP_HOLD_JOB,
-  IPP_OP_SET_JOB_ATTRIBUTES,
   IPP_OP_CUPS_NONE
 };
 
@@ -54,8 +51,6 @@ static const ipp_op_t ipp_doc_creation[] =
   IPP_OP_PRINT_URI,
   IPP_OP_SEND_DOCUMENT,
   IPP_OP_SEND_URI,
-  IPP_OP_SET_JOB_ATTRIBUTES,
-  IPP_OP_SET_DOCUMENT_ATTRIBUTES,
   IPP_OP_CUPS_NONE
 };
 
@@ -64,8 +59,8 @@ static const ipp_op_t ipp_sub_creation[] =
   IPP_OP_PRINT_JOB,
   IPP_OP_PRINT_URI,
   IPP_OP_CREATE_JOB,
-  IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS,
-  IPP_OP_CREATE_JOB_SUBSCRIPTIONS,
+  IPP_OP_CREATE_PRINTER_SUBSCRIPTION,
+  IPP_OP_CREATE_JOB_SUBSCRIPTION,
   IPP_OP_CUPS_NONE
 };
 
@@ -73,7 +68,6 @@ static const ipp_op_t ipp_all_print[] =
 {
   IPP_OP_PRINT_JOB,
   IPP_OP_PRINT_URI,
-  IPP_OP_VALIDATE_JOB,
   IPP_OP_CREATE_JOB,
   IPP_OP_SEND_DOCUMENT,
   IPP_OP_SEND_URI,
@@ -878,5 +872,5 @@ compare_ipp_options(_ipp_option_t *a,	/* I - First option */
 
 
 /*
- * End of "$Id: encode.c 11734 2014-03-25 18:01:47Z msweet $".
+ * End of "$Id$".
  */

cups/file-private.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: file-private.h 11642 2014-02-27 15:57:59Z msweet $"
+ * "$Id$"
  *
  *   Private file definitions for CUPS.
  *
@@ -16,8 +16,6 @@
  *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   which should have been included with this file.  If this file is
  *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_FILE_PRIVATE_H_
@@ -135,5 +133,5 @@ extern void			_cupsFileCheckFilter(void *context,
 #endif /* !_CUPS_FILE_PRIVATE_H_ */
 
 /*
- * End of "$Id: file-private.h 11642 2014-02-27 15:57:59Z msweet $".
+ * End of "$Id$".
  */

cups/file.c

@@ -1,23 +1,61 @@
 /*
- * "$Id: file.c 11642 2014-02-27 15:57:59Z msweet $"
+ * "$Id$"
  *
- * File functions for CUPS.
+ *   File functions for CUPS.
  *
- * Since stdio files max out at 256 files on many systems, we have to
- * write similar functions without this limit.  At the same time, using
- * our own file functions allows us to provide transparent support of
- * gzip'd print files, PPD files, etc.
+ *   Since stdio files max out at 256 files on many systems, we have to
+ *   write similar functions without this limit.  At the same time, using
+ *   our own file functions allows us to provide transparent support of
+ *   gzip'd print files, PPD files, etc.
  *
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
- * This file is subject to the Apple OS-Developed Software exception.
+ * Contents:
+ *
+ *   _cupsFileCheck()       - Check the permissions of the given filename.
+ *   _cupsFileCheckFilter() - Report file check results as CUPS filter messages.
+ *   cupsFileClose()        - Close a CUPS file.
+ *   cupsFileCompression()  - Return whether a file is compressed.
+ *   cupsFileEOF()          - Return the end-of-file status.
+ *   cupsFileFind()         - Find a file using the specified path.
+ *   cupsFileFlush()        - Flush pending output.
+ *   cupsFileGetChar()      - Get a single character from a file.
+ *   cupsFileGetConf()      - Get a line from a configuration file.
+ *   cupsFileGetLine()      - Get a CR and/or LF-terminated line that may
+ *                            contain binary data.
+ *   cupsFileGets()         - Get a CR and/or LF-terminated line.
+ *   cupsFileLock()         - Temporarily lock access to a file.
+ *   cupsFileNumber()       - Return the file descriptor associated with a CUPS
+ *                            file.
+ *   cupsFileOpen()         - Open a CUPS file.
+ *   cupsFileOpenFd()       - Open a CUPS file using a file descriptor.
+ *   cupsFilePeekChar()     - Peek at the next character from a file.
+ *   cupsFilePrintf()       - Write a formatted string.
+ *   cupsFilePutChar()      - Write a character.
+ *   cupsFilePutConf()      - Write a configuration line.
+ *   cupsFilePuts()         - Write a string.
+ *   cupsFileRead()         - Read from a file.
+ *   cupsFileRewind()       - Set the current file position to the beginning of
+ *                            the file.
+ *   cupsFileSeek()         - Seek in a file.
+ *   cupsFileStderr()       - Return a CUPS file associated with stderr.
+ *   cupsFileStdin()        - Return a CUPS file associated with stdin.
+ *   cupsFileStdout()       - Return a CUPS file associated with stdout.
+ *   cupsFileTell()         - Return the current file position.
+ *   cupsFileUnlock()       - Unlock access to a file.
+ *   cupsFileWrite()        - Write to a file.
+ *   cups_compress()        - Compress a buffer of data.
+ *   cups_fill()            - Fill the input buffer.
+ *   cups_open()            - Safely open a file for writing.
+ *   cups_read()            - Read from a file descriptor.
+ *   cups_write()           - Write to a file descriptor.
  */
 
 /*
@@ -2391,8 +2429,8 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
 	}
 	else
 	{
-	  tcrc = ((((((uLong)trailer[3] << 8) | (uLong)trailer[2]) << 8) |
-	          (uLong)trailer[1]) << 8) | (uLong)trailer[0];
+	  tcrc = (((((trailer[3] << 8) | trailer[2]) << 8) | trailer[1]) << 8) |
+        	 trailer[0];
 
 	  if (tcrc != fp->crc)
 	  {
@@ -2400,7 +2438,7 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
             * Bad CRC, mark end-of-file...
 	    */
 
-            DEBUG_printf(("9cups_fill: tcrc=%08x != fp->crc=%08x",
+            DEBUG_printf(("9cups_fill: tcrc=%08x, fp->crc=%08x",
 	                  (unsigned int)tcrc, (unsigned int)fp->crc));
 
 	    fp->eof = 1;
@@ -2672,5 +2710,5 @@ cups_write(cups_file_t *fp,		/* I - CUPS file */
 
 
 /*
- * End of "$Id: file.c 11642 2014-02-27 15:57:59Z msweet $".
+ * End of "$Id$".
  */

cups/file.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: file.h 11642 2014-02-27 15:57:59Z msweet $"
+ * "$Id$"
  *
  *   Public file definitions for CUPS.
  *
@@ -16,8 +16,6 @@
  *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   which should have been included with this file.  If this file is
  *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_FILE_H_
@@ -114,5 +112,5 @@ extern ssize_t		cupsFileWrite(cups_file_t *fp, const char *buf,
 #endif /* !_CUPS_FILE_H_ */
 
 /*
- * End of "$Id: file.h 11642 2014-02-27 15:57:59Z msweet $".
+ * End of "$Id$".
  */

cups/getdevices.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: getdevices.c 4216 2013-03-11 13:57:36Z msweet $"
+ * "$Id$"
  *
  *   cupsGetDevices implementation for CUPS.
  *
@@ -280,5 +280,5 @@ cupsGetDevices(
 
 
 /*
- * End of "$Id: getdevices.c 4216 2013-03-11 13:57:36Z msweet $".
+ * End of "$Id$".
  */

cups/getifaddrs.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: getifaddrs.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id$"
  *
  *   Network interface functions for CUPS.
  *
@@ -262,5 +262,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */
 
 
 /*
- * End of "$Id: getifaddrs.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
  */

cups/getputfile.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: getputfile.c 11153 2013-07-17 14:10:21Z msweet $"
+ * "$Id$"
  *
  *   Get/put file functions for CUPS.
  *
@@ -518,5 +518,5 @@ cupsPutFile(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE
 
 
 /*
- * End of "$Id: getputfile.c 11153 2013-07-17 14:10:21Z msweet $".
+ * End of "$Id$".
  */

cups/globals.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: globals.c 11113 2013-07-10 14:08:39Z msweet $"
+ * "$Id$"
  *
  *   Global variable access routines for CUPS.
  *
@@ -392,5 +392,5 @@ cups_globals_init(void)
 
 
 /*
- * End of "$Id: globals.c 11113 2013-07-10 14:08:39Z msweet $".
+ * End of "$Id$".
  */

cups/http-addr.c

@@ -1,18 +1,32 @@
 /*
- * "$Id: http-addr.c 11642 2014-02-27 15:57:59Z msweet $"
+ * "$Id$"
  *
- * HTTP address routines for CUPS.
+ *   HTTP address routines for CUPS.
  *
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2013 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
- * This file is subject to the Apple OS-Developed Software exception.
+ * Contents:
+ *
+ *   httpAddrAny()	 - Check for the "any" address.
+ *   httpAddrEqual()	 - Compare two addresses.
+ *   httpAddrLength()	 - Return the length of the address in bytes.
+ *   httpAddrListen()	 - Create a listening socket bound to the specified
+ *			   address and port.
+ *   httpAddrLocalhost() - Check for the local loopback address.
+ *   httpAddrLookup()	 - Lookup the hostname associated with the address.
+ *   httpAddrPort()	 - Get the port number associated with an address.
+ *   _httpAddrSetPort()  - Set the port number associated with an address.
+ *   httpAddrString()	 - Convert an address to a numeric string.
+ *   httpGetHostByName() - Lookup a hostname or IPv4 address, and return
+ *			   address records for the specified name.
+ *   httpGetHostname()	 - Get the FQDN for the connection or local system.
  */
 
 /*
@@ -629,9 +643,8 @@ httpGetHostByName(const char *name)	/* I - Hostname or IP address */
     if (ip[0] > 255 || ip[1] > 255 || ip[2] > 255 || ip[3] > 255)
       return (NULL);			/* Invalid byte ranges! */
 
-    cg->ip_addr = htonl((((((((unsigned)ip[0] << 8) | (unsigned)ip[1]) << 8) |
-                           (unsigned)ip[2]) << 8) |
-                         (unsigned)ip[3]));
+    cg->ip_addr = htonl(((((((ip[0] << 8) | ip[1]) << 8) | ip[2]) << 8) |
+                         ip[3]));
 
    /*
     * Fill in the host entry and return it...
@@ -756,5 +769,5 @@ httpGetHostname(http_t *http,		/* I - HTTP connection or NULL */
 
 
 /*
- * End of "$Id: http-addr.c 11642 2014-02-27 15:57:59Z msweet $".
+ * End of "$Id$".
  */

cups/http-addrlist.c

@@ -1,18 +1,25 @@
 /*
- * "$Id: http-addrlist.c 11642 2014-02-27 15:57:59Z msweet $"
+ * "$Id$"
  *
- * HTTP address list routines for CUPS.
+ *   HTTP address list routines for CUPS.
  *
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2013 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
- * This file is subject to the Apple OS-Developed Software exception.
+ * Contents:
+ *
+ *   httpAddrConnect()	- Connect to any of the addresses in the list.
+ *   httpAddrConnect2() - Connect to any of the addresses in the list with a
+ *			  timeout and optional cancel.
+ *   httpAddrCopyList() - Copy an address list.
+ *   httpAddrFreeList() - Free an address list.
+ *   httpAddrGetList()	- Get a list of addresses for a hostname.
  */
 
 /*
@@ -457,7 +464,6 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 
     if ((first = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t))) != NULL)
     {
-      addr = first;
       first->addr.un.sun_family = AF_LOCAL;
       strlcpy(first->addr.un.sun_path, hostname, sizeof(first->addr.un.sun_path));
     }
@@ -641,10 +647,9 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	    return (NULL);
 
           first->addr.ipv4.sin_family = AF_INET;
-          first->addr.ipv4.sin_addr.s_addr = htonl((((((((unsigned)ip[0] << 8) |
-	                                               (unsigned)ip[1]) << 8) |
-						     (unsigned)ip[2]) << 8) |
-						   (unsigned)ip[3]));
+          first->addr.ipv4.sin_addr.s_addr = htonl(((((((ip[0] << 8) |
+	                                               ip[1]) << 8) |
+						     ip[2]) << 8) | ip[3]));
           first->addr.ipv4.sin_port = htons(portnum);
 	}
       }
@@ -877,5 +882,5 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 
 
 /*
- * End of "$Id: http-addrlist.c 11642 2014-02-27 15:57:59Z msweet $".
+ * End of "$Id$".
  */

cups/http-private.h

@@ -1,18 +1,18 @@
 /*
- * "$Id: http-private.h 11392 2013-11-06 01:29:56Z msweet $"
+ * "$Id$"
  *
- * Private HTTP definitions for CUPS.
+ *   Private HTTP definitions for CUPS.
  *
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2013 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_HTTP_PRIVATE_H_
@@ -169,12 +169,12 @@ extern BIO_METHOD *_httpBIOMethods(void);
  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
  */
 
-typedef gnutls_session_t http_tls_t;
+typedef gnutls_session http_tls_t;
 typedef void *http_tls_credentials_t;
 
-extern ssize_t	_httpReadGNUTLS(gnutls_transport_ptr_t ptr, void *data,
+extern ssize_t	_httpReadGNUTLS(gnutls_transport_ptr ptr, void *data,
 		                size_t length);
-extern ssize_t	_httpWriteGNUTLS(gnutls_transport_ptr_t ptr, const void *data,
+extern ssize_t	_httpWriteGNUTLS(gnutls_transport_ptr ptr, const void *data,
 		                 size_t length);
 
 #  elif defined(HAVE_CDSASSL)
@@ -437,5 +437,5 @@ extern int		_httpWait(http_t *http, int msec, int usessl);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id: http-private.h 11392 2013-11-06 01:29:56Z msweet $".
+ * End of "$Id$".
  */

cups/http-support.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: http-support.c 11445 2013-12-05 19:57:43Z msweet $"
+ * "$Id$"
  *
  *   HTTP support routines for CUPS.
  *
@@ -206,10 +206,10 @@ httpAssembleURI(
   if (!ptr)
     goto assemble_overflow;
 
-  if (!strcmp(scheme, "mailto") || !strcmp(scheme, "tel"))
+  if (!strcmp(scheme, "mailto"))
   {
    /*
-    * mailto: and tel: only have :, no //...
+    * mailto: only has :, no //...
     */
 
     if (ptr < end)
@@ -220,7 +220,7 @@ httpAssembleURI(
   else
   {
    /*
-    * Schemes other than mailto: and tel: all have //...
+    * Schemes other than mailto: all have //...
     */
 
     if ((ptr + 2) < end)
@@ -1080,7 +1080,7 @@ httpSeparateURI(
     *port = 515;
   else if (!strcmp(scheme, "socket"))	/* Not yet registered with IANA... */
     *port = 9100;
-  else if (strcmp(scheme, "file") && strcmp(scheme, "mailto") && strcmp(scheme, "tel"))
+  else if (strcmp(scheme, "file") && strcmp(scheme, "mailto"))
     status = HTTP_URI_STATUS_UNKNOWN_SCHEME;
 
  /*
@@ -2382,5 +2382,5 @@ http_resolve_cb(
 
 
 /*
- * End of "$Id: http-support.c 11445 2013-12-05 19:57:43Z msweet $".
+ * End of "$Id$".
  */