Import CUPS v2.1rc1

Import CUPS v2.1b1
Import CUPS v2.0.4
2016-03-15 10:43:21 -04:00 · 2016-03-15 10:43:16 -04:00 · 2016-03-15 10:40:47 -04:00 · 2016-03-15 10:40:44 -04:00
@@ -0,0 +1,215 @@
+CHANGES-2.0.txt
+---------------
+
+CHANGES IN CUPS V2.0.4
+
+	- Fixed a bug in cupsRasterWritePixels (STR #4650)
+	- Fixed redirection in the web interface (STR #4538)
+	- The IPP backend did not respond to side-channel requests (STR #4645)
+	- The scheduler did not start all pending jobs at once (STR #4646)
+	- The web search incorrectly searched time-at-xxx values (STR #4652)
+	- Fixed an RPM spec file issue (STR #4657)
+	- The scheduler incorrectly started jobs while canceling multiple jobs
+	  (STR #4648)
+	- Fixed processing of server overrides without port numbers (STR #4675)
+	- Documentation changes (STR #4651, STR #4674)
+
+
+CHANGES IN CUPS V2.0.3
+
+	- Security: Fixed CERT VU #810572 exploiting the dynamic linker
+	  (STR #4609)
+	- Security: The scheduler could hang with malformed gzip data
+	  (STR #4602)
+	- Restored missing generic printer icon file (STR #4587)
+	- Fixed logging of configuration errors to show up as errors (STR #4582)
+	- Fixed potential buffer overflows in raster code and filters
+	  (STR #4598, STR #4599, STR #4600, STR #4601)
+	- Fixed a gzip processing bug (#4602)
+	- Fixed <Limit> inside <Location> (STR #4575)
+	- Fixed lpadmin when both -m and -o are used (STR #4578)
+	- The web interface always showed support for 2-sided printing
+	  (STR #4595)
+	- cupsRasterReadHeader did not fully validate the raster header
+	  (STR #4596)
+	- The rastertopwg filter did not check for truncated input (STR #4597)
+	- The cups-lpd mini-daemon did not check for request parameters
+	  (STR #4603)
+	- The scheduler could get caught in a busy loop (STR #4605)
+	- The sample Epson driver could crash (STR #4616)
+	- The IPP backend now correctly monitors jobs
+	  (<rdar://problem/20495955>)
+	- The ppdhtml and ppdpo utilities crashed when the -D option was used
+	  before a driver information file (STR #4627)
+	- ippfind incorrectly substituted "=port" for service_port.
+	- The IPP/1.1 test file did not handle the initial print job
+	  completing early (STR #4576)
+	- Fixed a memory leak in cupsConnectDest (STR #4634)
+	- PWG Raster Format output contained invalid ImageBox values
+	  (<rdar://problem/21144309>)
+	- Added Russian translation (STR #4577)
+	- Added German translation (STR #4635)
+
+
+CHANGES IN CUPS V2.0.2
+
+	- Security: cupsRasterReadPixels buffer overflow with invalid page
+	  header and compressed raster data (STR #4551)
+	- Command-line programs were not localized on Mac OS X
+	  (<rdar://problem/14546232>)
+	- The scheduler incorrectly cleared the MakeModel string in the
+	  printers.conf file after a restart (<rdar://problem/16827518>)
+	- CUPS did not compile with older versions of GNU TLS (STR #4527)
+	- CUPS did not compile without Avahi or mDNSResponder (STR #4523)
+	- ippLength() did not return the correct length for IPP_TAG_CONST
+	  string values.
+	- The scheduler incorrectly aborted jobs after a job was restarted
+	  (<rdar://problem/19129387>)
+	- The cups-files.conf file contained the old ServerCertificate/Key
+	  directives instead of ServerKeychain.
+	- Fixed builds when no SSL/TLS library is available, or when explicitly
+	  disabled (STR #4531)
+	- Fixed an OpenBSD charset transcoding issue.
+	- Fixed USB printing on OpenBSD (STR #4525)
+	- The --without-xinetd configure option did not work (STR #4542)
+	- Backends needing to load OS X kernel extensions did not work
+	  (<rdar://problem/19015679>)
+	- Mapping of PPD keywords to IPP keywords did not work if the PPD
+	  keyword was already an IPP keyword (<rdar://problem/19121005>)
+	- cupsGetPPD* sent bad requests (STR #4567)
+	- ippserver used the wrong temporary directory on Windows (STR #4547)
+	- ippserver did not handle Bonjour registrations properly (STR #4548)
+	- The scheduler could crash during shutdown if Avahi was shutdown
+	  first (STR #4550)
+	- Added a USB quirk rule for Intermec printers (STR #4553)
+	- The scheduler did not always log which configuration file had the
+	  error (STR #4559)
+	- The ippfind and ipptool programs now correctly match hostnames with
+	  trailing dots (STR #4563)
+	- The ipptool timeout option did not work (STR #4515)
+	- Fixed several issues with client.conf, CUPS_SERVER, and the "-h"
+	  option of most commands (STR #4528)
+	- Another change for OpenBSD (STR #4526)
+	- Added Japanese localization (STR #4524)
+	- Documentation changes (STR #4569)
+
+
+CHANGES IN CUPS V2.0.1
+
+	- Security: SSLv3 is now disabled by default to protect against the
+	  POODLE attack (STR #4476)
+	- Printer sharing did not work when systemd was being used (STR #4497)
+	- cupsGetPPD* would return a symlink to the PPD in /etc/cups/ppd even if
+	  it was not readable by the user (STR #4500)
+	- The web interface now protects against frame "click-jacking" attacks
+	  (STR #4492)
+	- Fixed a crash in ippAttributeString (<rdar://problem/17903871>)
+	- Fixed a crash in the scheduler on Linux/*BSD if colord was not running
+	  (STR #4496)
+	- Fixed a random crash in the scheduler when not using systemd
+	  (STR #4484)
+	- Added systemd support for cups-lpd (STR #4493)
+	- The scheduler did not honor the FatalErrors directive for mis-
+	  configured Group and SystemGroup values (STR #4495)
+	- The network backends no longer report waste-receptacle conditions when
+	  using SNMP (STR #4499)
+	- The IPP backend did not work with some configurations of Windows
+	  (STR #4503)
+	- RPMs did not build (STR #4490)
+	- Added a USB quirk rule for the Brother HL-1250 (STR #4519)
+	- Fixed compiles on unsupported platforms (STR #4510)
+	- "cancel -a" did not cancel all jobs on all destinations (STR #4513)
+	- The web interface did not work on OpenBSD (STR #4496)
+
+
+CHANGES IN CUPS V2.0.0
+
+	- The scheduler did not preserve listener sockets from launchd or
+	  systemd after a restart (<rdar://problem/18112848>)
+	- Added some USB quirk rules for the libusb-based USB backend
+	  (STR #4482)
+	- Spanish localization update (STR #4487)
+	- Updated documentation for 2.0.0 release.
+
+
+CHANGES IN CUPS V2.0rc1
+
+	- Documentation updates (STR #4464)
+	- The scheduler now monitors the AC power status on OS X, allowing for
+	  "sleep printing" when sharing printers (<rdar://problem/17325852>)
+	- The scheduler incorrectly called launch_activate_socket multiple times
+	  on OS X (<rdar://problem/17523218>)
+	- The ippserver test program now passes the IPP Everywhere self-
+	  certification tests (STR #4101)
+	- Relaxed the new OS X filter sandbox slightly (STR #4471,
+	  <rdar://problem/17483959>)
+	- Dropped the old Epson Stylus Color/Photo sample drivers since they
+	  don't work with any current printers and there are free alternatives
+	  that produce much better output (<rdar://problem/18036889>)
+	- Log and configuration files that are not world-readable are again
+	  accessible via the web interface (STR #4461)
+	- PPD files are now created using the permissions specified by the
+	  ConfigFilePerm directive.
+	- Fixed RPM build issues (STR #4459)
+	- Fixed the spinner image and restart page when reconfiguring the
+	  scheduler through the web interface (STR #4475)
+
+
+CHANGES IN CUPS V2.0b1
+
+	- Added a "--list-filters" option to the cupsfilter command (STR #4325)
+        - Added systemd support (STR #3917)
+	- Added support for re-sending a job as a raster file if a higher-level
+	  format such as PDF fails (<rdar://problem/15583721>)
+	- Added support for regular expression matching in the MIME type rules
+	  (<rdar://problem/11131245>)
+	- Added support for TLS certificate validation and policy enforcement
+	  (STR #1616)
+	- Added support for simultaneous XML and test output from ipptool.
+	- Added support for PAUSE directive in ipptool test files.
+	- Added support for auto-typing of TIFF files by ipptool (STR #4418)
+	- The scheduler now returns completed jobs in the correct newest-to-
+	  oldest order (STR #4396)
+	- The configure script now supports target-specific tools for pkg-config
+	  and others (STR #4423)
+	- The ipptool program now supports EXPECT statements for collection
+	  member attributes (<rdar://problem/15355218>)
+	- The ipptool program now supports collection attributes with multiple
+	  values (<rdar://problem/15355124>)
+	- The sample drivers now include all of the installed localizations by
+	  default (<rdar://problem/14756625>)
+	- Adopted Linux man page conventions and updated all man pages
+	  (STR #4372, STR #4329)
+	- The scheduler now supports the "first-index" operation attribute for
+	  the Get-Jobs operation (STR #2913)
+	- Changed the default AccessLogLevel and PageLogFormat to disable the
+	  access_log and page_log files by default (<rdar://problem/16495000>)
+	- cupsRasterInterpretPPD now supports the Orientation header in order to
+	  support long-edge feed raster printers (<rdar://problem/15837926>)
+	- The scheduler now allows run-as-root backends to have group read and
+	  execute permissions (STR #2935)
+	- The ippFindAttribute and ippFindNextAttribute functions now support
+	  hierarchical searches (STR #4395)
+	- Dropped OpenSSL support in favor of GNU TLS.
+	- Dropped "dark wake" support on OS X, which was preventing portables
+	  from going to sleep when there was a stuck job. We now use a variation
+	  of the CUPS 1.4 sleep support to do a cleaner sleep
+	  (<rdar://problem/14323704>)
+	- Dropped support for AIX, HP-UX, and OSF/1 (aka Digital UNIX)
+	- Dropped lppasswd and support for Digest authentication in in the
+	  scheduler (STR #4321)
+	- The cupsGetClasses, cupsGetPrinters, and cupsTempFile functions are no
+	  longer supported.
+	- The scheduler now caches more job history data and limits the number
+	  of completed jobs returned by Get-Jobs as needed in order to prevent a
+	  denial-of-service on busy servers (STR #2913)
+	- The filter/backend sandbox on OS X now defaults to a more strict
+	  whitelist (<rdar://problem/15939788>)
+	- Increased the default idle exit timeout to 60 seconds on OS X
+	  (<rdar://problem/16041820>)
+	- Printer classes were not accessible on OS X
+	  (<rdar://problem/16385643>)
+	- The scheduler now uses </DefaultPrinter> to close the default printer
+	  definition in printers.conf (STR #4153)
+	- Canceling all jobs in the web interface now just cancels the jobs
+	  (STR #1914)
@@ -1,165 +1,56 @@
-CHANGES.txt - 2.0.2 - 2015-02-03
--------------------------------
+CHANGES.txt - 2.1rc1 - 2015-07-31
+---------------------------------

-CHANGES IN CUPS V2.0.2
+CHANGES IN CUPS V2.1rc1

-	- Security: cupsRasterReadPixels buffer overflow with invalid page
-	  header and compressed raster data (STR #4551)
-	- Command-line programs were not localized on Mac OS X
-	  (<rdar://problem/14546232>)
-	- The scheduler incorrectly cleared the MakeModel string in the
-	  printers.conf file after a restart (<rdar://problem/16827518>)
-	- CUPS did not compile with older versions of GNU TLS (STR #4527)
-	- CUPS did not compile without Avahi or mDNSResponder (STR #4523)
-	- ippLength() did not return the correct length for IPP_TAG_CONST
-	  string values.
-	- The scheduler incorrectly aborted jobs after a job was restarted
-	  (<rdar://problem/19129387>)
-	- The cups-files.conf file contained the old ServerCertificate/Key
-	  directives instead of ServerKeychain.
-	- Fixed builds when no SSL/TLS library is available, or when explicitly
-	  disabled (STR #4531)
-	- Fixed an OpenBSD charset transcoding issue.
-	- Fixed USB printing on OpenBSD (STR #4525)
-	- The --without-xinetd configure option did not work (STR #4542)
-	- Backends needing to load OS X kernel extensions did not work
-	  (<rdar://problem/19015679>)
-	- Mapping of PPD keywords to IPP keywords did not work if the PPD
-	  keyword was already an IPP keyword (<rdar://problem/19121005>)
-	- cupsGetPPD* sent bad requests (STR #4567)
-	- ippserver used the wrong temporary directory on Windows (STR #4547)
-	- ippserver did not handle Bonjour registrations properly (STR #4548)
-	- The scheduler could crash during shutdown if Avahi was shutdown
-	  first (STR #4550)
-	- Added a USB quirk rule for Intermec printers (STR #4553)
-	- The scheduler did not always log which configuration file had the
-	  error (STR #4559)
-	- The ippfind and ipptool programs now correctly match hostnames with
-	  trailing dots (STR #4563)
-	- The ipptool timeout option did not work (STR #4515)
-	- Fixed several issues with client.conf, CUPS_SERVER, and the "-h"
-	  option of most commands (STR #4528)
-	- Another change for OpenBSD (STR #4526)
-	- Added Japanese localization (STR #4524)
-	- Documentation changes (STR #4569)
+	- Added support for 3D printers (basic types only, no built-in filters)
+	  based on PWG white paper.
+	- Fixed bugs in the new journald support (STR #4655, STR #4658,
+	  STR #4661)
+	- Fixed domain socket support on Linux (STR #4679)
+	- Fixed signal handlers in the dnssd and usb backends (STR #4671)
+	- <Limit All> in <Policy> sections now applies to all operations when
+	  used by itself (STR #4659)
+	- Configure script changes for systemd support (STR #4669)
+	- Updated autoconf sources to use newer form of AC_INIT (STR #4664)


-CHANGES IN CUPS V2.0.1
+CHANGES IN CUPS V2.1b1

-	- Security: SSLv3 is now disabled by default to protect against the
-	  POODLE attack (STR #4476)
-	- Printer sharing did not work when systemd was being used (STR #4497)
-	- cupsGetPPD* would return a symlink to the PPD in /etc/cups/ppd even if
-	  it was not readable by the user (STR #4500)
-	- The web interface now protects against frame "click-jacking" attacks
-	  (STR #4492)
-	- Fixed a crash in ippAttributeString (<rdar://problem/17903871>)
-	- Fixed a crash in the scheduler on Linux/*BSD if colord was not running
-	  (STR #4496)
-	- Fixed a random crash in the scheduler when not using systemd
-	  (STR #4484)
-	- Added systemd support for cups-lpd (STR #4493)
-	- The scheduler did not honor the FatalErrors directive for mis-
-	  configured Group and SystemGroup values (STR #4495)
-	- The network backends no longer report waste-receptacle conditions when
-	  using SNMP (STR #4499)
-	- The IPP backend did not work with some configurations of Windows
-	  (STR #4503)
-	- RPMs did not build (STR #4490)
-	- Added a USB quirk rule for the Brother HL-1250 (STR #4519)
-	- Fixed compiles on unsupported platforms (STR #4510)
-	- "cancel -a" did not cancel all jobs on all destinations (STR #4513)
-	- The web interface did not work on OpenBSD (STR #4496)
+	- Improved speed of ppdMarkDefaults for complex/large PPDs
+	  (<rdar://problem/15146999>)
+	- The IPP backend now stops sending print data if the printer indicates
+	  the job has been aborted or canceled (<rdar://problem/17837631>)
+	- The IPP backend now sends the job-pages-per-set attribute when
+	  printing multiple copy jobs with finishings
+	  (<rdar://problem/16792757>)
+	- The IPP backend now updates the cupsMandatory values when the printer
+	  configuration changes (<rdar://problem/18126570>)
+	- No longer install banner files since third-party banner filters now
+	  supply their own (STR #4518)
+	- Added support for EXPECT-ALL directive in ipptool test files
+	  (STR #4469)
+	- Added support for WITH-VALUE-FROM predicate in ipptool test files
+	  (STR #4470)
+	- The scheduler no longer listens on the loopback interface unless the
+	  web interface or printer sharing are enabled
+	  (<rdar://problem/9136448>)
+	- Added a PPD generator for IPP Everywhere printers (STR #4258)
+	- Now install "default" versions of more configuration files
+	  (<rdar://problem/19024491>)
+	- The cupstestppd program did not handle "maxsize(nnn)" entries in
+	  cupsFilter/cupsFilter2 values (<rdar://problem/18974858>)
+	- The scheduler now checks the return value of rename() calls
+	  (STR #4589)
+	- The scheduler now validates ErrorPolicy values in config files
+	  (STR #4591)
+	- Long cookies caused the web interface to stop working (STR #4619)
+	- Added SSLOptions values to allow Diffie-Hellman key exchange and
+	  disable TLS/1.0 support.
+	- Updated the scheduler to support more IPP Everywhere attributes
+	  (STR #4630)
+	- The scheduler now supports advanced ASL and journald logging when
+	  "syslog" output is configured (STR #4474)
+	- The scheduler now supports logging to stderr when running in the
+	  foreground (STR #4505)

-
-CHANGES IN CUPS V2.0.0
-
-	- The scheduler did not preserve listener sockets from launchd or
-	  systemd after a restart (<rdar://problem/18112848>)
-	- Added some USB quirk rules for the libusb-based USB backend
-	  (STR #4482)
-	- Spanish localization update (STR #4487)
-	- Updated documentation for 2.0.0 release.
-
-
-CHANGES IN CUPS V2.0rc1
-
-	- Documentation updates (STR #4464)
-	- The scheduler now monitors the AC power status on OS X, allowing for
-	  "sleep printing" when sharing printers (<rdar://problem/17325852>)
-	- The scheduler incorrectly called launch_activate_socket multiple times
-	  on OS X (<rdar://problem/17523218>)
-	- The ippserver test program now passes the IPP Everywhere self-
-	  certification tests (STR #4101)
-	- Relaxed the new OS X filter sandbox slightly (STR #4471,
-	  <rdar://problem/17483959>)
-	- Dropped the old Epson Stylus Color/Photo sample drivers since they
-	  don't work with any current printers and there are free alternatives
-	  that produce much better output (<rdar://problem/18036889>)
-	- Log and configuration files that are not world-readable are again
-	  accessible via the web interface (STR #4461)
-	- PPD files are now created using the permissions specified by the
-	  ConfigFilePerm directive.
-	- Fixed RPM build issues (STR #4459)
-	- Fixed the spinner image and restart page when reconfiguring the
-	  scheduler through the web interface (STR #4475)
-
-
-CHANGES IN CUPS V2.0b1
-
-	- Added a "--list-filters" option to the cupsfilter command (STR #4325)
-        - Added systemd support (STR #3917)
-	- Added support for re-sending a job as a raster file if a higher-level
-	  format such as PDF fails (<rdar://problem/15583721>)
-	- Added support for regular expression matching in the MIME type rules
-	  (<rdar://problem/11131245>)
-	- Added support for TLS certificate validation and policy enforcement
-	  (STR #1616)
-	- Added support for simultaneous XML and test output from ipptool.
-	- Added support for PAUSE directive in ipptool test files.
-	- Added support for auto-typing of TIFF files by ipptool (STR #4418)
-	- The scheduler now returns completed jobs in the correct newest-to-
-	  oldest order (STR #4396)
-	- The configure script now supports target-specific tools for pkg-config
-	  and others (STR #4423)
-	- The ipptool program now supports EXPECT statements for collection
-	  member attributes (<rdar://problem/15355218>)
-	- The ipptool program now supports collection attributes with multiple
-	  values (<rdar://problem/15355124>)
-	- The sample drivers now include all of the installed localizations by
-	  default (<rdar://problem/14756625>)
-	- Adopted Linux man page conventions and updated all man pages
-	  (STR #4372, STR #4329)
-	- The scheduler now supports the "first-index" operation attribute for
-	  the Get-Jobs operation (STR #2913)
-	- Changed the default AccessLogLevel and PageLogFormat to disable the
-	  access_log and page_log files by default (<rdar://problem/16495000>)
-	- cupsRasterInterpretPPD now supports the Orientation header in order to
-	  support long-edge feed raster printers (<rdar://problem/15837926>)
-	- The scheduler now allows run-as-root backends to have group read and
-	  execute permissions (STR #2935)
-	- The ippFindAttribute and ippFindNextAttribute functions now support
-	  hierarchical searches (STR #4395)
-	- Dropped OpenSSL support in favor of GNU TLS.
-	- Dropped "dark wake" support on OS X, which was preventing portables
-	  from going to sleep when there was a stuck job. We now use a variation
-	  of the CUPS 1.4 sleep support to do a cleaner sleep
-	  (<rdar://problem/14323704>)
-	- Dropped support for AIX, HP-UX, and OSF/1 (aka Digital UNIX)
-	- Dropped lppasswd and support for Digest authentication in in the
-	  scheduler (STR #4321)
-	- The cupsGetClasses, cupsGetPrinters, and cupsTempFile functions are no
-	  longer supported.
-	- The scheduler now caches more job history data and limits the number
-	  of completed jobs returned by Get-Jobs as needed in order to prevent a
-	  denial-of-service on busy servers (STR #2913)
-	- The filter/backend sandbox on OS X now defaults to a more strict
-	  whitelist (<rdar://problem/15939788>)
-	- Increased the default idle exit timeout to 60 seconds on OS X
-	  (<rdar://problem/16041820>)
-	- Printer classes were not accessible on OS X
-	  (<rdar://problem/16385643>)
-	- The scheduler now uses </DefaultPrinter> to close the default printer
-	  definition in printers.conf (STR #4153)
-	- Canceling all jobs in the web interface now just cancels the jobs
-	  (STR #1914)
@@ -1,5 +1,5 @@
-INSTALL - CUPS v2.0.2 - 2015-02-03
----------------------------------
+INSTALL - CUPS v2.1rc1 - 2015-07-31
+-----------------------------------

 This file describes how to compile and install CUPS from source code. For more
 information on CUPS see the file called "README.txt".  A complete change log can
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in 11716 2014-03-21 14:50:24Z msweet $"
+# "$Id: Makedefs.in 12519 2015-02-17 13:10:19Z msweet $"
 #
 # Common makefile definitions for CUPS.
 #
@@ -264,5 +264,5 @@ USBQUIRKS	=	@USBQUIRKS@


 #
-# End of "$Id: Makedefs.in 11716 2014-03-21 14:50:24Z msweet $"
+# End of "$Id: Makedefs.in 12519 2015-02-17 13:10:19Z msweet $"
 #
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 12415 2015-01-21 00:03:08Z msweet $"
+# "$Id: Makefile 12414 2015-01-21 00:02:04Z msweet $"
 #
 # Top-level Makefile for CUPS.
 #
@@ -348,5 +348,5 @@ dist:	all


 #
-# End of "$Id: Makefile 12415 2015-01-21 00:03:08Z msweet $".
+# End of "$Id: Makefile 12414 2015-01-21 00:02:04Z msweet $".
 #
@@ -1,5 +1,5 @@
-README - CUPS v2.0.2 - 2015-02-03
---------------------------------
+README - CUPS v2.1rc1 - 2015-07-31
+----------------------------------

 Looking for compile instructions?  Read the file "INSTALL.txt" instead...

@@ -1,9 +1,9 @@
 /*
- * "$Id: dnssd.c 11969 2014-06-30 14:27:01Z msweet $"
+ * "$Id: dnssd.c 12818 2015-07-31 13:29:25Z msweet $"
 *
 * DNS-SD discovery backend for CUPS.
 *
- * Copyright 2008-2014 by Apple Inc.
+ * Copyright 2008-2015 by Apple Inc.
 *
 * These coded instructions, statements, and computer programs are the
 * property of Apple Inc. and are protected by Federal copyright
@@ -318,7 +318,7 @@ main(int  argc,				/* I - Number of command-line args */
  if ((simple_poll = avahi_simple_poll_new()) == NULL)
  {
    fputs("DEBUG: Unable to create Avahi simple poll object.\n", stderr);
-    return (1);
+    return (0);
  }

  avahi_simple_poll_set_func(simple_poll, poll_callback, NULL);
@@ -328,7 +328,7 @@ main(int  argc,				/* I - Number of command-line args */
  if (!client)
  {
    fputs("DEBUG: Unable to create Avahi client.\n", stderr);
-    return (1);
+    return (0);
  }

  browsers = 6;
@@ -1289,7 +1289,7 @@ sigterm_handler(int sig)		/* I - Signal number (unused) */
  (void)sig;

  if (job_canceled)
-    exit(CUPS_BACKEND_OK);
+    _exit(CUPS_BACKEND_OK);
  else
    job_canceled = 1;
 }
@@ -1330,5 +1330,5 @@ unquote(char       *dst,		/* I - Destination buffer */


 /*
- * End of "$Id: dnssd.c 11969 2014-06-30 14:27:01Z msweet $".
+ * End of "$Id: dnssd.c 12818 2015-07-31 13:29:25Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: ipp.c 12048 2014-07-18 14:26:14Z msweet $"
+ * "$Id: ipp.c 12757 2015-06-24 19:55:31Z msweet $"
 *
 * IPP backend for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 * These coded instructions, statements, and computer programs are the
@@ -64,6 +64,7 @@ typedef struct _cups_monitor_s		/**** Monitoring data ****/
 			version,	/* IPP version */
 			job_id,		/* Job ID for submitted job */
 			job_reasons,	/* Job state reasons bits */
+			create_job,	/* Support Create-Job? */
 			get_job_attrs;	/* Support Get-Job-Attributes? */
  const char		*job_name;	/* Job name for submitted job */
  http_encryption_t	encryption;	/* Use encryption? */
@@ -121,6 +122,7 @@ static const char * const pattrs[] =	/* Printer attributes we want */
  "printer-alert",
  "printer-alert-description",
  "printer-is-accepting-jobs",
+  "printer-mandatory-job-attributes",
  "printer-state",
  "printer-state-message",
  "printer-state-reasons"
@@ -144,6 +146,8 @@ static cups_option_t	*attr_cache = NULL;
 static cups_array_t	*state_reasons;	/* Array of printe-state-reasons keywords */
 static char		tmpfilename[1024] = "";
 					/* Temporary spool file name */
+static char		mandatory_attrs[1024] = "";
+					/* cupsMandatory value */


 /*
@@ -1294,11 +1298,16 @@ main(int  argc,				/* I - Number of command-line args */
      * Load the PPD file and generate PWG attribute mapping information...
      */

+      ppd_attr_t *mandatory;		/* cupsMandatory value */
+
      ppd = ppdOpenFile(getenv("PPD"));
      pc  = _ppdCacheCreateWithPPD(ppd);

      ppdMarkDefaults(ppd);
      cupsMarkOptions(ppd, num_options, options);
+
+      if ((mandatory = ppdFindAttr(ppd, "cupsMandatory", NULL)) != NULL)
+        strlcpy(mandatory_attrs, mandatory->value, sizeof(mandatory_attrs));
    }
  }
  else
@@ -1396,6 +1405,7 @@ main(int  argc,				/* I - Number of command-line args */
  monitor.port          = port;
  monitor.version       = version;
  monitor.job_id        = 0;
+  monitor.create_job    = create_job;
  monitor.get_job_attrs = get_job_attrs;
  monitor.encryption    = cupsEncryption();
  monitor.job_state     = IPP_JOB_PENDING;
@@ -1457,6 +1467,7 @@ main(int  argc,				/* I - Number of command-line args */
             ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED)
      goto cleanup;
    else if (ipp_status == IPP_STATUS_ERROR_FORBIDDEN ||
+             ipp_status == IPP_STATUS_ERROR_NOT_AUTHORIZED ||
 	     ipp_status == IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED)
    {
      const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
@@ -1560,6 +1571,7 @@ main(int  argc,				/* I - Number of command-line args */
          FD_ZERO(&input);
 	  FD_SET(fd, &input);
 	  FD_SET(snmp_fd, &input);
+	  FD_SET(CUPS_SC_FD, &input);

          while (select(fd > snmp_fd ? fd + 1 : snmp_fd + 1, &input, NULL, NULL,
 	                NULL) <= 0 && !job_canceled);
@@ -2015,12 +2027,8 @@ main(int  argc,				/* I - Number of command-line args */
 	                   remote_job_states[job_state->values[0].integer -
 			                     IPP_JOB_PENDING]);

-	  if ((job_sheets = ippFindAttribute(response,
-					     "job-media-sheets-completed",
-					     IPP_TAG_INTEGER)) == NULL)
-	    job_sheets = ippFindAttribute(response,
-					  "job-impressions-completed",
-					  IPP_TAG_INTEGER);
+	  if ((job_sheets = ippFindAttribute(response, "job-impressions-completed", IPP_TAG_INTEGER)) == NULL)
+	    job_sheets = ippFindAttribute(response, "job-media-sheets-completed", IPP_TAG_INTEGER);

 	  if (job_sheets)
 	    fprintf(stderr, "PAGE: total %d\n",
@@ -2336,6 +2344,15 @@ monitor_printer(
      if (cupsLastError() <= IPP_OK_CONFLICT)
        password_tries = 0;

+      if (monitor->job_id == 0 && monitor->create_job)
+      {
+       /*
+        * No job-id yet, so continue...
+	*/
+
+        goto monitor_disconnect;
+      }
+
     /*
      * Check the status of the job itself...
      */
@@ -2448,6 +2465,8 @@ monitor_printer(
            new_reasons |= _CUPS_JSR_JOB_PASSWORD_WAIT;
          else if (!strcmp(attr->values[i].string.text, "job-release-wait"))
            new_reasons |= _CUPS_JSR_JOB_RELEASE_WAIT;
+          else if (!strncmp(attr->values[i].string.text, "job-canceled-", 13) || !strcmp(attr->values[i].string.text, "aborted-by-system"))
+            job_canceled = 1;
        }

        if (new_reasons != monitor->job_reasons)
@@ -2485,6 +2504,8 @@ monitor_printer(
      * Disconnect from the printer - we'll reconnect on the next poll...
      */

+      monitor_disconnect:
+
      _httpDisconnect(http);
    }

@@ -2546,19 +2567,10 @@ new_request(
    ipp_attribute_t *print_color_mode_sup)
 					/* I - Printer supports print-color-mode */
 {
-  int		i;			/* Looping var */
  ipp_t		*request;		/* Request data */
  const char	*keyword;		/* PWG keyword */
-  _pwg_size_t	*size;			/* PWG media size */
-  ipp_t		*media_col,		/* media-col value */
-		*media_size;		/* media-size value */
-  const char	*media_source,		/* media-source value */
-		*media_type,		/* media-type value */
-		*collate_str,		/* multiple-document-handling value */
-		*mandatory;		/* Mandatory attributes */
  ipp_tag_t	group;			/* Current group */
  ipp_attribute_t *attr;		/* Current attribute */
-  const char	*color_attr_name;	/* Supported color attribute */
  char		buffer[1024];		/* Value buffer */


@@ -2578,36 +2590,31 @@ new_request(
  * Add standard attributes...
  */

-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-	       NULL, uri);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
  fprintf(stderr, "DEBUG: printer-uri=\"%s\"\n", uri);

  if (user && *user)
  {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-		 "requesting-user-name", NULL, user);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, user);
    fprintf(stderr, "DEBUG: requesting-user-name=\"%s\"\n", user);
  }

  if (title && *title)
  {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
-		 title);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL, title);
    fprintf(stderr, "DEBUG: job-name=\"%s\"\n", title);
  }

  if (format && op != IPP_CREATE_JOB)
  {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
-		 "document-format", NULL, format);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format", NULL, format);
    fprintf(stderr, "DEBUG: document-format=\"%s\"\n", format);
  }

 #ifdef HAVE_LIBZ
  if (compression && op != IPP_OP_CREATE_JOB && op != IPP_OP_VALIDATE_JOB)
  {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-		 "compression", NULL, compression);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "compression", NULL, compression);
    fprintf(stderr, "DEBUG: compression=\"%s\"\n", compression);
  }
 #endif /* HAVE_LIBZ */
@@ -2620,313 +2627,13 @@ new_request(
  {
    if (pc)
    {
-      int	num_finishings = 0,	/* Number of finishing values */
-		finishings[10];		/* Finishing enum values */
-      ppd_choice_t *choice;		/* Marked choice */
-
     /*
      * Send standard IPP attributes...
      */

      fputs("DEBUG: Adding standard IPP operation/job attributes.\n", stderr);

-      if (pc->password &&
-          (keyword = cupsGetOption("job-password", num_options,
-                                   options)) != NULL)
-      {
-        ippAddOctetString(request, IPP_TAG_OPERATION, "job-password", keyword, (int)strlen(keyword));
-
-        if ((keyword = cupsGetOption("job-password-encryption", num_options,
-				     options)) == NULL)
-	  keyword = "none";
-
-        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                     "job-password-encryption", NULL, keyword);
-      }
-
-      if (pc->account_id)
-      {
-        if ((keyword = cupsGetOption("job-account-id", num_options,
-				     options)) == NULL)
-	  keyword = cupsGetOption("job-billing", num_options, options);
-
-        if (keyword)
-	  ippAddString(request, IPP_TAG_JOB, IPP_TAG_NAME, "job-account-id",
-		       NULL, keyword);
-      }
-
-      if (pc->accounting_user_id)
-      {
-        if ((keyword = cupsGetOption("job-accounting-user-id", num_options,
-				     options)) == NULL)
-	  keyword = user;
-
-        if (keyword)
-	  ippAddString(request, IPP_TAG_JOB, IPP_TAG_NAME,
-		       "job-accounting-user-id", NULL, keyword);
-      }
-
-      for (mandatory = (char *)cupsArrayFirst(pc->mandatory);
-           mandatory;
-           mandatory = (char *)cupsArrayNext(pc->mandatory))
-      {
-        if (strcmp(mandatory, "copies") &&
-            strcmp(mandatory, "destination-uris") &&
-            strcmp(mandatory, "finishings") &&
-            strcmp(mandatory, "job-account-id") &&
-            strcmp(mandatory, "job-accounting-user-id") &&
-            strcmp(mandatory, "job-password") &&
-            strcmp(mandatory, "job-password-encryption") &&
-            strcmp(mandatory, "media") &&
-            strncmp(mandatory, "media-col", 9) &&
-            strcmp(mandatory, "multiple-document-handling") &&
-            strcmp(mandatory, "output-bin") &&
-            strcmp(mandatory, "print-color-mode") &&
-            strcmp(mandatory, "print-quality") &&
-            strcmp(mandatory, "sides") &&
-            (keyword = cupsGetOption(mandatory, num_options, options)) != NULL)
-	{
-	  _ipp_option_t *opt = _ippFindOption(mandatory);
-					/* Option type */
-          ipp_tag_t	value_tag = opt ? opt->value_tag : IPP_TAG_NAME;
-					/* Value type */
-
-          switch (value_tag)
-          {
-            case IPP_TAG_INTEGER :
-            case IPP_TAG_ENUM :
-                ippAddInteger(request, IPP_TAG_JOB, value_tag, mandatory,
-                              atoi(keyword));
-                break;
-            case IPP_TAG_BOOLEAN :
-                ippAddBoolean(request, IPP_TAG_JOB, mandatory,
-                              !_cups_strcasecmp(keyword, "true"));
-                break;
-            case IPP_TAG_RANGE :
-                {
-                  int lower, upper;	/* Range */
-
-		  if (sscanf(keyword, "%d-%d", &lower, &upper) != 2)
-		    lower = upper = atoi(keyword);
-
-		  ippAddRange(request, IPP_TAG_JOB, mandatory, lower, upper);
-                }
-                break;
-            case IPP_TAG_STRING :
-                ippAddOctetString(request, IPP_TAG_JOB, mandatory, keyword, (int)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;
-	  }
-	}
-      }
-
-      if ((keyword = cupsGetOption("PageSize", num_options, options)) == NULL)
-	keyword = cupsGetOption("media", num_options, options);
-
-      if ((size = _ppdCacheGetSize(pc, keyword)) != NULL)
-      {
-       /*
-        * Add a media-col value...
-	*/
-
-	media_size = ippNew();
-	ippAddInteger(media_size, IPP_TAG_ZERO, IPP_TAG_INTEGER,
-		      "x-dimension", size->width);
-	ippAddInteger(media_size, IPP_TAG_ZERO, IPP_TAG_INTEGER,
-		      "y-dimension", size->length);
-
-	media_col = ippNew();
-	ippAddCollection(media_col, IPP_TAG_ZERO, "media-size", media_size);
-
-	media_source = _ppdCacheGetSource(pc, cupsGetOption("InputSlot",
-							    num_options,
-							    options));
-	media_type   = _ppdCacheGetType(pc, cupsGetOption("MediaType",
-						          num_options,
-							  options));
-
-	for (i = 0; i < media_col_sup->num_values; i ++)
-	{
-	  if (!strcmp(media_col_sup->values[i].string.text,
-		      "media-left-margin"))
-	    ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
-			  "media-left-margin", size->left);
-	  else if (!strcmp(media_col_sup->values[i].string.text,
-			   "media-bottom-margin"))
-	    ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
-			  "media-bottom-margin", size->bottom);
-	  else if (!strcmp(media_col_sup->values[i].string.text,
-			   "media-right-margin"))
-	    ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
-			  "media-right-margin", size->right);
-	  else if (!strcmp(media_col_sup->values[i].string.text,
-			   "media-top-margin"))
-	    ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
-			  "media-top-margin", size->top);
-	  else if (!strcmp(media_col_sup->values[i].string.text,
-			   "media-source") && media_source)
-	    ippAddString(media_col, IPP_TAG_ZERO, IPP_TAG_KEYWORD,
-			 "media-source", NULL, media_source);
-	  else if (!strcmp(media_col_sup->values[i].string.text,
-			   "media-type") && media_type)
-	    ippAddString(media_col, IPP_TAG_ZERO, IPP_TAG_KEYWORD,
-			 "media-type", NULL, media_type);
-	}
-
-	ippAddCollection(request, IPP_TAG_JOB, "media-col", media_col);
-      }
-
-      if ((keyword = cupsGetOption("output-bin", num_options,
-				   options)) == NULL)
-      {
-        if ((choice = ppdFindMarkedChoice(ppd, "OutputBin")) != NULL)
-	  keyword = _ppdCacheGetBin(pc, choice->choice);
-      }
-
-      if (keyword)
-	ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-bin",
-		     NULL, keyword);
-
-      color_attr_name = print_color_mode_sup ? "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)
-	ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, color_attr_name,
-		     NULL, keyword);
-
-      if ((keyword = cupsGetOption("print-quality", num_options,
-				   options)) != NULL)
-	ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
-		      atoi(keyword));
-      else if ((choice = ppdFindMarkedChoice(ppd, "cupsPrintQuality")) != NULL)
-      {
-	if (!_cups_strcasecmp(choice->choice, "draft"))
-	  ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
-			IPP_QUALITY_DRAFT);
-	else if (!_cups_strcasecmp(choice->choice, "normal"))
-	  ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
-			IPP_QUALITY_NORMAL);
-	else if (!_cups_strcasecmp(choice->choice, "high"))
-	  ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
-			IPP_QUALITY_HIGH);
-      }
-
-      if ((keyword = cupsGetOption("sides", num_options, options)) != NULL)
-	ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
-		     NULL, keyword);
-      else if (pc->sides_option &&
-               (choice = ppdFindMarkedChoice(ppd, pc->sides_option)) != NULL)
-      {
-	if (!_cups_strcasecmp(choice->choice, pc->sides_1sided))
-	  ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
-		       NULL, "one-sided");
-	else if (!_cups_strcasecmp(choice->choice, pc->sides_2sided_long))
-	  ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
-		       NULL, "two-sided-long-edge");
-	if (!_cups_strcasecmp(choice->choice, pc->sides_2sided_short))
-	  ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
-		       NULL, "two-sided-short-edge");
-      }
-
-      if ((keyword = cupsGetOption("multiple-document-handling",
-				   num_options, options)) != NULL)
-      {
-        if (strstr(keyword, "uncollated"))
-          keyword = "false";
-        else
-          keyword = "true";
-      }
-      else if ((keyword = cupsGetOption("collate", num_options,
-                                        options)) == NULL)
-        keyword = "true";
-
-      if (format)
-      {
-        if (!_cups_strcasecmp(format, "image/gif") ||
-	    !_cups_strcasecmp(format, "image/jp2") ||
-	    !_cups_strcasecmp(format, "image/jpeg") ||
-	    !_cups_strcasecmp(format, "image/png") ||
-	    !_cups_strcasecmp(format, "image/tiff") ||
-	    !_cups_strncasecmp(format, "image/x-", 8))
-	{
-	 /*
-	  * Collation makes no sense for single page image formats...
-	  */
-
-	  keyword = "false";
-	}
-	else if (!_cups_strncasecmp(format, "image/", 6) ||
-	         !_cups_strcasecmp(format, "application/vnd.cups-raster"))
-	{
-	 /*
-	  * Multi-page image formats will have copies applied by the upstream
-	  * filters...
-	  */
-
-	  copies = 1;
-	}
-      }
-
-      if (doc_handling_sup)
-      {
-        if (!_cups_strcasecmp(keyword, "true"))
-	  collate_str = "separate-documents-collated-copies";
-	else
-	  collate_str = "separate-documents-uncollated-copies";
-
-        for (i = 0; i < doc_handling_sup->num_values; i ++)
-	  if (!strcmp(doc_handling_sup->values[i].string.text, collate_str))
-	  {
-	    ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD,
-			 "multiple-document-handling", NULL, collate_str);
-	    break;
-          }
-
-        if (i >= doc_handling_sup->num_values)
-          copies = 1;
-      }
-
-     /*
-      * Map finishing options...
-      */
-
-      num_finishings = _ppdCacheGetFinishingValues(pc, num_options, options,
-                                                   (int)(sizeof(finishings) /
-                                                         sizeof(finishings[0])),
-                                                   finishings);
-      if (num_finishings > 0)
-	ippAddIntegers(request, IPP_TAG_JOB, IPP_TAG_ENUM, "finishings",
-		       num_finishings, finishings);
+      copies = _cupsConvertOptions(request, ppd, pc, media_col_sup, doc_handling_sup, print_color_mode_sup, user, format, copies, num_options, options);

     /*
      * Map FaxOut options...
@@ -3208,6 +2915,7 @@ report_printer_state(ipp_t *ipp)	/* I - IPP response */
 {
  ipp_attribute_t	*pa,		/* printer-alert */
 			*pam,		/* printer-alert-message */
+			*pmja,		/* printer-mandatory-job-attributes */
 			*psm,		/* printer-state-message */
 			*reasons,	/* printer-state-reasons */
 			*marker;	/* marker-* attributes */
@@ -3228,6 +2936,26 @@ report_printer_state(ipp_t *ipp)	/* I - IPP response */
                              IPP_TAG_TEXT)) != NULL)
    report_attr(pam);

+  if ((pmja = ippFindAttribute(ipp, "printer-mandatory-job-attributes", IPP_TAG_KEYWORD)) != NULL)
+  {
+    int	i,				/* Looping var */
+	count = ippGetCount(pmja);	/* Number of values */
+
+    for (i = 0, valptr = value; i < count; i ++, valptr += strlen(valptr))
+    {
+      if (i)
+        snprintf(valptr, sizeof(value) - (size_t)(valptr - value), " %s", ippGetString(pmja, i, NULL));
+      else
+        strlcpy(value, ippGetString(pmja, i, NULL), sizeof(value));
+    }
+
+    if (strcmp(value, mandatory_attrs))
+    {
+      strlcpy(mandatory_attrs, value, sizeof(mandatory_attrs));
+      fprintf(stderr, "PPD: cupsMandatory=\"%s\"\n", value);
+    }
+  }
+
  if ((psm = ippFindAttribute(ipp, "printer-state-message",
                              IPP_TAG_TEXT)) != NULL)
  {
@@ -3756,5 +3484,5 @@ update_reasons(ipp_attribute_t *attr,	/* I - printer-state-reasons or NULL */
 }

 /*
- * End of "$Id: ipp.c 12048 2014-07-18 14:26:14Z msweet $".
+ * End of "$Id: ipp.c 12757 2015-06-24 19:55:31Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp-supplies.c 12228 2014-10-21 13:42:05Z msweet $"
+ * "$Id: snmp-supplies.c 12227 2014-10-21 13:42:04Z msweet $"
 *
 * SNMP supplies functions for CUPS.
 *
@@ -1098,5 +1098,5 @@ utf16_to_utf8(


 /*
- * End of "$Id: snmp-supplies.c 12228 2014-10-21 13:42:05Z msweet $".
+ * End of "$Id: snmp-supplies.c 12227 2014-10-21 13:42:04Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-libusb.c 12349 2014-12-09 22:10:52Z msweet $"
+ * "$Id: usb-libusb.c 12348 2014-12-09 22:10:45Z msweet $"
 *
 * LIBUSB interface code for CUPS.
 *
@@ -2004,6 +2004,6 @@ soft_reset_printer(


 /*
- * End of "$Id: usb-libusb.c 12349 2014-12-09 22:10:52Z msweet $".
+ * End of "$Id: usb-libusb.c 12348 2014-12-09 22:10:45Z msweet $".
 */

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 11777 2014-03-28 19:18:10Z msweet $"
+# "$Id: Makefile 12519 2015-02-17 13:10:19Z msweet $"
 #
 # CGI makefile for CUPS.
 #
@@ -353,5 +353,5 @@ include Dependencies


 #
-# End of "$Id: Makefile 11777 2014-03-28 19:18:10Z msweet $".
+# End of "$Id: Makefile 12519 2015-02-17 13:10:19Z msweet $".
 #
@@ -1,9 +1,9 @@
 /*
- * "$Id: admin.c 12123 2014-08-28 14:24:45Z msweet $"
+ * "$Id: admin.c 12516 2015-02-12 20:18:11Z msweet $"
 *
 * Administration CGI for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -18,6 +18,8 @@
 */

 #include "cgi-private.h"
+#include <cups/http-private.h>
+#include <cups/ppd-private.h>
 #include <cups/adminutil.h>
 #include <cups/ppd.h>
 #include <errno.h>
@@ -38,12 +40,7 @@ static int	current_device = 0;	/* Current device shown */
 * Local functions...
 */

-static void	choose_device_cb(const char *device_class,
-                                 const char *device_id, const char *device_info,
-                                 const char *device_make_and_model,
-                                 const char *device_uri,
-                                 const char *device_location,
-				 const char *title);
+static void	choose_device_cb(const char *device_class, const char *device_id, const char *device_info, const char *device_make_and_model, const char *device_uri, const char *device_location, const char *title);
 static void	do_add_rss_subscription(http_t *http);
 static void	do_am_class(http_t *http, int modify);
 static void	do_am_printer(http_t *http, int modify);
@@ -61,6 +58,7 @@ static void	do_set_sharing(http_t *http);
 static char	*get_option_value(ppd_file_t *ppd, const char *name,
 		                  char *buffer, size_t bufsize);
 static double	get_points(double number, const char *uval);
+static char	*get_printer_ppd(const char *uri, char *buffer, size_t bufsize);


 /*
@@ -832,7 +830,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
  const cgi_file_t *file;		/* Uploaded file, if any */
  const char	*var;			/* CGI variable */
  char		uri[HTTP_MAX_URI],	/* Device or printer URI */
-		*uriptr;		/* Pointer into URI */
+		*uriptr,		/* Pointer into URI */
+		evefile[1024] = "";	/* IPP Everywhere PPD file */
  int		maxrate;		/* Maximum baud rate */
  char		baudrate[255];		/* Baud rate string */
  const char	*name,			/* Pointer to class name */
@@ -1331,7 +1330,9 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
    if (!file)
    {
      var = cgiGetVariable("PPD_NAME");
-      if (strcmp(var, "__no_change__"))
+      if (!strcmp(var, "everywhere"))
+        get_printer_ppd(cgiGetVariable("DEVICE_URI"), evefile, sizeof(evefile));
+      else if (strcmp(var, "__no_change__"))
 	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "ppd-name",
 		     NULL, var);
    }
@@ -1384,6 +1385,11 @@ do_am_printer(http_t *http,		/* I - HTTP connection */

    if (file)
      ippDelete(cupsDoFileRequest(http, request, "/admin/", file->tempfile));
+    else if (evefile[0])
+    {
+      ippDelete(cupsDoFileRequest(http, request, "/admin/", evefile));
+      unlink(evefile);
+    }
    else
      ippDelete(cupsDoRequest(http, request, "/admin/"));

@@ -4198,5 +4204,78 @@ get_points(double     number,		/* I - Original number */


 /*
- * End of "$Id: admin.c 12123 2014-08-28 14:24:45Z msweet $".
+ * 'get_printer_ppd()' - Get an IPP Everywhere PPD file for the given URI.
+ */
+
+static char *				/* O - Filename or NULL */
+get_printer_ppd(const char *uri,	/* I - Printer URI */
+                char       *buffer,	/* I - Filename buffer */
+		size_t     bufsize)	/* I - Size of filename buffer */
+{
+  http_t	*http;			/* Connection to printer */
+  ipp_t		*request,		/* Get-Printer-Attributes request */
+		*response;		/* Get-Printer-Attributes response */
+  char		resolved[1024],		/* Resolved URI */
+		scheme[32],		/* URI scheme */
+		userpass[256],		/* Username:password */
+		host[256],		/* Hostname */
+		resource[256];		/* Resource path */
+  int		port;			/* Port number */
+
+
+ /*
+  * Connect to the printer...
+  */
+
+  if (strstr(uri, "._tcp"))
+  {
+   /*
+    * Resolve URI...
+    */
+
+    if (!_httpResolveURI(uri, resolved, sizeof(resolved), _HTTP_RESOLVE_DEFAULT, NULL, NULL))
+    {
+      fprintf(stderr, "ERROR: Unable to resolve \"%s\".\n", uri);
+      return (NULL);
+    }
+
+    uri = resolved;
+  }
+
+  if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK)
+  {
+    fprintf(stderr, "ERROR: Bad printer URI \"%s\".\n", uri);
+    return (NULL);
+  }
+
+  http = httpConnect2(host, port, NULL, AF_UNSPEC, !strcmp(scheme, "ipps") ? HTTP_ENCRYPTION_ALWAYS : HTTP_ENCRYPTION_IF_REQUESTED, 1, 30000, NULL);
+  if (!http)
+  {
+    fprintf(stderr, "ERROR: Unable to connect to \"%s:%d\": %s\n", host, port, cupsLastErrorString());
+    return (NULL);
+  }
+
+ /*
+  * Send a Get-Printer-Attributes request...
+  */
+
+  request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
+  response = cupsDoRequest(http, request, resource);
+
+  if (!_ppdCreateFromIPP(buffer, bufsize, response))
+    fprintf(stderr, "ERROR: Unable to create PPD file: %s\n", strerror(errno));
+
+  ippDelete(response);
+  httpClose(http);
+
+  if (buffer[0])
+    return (buffer);
+  else
+    return (NULL);
+}
+
+
+/*
+ * End of "$Id: admin.c 12516 2015-02-12 20:18:11Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: help-index.c 12344 2014-12-09 21:36:11Z msweet $"
+ * "$Id: help-index.c 12644 2015-05-19 21:22:35Z msweet $"
 *
 * Online help index routines for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -1220,7 +1220,7 @@ help_new_node(const char   *filename,	/* I - Filename */

  n->filename = strdup(filename);
  n->anchor   = anchor ? strdup(anchor) : NULL;
-  n->section  = (section && *section) ? strdup(section) : NULL;
+  n->section  = *section ? strdup(section) : NULL;
  n->text     = strdup(text);
  n->mtime    = mtime;
  n->offset   = offset;
@@ -1306,5 +1306,5 @@ help_sort_words(help_word_t *w1,	/* I - Second word */


 /*
- * End of "$Id: help-index.c 12344 2014-12-09 21:36:11Z msweet $".
+ * End of "$Id: help-index.c 12644 2015-05-19 21:22:35Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: ipp-var.c 11889 2014-05-22 13:54:15Z msweet $"
+ * "$Id: ipp-var.c 12768 2015-06-30 16:13:38Z msweet $"
 *
 * CGI <-> IPP variable routines for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -222,6 +222,9 @@ cgiGetIPPObjects(ipp_t *response,	/* I - IPP response */
 	      break;

          case IPP_TAG_INTEGER :
+	      if (!strncmp(ippGetName(attr), "time-at-", 8))
+	        break;			/* Ignore time-at-xxx */
+
 	      for (i = 0; !add && i < attr->num_values; i ++)
 	      {
 	        char	buf[255];	/* Number buffer */
@@ -1202,21 +1205,7 @@ cgiSetIPPObjectVars(
 	      * Rewrite URIs...
 	      */

-              if (!strcmp(name, "member_uris"))
-	      {
-		char	url[1024];	/* URL for class member... */
-
-
-		cgiRewriteURL(attr->values[i].string.text, url,
-		              sizeof(url), NULL);
-
-                snprintf(valptr, sizeof(value) - (size_t)(valptr - value),
-		         "<A HREF=\"%s\">%s</A>", url,
-			 strrchr(attr->values[i].string.text, '/') + 1);
-	      }
-	      else
-		cgiRewriteURL(attr->values[i].string.text, valptr,
-		              (int)(sizeof(value) - (size_t)(valptr - value)), NULL);
+	      cgiRewriteURL(attr->values[i].string.text, valptr, (int)(sizeof(value) - (size_t)(valptr - value)), NULL);
              break;
            }

@@ -1561,5 +1550,5 @@ cgiText(const char *message)		/* I - Message */


 /*
- * End of "$Id: ipp-var.c 11889 2014-05-22 13:54:15Z msweet $".
+ * End of "$Id: ipp-var.c 12768 2015-06-30 16:13:38Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: template.c 11685 2014-03-05 20:03:29Z msweet $"
+ * "$Id: template.c 12700 2015-06-08 18:32:35Z msweet $"
 *
 * CGI template function.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2006 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -648,39 +648,7 @@ cgi_puts(const char *s,			/* I - String to output */
  while (*s)
  {
    if (*s == '<')
-    {
-     /*
-      * Pass <A HREF="url"> and </A>, otherwise quote it...
-      */
-
-      if (!_cups_strncasecmp(s, "<A HREF=\"", 9))
-      {
-        fputs("<A HREF=\"", out);
-	s += 9;
-
-	while (*s && *s != '\"')
-	{
-          if (*s == '&')
-            fputs("&amp;", out);
-	  else
-	    putc(*s, out);
-
-	  s ++;
-	}
-
-        if (*s)
-	  s ++;
-
-	fputs("\">", out);
-      }
-      else if (!_cups_strncasecmp(s, "</A>", 4))
-      {
-        fputs("</A>", out);
-	s += 3;
-      }
-      else
-        fputs("&lt;", out);
-    }
+      fputs("&lt;", out);
    else if (*s == '>')
      fputs("&gt;", out);
    else if (*s == '\"')
@@ -718,5 +686,5 @@ cgi_puturi(const char *s,		/* I - String to output */


 /*
- * End of "$Id: template.c 11685 2014-03-05 20:03:29Z msweet $".
+ * End of "$Id: template.c 12700 2015-06-08 18:32:35Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: var.c 12034 2014-07-16 19:37:34Z msweet $"
+ * "$Id: var.c 12621 2015-05-06 21:32:18Z msweet $"
 *
 * CGI form variable and array functions for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2005 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -626,6 +626,8 @@ cgi_initialize_cookies(void)

  while (*cookie)
  {
+    int	skip = 0;			/* Skip this cookie? */
+
   /*
    * Skip leading whitespace...
    */
@@ -641,9 +643,14 @@ cgi_initialize_cookies(void)

    for (ptr = name; *cookie && *cookie != '=';)
      if (ptr < (name + sizeof(name) - 1))
+      {
        *ptr++ = *cookie++;
+      }
      else
-        break;
+      {
+        skip = 1;
+	cookie ++;
+      }

    if (*cookie != '=')
      break;
@@ -659,26 +666,38 @@ cgi_initialize_cookies(void)
    {
      for (cookie ++, ptr = value; *cookie && *cookie != '\"';)
        if (ptr < (value + sizeof(value) - 1))
+	{
 	  *ptr++ = *cookie++;
+	}
 	else
-	  break;
+	{
+	  skip = 1;
+	  cookie ++;
+	}

      if (*cookie == '\"')
        cookie ++;
+      else
+        skip = 1;
    }
    else
    {
      for (ptr = value; *cookie && *cookie != ';';)
        if (ptr < (value + sizeof(value) - 1))
+	{
 	  *ptr++ = *cookie++;
+	}
 	else
-	  break;
+	{
+	  skip = 1;
+	  cookie ++;
+	}
    }

    if (*cookie == ';')
      cookie ++;
    else if (*cookie)
-      break;
+      skip = 1;

    *ptr = '\0';

@@ -687,7 +706,7 @@ cgi_initialize_cookies(void)
    * "$"...
    */

-    if (name[0] != '$')
+    if (name[0] != '$' && !skip)
      num_cookies = cupsAddOption(name, value, num_cookies, &cookies);
  }
 }
@@ -1278,5 +1297,5 @@ cgi_unlink_file(void)


 /*
- * End of "$Id: var.c 12034 2014-07-16 19:37:34Z msweet $".
+ * End of "$Id: var.c 12621 2015-05-06 21:32:18Z msweet $".
 */
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
+# "$Id: Makefile 12533 2015-02-27 12:30:26Z msweet $"
 #
 #   Configuration file makefile for CUPS.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2015 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -76,8 +76,8 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
 	done
-	$(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
 		if test -r $(DATADIR)/mime/$$file ; then \
@@ -139,5 +139,5 @@ uninstall:


 #
-# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
+# End of "$Id: Makefile 12533 2015-02-27 12:30:26Z msweet $".
 #
@@ -7,7 +7,7 @@
 # VERSIONS OF CUPS.  Instead, create a "local.types" file that
 # reflects your local configuration changes.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2015 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -81,6 +81,13 @@ application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
 				 (contains(0,4096,<0a>%!) + \
 				  !contains(0,4096,"ENTER LANGUAGE")))

+application/g-code		gcode
+application/sla			stl string(0,"solid ") + contains(0,4096,"facet") + contains(0,4096,"vertex")
+application/vnd.makerbot-s3g	x3g
+model/amf			amf
+model/vnd.collada+xml		dae
+
+
 ########################################################################
 #
 # Image files...
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 12336 2014-12-09 21:19:52Z msweet $"
+dnl "$Id: cups-common.m4 12785 2015-07-14 18:07:49Z msweet $"
 dnl
 dnl Common configuration stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 2007-2015 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
@@ -13,18 +13,26 @@ 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...
-AC_PREREQ(2.60)
-
 dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

 dnl Version number information...
-CUPS_VERSION=2.0.2
-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
+CUPS_VERSION=2.1rc1
+
+case "$CUPS_VERSION" in
+	*svn)
+		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'`"
+		else
+			CUPS_REVISION=""
+		fi
+		;;
+
+	*)
+		CUPS_REVISION=""
+		;;
+esac
+
 CUPS_BUILD="cups-$CUPS_VERSION"

 AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" string ],
@@ -33,8 +41,8 @@ AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" str
 AC_SUBST(CUPS_VERSION)
 AC_SUBST(CUPS_REVISION)
 AC_SUBST(CUPS_BUILD)
-AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION$CUPS_REVISION")
-AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "CUPS/$CUPS_VERSION$CUPS_REVISION")
+AC_DEFINE_UNQUOTED(CUPS_SVERSION, "AC_PACKAGE_NAME v$CUPS_VERSION$CUPS_REVISION")
+AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "AC_PACKAGE_NAME/$CUPS_VERSION$CUPS_REVISION")

 dnl Default compiler flags...
 CFLAGS="${CFLAGS:=}"
@@ -137,6 +145,7 @@ AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
 AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
 AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H))
 AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H))
+AC_CHECK_HEADER(asl.h,AC_DEFINE(HAVE_ASL_H))

 dnl Checks for iconv.h and iconv_open
 AC_CHECK_HEADER(iconv.h,
@@ -465,5 +474,5 @@ esac
 AC_SUBST(BUILDDIRS)

 dnl
-dnl End of "$Id: cups-common.m4 12336 2014-12-09 21:19:52Z msweet $".
+dnl End of "$Id: cups-common.m4 12785 2015-07-14 18:07:49Z msweet $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4 12122 2014-08-28 12:55:52Z msweet $"
+dnl "$Id: cups-compiler.m4 12742 2015-06-23 14:48:53Z msweet $"
 dnl
 dnl Compiler stuff for CUPS.
 dnl
@@ -156,6 +156,15 @@ if test -n "$GCC"; then
 		# Add useful warning options for tracking down problems...
 		OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM"

+		AC_MSG_CHECKING(whether compiler supports -Wno-unused-result)
+		OLDCFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS -Werror -Wno-unused-result"
+		AC_TRY_COMPILE(,,
+			[OPTIM="$OPTIM -Wno-unused-result"
+			AC_MSG_RESULT(yes)],
+			AC_MSG_RESULT(no))
+		CFLAGS="$OLDCFLAGS"
+
 		AC_MSG_CHECKING(whether compiler supports -Wsign-conversion)
 		OLDCFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -Werror -Wsign-conversion"
@@ -237,5 +246,5 @@ case $uname in
 esac

 dnl
-dnl End of "$Id: cups-compiler.m4 12122 2014-08-28 12:55:52Z msweet $".
+dnl End of "$Id: cups-compiler.m4 12742 2015-06-23 14:48:53Z msweet $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-defaults.m4 11789 2014-04-02 16:52:53Z msweet $"
+dnl "$Id: cups-defaults.m4 12350 2014-12-09 22:18:21Z msweet $"
 dnl
 dnl   Default cupsd configuration settings for CUPS.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 2007-2014 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -409,5 +409,5 @@ AC_SUBST(CUPS_WEBIF)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)

 dnl
-dnl End of "$Id: cups-defaults.m4 11789 2014-04-02 16:52:53Z msweet $".
+dnl End of "$Id: cups-defaults.m4 12350 2014-12-09 22:18:21Z msweet $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-network.m4 12325 2014-12-09 20:28:51Z msweet $"
+dnl "$Id: cups-network.m4 12324 2014-12-09 20:28:39Z msweet $"
 dnl
 dnl Networking stuff for CUPS.
 dnl
@@ -72,5 +72,5 @@ AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
 AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)

 dnl
-dnl End of "$Id: cups-network.m4 12325 2014-12-09 20:28:51Z msweet $".
+dnl End of "$Id: cups-network.m4 12324 2014-12-09 20:28:39Z msweet $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-ssl.m4 12290 2014-12-05 17:25:55Z msweet $"
+dnl "$Id: cups-ssl.m4 12645 2015-05-20 01:20:52Z msweet $"
 dnl
 dnl TLS stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 2007-2015 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
@@ -53,6 +53,10 @@ if test x$enable_ssl != xno; then

 		AC_DEFINE(HAVE_CSSMERRORSTRING)
 		AC_DEFINE(HAVE_SECKEYCHAINOPEN)])
+
+		if test $uversion -ge 150; then
+			AC_DEFINE(HAVE_SSLSETENABLEDCIPHERS)
+		fi
 	fi
    fi

@@ -104,5 +108,5 @@ EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)

 dnl
-dnl End of "$Id: cups-ssl.m4 12290 2014-12-05 17:25:55Z msweet $".
+dnl End of "$Id: cups-ssl.m4 12645 2015-05-20 01:20:52Z msweet $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-startup.m4 12351 2014-12-09 22:18:45Z msweet $"
+dnl "$Id: cups-startup.m4 12784 2015-07-14 17:39:26Z msweet $"
 dnl
 dnl Launch-on-demand/startup stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 2007-2015 by Apple Inc.
 dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl These coded instructions, statements, and computer programs are the
@@ -56,12 +56,13 @@ if test x$enable_systemd != xno; then
 	        	AC_MSG_ERROR(Need pkg-config to enable systemd support.)
                fi
        else
-        	AC_MSG_CHECKING(for libsystemd-daemon)
-                if $PKGCONFIG --exists libsystemd-daemon; then
+        	AC_MSG_CHECKING(for libsystemd)
+                if $PKGCONFIG --exists libsystemd; then
                        AC_MSG_RESULT(yes)
-                        ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
-                        ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
+                        ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd`
+                        ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd`
                        AC_DEFINE(HAVE_SYSTEMD)
+			AC_CHECK_HEADER(systemd/sd-journal.h,AC_DEFINE(HAVE_SYSTEMD_SD_JOURNAL_H))
 			if test "x$SYSTEMD_DIR" = x; then
 			        SYSTEMD_DIR="`$PKGCONFIG --variable=systemdsystemunitdir systemd`"
                        fi
@@ -172,5 +173,5 @@ fi


 dnl
-dnl End of "$Id: cups-startup.m4 12351 2014-12-09 22:18:45Z msweet $".
+dnl End of "$Id: cups-startup.m4 12784 2015-07-14 17:39:26Z msweet $".
 dnl
@@ -1,9 +1,9 @@
 /*
- * "$Id: config.h.in 12329 2014-12-09 20:50:51Z msweet $"
+ * "$Id: config.h.in 12687 2015-06-03 17:19:04Z msweet $"
 *
 * Configuration file for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -242,6 +242,20 @@
 #undef HAVE_VSYSLOG


+/*
+ * Do we have the ASL functions?
+ */
+
+#undef HAVE_ASL_H
+
+
+/*
+ * Do we have the systemd journal functions?
+ */
+
+#undef HAVE_SYSTEMD_SD_JOURNAL_H
+
+
 /*
 * Do we have the (v)snprintf() functions?
 */
@@ -348,6 +362,13 @@
 #undef HAVE_SECKEYCHAINOPEN


+/*
+ * Do we have (a working) SSLSetEnabledCiphers function?
+ */
+
+#undef HAVE_SSLSETENABLEDCIPHERS
+
+
 /*
 * Do we have libpaper?
 */
@@ -719,5 +740,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */

 /*
- * End of "$Id: config.h.in 12329 2014-12-09 20:50:51Z msweet $".
+ * End of "$Id: config.h.in 12687 2015-06-03 17:19:04Z msweet $".
 */
@@ -1,6 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.69 for CUPS 2.1rc1.
+#
+# Report bugs to <https://www.cups.org/str.php>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -264,7 +266,8 @@ fi
    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: https://www.cups.org/str.php about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -575,14 +578,13 @@ MFLAGS=
 MAKEFLAGS=

 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME='CUPS'
+PACKAGE_TARNAME='cups'
+PACKAGE_VERSION='2.1rc1'
+PACKAGE_STRING='CUPS 2.1rc1'
+PACKAGE_BUGREPORT='https://www.cups.org/str.php'
+PACKAGE_URL='https://www.cups.org/'

-ac_unique_file="cups/cups.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -963,7 +965,7 @@ sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1463,7 +1465,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures CUPS 2.1rc1 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1511,7 +1513,7 @@ Fine tuning of the installation directories:
  --infodir=DIR           info documentation [DATAROOTDIR/info]
  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/cups]
  --htmldir=DIR           html documentation [DOCDIR]
  --dvidir=DIR            dvi documentation [DOCDIR]
  --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1523,7 +1525,9 @@ _ACEOF
 fi

 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of CUPS 2.1rc1:";;
+   esac
  cat <<\_ACEOF

 Optional Features:
@@ -1637,7 +1641,8 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.

-Report bugs to the package provider.
+Report bugs to <https://www.cups.org/str.php>.
+CUPS home page: <https://www.cups.org/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1700,7 +1705,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-configure
+CUPS configure 2.1rc1
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1985,6 +1990,10 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ------------------------------------------- ##
+## Report this to https://www.cups.org/str.php ##
+## ------------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
    ;;
 esac
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -2160,7 +2169,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by $as_me, which was
+It was created by CUPS $as_me 2.1rc1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -2532,16 +2541,25 @@ esac



-
-
 ac_config_headers="$ac_config_headers config.h"


-CUPS_VERSION=2.0.2
-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
+CUPS_VERSION=2.1rc1
+
+case "$CUPS_VERSION" in
+	*svn)
+		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'`"
+		else
+			CUPS_REVISION=""
+		fi
+		;;
+
+	*)
+		CUPS_REVISION=""
+		;;
+esac
+
 CUPS_BUILD="cups-$CUPS_VERSION"


@@ -4927,6 +4945,13 @@ if test "x$ac_cv_header_sys_ucred_h" = xyes; then :
 fi


+ac_fn_c_check_header_mongrel "$LINENO" "asl.h" "ac_cv_header_asl_h" "$ac_includes_default"
+if test "x$ac_cv_header_asl_h" = xyes; then :
+  $as_echo "#define HAVE_ASL_H 1" >>confdefs.h
+
+fi
+
+

 ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
 if test "x$ac_cv_header_iconv_h" = xyes; then :
@@ -6786,6 +6811,32 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		# Add useful warning options for tracking down problems...
 		OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM"

+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -Wno-unused-result" >&5
+$as_echo_n "checking whether compiler supports -Wno-unused-result... " >&6; }
+		OLDCFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS -Werror -Wno-unused-result"
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  OPTIM="$OPTIM -Wno-unused-result"
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+		CFLAGS="$OLDCFLAGS"
+
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -Wsign-conversion" >&5
 $as_echo_n "checking whether compiler supports -Wsign-conversion... " >&6; }
 		OLDCFLAGS="$CFLAGS"
@@ -8167,6 +8218,11 @@ fi
 fi


+
+		if test $uversion -ge 150; then
+			$as_echo "#define HAVE_SSLSETENABLEDCIPHERS 1" >>confdefs.h
+
+		fi
 	fi
    fi

@@ -9141,15 +9197,22 @@ if test x$enable_systemd != xno; then
 	        	as_fn_error $? "Need pkg-config to enable systemd support." "$LINENO" 5
                fi
        else
-        	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd-daemon" >&5
-$as_echo_n "checking for libsystemd-daemon... " >&6; }
-                if $PKGCONFIG --exists libsystemd-daemon; then
+        	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5
+$as_echo_n "checking for libsystemd... " >&6; }
+                if $PKGCONFIG --exists libsystemd; then
                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                        ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
-                        ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
+                        ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd`
+                        ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd`
                        $as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h

+			ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-journal.h" "ac_cv_header_systemd_sd_journal_h" "$ac_includes_default"
+if test "x$ac_cv_header_systemd_sd_journal_h" = xyes; then :
+  $as_echo "#define HAVE_SYSTEMD_SD_JOURNAL_H 1" >>confdefs.h
+
+fi
+
+
 			if test "x$SYSTEMD_DIR" = x; then
 			        SYSTEMD_DIR="`$PKGCONFIG --variable=systemdsystemunitdir systemd`"
                        fi
@@ -10186,7 +10249,7 @@ fi



-ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config data/testprint desktop/cups.desktop doc/index.html man/client.conf.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsaddsmb.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket templates/header.tmpl packaging/cups.list $LANGFILES"
+ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config desktop/cups.desktop doc/index.html man/client.conf.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsaddsmb.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket templates/header.tmpl packaging/cups.list $LANGFILES"

 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -10694,7 +10757,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by CUPS $as_me 2.1rc1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -10750,13 +10813,14 @@ $config_files
 Configuration headers:
 $config_headers

-Report bugs to the package provider."
+Report bugs to <https://www.cups.org/str.php>.
+CUPS home page: <https://www.cups.org/>."

 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
+CUPS config.status 2.1rc1
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

@@ -10886,7 +10950,6 @@ do
    "conf/pam.std") CONFIG_FILES="$CONFIG_FILES conf/pam.std" ;;
    "conf/snmp.conf") CONFIG_FILES="$CONFIG_FILES conf/snmp.conf" ;;
    "cups-config") CONFIG_FILES="$CONFIG_FILES cups-config" ;;
-    "data/testprint") CONFIG_FILES="$CONFIG_FILES data/testprint" ;;
    "desktop/cups.desktop") CONFIG_FILES="$CONFIG_FILES desktop/cups.desktop" ;;
    "doc/index.html") CONFIG_FILES="$CONFIG_FILES doc/index.html" ;;
    "man/client.conf.man") CONFIG_FILES="$CONFIG_FILES man/client.conf.man" ;;
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: configure.ac 12222 2014-10-21 11:55:01Z msweet $"
+dnl "$Id: configure.ac 12787 2015-07-14 21:19:57Z msweet $"
 dnl
 dnl Configuration script for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 2007-2015 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
@@ -13,7 +13,11 @@ 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

-AC_INIT(cups/cups.h)
+dnl We need at least autoconf 2.60...
+AC_PREREQ(2.60)
+
+dnl Package name and version...
+AC_INIT([CUPS], [2.1rc1], [https://www.cups.org/str.php], [cups], [https://www.cups.org/])

 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
@@ -66,7 +70,6 @@ AC_OUTPUT(Makedefs
 	  conf/pam.std
 	  conf/snmp.conf
 	  cups-config
-	  data/testprint
 	  desktop/cups.desktop
 	  doc/index.html
 	  man/client.conf.man
@@ -92,5 +95,5 @@ AC_OUTPUT(Makedefs
 chmod +x cups-config

 dnl
-dnl End of "$Id: configure.ac 12222 2014-10-21 11:55:01Z msweet $".
+dnl End of "$Id: configure.ac 12787 2015-07-14 21:19:57Z msweet $".
 dnl
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 12032 2014-07-15 20:37:32Z msweet $"
+# "$Id: Makefile 12635 2015-05-19 02:12:22Z msweet $"
 #
 # API library Makefile for CUPS.
 #
@@ -94,7 +94,8 @@ TESTOBJS	= \
 		testlang.o \
 		testppd.o \
 		testpwg.o \
-		testsnmp.o
+		testsnmp.o \
+		tlscheck.o
 OBJS	=	\
 		$(LIBOBJS) \
 		$(TESTOBJS)
@@ -161,7 +162,8 @@ UNITTARGETS =	\
 		testoptions \
 		testppd \
 		testpwg \
-		testsnmp
+		testsnmp \
+		tlscheck

 TARGETS	=	\
 		$(LIBTARGETS)
@@ -539,6 +541,16 @@ testsnmp:	testsnmp.o $(LIBCUPSSTATIC)
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)


+#
+# tlscheck (dependency on static CUPS library is intentional)
+#
+
+tlscheck:	tlscheck.o $(LIBCUPSSTATIC)
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+
+
 #
 # Automatic API help files...
 #
@@ -665,5 +677,5 @@ tls.o: tls-darwin.c tls-gnutls.c tls-sspi.c


 #
-# End of "$Id: Makefile 12032 2014-07-15 20:37:32Z msweet $".
+# End of "$Id: Makefile 12635 2015-05-19 02:12:22Z msweet $".
 #
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c 12230 2014-10-21 13:55:24Z msweet $"
+ * "$Id: auth.c 12619 2015-05-06 21:00:19Z msweet $"
 *
 * Authentication functions for CUPS.
 *
@@ -311,7 +311,7 @@ _cupsSetNegotiateAuthString(
  * to use it...
  */

-  if (gss_init_sec_context == NULL)
+  if (&gss_init_sec_context == NULL)
  {
    DEBUG_puts("1_cupsSetNegotiateAuthString: Weak-linked GSSAPI/Kerberos "
               "framework is not present");
@@ -876,5 +876,5 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */


 /*
- * End of "$Id: auth.c 12230 2014-10-21 13:55:24Z msweet $".
+ * End of "$Id: auth.c 12619 2015-05-06 21:00:19Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: cups-private.h 11851 2014-05-07 23:55:35Z msweet $"
+ * "$Id: cups-private.h 12441 2015-01-29 14:42:32Z msweet $"
 *
 *   Private definitions for CUPS.
 *
- *   Copyright 2007-2013 by Apple Inc.
+ *   Copyright 2007-2015 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
@@ -281,5 +281,5 @@ extern char		*_cupsUserDefault(char *name, size_t namesize);
 #endif /* !_CUPS_CUPS_PRIVATE_H_ */

 /*
- * End of "$Id: cups-private.h 11851 2014-05-07 23:55:35Z msweet $".
+ * End of "$Id: cups-private.h 12441 2015-01-29 14:42:32Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h 12266 2014-11-19 16:05:28Z msweet $"
+ * "$Id: cups.h 12733 2015-06-12 01:21:05Z msweet $"
 *
 * API definitions for CUPS.
 *
@@ -35,6 +35,15 @@ typedef off_t ssize_t;			/* @private@ */
 #  include "language.h"
 #  include "pwg.h"

+/*
+ * Define _PPD_DEPRECATED to silence the warnings about PPD functions being
+ * deprecated...
+ */
+
+#  ifndef _PPD_DEPRECATED
+#    define _PPD_DEPRECATED _CUPS_DEPRECATED_1_6_MSG("Use cupsCopyDestInfo and friends instead.")
+#  endif /* !_PPD_DEPRECATED */
+

 /*
 * C++ magic...
@@ -49,10 +58,10 @@ extern "C" {
 * Constants...
 */

-#  define CUPS_VERSION			2.0002
+#  define CUPS_VERSION			2.0100
 #  define CUPS_VERSION_MAJOR		2
-#  define CUPS_VERSION_MINOR		0
-#  define CUPS_VERSION_PATCH		2
+#  define CUPS_VERSION_MINOR		1
+#  define CUPS_VERSION_PATCH		0

 #  define CUPS_BC_FD			3
 					/* Back-channel file descriptor for
@@ -241,6 +250,7 @@ enum cups_ptype_e			/* Printer type/capability bit
 					 * @since CUPS 1.4/OS X 10.6@ */
  CUPS_PRINTER_MFP = 0x4000000,		/* Printer with scanning capabilities
 					 * @since CUPS 1.4/OS X 10.6@ */
+  CUPS_PRINTER_3D = 0x8000000,		/* 3D Printing @since CUPS 2.1@ */
  CUPS_PRINTER_OPTIONS = 0x6fffc	/* ~(CLASS | REMOTE | IMPLICIT |
 					 * DEFAULT | FAX | REJECTING | DELETE |
 					 * NOT_SHARED | AUTHENTICATED |
@@ -354,8 +364,7 @@ extern int		cupsGetClasses(char ***classes) _CUPS_DEPRECATED_MSG("Use cupsGetDes
 extern const char	*cupsGetDefault(void);
 extern int		cupsGetJobs(cups_job_t **jobs, const char *name,
 			            int myjobs, int whichjobs);
-extern const char	*cupsGetPPD(const char *name)
-			            _CUPS_DEPRECATED_1_6_MSG("Use cupsCopyDestInfo instead.");
+extern const char	*cupsGetPPD(const char *name) _PPD_DEPRECATED;
 extern int		cupsGetPrinters(char ***printers) _CUPS_DEPRECATED_MSG("Use cupsGetDests instead.");
 extern ipp_status_t	cupsLastError(void);
 extern int		cupsPrintFile(const char *name, const char *filename,
@@ -413,8 +422,7 @@ extern int		cupsGetDests2(http_t *http, cups_dest_t **dests)
 extern int		cupsGetJobs2(http_t *http, cups_job_t **jobs,
 			             const char *name, int myjobs,
 				     int whichjobs) _CUPS_API_1_1_21;
-extern const char	*cupsGetPPD2(http_t *http, const char *name)
-			             _CUPS_DEPRECATED_1_6_MSG("Use cupsCopyDestInfo instead.");
+extern const char	*cupsGetPPD2(http_t *http, const char *name) _PPD_DEPRECATED;
 extern int		cupsPrintFile2(http_t *http, const char *name,
 			               const char *filename,
 				       const char *title, int num_options,
@@ -479,7 +487,7 @@ extern const char	*cupsGetPassword2(const char *prompt, http_t *http,
 					  const char *resource) _CUPS_API_1_4;
 extern http_status_t	cupsGetPPD3(http_t *http, const char *name,
 			            time_t *modtime, char *buffer,
-				    size_t bufsize) _CUPS_API_1_4;
+				    size_t bufsize) _PPD_DEPRECATED;
 extern ipp_t		*cupsGetResponse(http_t *http,
 			                 const char *resource) _CUPS_API_1_4;
 extern ssize_t		cupsReadResponseData(http_t *http, char *buffer,
@@ -628,5 +636,5 @@ extern int		cupsSetServerCredentials(const char *path, const char *common_name,
 #endif /* !_CUPS_CUPS_H_ */

 /*
- * End of "$Id: cups.h 12266 2014-11-19 16:05:28Z msweet $".
+ * End of "$Id: cups.h 12733 2015-06-12 01:21:05Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: debug.c 12328 2014-12-09 20:38:47Z msweet $"
+ * "$Id: debug.c 12327 2014-12-09 20:38:39Z msweet $"
 *
 * Debugging functions for CUPS.
 *
@@ -643,5 +643,5 @@ _cups_debug_set(const char *logfile,	/* I - Log file or NULL */


 /*
- * End of "$Id: debug.c 12328 2014-12-09 20:38:47Z msweet $".
+ * End of "$Id: debug.c 12327 2014-12-09 20:38:39Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: dest.c 12094 2014-08-19 12:15:11Z msweet $"
+ * "$Id: dest.c 12733 2015-06-12 01:21:05Z msweet $"
 *
 * User-defined destination (and option) support for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -657,6 +657,7 @@ cupsConnectDest(

  http = httpConnect2(hostname, port, addrlist, AF_UNSPEC, encryption, 1, 0,
                      NULL);
+  httpAddrFreeList(addrlist);

 /*
  * Connect if requested...
@@ -870,7 +871,7 @@ cupsEnumDests(
  */

  num_dests = _cupsGetDests(CUPS_HTTP_DEFAULT, IPP_OP_CUPS_GET_PRINTERS, NULL,
-                            &dests, type, mask);
+                            &dests, type, mask | CUPS_PRINTER_3D);

  if ((user_default = _cupsUserDefault(name, sizeof(name))) != NULL)
    defprinter = name;
@@ -1742,7 +1743,7 @@ cupsGetDests2(http_t      *http,	/* I - Connection to server or @code CUPS_HTTP_
  */

  *dests    = (cups_dest_t *)0;
-  num_dests = _cupsGetDests(http, IPP_OP_CUPS_GET_PRINTERS, NULL, dests, 0, 0);
+  num_dests = _cupsGetDests(http, IPP_OP_CUPS_GET_PRINTERS, NULL, dests, 0, CUPS_PRINTER_3D);

  if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
  {
@@ -1959,7 +1960,7 @@ cupsGetNamedDest(http_t     *http,	/* I - Connection to server or @code CUPS_HTT
  * Get the printer's attributes...
  */

-  if (!_cupsGetDests(http, op, name, &dest, 0, 0))
+  if (!_cupsGetDests(http, op, name, &dest, 0, CUPS_PRINTER_3D))
    return (NULL);

  if (instance)
@@ -2135,7 +2136,7 @@ cupsSetDests2(http_t      *http,	/* I - Connection to server or @code CUPS_HTTP_
  * Get the server destinations...
  */

-  num_temps = _cupsGetDests(http, IPP_OP_CUPS_GET_PRINTERS, NULL, &temps, 0, 0);
+  num_temps = _cupsGetDests(http, IPP_OP_CUPS_GET_PRINTERS, NULL, &temps, 0, CUPS_PRINTER_3D);

  if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
  {
@@ -3942,5 +3943,5 @@ cups_make_string(


 /*
- * End of "$Id: dest.c 12094 2014-08-19 12:15:11Z msweet $".
+ * End of "$Id: dest.c 12733 2015-06-12 01:21:05Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: encode.c 11733 2014-03-25 18:01:41Z msweet $"
+ * "$Id: encode.c 12668 2015-05-27 19:30:32Z msweet $"
 *
 * Option encoding routines for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -117,6 +117,9 @@ static const _ipp_option_t ipp_options[] =
  { 0, "copies",		IPP_TAG_INTEGER,	IPP_TAG_JOB,
 							IPP_TAG_DOCUMENT },
  { 0, "copies-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { 0, "date-time-at-completed",IPP_TAG_DATE,		IPP_TAG_ZERO }, /* never send as option */
+  { 0, "date-time-at-creation",	IPP_TAG_DATE,		IPP_TAG_ZERO }, /* never send as option */
+  { 0, "date-time-at-processing",IPP_TAG_DATE,		IPP_TAG_ZERO }, /* never send as option */
  { 0, "device-uri",		IPP_TAG_URI,		IPP_TAG_PRINTER },
  { 1, "document-copies",	IPP_TAG_RANGE,		IPP_TAG_JOB,
 							IPP_TAG_DOCUMENT,
@@ -274,6 +277,7 @@ static const _ipp_option_t ipp_options[] =
  { 0, "print-quality-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
  { 1, "printer-commands",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
  { 0, "printer-error-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
+  { 0, "printer-geo-location",	IPP_TAG_URI,		IPP_TAG_PRINTER },
  { 0, "printer-info",		IPP_TAG_TEXT,		IPP_TAG_PRINTER },
  { 0, "printer-is-accepting-jobs", IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
  { 0, "printer-is-shared",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
@@ -849,5 +853,5 @@ compare_ipp_options(_ipp_option_t *a,	/* I - First option */


 /*
- * End of "$Id: encode.c 11733 2014-03-25 18:01:41Z msweet $".
+ * End of "$Id: encode.c 12668 2015-05-27 19:30:32Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.c 12297 2014-12-08 19:26:32Z msweet $"
+ * "$Id: file.c 12641 2015-05-19 15:04:39Z msweet $"
 *
 * File functions for CUPS.
 *
@@ -8,7 +8,7 @@
 * our own file functions allows us to provide transparent support of
 * gzip'd print files, PPD files, etc.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 * These coded instructions, statements, and computer programs are the
@@ -639,6 +639,8 @@ cupsFileGetChar(cups_file_t *fp)	/* I - CUPS file */
  * Range check input...
  */

+  DEBUG_printf(("4cupsFileGetChar(fp=%p)", fp));
+
  if (!fp || (fp->mode != 'r' && fp->mode != 's'))
  {
    DEBUG_puts("5cupsFileGetChar: Bad arguments!");
@@ -649,8 +651,10 @@ cupsFileGetChar(cups_file_t *fp)	/* I - CUPS file */
  * If the input buffer is empty, try to read more data...
  */

+  DEBUG_printf(("5cupsFileGetChar: fp->eof=%d, fp->ptr=%p, fp->end=%p", fp->eof, fp->ptr, fp->end));
+
  if (fp->ptr >= fp->end)
-    if (cups_fill(fp) < 0)
+    if (cups_fill(fp) <= 0)
    {
      DEBUG_puts("5cupsFileGetChar: Unable to fill buffer!");
      return (-1);
@@ -1284,7 +1288,7 @@ cupsFilePeekChar(cups_file_t *fp)	/* I - CUPS file */
  */

  if (fp->ptr >= fp->end)
-    if (cups_fill(fp) < 0)
+    if (cups_fill(fp) <= 0)
      return (-1);

 /*
@@ -1779,7 +1783,7 @@ cupsFileSeek(cups_file_t *fp,		/* I - CUPS file */
    * Preload a buffer to determine whether the file is compressed...
    */

-    if (cups_fill(fp) < 0)
+    if (cups_fill(fp) <= 0)
      return (-1);
  }
 #endif /* HAVE_LIBZ */
@@ -2195,6 +2199,8 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
        DEBUG_printf(("9cups_fill: cups_read() returned " CUPS_LLFMT,
 	              CUPS_LLCAST bytes));

+        fp->eof = 1;
+
 	return (-1);
      }

@@ -2234,6 +2240,11 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
 	  * Can't read from file!
 	  */

+	  DEBUG_puts("9cups_fill: Extra gzip header data missing, returning -1.");
+
+          fp->eof = 1;
+	  errno   = EIO;
+
 	  return (-1);
 	}

@@ -2246,6 +2257,11 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
 	  * Can't read from file!
 	  */

+	  DEBUG_puts("9cups_fill: Extra gzip header data does not fit in initial buffer, returning -1.");
+
+          fp->eof = 1;
+	  errno   = EIO;
+
 	  return (-1);
 	}
      }
@@ -2267,6 +2283,11 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
 	  * Can't read from file!
 	  */

+	  DEBUG_puts("9cups_fill: Original filename in gzip header data does not fit in initial buffer, returning -1.");
+
+          fp->eof = 1;
+	  errno   = EIO;
+
 	  return (-1);
 	}
      }
@@ -2288,6 +2309,11 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
 	  * Can't read from file!
 	  */

+	  DEBUG_puts("9cups_fill: Comment in gzip header data does not fit in initial buffer, returning -1.");
+
+          fp->eof = 1;
+	  errno   = EIO;
+
 	  return (-1);
 	}
      }
@@ -2306,6 +2332,11 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
 	  * Can't read from file!
 	  */

+	  DEBUG_puts("9cups_fill: Header CRC in gzip header data does not fit in initial buffer, returning -1.");
+
+          fp->eof = 1;
+	  errno   = EIO;
+
 	  return (-1);
 	}
      }
@@ -2330,8 +2361,15 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
      fp->stream.avail_out = 0;
      fp->crc              = crc32(0L, Z_NULL, 0);

-      if (inflateInit2(&(fp->stream), -15) != Z_OK)
+      if ((status = inflateInit2(&(fp->stream), -15)) != Z_OK)
+      {
+	DEBUG_printf(("9cups_fill: inflateInit2 returned %d, returning -1.", status));
+
+        fp->eof = 1;
+        errno   = EIO;
+
 	return (-1);
+      }

      fp->compressed = 1;
    }
@@ -2343,7 +2381,11 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
      */

      if (fp->eof)
-	return (-1);
+      {
+        DEBUG_puts("9cups_fill: EOF, returning 0.");
+
+	return (0);
+      }

     /*
      * Fill the decompression buffer as needed...
@@ -2352,7 +2394,13 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
      if (fp->stream.avail_in == 0)
      {
 	if ((bytes = cups_read(fp, (char *)fp->cbuf, sizeof(fp->cbuf))) <= 0)
-          return (-1);
+	{
+	  DEBUG_printf(("9cups_fill: cups_read error, returning %d.", (int)bytes));
+
+	  fp->eof = 1;
+
+          return (bytes);
+	}

 	fp->stream.next_in  = fp->cbuf;
 	fp->stream.avail_in = (uInt)bytes;
@@ -2379,42 +2427,69 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */

 	unsigned char	trailer[8];	/* Trailer bytes */
 	uLong		tcrc;		/* Trailer CRC */
+	ssize_t		tbytes = 0;	/* Number of bytes */

-
-	if (read(fp->fd, trailer, sizeof(trailer)) < (ssize_t)sizeof(trailer))
+	if (fp->stream.avail_in > 0)
 	{
-	 /*
-          * Can't get it, so mark end-of-file...
-	  */
+	  if (fp->stream.avail_in > sizeof(trailer))
+	    tbytes = (ssize_t)sizeof(trailer);
+	  else
+	    tbytes = (ssize_t)fp->stream.avail_in;

-          fp->eof = 1;
+	  memcpy(trailer, fp->stream.next_in, (size_t)tbytes);
+	  fp->stream.next_in  += tbytes;
+	  fp->stream.avail_in -= (size_t)tbytes;
 	}
-	else
-	{
-	  tcrc = ((((((uLong)trailer[3] << 8) | (uLong)trailer[2]) << 8) |
-	          (uLong)trailer[1]) << 8) | (uLong)trailer[0];

-	  if (tcrc != fp->crc)
+        if (tbytes < (ssize_t)sizeof(trailer))
+	{
+	  if (read(fp->fd, trailer + tbytes, sizeof(trailer) - (size_t)tbytes) < ((ssize_t)sizeof(trailer) - tbytes))
 	  {
 	   /*
-            * Bad CRC, mark end-of-file...
+	    * Can't get it, so mark end-of-file...
 	    */

-            DEBUG_printf(("9cups_fill: tcrc=%08x != fp->crc=%08x",
-	                  (unsigned int)tcrc, (unsigned int)fp->crc));
+	    DEBUG_puts("9cups_fill: Unable to read gzip CRC trailer, returning -1.");

 	    fp->eof = 1;
+	    errno   = EIO;

 	    return (-1);
 	  }
+	}

+	tcrc = ((((((uLong)trailer[3] << 8) | (uLong)trailer[2]) << 8) |
+		(uLong)trailer[1]) << 8) | (uLong)trailer[0];
+
+	if (tcrc != fp->crc)
+	{
 	 /*
-	  * Otherwise, reset the compressed flag so that we re-read the
-	  * file header...
+	  * Bad CRC, mark end-of-file...
 	  */

-	  fp->compressed = 0;
+	  DEBUG_printf(("9cups_fill: tcrc=%08x != fp->crc=%08x, returning -1.", (unsigned int)tcrc, (unsigned int)fp->crc));
+
+	  fp->eof = 1;
+	  errno   = EIO;
+
+	  return (-1);
 	}
+
+       /*
+	* Otherwise, reset the compressed flag so that we re-read the
+	* file header...
+	*/
+
+	fp->compressed = 0;
+      }
+      else if (status < Z_OK)
+      {
+	DEBUG_printf(("9cups_fill: inflate returned %d, returning -1.", status));
+
+        fp->eof = 1;
+        errno   = EIO;
+
+	return (-1);
      }

      bytes = (ssize_t)sizeof(fp->buf) - (ssize_t)fp->stream.avail_out;
@@ -2427,7 +2502,10 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
      fp->end = fp->buf + bytes;

      if (bytes)
+      {
+        DEBUG_printf(("9cups_fill: Returning %d.", (int)bytes));
 	return (bytes);
+      }
    }
  }
 #endif /* HAVE_LIBZ */
@@ -2445,17 +2523,19 @@ cups_fill(cups_file_t *fp)		/* I - CUPS file */
    fp->eof = 1;
    fp->ptr = fp->buf;
    fp->end = fp->buf;
+  }
+  else
+  {
+   /*
+    * Return the bytes we read...
+    */

-    return (-1);
+    fp->eof = 0;
+    fp->ptr = fp->buf;
+    fp->end = fp->buf + bytes;
  }

- /*
-  * Return the bytes we read...
-  */
-
-  fp->eof = 0;
-  fp->ptr = fp->buf;
-  fp->end = fp->buf + bytes;
+  DEBUG_printf(("9cups_fill: Not gzip, returning %d.", (int)bytes));

  return (bytes);
 }
@@ -2672,5 +2752,5 @@ cups_write(cups_file_t *fp,		/* I - CUPS file */


 /*
- * End of "$Id: file.c 12297 2014-12-08 19:26:32Z msweet $".
+ * End of "$Id: file.c 12641 2015-05-19 15:04:39Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: globals.c 12481 2015-02-03 12:45:14Z msweet $"
+ * "$Id: globals.c 12480 2015-02-03 12:36:34Z msweet $"
 *
 *   Global variable access routines for CUPS.
 *
@@ -394,5 +394,5 @@ cups_globals_init(void)


 /*
- * End of "$Id: globals.c 12481 2015-02-03 12:45:14Z msweet $".
+ * End of "$Id: globals.c 12480 2015-02-03 12:36:34Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-private.h 12419 2015-01-22 15:51:20Z msweet $"
+ * "$Id: http-private.h 12645 2015-05-20 01:20:52Z msweet $"
 *
 * Private HTTP definitions for CUPS.
 *
@@ -126,6 +126,7 @@ extern CFAbsoluteTime SecCertificateNotValidAfter(SecCertificateRef certificate)

 #  ifndef WIN32
 #    include <net/if.h>
+#    include <resolv.h>
 #    ifdef HAVE_GETIFADDRS
 #      include <ifaddrs.h>
 #    else
@@ -161,8 +162,11 @@ extern "C" {
 #define _HTTP_RESOLVE_FQDN	2	/* Resolve to a FQDN */
 #define _HTTP_RESOLVE_FAXOUT	4	/* Resolve FaxOut service? */

+#define _HTTP_TLS_NONE		0	/* No TLS options */
 #define _HTTP_TLS_ALLOW_RC4	1	/* Allow RC4 cipher suites */
 #define _HTTP_TLS_ALLOW_SSL3	2	/* Allow SSL 3.0 */
+#define _HTTP_TLS_ALLOW_DH	4	/* Allow DH/DHE key negotiation */
+#define _HTTP_TLS_DENY_TLS10	16	/* Deny TLS 1.0 */


 /*
@@ -438,5 +442,5 @@ extern int		_httpWait(http_t *http, int msec, int usessl);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */

 /*
- * End of "$Id: http-private.h 12419 2015-01-22 15:51:20Z msweet $".
+ * End of "$Id: http-private.h 12645 2015-05-20 01:20:52Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: http-support.c 12124 2014-08-28 15:37:22Z msweet $"
+ * "$Id: http-support.c 12752 2015-06-24 19:30:47Z msweet $"
 *
 * HTTP support routines for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 * These coded instructions, statements, and computer programs are the
@@ -1722,7 +1722,7 @@ _httpResolveURI(
 	while (time(NULL) < end_time)
 	{
 	  if (options & _HTTP_RESOLVE_STDERR)
-	    _cupsLangPrintFilter(stderr, "INFO", _("Looking for printer."));
+	    _cupsLangPrintFilter(stderr, "INFO", _("Looking for printer..."));

 	  if (cb && !(*cb)(context))
 	  {
@@ -2544,5 +2544,5 @@ http_resolve_cb(


 /*
- * End of "$Id: http-support.c 12124 2014-08-28 15:37:22Z msweet $".
+ * End of "$Id: http-support.c 12752 2015-06-24 19:30:47Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c 12334 2014-12-09 21:01:55Z msweet $"
+ * "$Id: http.c 12333 2014-12-09 21:01:46Z msweet $"
 *
 * HTTP routines for CUPS.
 *
@@ -4850,5 +4850,5 @@ http_write_chunk(http_t     *http,	/* I - HTTP connection */


 /*
- * End of "$Id: http.c 12334 2014-12-09 21:01:55Z msweet $".
+ * End of "$Id: http.c 12333 2014-12-09 21:01:46Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-support.c 12194 2014-10-02 18:44:36Z msweet $"
+ * "$Id: ipp-support.c 12666 2015-05-25 19:38:09Z msweet $"
 *
 * Internet Printing Protocol support functions for CUPS.
 *
@@ -195,7 +195,7 @@ static const char * const ipp_std_ops[] =
 		  "Suspend-Current-Job",
 		  "Resume-Job",

-		  /* 0x0030 - 0x003e */
+		  /* 0x0030 - 0x003f */
 		  "Promote-Job",
 		  "Schedule-Job-After",
 		  "0x0032",
@@ -210,7 +210,21 @@ static const char * const ipp_std_ops[] =
 		  "Close-Job",
 		  "Identify-Printer",
 		  "Validate-Document",
-		  "Send-Hardcopy-Document"
+		  "Send-Hardcopy-Document",
+		  "Acknowledge-Document",
+
+		  /* 0x0040 - 0x004a */
+		  "Acknowledge-Identify-Printer",
+		  "Acknowledge-Job",
+		  "Fetch-Document",
+		  "Fetch-Job",
+		  "Get-Output-Device-Attributes",
+		  "Update-Active-Jobs",
+		  "Deregister-Output-Device",
+		  "Update-Document-Status",
+		  "Update-Job-Status",
+		  "Update-Output-Device-Attributes",
+		  "Get-Next-Document-Data"
 		},
 		* const ipp_cups_ops[] =
 		{
@@ -2271,5 +2285,5 @@ ipp_col_string(ipp_t  *col,		/* I - Collection attribute */


 /*
- * End of "$Id: ipp-support.c 12194 2014-10-02 18:44:36Z msweet $".
+ * End of "$Id: ipp-support.c 12666 2015-05-25 19:38:09Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 12469 2015-02-01 04:51:08Z msweet $"
+ * "$Id: ipp.c 12468 2015-02-01 04:50:43Z msweet $"
 *
 * Internet Printing Protocol functions for CUPS.
 *
@@ -7062,5 +7062,5 @@ ipp_write_file(int         *fd,		/* I - File descriptor */


 /*
- * End of "$Id: ipp.c 12469 2015-02-01 04:51:08Z msweet $".
+ * End of "$Id: ipp.c 12468 2015-02-01 04:50:43Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.h 11806 2014-04-09 16:12:27Z msweet $"
+ * "$Id: ipp.h 12666 2015-05-25 19:38:09Z msweet $"
 *
 * Internet Printing Protocol definitions for CUPS.
 *
@@ -246,11 +246,11 @@ typedef enum ipp_op_e			/**** IPP operations ****/
  IPP_OP_CUPS_INVALID = -1,		/* Invalid operation name for @link ippOpValue@ */
  IPP_OP_CUPS_NONE = 0,			/* No operation @private@ */
  IPP_OP_PRINT_JOB = 0x0002,		/* Print a single file */
-  IPP_OP_PRINT_URI,			/* Print a single URL @private@ */
+  IPP_OP_PRINT_URI,			/* Print a single URL */
  IPP_OP_VALIDATE_JOB,			/* Validate job options */
  IPP_OP_CREATE_JOB,			/* Create an empty print job */
  IPP_OP_SEND_DOCUMENT,			/* Add a file to a job */
-  IPP_OP_SEND_URI,			/* Add a URL to a job @private@ */
+  IPP_OP_SEND_URI,			/* Add a URL to a job */
  IPP_OP_CANCEL_JOB,			/* Cancel a job */
  IPP_OP_GET_JOB_ATTRIBUTES,		/* Get job attributes */
  IPP_OP_GET_JOBS,			/* Get a list of jobs */
@@ -261,7 +261,7 @@ typedef enum ipp_op_e			/**** IPP operations ****/
  IPP_OP_PAUSE_PRINTER = 0x0010,	/* Stop a printer */
  IPP_OP_RESUME_PRINTER,		/* Start a printer */
  IPP_OP_PURGE_JOBS,			/* Cancel all jobs */
-  IPP_OP_SET_PRINTER_ATTRIBUTES,	/* Set printer attributes @private@ */
+  IPP_OP_SET_PRINTER_ATTRIBUTES,	/* Set printer attributes */
  IPP_OP_SET_JOB_ATTRIBUTES,		/* Set job attributes */
  IPP_OP_GET_PRINTER_SUPPORTED_VALUES,	/* Get supported attribute values */
  IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS,	/* Create one or more printer subscriptions @since CUPS 1.2/OS X 10.5@ */
@@ -279,32 +279,45 @@ typedef enum ipp_op_e			/**** IPP operations ****/
  IPP_OP_ENABLE_PRINTER,		/* Start a printer */
  IPP_OP_DISABLE_PRINTER,		/* Stop a printer */
  IPP_OP_PAUSE_PRINTER_AFTER_CURRENT_JOB,
-					/* Stop printer after the current job @private@ */
-  IPP_OP_HOLD_NEW_JOBS,			/* Hold new jobs @private@ */
-  IPP_OP_RELEASE_HELD_NEW_JOBS,		/* Release new jobs @private@ */
-  IPP_OP_DEACTIVATE_PRINTER,		/* Stop a printer @private@ */
-  IPP_OP_ACTIVATE_PRINTER,		/* Start a printer @private@ */
-  IPP_OP_RESTART_PRINTER,		/* Restart a printer @private@ */
-  IPP_OP_SHUTDOWN_PRINTER,		/* Turn a printer off @private@ */
-  IPP_OP_STARTUP_PRINTER,		/* Turn a printer on @private@ */
-  IPP_OP_REPROCESS_JOB,			/* Reprint a job @private@ */
-  IPP_OP_CANCEL_CURRENT_JOB,		/* Cancel the current job @private@ */
-  IPP_OP_SUSPEND_CURRENT_JOB,		/* Suspend the current job @private@ */
-  IPP_OP_RESUME_JOB,			/* Resume the current job @private@ */
-  IPP_OP_PROMOTE_JOB,			/* Promote a job to print sooner @private@ */
-  IPP_OP_SCHEDULE_JOB_AFTER,		/* Schedule a job to print after another @private@ */
-  IPP_OP_CANCEL_DOCUMENT = 0x0033,	/* Cancel-Document @private@ */
-  IPP_OP_GET_DOCUMENT_ATTRIBUTES,	/* Get-Document-Attributes @private@ */
-  IPP_OP_GET_DOCUMENTS,			/* Get-Documents @private@ */
-  IPP_OP_DELETE_DOCUMENT,		/* Delete-Document @private@ */
-  IPP_OP_SET_DOCUMENT_ATTRIBUTES,	/* Set-Document-Attributes @private@ */
+					/* Stop printer after the current job */
+  IPP_OP_HOLD_NEW_JOBS,			/* Hold new jobs */
+  IPP_OP_RELEASE_HELD_NEW_JOBS,		/* Release new jobs */
+  IPP_OP_DEACTIVATE_PRINTER,		/* Stop a printer */
+  IPP_OP_ACTIVATE_PRINTER,		/* Start a printer */
+  IPP_OP_RESTART_PRINTER,		/* Restart a printer */
+  IPP_OP_SHUTDOWN_PRINTER,		/* Turn a printer off */
+  IPP_OP_STARTUP_PRINTER,		/* Turn a printer on */
+  IPP_OP_REPROCESS_JOB,			/* Reprint a job */
+  IPP_OP_CANCEL_CURRENT_JOB,		/* Cancel the current job */
+  IPP_OP_SUSPEND_CURRENT_JOB,		/* Suspend the current job */
+  IPP_OP_RESUME_JOB,			/* Resume the current job */
+  IPP_OP_PROMOTE_JOB,			/* Promote a job to print sooner */
+  IPP_OP_SCHEDULE_JOB_AFTER,		/* Schedule a job to print after another */
+  IPP_OP_CANCEL_DOCUMENT = 0x0033,	/* Cancel-Document */
+  IPP_OP_GET_DOCUMENT_ATTRIBUTES,	/* Get-Document-Attributes */
+  IPP_OP_GET_DOCUMENTS,			/* Get-Documents */
+  IPP_OP_DELETE_DOCUMENT,		/* Delete-Document */
+  IPP_OP_SET_DOCUMENT_ATTRIBUTES,	/* Set-Document-Attributes */
  IPP_OP_CANCEL_JOBS,			/* Cancel-Jobs */
  IPP_OP_CANCEL_MY_JOBS,		/* Cancel-My-Jobs */
  IPP_OP_RESUBMIT_JOB,			/* Resubmit-Job */
  IPP_OP_CLOSE_JOB,			/* Close-Job */
-  IPP_OP_IDENTIFY_PRINTER,		/* Identify-Printer @private@ */
-  IPP_OP_VALIDATE_DOCUMENT,		/* Validate-Document @private@ */
-  IPP_OP_SEND_HARDCOPY_DOCUMENT,	/* Send-Hardcopy-Document @private@ */
+  IPP_OP_IDENTIFY_PRINTER,		/* Identify-Printer */
+  IPP_OP_VALIDATE_DOCUMENT,		/* Validate-Document */
+  IPP_OP_SEND_HARDCOPY_DOCUMENT,	/* Send-Hardcopy-Document */
+  IPP_OP_ACKNOWLEDGE_DOCUMENT,		/* Acknowledge-Document */
+  IPP_OP_ACKNOWLEDGE_IDENTIFY_PRINTER,	/* Acknowledge-Identify-Printer */
+  IPP_OP_ACKNOWLEDGE_JOB,		/* Acknowledge-Job */
+  IPP_OP_FETCH_DOCUMENT,		/* Fetch-Document */
+  IPP_OP_FETCH_JOB,			/* Fetch-Job */
+  IPP_OP_GET_OUTPUT_DEVICE_ATTRIBUTES,	/* Get-Output-Device-Attributes */
+  IPP_OP_UPDATE_ACTIVE_JOBS,		/* Update-Active-Jobs */
+  IPP_OP_DEREGISTER_OUTPUT_DEVICE,	/* Deregister-Output-Device */
+  IPP_OP_UPDATE_DOCUMENT_STATUS,	/* Update-Document-Status */
+  IPP_OP_UPDATE_JOB_STATUS,		/* Update-Job-Status */
+  IPP_OP_UPDATE_OUTPUT_DEVICE_ATTRIBUTES,
+					/* Update-Output-Device-Attributes */
+  IPP_OP_GET_NEXT_DOCUMENT_DATA,	/* Get-Next-Document-Data */

  IPP_OP_PRIVATE = 0x4000,		/* Reserved @private@ */
  IPP_OP_CUPS_GET_DEFAULT,		/* Get the default printer */
@@ -1021,5 +1034,5 @@ extern const char	*ippStateString(ipp_state_t state) _CUPS_API_2_0;
 #endif /* !_CUPS_IPP_H_ */

 /*
- * End of "$Id: ipp.h 11806 2014-04-09 16:12:27Z msweet $".
+ * End of "$Id: ipp.h 12666 2015-05-25 19:38:09Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: language.c 12266 2014-11-19 16:05:28Z msweet $"
+ * "$Id: language.c 12790 2015-07-20 17:05:06Z msweet $"
 *
 * I18N/language support for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -1305,7 +1305,8 @@ static cups_array_t *			/* O - Message catalog */
 appleMessageLoad(const char *locale)	/* I - Locale ID */
 {
  char			filename[1024],	/* Path to cups.strings file */
-			applelang[256];	/* Apple language ID */
+			applelang[256],	/* Apple language ID */
+			baselang[3];	/* Base language */
  CFURLRef		url;		/* URL to cups.strings file */
  CFReadStreamRef	stream = NULL;	/* File stream */
  CFPropertyListRef	plist = NULL;	/* Localization file */
@@ -1345,6 +1346,15 @@ appleMessageLoad(const char *locale)	/* I - Locale ID */
      locale = "Japanese";
    else if (!strncmp(locale, "es", 2))
      locale = "Spanish";
+    else if (strstr(locale, "_") != NULL || strstr(locale, "-") != NULL)
+    {
+     /*
+      * Drop country code, just try language...
+      */
+
+      strlcpy(baselang, locale, sizeof(baselang));
+      locale = baselang;
+    }

    snprintf(filename, sizeof(filename),
 	     CUPS_BUNDLEDIR "/Resources/%s.lproj/cups.strings", locale);
@@ -1588,5 +1598,5 @@ cups_unquote(char       *d,		/* O - Unquoted string */


 /*
- * End of "$Id: language.c 12266 2014-11-19 16:05:28Z msweet $".
+ * End of "$Id: language.c 12790 2015-07-20 17:05:06Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: mark.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id: mark.c 12258 2014-11-19 12:38:44Z msweet $"
 *
 * Option marking routines for CUPS.
 *
@@ -514,6 +514,12 @@ ppdMarkDefaults(ppd_file_t *ppd)	/* I - PPD file record */

  for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++)
    ppd_defaults(ppd, g);
+
+ /*
+  * Finally, tag any conflicts (API compatibility) once at the end.
+  */
+
+  ppdConflicts(ppd);
 }


@@ -710,7 +716,7 @@ ppd_defaults(ppd_file_t  *ppd,		/* I - PPD file */

  for (i = g->num_options, o = g->options; i > 0; i --, o ++)
    if (_cups_strcasecmp(o->keyword, "PageRegion") != 0)
-      ppdMarkOption(ppd, o->keyword, o->defchoice);
+      ppd_mark_option(ppd, o->keyword, o->defchoice);

  for (i = g->num_subgroups, sg = g->subgroups; i > 0; i --, sg ++)
    ppd_defaults(ppd, sg);
@@ -1078,5 +1084,5 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */


 /*
- * End of "$Id: mark.c 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id: mark.c 12258 2014-11-19 12:38:44Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: ppd-private.h 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id: ppd-private.h 12733 2015-06-12 01:21:05Z msweet $"
 *
 * Private PPD definitions for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 * These coded instructions, statements, and computer programs are the
@@ -49,7 +49,7 @@ extern "C" {
 * Constants...
 */

-#  define _PPD_CACHE_VERSION	6	/* Version number in cache file */
+#  define _PPD_CACHE_VERSION	7	/* Version number in cache file */


 /*
@@ -109,6 +109,14 @@ typedef struct _pwg_finishings_s	/**** PWG finishings mapping data ****/
  cups_option_t		*options;	/* Options to apply */
 } _pwg_finishings_t;

+typedef struct _pwg_material_s		/**** PWG material mapping data ****/
+{
+  char		*key,			/* material-key value */
+		*name;			/* material-name value */
+  int		num_props;		/* Number of properties */
+  cups_option_t	*props;			/* Material properties */
+} _pwg_material_t;
+
 struct _ppd_cache_s			/**** PPD cache and PWG conversion data ****/
 {
  int		num_bins;		/* Number of output bins */
@@ -148,6 +156,11 @@ struct _ppd_cache_s			/**** PPD cache and PWG conversion data ****/
  cups_array_t	*mandatory;		/* cupsMandatory value */
  char		*charge_info_uri;	/* cupsChargeInfoURI value */
  cups_array_t	*support_files;		/* Support files - ICC profiles, etc. */
+  char		*cups_3d,		/* cups3D value */
+		*cups_layer_order;	/* cupsLayerOrder value */
+  int		cups_accuracy[3];	/* cupsAccuracy value - x, y, and z in nanometers */
+  int		cups_volume[3];		/* cupsVolume value - x, y, and z in millimeters */
+  cups_array_t	*materials;		/* cupsMaterial values */
 };


@@ -155,6 +168,7 @@ struct _ppd_cache_s			/**** PPD cache and PWG conversion data ****/
 * Prototypes...
 */

+extern int		_cupsConvertOptions(ipp_t *request, ppd_file_t *ppd, _ppd_cache_t *pc, ipp_attribute_t *media_col_sup, ipp_attribute_t *doc_handling_sup, ipp_attribute_t *print_color_mode_sup, const char *user, const char *format, int copies, int num_options, cups_option_t *options);
 extern _ppd_cache_t	*_ppdCacheCreateWithFile(const char *filename,
 			                         ipp_t **attrs);
 extern _ppd_cache_t	*_ppdCacheCreateWithPPD(ppd_file_t *ppd);
@@ -187,6 +201,7 @@ extern const char	*_ppdCacheGetType(_ppd_cache_t *pc,
 			                  const char *media_type);
 extern int		_ppdCacheWriteFile(_ppd_cache_t *pc,
 			                   const char *filename, ipp_t *attrs);
+extern char		*_ppdCreateFromIPP(char *buffer, size_t bufsize, ipp_t *response);
 extern void		_ppdFreeLanguages(cups_array_t *languages);
 extern cups_encoding_t	_ppdGetEncoding(const char *name);
 extern cups_array_t	*_ppdGetLanguages(ppd_file_t *ppd);
@@ -221,5 +236,5 @@ extern const char	*_pwgPageSizeForMedia(pwg_media_t *media,
 #endif /* !_CUPS_PPD_PRIVATE_H_ */

 /*
- * End of "$Id: ppd-private.h 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id: ppd-private.h 12733 2015-06-12 01:21:05Z msweet $".
 */
@@ -14,7 +14,7 @@
 *%
 *% Copyright 2007-2010 by Apple Inc.
 *% Copyright 2002-2006 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"
@@ -22,7 +22,7 @@
 *% file is missing or damaged, see the license at "http://www.cups.org/".
 *FormatVersion:	"4.3"
 *FileVersion:	"1.3"
-*LanguageVersion: English 
+*LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName:	"TEST.PPD"
 *Manufacturer:	"ESP"
@@ -104,7 +104,7 @@
 *fr_CA.PageRegion A4/French Canadian A4: ""
 *fr_CA.PageRegion Env10/French Canadian #10 Envelope: ""

-*DefaultImageableArea: Letter 
+*DefaultImageableArea: Letter
 *ImageableArea Letter:	"18 36 594 756"
 *ImageableArea Letter.Banner:	"18 0 594 792"
 *ImageableArea Letter.Fullbleed:	"0 0 612 792"
@@ -145,6 +145,15 @@
 *MediaType Transparency/Transparency Film: "MediaType=Transparency"
 *CloseUI: *MediaType

+*OpenUI *OutputBin/Output Tray: PickOne
+*OrderDependency: 25 AnySetup *OutputBin
+*DefaultOutputBin: Tray1
+*OutputBin Auto/Automatic Tray: "OutputBin=Auto"
+*OutputBin Tray1/Tray 1: "OutputBin=Tray1"
+*OutputBin Tray2/Tray 2: "OutputBin=Tray2"
+*OutputBin MainTray/Main Tray: "OutputBin=MainTray"
+*CloseUI: *OutputBin
+
 *OpenUI *Duplex/2-Sided Printing: PickOne
 *OrderDependency: 10 DocumentSetup *Duplex
 *DefaultDuplex: None
@@ -1,9 +1,9 @@
 /*
- * "$Id: testfile.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id: testfile.c 12577 2015-03-30 19:07:17Z msweet $"
 *
 * File test program for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -205,14 +205,14 @@ main(int  argc,				/* I - Number of command-line arguments */
    * Cat the filename on the command-line...
    */

-    char	line[1024];		/* Line from file */
+    char	line[8192];		/* Line from file */

    if ((fp = cupsFileOpen(argv[1], "r")) == NULL)
    {
      perror(argv[1]);
      status = 1;
    }
-    else
+    else if (argc == 2)
    {
      status = 0;

@@ -224,6 +224,21 @@ main(int  argc,				/* I - Number of command-line arguments */

      cupsFileClose(fp);
    }
+    else
+    {
+      status = 0;
+      ssize_t bytes;
+
+      while ((bytes = cupsFileRead(fp, line, sizeof(line))) > 0)
+        printf("%s: %d bytes\n", argv[1], (int)bytes);
+
+      if (cupsFileEOF(fp))
+        printf("%s: EOF\n", argv[1]);
+      else
+        perror(argv[1]);
+
+      cupsFileClose(fp);
+    }
  }

  return (status);
@@ -798,7 +813,8 @@ read_write_tests(int compression)	/* I - Use compression? */
  * Remove the test file...
  */

-  unlink(compression ? "testfile.dat.gz" : "testfile.dat");
+  if (!status)
+    unlink(compression ? "testfile.dat.gz" : "testfile.dat");

 /*
  * Return the test status...
@@ -809,5 +825,5 @@ read_write_tests(int compression)	/* I - Use compression? */


 /*
- * End of "$Id: testfile.c 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id: testfile.c 12577 2015-03-30 19:07:17Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: testhttp.c 12028 2014-07-15 14:01:27Z msweet $"
+ * "$Id: testhttp.c 12678 2015-05-28 19:09:48Z msweet $"
 *
 * HTTP test program for CUPS.
 *
@@ -645,7 +645,6 @@ main(int  argc,				/* I - Number of command-line arguments */

        if (lcreds && cupsArrayCount(creds) == cupsArrayCount(lcreds))
        {
-          int			i;
          http_credential_t	*cred, *lcred;

          for (i = 1, cred = (http_credential_t *)cupsArrayFirst(creds), lcred = (http_credential_t *)cupsArrayFirst(lcreds);
@@ -890,5 +889,5 @@ main(int  argc,				/* I - Number of command-line arguments */


 /*
- * End of "$Id: testhttp.c 12028 2014-07-15 14:01:27Z msweet $".
+ * End of "$Id: testhttp.c 12678 2015-05-28 19:09:48Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: testppd.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id: testppd.c 12603 2015-05-06 01:42:51Z msweet $"
 *
 * PPD test program for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1997-2006 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -51,6 +51,11 @@ static const char	*default_code =
 			"%%EndFeature\n"
 			"} stopped cleartomark\n"
 			"[{\n"
+			"%%BeginFeature: *OutputBin Tray1\n"
+			"OutputBin=Tray1\n"
+			"%%EndFeature\n"
+			"} stopped cleartomark\n"
+			"[{\n"
 			"%%BeginFeature: *MediaType Plain\n"
 			"MediaType=Plain\n"
 			"%%EndFeature\n"
@@ -80,6 +85,11 @@ static const char	*custom_code =
 			"%%EndFeature\n"
 			"} stopped cleartomark\n"
 			"[{\n"
+			"%%BeginFeature: *OutputBin Tray1\n"
+			"OutputBin=Tray1\n"
+			"%%EndFeature\n"
+			"} stopped cleartomark\n"
+			"[{\n"
 			"%%BeginFeature: *IntOption None\n"
 			"%%EndFeature\n"
 			"} stopped cleartomark\n"
@@ -853,13 +863,66 @@ main(int  argc,				/* I - Number of command-line arguments */
      status ++;
    }
  }
+  else if (!strncmp(argv[1], "ipp://", 6) || !strncmp(argv[1], "ipps://", 7))
+  {
+   /*
+    * ipp://... or ipps://...
+    */
+
+    http_t	*http;			/* Connection to printer */
+    ipp_t	*request,		/* Get-Printer-Attributes request */
+		*response;		/* Get-Printer-Attributes response */
+    char	scheme[32],		/* URI scheme */
+		userpass[256],		/* Username:password */
+		host[256],		/* Hostname */
+		resource[256];		/* Resource path */
+    int		port;			/* Port number */
+
+    if (httpSeparateURI(HTTP_URI_CODING_ALL, argv[1], scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK)
+    {
+      printf("Bad URI \"%s\".\n", argv[1]);
+      return (1);
+    }
+
+    http = httpConnect2(host, port, NULL, AF_UNSPEC, !strcmp(scheme, "ipps") ? HTTP_ENCRYPTION_ALWAYS : HTTP_ENCRYPTION_IF_REQUESTED, 1, 30000, NULL);
+    if (!http)
+    {
+      printf("Unable to connect to \"%s:%d\": %s\n", host, port, cupsLastErrorString());
+      return (1);
+    }
+
+    request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, argv[1]);
+    response = cupsDoRequest(http, request, resource);
+
+    if (_ppdCreateFromIPP(buffer, sizeof(buffer), response))
+      printf("Created PPD: %s\n", buffer);
+    else
+      puts("Unable to create PPD.");
+
+    ippDelete(response);
+    httpClose(http);
+    return (0);
+  }
  else
  {
    const char	*filename;		/* PPD filename */
    struct stat	fileinfo;		/* File information */


-    if (!strncmp(argv[1], "-d", 2))
+    if (strchr(argv[1], ':'))
+    {
+     /*
+      * Server PPD...
+      */
+
+      if ((filename = cupsGetServerPPD(CUPS_HTTP_DEFAULT, argv[1])) == NULL)
+      {
+        printf("%s: %s\n", argv[1], cupsLastErrorString());
+        return (1);
+      }
+    }
+    else if (!strncmp(argv[1], "-d", 2))
    {
      const char *printer;		/* Printer name */

@@ -1107,5 +1170,5 @@ main(int  argc,				/* I - Number of command-line arguments */


 /*
- * End of "$Id: testppd.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id: testppd.c 12603 2015-05-06 01:42:51Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls-darwin.c 12481 2015-02-03 12:45:14Z msweet $"
+ * "$Id: tls-darwin.c 12675 2015-05-28 01:14:32Z msweet $"
 *
 * TLS support code for CUPS on OS X.
 *
@@ -26,14 +26,6 @@
 extern char **environ;


-/*
- * Test define - set to 1 to use SSLSetEnabledCiphers.  Currently disabled (0)
- * because of <rdar://problem/18707430>.
- */
-
-#define USE_SET_ENABLED_CIPHERS 0
-
-
 /*
 * Local globals...
 */
@@ -49,8 +41,8 @@ static char		*tls_keypath = NULL;
 					/* Server cert keychain path */
 static _cups_mutex_t	tls_mutex = _CUPS_MUTEX_INITIALIZER;
 					/* Mutex for keychain/certs */
-static int		tls_options = 0;/* Options for TLS connections */
 #endif /* HAVE_SECKEYCHAINOPEN */
+static int		tls_options = -1;/* Options for TLS connections */


 /*
@@ -1017,7 +1009,14 @@ _httpTLSStart(http_t *http)		/* I - HTTP connection */
  http_credential_t	*credential;	/* Credential data */


-  DEBUG_printf(("7_httpTLSStart(http=%p)", http));
+  DEBUG_printf(("3_httpTLSStart(http=%p)", http));
+
+  if (tls_options < 0)
+  {
+    DEBUG_puts("4_httpTLSStart: Setting defaults.");
+    _cupsSetDefaults();
+    DEBUG_printf(("4_httpTLSStart: tls_options=%x", tls_options));
+  }

 #ifdef HAVE_SECKEYCHAINOPEN
  if (http->mode == _HTTP_MODE_SERVER && !tls_keychain)
@@ -1061,11 +1060,20 @@ _httpTLSStart(http_t *http)		/* I - HTTP connection */

  if (!error)
  {
-    error = SSLSetProtocolVersionMin(http->tls, (tls_options & _HTTP_TLS_ALLOW_SSL3) ? kSSLProtocol3 : kTLSProtocol1);
-    DEBUG_printf(("4_httpTLSStart: SSLSetProtocolVersionMin, error=%d", (int)error));
+    SSLProtocol minProtocol;
+
+    if (tls_options & _HTTP_TLS_DENY_TLS10)
+      minProtocol = kTLSProtocol11;
+    else if (tls_options & _HTTP_TLS_ALLOW_SSL3)
+      minProtocol = kSSLProtocol3;
+    else
+      minProtocol = kTLSProtocol1;
+
+    error = SSLSetProtocolVersionMin(http->tls, minProtocol);
+    DEBUG_printf(("4_httpTLSStart: SSLSetProtocolVersionMin(%d), error=%d", minProtocol, (int)error));
  }

-#  if USE_SET_ENABLED_CIPHERS
+#  if HAVE_SSLSETENABLEDCIPHERS
  if (!error)
  {
    SSLCipherSuite	supported[100];	/* Supported cipher suites */
@@ -1130,6 +1138,7 @@ _httpTLSStart(http_t *http)		/* I - HTTP connection */
 	  case TLS_RSA_PSK_WITH_NULL_SHA256 :
 	  case TLS_RSA_PSK_WITH_NULL_SHA384 :
 	  case SSL_RSA_WITH_DES_CBC_MD5 :
+	      DEBUG_printf(("4_httpTLSStart: Excluding insecure cipher suite %d", supported[i]));
 	      break;

          /* RC4 cipher suites that should only be used as a last resort */
@@ -1144,8 +1153,52 @@ _httpTLSStart(http_t *http)		/* I - HTTP connection */
 	  case TLS_RSA_PSK_WITH_RC4_128_SHA :
 	      if (tls_options & _HTTP_TLS_ALLOW_RC4)
 	        enabled[num_enabled ++] = supported[i];
+	      else
+		DEBUG_printf(("4_httpTLSStart: Excluding RC4 cipher suite %d", supported[i]));
 	      break;

+          /* DH/DHE cipher suites that are problematic with parameters < 1024 bits */
+          case TLS_DH_DSS_WITH_AES_128_CBC_SHA :
+          case TLS_DH_RSA_WITH_AES_128_CBC_SHA :
+          case TLS_DHE_DSS_WITH_AES_128_CBC_SHA :
+          case TLS_DHE_RSA_WITH_AES_128_CBC_SHA :
+          case TLS_DH_DSS_WITH_AES_256_CBC_SHA :
+          case TLS_DH_RSA_WITH_AES_256_CBC_SHA :
+          case TLS_DHE_DSS_WITH_AES_256_CBC_SHA :
+          case TLS_DHE_RSA_WITH_AES_256_CBC_SHA :
+          case TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA :
+          case TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA :
+//          case TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA :
+          case TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA :
+          case TLS_DH_DSS_WITH_AES_128_CBC_SHA256 :
+          case TLS_DH_RSA_WITH_AES_128_CBC_SHA256 :
+          case TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 :
+          case TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 :
+          case TLS_DH_DSS_WITH_AES_256_CBC_SHA256 :
+          case TLS_DH_RSA_WITH_AES_256_CBC_SHA256 :
+          case TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 :
+          case TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 :
+          case TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA :
+          case TLS_DHE_PSK_WITH_AES_128_CBC_SHA :
+          case TLS_DHE_PSK_WITH_AES_256_CBC_SHA :
+//          case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 :
+//          case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 :
+          case TLS_DH_RSA_WITH_AES_128_GCM_SHA256 :
+          case TLS_DH_RSA_WITH_AES_256_GCM_SHA384 :
+//          case TLS_DHE_DSS_WITH_AES_128_GCM_SHA256 :
+//          case TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 :
+          case TLS_DH_DSS_WITH_AES_128_GCM_SHA256 :
+          case TLS_DH_DSS_WITH_AES_256_GCM_SHA384 :
+          case TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 :
+          case TLS_DHE_PSK_WITH_AES_256_GCM_SHA384 :
+          case TLS_DHE_PSK_WITH_AES_128_CBC_SHA256 :
+          case TLS_DHE_PSK_WITH_AES_256_CBC_SHA384 :
+              if (tls_options & _HTTP_TLS_ALLOW_DH)
+	        enabled[num_enabled ++] = supported[i];
+	      else
+		DEBUG_printf(("4_httpTLSStart: Excluding DH/DHE cipher suite %d", supported[i]));
+              break;
+
          /* Anything else we'll assume is secure */
          default :
 	      enabled[num_enabled ++] = supported[i];
@@ -1157,7 +1210,7 @@ _httpTLSStart(http_t *http)		/* I - HTTP connection */
      error = SSLSetEnabledCiphers(http->tls, enabled, num_enabled);
    }
  }
-#endif /* USE_SET_ENABLED_CIPHERS */
+#endif /* HAVE_SSLSETENABLEDCIPHERS */

  if (!error && http->mode == _HTTP_MODE_CLIENT)
  {
@@ -1782,5 +1835,5 @@ http_cdsa_write(


 /*
- * End of "$Id: tls-darwin.c 12481 2015-02-03 12:45:14Z msweet $".
+ * End of "$Id: tls-darwin.c 12675 2015-05-28 01:14:32Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls-gnutls.c 12481 2015-02-03 12:45:14Z msweet $"
+ * "$Id: tls-gnutls.c 12670 2015-05-27 19:48:05Z msweet $"
 *
 * TLS support code for CUPS using GNU TLS.
 *
@@ -36,7 +36,7 @@ static char		*tls_keypath = NULL;
 					/* Server cert keychain path */
 static _cups_mutex_t	tls_mutex = _CUPS_MUTEX_INITIALIZER;
 					/* Mutex for keychain/certs */
-static int		tls_options = 0;/* Options for TLS connections */
+static int		tls_options = -1;/* Options for TLS connections */


 /*
@@ -1028,9 +1028,18 @@ _httpTLSStart(http_t *http)		/* I - Connection to server */
  int			status;		/* Status of handshake */
  gnutls_certificate_credentials_t *credentials;
 					/* TLS credentials */
+  char			priority_string[1024];
+					/* Priority string */


-  DEBUG_printf(("7_httpTLSStart(http=%p)", http));
+  DEBUG_printf(("3_httpTLSStart(http=%p)", http));
+
+  if (tls_options < 0)
+  {
+    DEBUG_puts("4_httpTLSStart: Setting defaults.");
+    _cupsSetDefaults();
+    DEBUG_printf(("4_httpTLSStart: tls_options=%x", tls_options));
+  }

  if (http->mode == _HTTP_MODE_SERVER && !tls_keypath)
  {
@@ -1199,28 +1208,28 @@ _httpTLSStart(http_t *http)		/* I - Connection to server */
    return (-1);
  }

-#ifdef HAVE_GNUTLS_PRIORITY_SET_DIRECT
-  if (!tls_options)
-    gnutls_priority_set_direct(http->tls, "NORMAL:-ARCFOUR-128:+VERS-TLS-ALL:-VERS-SSL3.0", NULL);
-  else if ((tls_options & _HTTP_TLS_ALLOW_SSL3) && (tls_options & _HTTP_TLS_ALLOW_RC4))
-    gnutls_priority_set_direct(http->tls, "NORMAL", NULL);
+  strlcpy(priority_string, "NORMAL", sizeof(priority_string));
+
+  if (tls_options & _HTTP_TLS_DENY_TLS10)
+    strlcat(priority_string, ":+VERS-TLS-ALL:-VERS-TLS1.0:-VERS-SSL3.0", sizeof(priority_string));
  else if (tls_options & _HTTP_TLS_ALLOW_SSL3)
-    gnutls_priority_set_direct(http->tls, "NORMAL:-ARCFOUR-128:+VERS-TLS-ALL", NULL);
+    strlcat(priority_string, ":+VERS-TLS-ALL", sizeof(priority_string));
  else
-    gnutls_priority_set_direct(http->tls, "NORMAL:+VERS-TLS-ALL:-VERS-SSL3.0", NULL);
+    strlcat(priority_string, ":+VERS-TLS-ALL:-VERS-SSL3.0", sizeof(priority_string));
+
+  if (!(tls_options & _HTTP_TLS_ALLOW_RC4))
+    strlcat(priority_string, ":-ARCFOUR-128", sizeof(priority_string));
+
+  if (!(tls_options & _HTTP_TLS_ALLOW_DH))
+    strlcat(priority_string, ":!ANON-DH", sizeof(priority_string));
+
+#ifdef HAVE_GNUTLS_PRIORITY_SET_DIRECT
+  gnutls_priority_set_direct(http->tls, priority_string, NULL);

 #else
  gnutls_priority_t priority;		/* Priority */

-  if (!tls_options)
-    gnutls_priority_init(&priority, "NORMAL:-ARCFOUR-128:+VERS-TLS-ALL:-VERS-SSL3.0", NULL);
-  else if ((tls_options & _HTTP_TLS_ALLOW_SSL3) && (tls_options & _HTTP_TLS_ALLOW_RC4))
-    gnutls_priority_init(&priority, "NORMAL", NULL);
-  else if (tls_options & _HTTP_TLS_ALLOW_SSL3)
-    gnutls_priority_init(&priority, "NORMAL:-ARCFOUR-128:+VERS-TLS-ALL", NULL);
-  else
-    gnutls_priority_init(&priority, "NORMAL:+VERS-TLS-ALL:-VERS-SSL3.0", NULL);
-
+  gnutls_priority_init(&priority, priority_string, NULL);
  gnutls_priority_set(http->tls, priority);
  gnutls_priority_deinit(priority);
 #endif /* HAVE_GNUTLS_PRIORITY_SET_DIRECT */
@@ -1332,5 +1341,5 @@ _httpTLSWrite(http_t     *http,		/* I - Connection to server */


 /*
- * End of "$Id: tls-gnutls.c 12481 2015-02-03 12:45:14Z msweet $".
+ * End of "$Id: tls-gnutls.c 12670 2015-05-27 19:48:05Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: tls-sspi.c 12481 2015-02-03 12:45:14Z msweet $"
+ * "$Id: tls-sspi.c 12647 2015-05-20 18:37:52Z msweet $"
 *
 * TLS support for CUPS on Windows using the Security Support Provider
 * Interface (SSPI).
@@ -54,7 +54,7 @@
 * Local globals...
 */

-static int		tls_options = 0;/* Options for TLS connections */
+static int		tls_options = -1;/* Options for TLS connections */


 /*
@@ -930,7 +930,14 @@ _httpTLSStart(http_t *http)		/* I - HTTP connection */
 	*hostptr;			/* Pointer into hostname */


-  DEBUG_printf(("7_httpTLSStart(http=%p)", http));
+  DEBUG_printf(("3_httpTLSStart(http=%p)", http));
+
+  if (tls_options < 0)
+  {
+    DEBUG_puts("4_httpTLSStart: Setting defaults.");
+    _cupsSetDefaults();
+    DEBUG_printf(("4_httpTLSStart: tls_options=%x", tls_options));
+  }

  if ((http->tls = http_sspi_alloc()) == NULL)
    return (-1);
@@ -1756,14 +1763,18 @@ http_sspi_find_credentials(
 #ifdef SP_PROT_TLS1_2_SERVER
  if (http->mode == _HTTP_MODE_SERVER)
  {
-    if (tls_options & _HTTP_TLS_ALLOW_SSL3)
+    if (tls_options & _HTTP_TLS_DENY_TLS10)
+      SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_1_SERVER;
+    else if (tls_options & _HTTP_TLS_ALLOW_SSL3)
      SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_0_SERVER | SP_PROT_SSL3_SERVER;
    else
      SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_0_SERVER;
  }
  else
  {
-    if (tls_options & _HTTP_TLS_ALLOW_SSL3)
+    if (tls_options & _HTTP_TLS_DENY_TLS10)
+      SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_1_CLIENT;
+    else if (tls_options & _HTTP_TLS_ALLOW_SSL3)
      SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_SSL3_CLIENT;
    else
      SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_0_CLIENT;
@@ -1786,7 +1797,7 @@ http_sspi_find_credentials(
  }
 #endif /* SP_PROT_TLS1_2_SERVER */

-  /* TODO: Support _HTTP_TLS_ALLOW_RC4 option; right now we'll rely on Windows registry to enable/disable RC4... */
+  /* TODO: Support _HTTP_TLS_ALLOW_RC4 and _HTTP_TLS_ALLOW_DH options; right now we'll rely on Windows registry to enable/disable RC4/DH... */

 /*
  * Create an SSPI credential.
@@ -2416,5 +2427,5 @@ http_sspi_verify(


 /*
- * End of "$Id: tls-sspi.c 12481 2015-02-03 12:45:14Z msweet $".
+ * End of "$Id: tls-sspi.c 12647 2015-05-20 18:37:52Z msweet $".
 */
@@ -0,0 +1,739 @@
+/*
+ * "$Id: tlscheck.c 12688 2015-06-03 17:31:30Z msweet $"
+ *
+ * TLS check program for CUPS.
+ *
+ * Copyright 2007-2015 by Apple Inc.
+ * Copyright 1997-2006 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/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cups-private.h"
+
+
+#ifndef HAVE_SSL
+int main(void) { puts("Sorry, no TLS support compiled in."); return (1); }
+#else
+
+/*
+ * Local functions...
+ */
+
+static void	usage(void);
+
+
+/*
+ * 'main()' - Main entry.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
+{
+  int		i;			/* Looping var */
+  http_t	*http;			/* HTTP connection */
+  const char	*server = NULL;		/* Hostname from command-line */
+  int		port = 0;		/* Port number */
+  const char	*cipherName = "UNKNOWN";/* Cipher suite name */
+  int		dhBits = 0;		/* Diffie-Hellman bits */
+  int		tlsVersion = 0;		/* TLS version number */
+  char		uri[1024],		/* Printer URI */
+		scheme[32],		/* URI scheme */
+		host[256],		/* Hostname */
+		userpass[256],		/* Username/password */
+		resource[256];		/* Resource path */
+  int		tls_options = _HTTP_TLS_NONE,
+					/* TLS options */
+		verbose = 0;		/* Verbosity */
+  ipp_t		*request,		/* IPP Get-Printer-Attributes request */
+		*response;		/* IPP Get-Printer-Attributes response */
+  ipp_attribute_t *attr;		/* Current attribute */
+  const char	*name;			/* Attribute name */
+  char		value[1024];		/* Attribute (string) value */
+  static const char * const pattrs[] =	/* Requested attributes */
+  {
+    "color-supported",
+    "compression-supported",
+    "document-format-supported",
+    "pages-per-minute",
+    "printer-location",
+    "printer-make-and-model",
+    "printer-state",
+    "printer-state-reasons",
+    "sides-supported",
+    "uri-authentication-supported",
+    "uri-security-supported"
+  };
+
+
+  for (i = 1; i < argc; i ++)
+  {
+    if (!strcmp(argv[i], "--dh"))
+    {
+      tls_options |= _HTTP_TLS_ALLOW_DH;
+    }
+    else if (!strcmp(argv[i], "--no-tls10"))
+    {
+      tls_options |= _HTTP_TLS_DENY_TLS10;
+    }
+    else if (!strcmp(argv[i], "--rc4"))
+    {
+      tls_options |= _HTTP_TLS_ALLOW_RC4;
+    }
+    else if (!strcmp(argv[i], "--verbose") || !strcmp(argv[i], "-v"))
+    {
+      verbose = 1;
+    }
+    else if (argv[i][0] == '-')
+    {
+      printf("tlscheck: Unknown option '%s'.\n", argv[i]);
+      usage();
+    }
+    else if (!server)
+    {
+      if (!strncmp(argv[i], "ipps://", 7))
+      {
+        httpSeparateURI(HTTP_URI_CODING_ALL, argv[i], scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource));
+        server = host;
+      }
+      else
+      {
+        server = argv[i];
+        strlcpy(resource, "/ipp/print", sizeof(resource));
+      }
+    }
+    else if (!port && (argv[i][0] == '=' || isdigit(argv[i][0] & 255)))
+    {
+      if (argv[i][0] == '=')
+	port = atoi(argv[i] + 1);
+      else
+	port = atoi(argv[i]);
+    }
+    else
+    {
+      printf("tlscheck: Unexpected argument '%s'.\n", argv[i]);
+      usage();
+    }
+  }
+
+  if (!server)
+    usage();
+
+  if (!port)
+    port = 631;
+
+  _httpTLSSetOptions(tls_options);
+
+  http = httpConnect2(server, port, NULL, AF_UNSPEC, HTTP_ENCRYPTION_ALWAYS, 1, 30000, NULL);
+  if (!http)
+  {
+    printf("%s: ERROR (%s)\n", server, cupsLastErrorString());
+    return (1);
+  }
+
+#ifdef __APPLE__
+  SSLProtocol protocol;
+  SSLCipherSuite cipher;
+  char unknownCipherName[256];
+  int paramsNeeded = 0;
+  const void *params;
+  size_t paramsLen;
+  OSStatus err;
+
+  if ((err = SSLGetNegotiatedProtocolVersion(http->tls, &protocol)) != noErr)
+  {
+    printf("%s: ERROR (No protocol version - %d)\n", server, (int)err);
+    httpClose(http);
+    return (1);
+  }
+
+  switch (protocol)
+  {
+    default :
+        tlsVersion = 0;
+        break;
+    case kSSLProtocol3 :
+        tlsVersion = 30;
+        break;
+    case kTLSProtocol1 :
+        tlsVersion = 10;
+        break;
+    case kTLSProtocol11 :
+        tlsVersion = 11;
+        break;
+    case kTLSProtocol12 :
+        tlsVersion = 12;
+        break;
+  }
+
+  if ((err = SSLGetNegotiatedCipher(http->tls, &cipher)) != noErr)
+  {
+    printf("%s: ERROR (No cipher suite - %d)\n", server, (int)err);
+    httpClose(http);
+    return (1);
+  }
+
+  switch (cipher)
+  {
+    case TLS_NULL_WITH_NULL_NULL:
+	cipherName = "TLS_NULL_WITH_NULL_NULL";
+	break;
+    case TLS_RSA_WITH_NULL_MD5:
+	cipherName = "TLS_RSA_WITH_NULL_MD5";
+	break;
+    case TLS_RSA_WITH_NULL_SHA:
+	cipherName = "TLS_RSA_WITH_NULL_SHA";
+	break;
+    case TLS_RSA_WITH_RC4_128_MD5:
+	cipherName = "TLS_RSA_WITH_RC4_128_MD5";
+	break;
+    case TLS_RSA_WITH_RC4_128_SHA:
+	cipherName = "TLS_RSA_WITH_RC4_128_SHA";
+	break;
+    case TLS_RSA_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_RSA_WITH_3DES_EDE_CBC_SHA";
+	break;
+    case TLS_RSA_WITH_NULL_SHA256:
+	cipherName = "TLS_RSA_WITH_NULL_SHA256";
+	break;
+    case TLS_RSA_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_RSA_WITH_AES_128_CBC_SHA256";
+	break;
+    case TLS_RSA_WITH_AES_256_CBC_SHA256:
+	cipherName = "TLS_RSA_WITH_AES_256_CBC_SHA256";
+	break;
+    case TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_DSS_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_DH_DSS_WITH_AES_128_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_RSA_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_DH_RSA_WITH_AES_128_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_DSS_WITH_AES_256_CBC_SHA256:
+	cipherName = "TLS_DH_DSS_WITH_AES_256_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_RSA_WITH_AES_256_CBC_SHA256:
+	cipherName = "TLS_DH_RSA_WITH_AES_256_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
+	cipherName = "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
+	cipherName = "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_anon_WITH_RC4_128_MD5:
+	cipherName = "TLS_DH_anon_WITH_RC4_128_MD5";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_anon_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_anon_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_DH_anon_WITH_AES_128_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_anon_WITH_AES_256_CBC_SHA256:
+	cipherName = "TLS_DH_anon_WITH_AES_256_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_PSK_WITH_RC4_128_SHA:
+	cipherName = "TLS_PSK_WITH_RC4_128_SHA";
+	break;
+    case TLS_PSK_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_PSK_WITH_3DES_EDE_CBC_SHA";
+	break;
+    case TLS_PSK_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_PSK_WITH_AES_128_CBC_SHA";
+	break;
+    case TLS_PSK_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_PSK_WITH_AES_256_CBC_SHA";
+	break;
+    case TLS_DHE_PSK_WITH_RC4_128_SHA:
+	cipherName = "TLS_DHE_PSK_WITH_RC4_128_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_PSK_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_DHE_PSK_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_PSK_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_DHE_PSK_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_RSA_PSK_WITH_RC4_128_SHA:
+	cipherName = "TLS_RSA_PSK_WITH_RC4_128_SHA";
+	break;
+    case TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA";
+	break;
+    case TLS_RSA_PSK_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_RSA_PSK_WITH_AES_128_CBC_SHA";
+	break;
+    case TLS_RSA_PSK_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_RSA_PSK_WITH_AES_256_CBC_SHA";
+	break;
+    case TLS_PSK_WITH_NULL_SHA:
+	cipherName = "TLS_PSK_WITH_NULL_SHA";
+	break;
+    case TLS_DHE_PSK_WITH_NULL_SHA:
+	cipherName = "TLS_DHE_PSK_WITH_NULL_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_RSA_PSK_WITH_NULL_SHA:
+	cipherName = "TLS_RSA_PSK_WITH_NULL_SHA";
+	break;
+    case TLS_RSA_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_RSA_WITH_AES_128_GCM_SHA256";
+	break;
+    case TLS_RSA_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_RSA_WITH_AES_256_GCM_SHA384";
+	break;
+    case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_RSA_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_DH_RSA_WITH_AES_128_GCM_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_RSA_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_DH_RSA_WITH_AES_256_GCM_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_DH_DSS_WITH_AES_128_GCM_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_DH_DSS_WITH_AES_256_GCM_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_anon_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_DH_anon_WITH_AES_128_GCM_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_anon_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_DH_anon_WITH_AES_256_GCM_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_PSK_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_PSK_WITH_AES_128_GCM_SHA256";
+	break;
+    case TLS_PSK_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_PSK_WITH_AES_256_GCM_SHA384";
+	break;
+    case TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_RSA_PSK_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256";
+	break;
+    case TLS_RSA_PSK_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384";
+	break;
+    case TLS_PSK_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_PSK_WITH_AES_128_CBC_SHA256";
+	break;
+    case TLS_PSK_WITH_AES_256_CBC_SHA384:
+	cipherName = "TLS_PSK_WITH_AES_256_CBC_SHA384";
+	break;
+    case TLS_PSK_WITH_NULL_SHA256:
+	cipherName = "TLS_PSK_WITH_NULL_SHA256";
+	break;
+    case TLS_PSK_WITH_NULL_SHA384:
+	cipherName = "TLS_PSK_WITH_NULL_SHA384";
+	break;
+    case TLS_DHE_PSK_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_PSK_WITH_AES_256_CBC_SHA384:
+	cipherName = "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_PSK_WITH_NULL_SHA256:
+	cipherName = "TLS_DHE_PSK_WITH_NULL_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_PSK_WITH_NULL_SHA384:
+	cipherName = "TLS_DHE_PSK_WITH_NULL_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_RSA_PSK_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256";
+	break;
+    case TLS_RSA_PSK_WITH_AES_256_CBC_SHA384:
+	cipherName = "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384";
+	break;
+    case TLS_RSA_PSK_WITH_NULL_SHA256:
+	cipherName = "TLS_RSA_PSK_WITH_NULL_SHA256";
+	break;
+    case TLS_RSA_PSK_WITH_NULL_SHA384:
+	cipherName = "TLS_RSA_PSK_WITH_NULL_SHA384";
+	break;
+    case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
+	cipherName = "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
+	cipherName = "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
+	cipherName = "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
+	cipherName = "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
+	cipherName = "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
+	cipherName = "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
+	cipherName = "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384";
+	paramsNeeded = 1;
+	break;
+    case TLS_RSA_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_RSA_WITH_AES_128_CBC_SHA";
+	break;
+    case TLS_DH_DSS_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_DH_DSS_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_RSA_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_DH_RSA_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_DHE_DSS_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_anon_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_DH_anon_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_RSA_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_RSA_WITH_AES_256_CBC_SHA";
+	break;
+    case TLS_DH_DSS_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_DH_DSS_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_RSA_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_DH_RSA_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_DSS_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_DHE_DSS_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_DHE_RSA_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_DH_anon_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_DH_anon_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_ECDSA_WITH_NULL_SHA:
+	cipherName = "TLS_ECDH_ECDSA_WITH_NULL_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
+	cipherName = "TLS_ECDH_ECDSA_WITH_RC4_128_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_ECDSA_WITH_NULL_SHA:
+	cipherName = "TLS_ECDHE_ECDSA_WITH_NULL_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
+	cipherName = "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_RSA_WITH_NULL_SHA:
+	cipherName = "TLS_ECDH_RSA_WITH_NULL_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_RSA_WITH_RC4_128_SHA:
+	cipherName = "TLS_ECDH_RSA_WITH_RC4_128_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_RSA_WITH_NULL_SHA:
+	cipherName = "TLS_ECDHE_RSA_WITH_NULL_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_RSA_WITH_RC4_128_SHA:
+	cipherName = "TLS_ECDHE_RSA_WITH_RC4_128_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_anon_WITH_NULL_SHA:
+	cipherName = "TLS_ECDH_anon_WITH_NULL_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_anon_WITH_RC4_128_SHA:
+	cipherName = "TLS_ECDH_anon_WITH_RC4_128_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA:
+	cipherName = "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_anon_WITH_AES_128_CBC_SHA:
+	cipherName = "TLS_ECDH_anon_WITH_AES_128_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    case TLS_ECDH_anon_WITH_AES_256_CBC_SHA:
+	cipherName = "TLS_ECDH_anon_WITH_AES_256_CBC_SHA";
+	paramsNeeded = 1;
+	break;
+    default :
+        snprintf(unknownCipherName, sizeof(unknownCipherName), "UNKNOWN_%04X", cipher);
+        cipherName = unknownCipherName;
+        break;
+  }
+
+  if (cipher == TLS_RSA_WITH_RC4_128_MD5 ||
+      cipher == TLS_RSA_WITH_RC4_128_SHA)
+  {
+    printf("%s: ERROR (Printers MUST NOT negotiate RC4 cipher suites.)\n", server);
+    httpClose(http);
+    return (1);
+  }
+
+  if ((err = SSLGetDiffieHellmanParams(http->tls, &params, &paramsLen)) != noErr && paramsNeeded)
+  {
+    printf("%s: ERROR (Unable to get Diffie-Hellman parameters - %d)\n", server, (int)err);
+    httpClose(http);
+    return (1);
+  }
+
+  if (paramsLen < 128 && paramsLen != 0)
+  {
+    printf("%s: ERROR (Diffie-Hellman parameters MUST be at least 2048 bits, but Printer uses only %d bits/%d bytes)\n", server, (int)paramsLen * 8, (int)paramsLen);
+    httpClose(http);
+    return (1);
+  }
+
+  dhBits = (int)paramsLen * 8;
+#endif /* __APPLE__ */
+
+  if (dhBits > 0)
+    printf("%s: OK (TLS: %d.%d, %s, %d DH bits)\n", server, tlsVersion / 10, tlsVersion % 10, cipherName, dhBits);
+  else
+    printf("%s: OK (TLS: %d.%d, %s)\n", server, tlsVersion / 10, tlsVersion % 10, cipherName);
+
+  if (verbose)
+  {
+    httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipps", NULL, host, port, resource);
+    request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsUser());
+    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", (int)(sizeof(pattrs) / sizeof(pattrs[0])), NULL, pattrs);
+
+    response = cupsDoRequest(http, request, resource);
+
+    for (attr = ippFirstAttribute(response); attr; attr = ippNextAttribute(response))
+    {
+      if (ippGetGroupTag(attr) != IPP_TAG_PRINTER)
+        continue;
+
+      if ((name = ippGetName(attr)) == NULL)
+        continue;
+
+      ippAttributeString(attr, value, sizeof(value));
+      printf("    %s=%s\n", name, value);
+    }
+
+    ippDelete(response);
+  }
+
+  httpClose(http);
+
+  return (0);
+}
+
+
+/*
+ * 'usage()' - Show program usage.
+ */
+
+static void
+usage(void)
+{
+  puts("Usage: ./tlscheck [options] server [port]");
+  puts("       ./tlscheck [options] ipps://server[:port]/path");
+  puts("");
+  puts("Options:");
+  puts("  --dh        Allow DH/DHE key exchange");
+  puts("  --no-tls10  Disable TLS/1.0");
+  puts("  --rc4       Allow RC4 encryption");
+  puts("  --verbose   Be verbose");
+  puts("  -v          Be verbose");
+  puts("");
+  puts("The default port is 631.");
+
+  exit(1);
+}
+#endif /* !HAVE_SSL */
+
+
+/*
+ * End of "$Id: tlscheck.c 12688 2015-06-03 17:31:30Z msweet $".
+ */
@@ -1,5 +1,5 @@
 /*
- * "$Id: transcode.c 12332 2014-12-09 20:58:45Z msweet $"
+ * "$Id: transcode.c 12330 2014-12-09 20:57:28Z msweet $"
 *
 * Transcoding support for CUPS.
 *
@@ -716,5 +716,5 @@ cupsUTF32ToUTF8(


 /*
- * End of "$Id: transcode.c 12332 2014-12-09 20:58:45Z msweet $"
+ * End of "$Id: transcode.c 12330 2014-12-09 20:57:28Z msweet $"
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: usersys.c 12481 2015-02-03 12:45:14Z msweet $"
+ * "$Id: usersys.c 12817 2015-07-30 15:45:46Z msweet $"
 *
 * User, system, and password routines for CUPS.
 *
@@ -68,6 +68,7 @@ typedef struct _cups_client_conf_s	/**** client.conf config data ****/
 static void	cups_finalize_client_conf(_cups_client_conf_t *cc);
 static void	cups_init_client_conf(_cups_client_conf_t *cc);
 static void	cups_read_client_conf(cups_file_t *fp, _cups_client_conf_t *cc);
+static void	cups_set_default_ipp_port(_cups_globals_t *cg);
 static void	cups_set_encryption(_cups_client_conf_t *cc, const char *value);
 #ifdef HAVE_GSSAPI
 static void	cups_set_gss_service_name(_cups_client_conf_t *cc, const char *value);
@@ -382,6 +383,9 @@ cupsSetServer(const char *server)	/* I - Server name */
      cg->ipp_port = atoi(port);
    }

+    if (!cg->ipp_port)
+      cups_set_default_ipp_port(cg);
+
    if (cg->server[0] == '/')
      strlcpy(cg->servername, "localhost", sizeof(cg->servername));
    else
@@ -392,6 +396,7 @@ cupsSetServer(const char *server)	/* I - Server name */
    cg->server[0]      = '\0';
    cg->servername[0]  = '\0';
    cg->server_version = 20;
+    cg->ipp_port       = 0;
  }

  if (cg->http)
@@ -908,17 +913,7 @@ _cupsSetDefaults(void)
    cupsSetServer(cc.server_name);

  if (!cg->ipp_port)
-  {
-    const char	*ipp_port;		/* IPP_PORT environment variable */
-
-    if ((ipp_port = getenv("IPP_PORT")) != NULL)
-    {
-      if ((cg->ipp_port = atoi(ipp_port)) <= 0)
-        cg->ipp_port = CUPS_DEFAULT_IPP_PORT;
-    }
-    else
-      cg->ipp_port = CUPS_DEFAULT_IPP_PORT;
-  }
+    cups_set_default_ipp_port(cg);

  if (!cg->user[0])
    strlcpy(cg->user, cc.user, sizeof(cg->user));
@@ -1017,7 +1012,7 @@ cups_finalize_client_conf(
    struct stat	sockinfo;		/* Domain socket information */

    if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
-	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
+	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
      cups_set_server_name(cc, CUPS_DEFAULT_DOMAINSOCKET);
    else
 #endif /* CUPS_DEFAULT_DOMAINSOCKET */
@@ -1150,6 +1145,26 @@ cups_read_client_conf(
 }


+/*
+ * 'cups_set_default_ipp_port()' - Set the default IPP port value.
+ */
+
+static void
+cups_set_default_ipp_port(
+    _cups_globals_t *cg)		/* I - Global data */
+{
+  const char	*ipp_port;		/* IPP_PORT environment variable */
+
+
+  if ((ipp_port = getenv("IPP_PORT")) != NULL)
+  {
+    if ((cg->ipp_port = atoi(ipp_port)) <= 0)
+      cg->ipp_port = CUPS_DEFAULT_IPP_PORT;
+  }
+  else
+    cg->ipp_port = CUPS_DEFAULT_IPP_PORT;
+}
+
 /*
 * 'cups_set_encryption()' - Set the Encryption value.
 */
@@ -1209,10 +1224,10 @@ cups_set_ssl_options(
    const char          *value)		/* I - Value */
 {
 /*
-  * SSLOptions [AllowRC4] [AllowSSL3] [None]
+  * SSLOptions [AllowRC4] [AllowSSL3] [AllowDH] [DenyTLS1.0] [None]
  */

-  int	options = 0;			/* SSL/TLS options */
+  int	options = _HTTP_TLS_NONE;	/* SSL/TLS options */
  char	temp[256],			/* Copy of value */
 	*start,				/* Start of option */
 	*end;				/* End of option */
@@ -1241,11 +1256,17 @@ cups_set_ssl_options(
      options |= _HTTP_TLS_ALLOW_RC4;
    else if (!_cups_strcasecmp(start, "AllowSSL3"))
      options |= _HTTP_TLS_ALLOW_SSL3;
+    else if (!_cups_strcasecmp(start, "AllowDH"))
+      options |= _HTTP_TLS_ALLOW_DH;
+    else if (!_cups_strcasecmp(start, "DenyTLS1.0"))
+      options |= _HTTP_TLS_DENY_TLS10;
    else if (!_cups_strcasecmp(start, "None"))
-      options = 0;
+      options = _HTTP_TLS_NONE;
  }

  cc->ssl_options = options;
+
+  DEBUG_printf(("4cups_set_ssl_options(cc=%p, value=\"%s\") options=%x", cc, value, options));
 }
 #endif /* HAVE_SSL */

@@ -1264,5 +1285,5 @@ cups_set_user(


 /*
- * End of "$Id: usersys.c 12481 2015-02-03 12:45:14Z msweet $".
+ * End of "$Id: usersys.c 12817 2015-07-30 15:45:46Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.c 12449 2015-01-29 20:32:16Z msweet $"
+ * "$Id: util.c 12448 2015-01-29 20:32:07Z msweet $"
 *
 * Printing utilities for CUPS.
 *
@@ -1655,5 +1655,5 @@ cups_get_printer_uri(


 /*
- * End of "$Id: util.c 12449 2015-01-29 20:32:16Z msweet $".
+ * End of "$Id: util.c 12448 2015-01-29 20:32:07Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: versioning.h 12419 2015-01-22 15:51:20Z msweet $"
+ * "$Id: versioning.h 12418 2015-01-22 15:49:23Z msweet $"
 *
 *   API versioning definitions for CUPS.
 *
@@ -162,5 +162,5 @@
 #endif /* !_CUPS_VERSIONING_H_ */

 /*
- * End of "$Id: versioning.h 12419 2015-01-22 15:51:20Z msweet $".
+ * End of "$Id: versioning.h 12418 2015-01-22 15:49:23Z msweet $".
 */
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
+# "$Id: Makefile 12278 2014-12-01 13:53:56Z msweet $"
 #
 #   Datafile makefile for CUPS.
 #
-#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 2007-2014 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -19,17 +19,6 @@ include ../Makedefs
 # Data files...
 #

-BANNERS	=	\
-		classified \
-		confidential \
-		secret \
-		standard \
-		topsecret \
-		unclassified
-
-DATAFILES =	\
-		testprint
-
 PPDCFILES =	\
 		epson.h \
 		font.defs \
@@ -87,13 +76,7 @@ install:	all install-data install-headers install-libs install-exec

 install-data:
 	$(INSTALL_DIR) -m 755 $(DATADIR)/banners
-	for file in $(BANNERS); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/banners; \
-	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/data
-	for file in $(DATAFILES); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/data; \
-	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/model
 	$(INSTALL_DIR) -m 755 $(DATADIR)/ppdc
 	for file in $(PPDCFILES); do \
@@ -128,12 +111,6 @@ install-libs:
 #

 uninstall:
-	for file in $(BANNERS); do \
-		$(RM) $(DATADIR)/banners/$$file; \
-	done
-	for file in $(DATAFILES); do \
-		$(RM) $(DATADIR)/data/$$file; \
-	done
 	for file in $(PPDCFILES); do \
 		$(RM) $(DATADIR)/ppdc/$$file; \
 	done
@@ -146,5 +123,5 @@ uninstall:


 #
-# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
+# End of "$Id: Makefile 12278 2014-12-01 13:53:56Z msweet $".
 #
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Classified
-Footer Classified
-Image images/cups.png
-
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Confidential
-Footer Confidential
-Image images/cups.png
-
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Secret
-Footer Secret
-Image images/cups.png
-
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Cover Page
-Footer Cover Page
-Image images/cups.png
-
@@ -1,7 +0,0 @@
-#CUPS-BANNER
-Show printer-name printer-info printer-location printer-make-and-model printer-driver-name printer-driver-version paper-size imageable-area
-Header Printer Test Page
-Footer Printer Test Page
-Notice CUPS @CUPS_VERSION@.
-Image images/cups.png
-Image images/color-wheel.png
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Top Secret
-Footer Top Secret
-Image images/cups.png
-
@@ -1,6 +0,0 @@
-#CUPS-BANNER
-Show job-id job-name job-originating-user-name job-originating-host-name job-billing
-Header Unclassified
-Footer Unclassified
-Image images/cups.png
-
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <link rel="stylesheet" href="/cups.css" type="text/css">
+    <link rel="shortcut icon" href="/apple-touch-icon.png" type="image/png">
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=9">
+    <meta name="viewport" content="width=device-width">
+    <title>Home - CUPS @CUPS_VERSION@@CUPS_REVISION@</title>
+  </head>
+  <body>
+    <div class="header">
+      <ul>
+	<li><a href="http://www.cups.org/" target="_blank">CUPS.org</a></li>
+	<li><a class="active" href="/">Home</a></li>
+	<li><a href="/admin">Verwaltung</a></li>
+	<li><a href="/classes/">Klassen</a></li>
+	<li><a href="/help/">Hilfe</a></li>
+	<li><a href="/jobs/">Aufträge</a></li>
+	<li><a href="/printers/">Drucker</a></li>
+      </ul>
+    </div>
+    <div class="body">
+      <div class="row">
+	<h1>CUPS 2.0.2</h1>
+	<p>CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch <a href="http://www.apple.com/">Apple Inc.</a> für OS X<sup>&reg;</sup> und andere UNIX<sup>&reg;</sup>-artige Betriebssysteme.</p>
+      </div>
+      <div class="row">
+	<div class="thirds">
+	  <h2>CUPS für Benutzer</h2>
+	  <p><a href="help/overview.html">Überblick über CUPS</a></p>
+	  <p><a href="help/options.html">Befehlszeilen-Druck und Optionen</a></p>
+	  <p><a href="http://www.cups.org/lists.php?LIST=cups">Benutzerforum</a></p>
+	</div>
+	<div class="thirds">
+	  <h2>CUPS für Administratoren</h2>
+	  <p><a href="admin">Drucker und Klassen hinzufügen</a></p>
+	  <p><a href="help/policies.html">Betriebs-Richtlinie festlegen</a></p>
+	  <p><a href="help/network.html">Benutzung von Netzwerk-Druckern</a></p>
+	  <p><a href="help/man-cupsd.conf.html">cupsd.conf Referenz</a></p>
+	</div>
+	<div class="thirds">
+	  <h2>CUPS für Entwickler</h2>
+	  <p><a href="help/api-overview.html">Einführung in die CUPS Programmierung</a></p>
+	  <p><a href="help/api-cups.html">CUPS API</a></p>
+	  <p><a href="help/api-filter.html">Filter und Backend Programmierung</a></p>
+	  <p><a href="help/api-httpipp.html">HTTP und IPP APIs</a></p>
+	  <p><a href="http://www.cups.org/lists.php?LIST=cups-devel">Entwicklerforum</a></p>
+	</div>
+      </div>
+    </div>
+    <div class="footer">CUPS und das CUPS Logo sind Warenzeichen der <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2015 Apple Inc. Alle Rechte vorbehalten.</div>
+  </body>
+</html>
@@ -5,7 +5,7 @@
 	<title>Array API	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>CGI API	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>CUPS API	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>File and Directory APIs	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>Filter and Backend Programming	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>HTTP and IPP APIs	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -6331,6 +6331,18 @@ are server-oriented...</p>
 <p class="description">IPP operations</p>
 <h4 class="constants">Constants</h4>
 <dl>
+<dt>IPP_OP_ACKNOWLEDGE_DOCUMENT </dt>
+<dd class="description">Acknowledge-Document</dd>
+<dt>IPP_OP_ACKNOWLEDGE_IDENTIFY_PRINTER </dt>
+<dd class="description">Acknowledge-Identify-Printer</dd>
+<dt>IPP_OP_ACKNOWLEDGE_JOB </dt>
+<dd class="description">Acknowledge-Job</dd>
+<dt>IPP_OP_ACTIVATE_PRINTER </dt>
+<dd class="description">Start a printer</dd>
+<dt>IPP_OP_CANCEL_CURRENT_JOB </dt>
+<dd class="description">Cancel the current job</dd>
+<dt>IPP_OP_CANCEL_DOCUMENT </dt>
+<dd class="description">Cancel-Document</dd>
 <dt>IPP_OP_CANCEL_JOB </dt>
 <dd class="description">Cancel a job</dd>
 <dt>IPP_OP_CANCEL_JOBS </dt>
@@ -6381,16 +6393,34 @@ are server-oriented...</p>
 <dd class="description">Reject new jobs on a printer</dd>
 <dt>IPP_OP_CUPS_SET_DEFAULT </dt>
 <dd class="description">Set the default printer</dd>
+<dt>IPP_OP_DEACTIVATE_PRINTER </dt>
+<dd class="description">Stop a printer</dd>
+<dt>IPP_OP_DELETE_DOCUMENT </dt>
+<dd class="description">Delete-Document</dd>
+<dt>IPP_OP_DEREGISTER_OUTPUT_DEVICE </dt>
+<dd class="description">Deregister-Output-Device</dd>
 <dt>IPP_OP_DISABLE_PRINTER </dt>
 <dd class="description">Stop a printer</dd>
 <dt>IPP_OP_ENABLE_PRINTER </dt>
 <dd class="description">Start a printer</dd>
+<dt>IPP_OP_FETCH_DOCUMENT </dt>
+<dd class="description">Fetch-Document</dd>
+<dt>IPP_OP_FETCH_JOB </dt>
+<dd class="description">Fetch-Job</dd>
+<dt>IPP_OP_GET_DOCUMENTS </dt>
+<dd class="description">Get-Documents</dd>
+<dt>IPP_OP_GET_DOCUMENT_ATTRIBUTES </dt>
+<dd class="description">Get-Document-Attributes</dd>
 <dt>IPP_OP_GET_JOBS </dt>
 <dd class="description">Get a list of jobs</dd>
 <dt>IPP_OP_GET_JOB_ATTRIBUTES </dt>
 <dd class="description">Get job attributes</dd>
+<dt>IPP_OP_GET_NEXT_DOCUMENT_DATA </dt>
+<dd class="description">Get-Next-Document-Data</dd>
 <dt>IPP_OP_GET_NOTIFICATIONS <span class="info">&nbsp;CUPS 1.2/OS X 10.5&nbsp;</span></dt>
 <dd class="description">Get notification events </dd>
+<dt>IPP_OP_GET_OUTPUT_DEVICE_ATTRIBUTES </dt>
+<dd class="description">Get-Output-Device-Attributes</dd>
 <dt>IPP_OP_GET_PRINTER_ATTRIBUTES </dt>
 <dd class="description">Get printer attributes</dd>
 <dt>IPP_OP_GET_PRINTER_SUPPORTED_VALUES </dt>
@@ -6401,26 +6431,70 @@ are server-oriented...</p>
 <dd class="description">Get subscription attributes </dd>
 <dt>IPP_OP_HOLD_JOB </dt>
 <dd class="description">Hold a job for printing</dd>
+<dt>IPP_OP_HOLD_NEW_JOBS </dt>
+<dd class="description">Hold new jobs</dd>
+<dt>IPP_OP_IDENTIFY_PRINTER </dt>
+<dd class="description">Identify-Printer</dd>
 <dt>IPP_OP_PAUSE_PRINTER </dt>
 <dd class="description">Stop a printer</dd>
+<dt>IPP_OP_PAUSE_PRINTER_AFTER_CURRENT_JOB </dt>
+<dd class="description">Stop printer after the current job</dd>
 <dt>IPP_OP_PRINT_JOB </dt>
 <dd class="description">Print a single file</dd>
+<dt>IPP_OP_PRINT_URI </dt>
+<dd class="description">Print a single URL</dd>
+<dt>IPP_OP_PROMOTE_JOB </dt>
+<dd class="description">Promote a job to print sooner</dd>
 <dt>IPP_OP_PURGE_JOBS </dt>
 <dd class="description">Cancel all jobs</dd>
+<dt>IPP_OP_RELEASE_HELD_NEW_JOBS </dt>
+<dd class="description">Release new jobs</dd>
 <dt>IPP_OP_RELEASE_JOB </dt>
 <dd class="description">Release a job for printing</dd>
 <dt>IPP_OP_RENEW_SUBSCRIPTION <span class="info">&nbsp;CUPS 1.2/OS X 10.5&nbsp;</span></dt>
 <dd class="description">Renew a printer subscription </dd>
+<dt>IPP_OP_REPROCESS_JOB </dt>
+<dd class="description">Reprint a job</dd>
 <dt>IPP_OP_RESTART_JOB </dt>
 <dd class="description">Reprint a job</dd>
+<dt>IPP_OP_RESTART_PRINTER </dt>
+<dd class="description">Restart a printer</dd>
 <dt>IPP_OP_RESUBMIT_JOB </dt>
 <dd class="description">Resubmit-Job</dd>
+<dt>IPP_OP_RESUME_JOB </dt>
+<dd class="description">Resume the current job</dd>
 <dt>IPP_OP_RESUME_PRINTER </dt>
 <dd class="description">Start a printer</dd>
+<dt>IPP_OP_SCHEDULE_JOB_AFTER </dt>
+<dd class="description">Schedule a job to print after another</dd>
 <dt>IPP_OP_SEND_DOCUMENT </dt>
 <dd class="description">Add a file to a job</dd>
+<dt>IPP_OP_SEND_HARDCOPY_DOCUMENT </dt>
+<dd class="description">Send-Hardcopy-Document</dd>
+<dt>IPP_OP_SEND_URI </dt>
+<dd class="description">Add a URL to a job</dd>
+<dt>IPP_OP_SET_DOCUMENT_ATTRIBUTES </dt>
+<dd class="description">Set-Document-Attributes</dd>
 <dt>IPP_OP_SET_JOB_ATTRIBUTES </dt>
 <dd class="description">Set job attributes</dd>
+<dt>IPP_OP_SET_PRINTER_ATTRIBUTES </dt>
+<dd class="description">Set printer attributes</dd>
+<dt>IPP_OP_SHUTDOWN_PRINTER </dt>
+<dd class="description">Turn a printer off</dd>
+<dt>IPP_OP_STARTUP_PRINTER </dt>
+<dd class="description">Turn a printer on</dd>
+<dt>IPP_OP_SUSPEND_CURRENT_JOB </dt>
+<dd class="description">Suspend the current job</dd>
+<dt>IPP_OP_UPDATE_ACTIVE_JOBS </dt>
+<dd class="description">Update-Active-Jobs</dd>
+<dt>IPP_OP_UPDATE_DOCUMENT_STATUS </dt>
+<dd class="description">Update-Document-Status</dd>
+<dt>IPP_OP_UPDATE_JOB_STATUS </dt>
+<dd class="description">Update-Job-Status</dd>
+<dt>IPP_OP_UPDATE_OUTPUT_DEVICE_ATTRIBUTES </dt>
+<dd class="description">Update-Output-Device-Attributes</dd>
+<dt>IPP_OP_VALIDATE_DOCUMENT </dt>
+<dd class="description">Validate-Document</dd>
 <dt>IPP_OP_VALIDATE_JOB </dt>
 <dd class="description">Validate job options</dd>
 </dl>
@@ -5,7 +5,7 @@
 	<title>MIME API	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>Introduction to CUPS Programming	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>PPD API (DEPRECATED)	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>PPD Compiler API	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>Raster API	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -12,7 +12,7 @@ client.conf - client configuration file for cups (deprecated)
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>client.conf</b> file configures the CUPS client and is normally located in the <i>/etc/cups</i> and/or <i>~/.cups</i> directories.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
-<p><b>Note:</b> Starting with OS X 10.7, this file is only used by command-line and X11 applications.
+<p><b>Note:</b> Starting with OS X 10.7, this file is only used by command-line and X11 applications plus the IPP backend.
 The <b>ServerName</b> directive is not supported on OS X at all.
 <h3><a name="DIRECTIVES">Directives</a></h3>
 The following directives are understood by the client. Consult the online help for detailed descriptions:
@@ -38,12 +38,14 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n
 <b>Note: This directive it not supported on OS X 10.7 or later.</b>
 <dt><b>ServerName </b><i>hostname-or-ip-address</i>[<i>:port</i>]<b>/version=1.1</b>
 <dd style="margin-left: 5.0em">Specifies the address and optionally the port to use when connecting to a server running CUPS 1.3.12 and earlier.
-<dt><b>SSLOptions </b>[<i>AllowRC4</i>] [<i>AllowSSL3</i>]
+<dt><b>SSLOptions </b>[<i>AllowDH</i>] [<i>AllowRC4</i>] [<i>AllowSSL3</i>] [<i>DenyTLS1.0</i>]
 <dd style="margin-left: 5.0em"><dt><b>SSLOptions None</b>
 <dd style="margin-left: 5.0em">Sets encryption options (only in /etc/cups/client.conf).
 By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites.
+The <i>AllowDH</i> option enables cipher suites using plain Diffie-Hellman key negotiation.
 The <i>AllowRC4</i> option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones.
 The <i>AllowSSL3</i> option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+The <i>DenyTLS1.0</i> option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
 <dt><b>User </b><i>name</i>
 <dd style="margin-left: 5.0em">Specifies the default user name to use for requests.
 <dt><b>ValidateCerts Yes</b>
@@ -57,7 +59,7 @@ The <b>client.conf</b> file is deprecated and will no longer be supported in a f
 <a href="man-cups.html?TOPIC=Man+Pages"><b>cups</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2014 by Apple Inc.
+Copyright &copy; 2007-2015 by Apple Inc.

 </body>
 </html>
@@ -23,9 +23,11 @@ The following directives are understood by
 <dl class="man">
 <dt><a name="AccessLog"></a><b>AccessLog</b>
 <dd style="margin-left: 5.0em"><dt><b>AccessLog </b><i>filename</i>
+<dd style="margin-left: 5.0em"><dt><b>AccessLog stderr</b>
 <dd style="margin-left: 5.0em"><dt><b>AccessLog syslog</b>
 <dd style="margin-left: 5.0em">Defines the access log filename.
 Specifying a blank filename disables access log generation.
+The value "stderr" causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background.
 The value "syslog" causes log entries to be sent to the system log daemon.
 The server name may be included in filenames using the string "%s", for example:
 <pre class="man">
@@ -50,9 +52,11 @@ The default is usually "/usr/share/cups".
 The default is usually "/usr/share/doc/cups".
 <dt><a name="ErrorLog"></a><b>ErrorLog</b>
 <dd style="margin-left: 5.0em"><dt><b>ErrorLog </b><i>filename</i>
+<dd style="margin-left: 5.0em"><dt><b>ErrorLog stderr</b>
 <dd style="margin-left: 5.0em"><dt><b>ErrorLog syslog</b>
 <dd style="margin-left: 5.0em">Defines the error log filename.
 Specifying a blank filename disables error log generation.
+The value "stderr" causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background.
 The value "syslog" causes log entries to be sent to the system log daemon.
 The server name may be included in filenames using the string "%s", for example:
 <pre class="man">
@@ -95,8 +99,10 @@ The default group is operating system specific but is usually "lp" or "nobody".
 <dd style="margin-left: 5.0em">Specifies the permissions of all log files that the scheduler writes.
 The default is "0644".
 <dt><a name="PageLog"></a><b>PageLog </b>[ <i>filename</i> ]
+<dd style="margin-left: 5.0em"><dt><b>PageLog stderr</b>
 <dd style="margin-left: 5.0em"><dt><b>PageLog syslog</b>
 <dd style="margin-left: 5.0em">Defines the page log filename.
+The value "stderr" causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background.
 The value "syslog" causes log entries to be sent to the system log daemon.
 Specifying a blank filename disables page log generation.
 The server name may be included in filenames using the string "%s", for example:
@@ -112,8 +118,7 @@ The default is "remroot".
 <dt><a name="RequestRoot"></a><b>RequestRoot </b><i>directory</i>
 <dd style="margin-left: 5.0em">Specifies the directory that contains print jobs and other HTTP request data.
 The default is "/var/spool/cups".
-<dt><a name="Sandboxing"></a><b>Sandboxing off</b>
-<dd style="margin-left: 5.0em"><dt><b>Sandboxing relaxed</b>
+<dt><a name="Sandboxing"></a><b>Sandboxing relaxed</b>
 <dd style="margin-left: 5.0em"><dt><b>Sandboxing strict</b>
 <dd style="margin-left: 5.0em">Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler.
 The default is "strict".
@@ -240,7 +240,8 @@ The following percent sequences are recognized:
    "%u" inserts the username.

 </pre>
-The default is "%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} %{media} %{sides}".
+The default is the empty string, which disables page logging.
+The string "%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} %{media} %{sides}" creates a page log with the standard items.
 <dt><a name="PassEnv"></a><b>PassEnv </b><i>variable </i>[ ... <i>variable </i>]
 <dd style="margin-left: 5.0em">Passes the specified environment variable(s) to child processes.
 <dt><a name="Policy"></a><b>&lt;Policy </b><i>name</i><b>> </b>... <b>&lt;/Policy></b>
@@ -588,7 +589,7 @@ Require authentication for accesses from outside the 10. network:
 <a href="man-subscriptions.conf.html?TOPIC=Man+Pages"><b>subscriptions.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2014 by Apple Inc.
+Copyright &copy; 2007-2015 by Apple Inc.

 </body>
 </html>
@@ -215,7 +215,7 @@ IANA IPP Registry (<a href="http://www.iana.org/assignments/ipp\-registrations)"
 PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp">http://www.pwg.org/ipp</a>)
 RFC 2911 (<a href="http://tools.ietf.org/html/rfc2911)">http://tools.ietf.org/html/rfc2911)</a>,
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2014 by Apple Inc.
+Copyright &copy; 2007-2015 by Apple Inc.

 </body>
 </html>
@@ -131,6 +131,9 @@ test report.
 <dd style="margin-left: 5.0em"><dt><b>EXPECT ?</b><i>attribute-name predicate(s)</i>
 <dd style="margin-left: 5.0em"><dt><b>EXPECT !</b><i>attribute-name</i>
 <dd style="margin-left: 5.0em">Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media-col/media-size/x-dimension".
+<dt><b>EXPECT-ALL </b><i>attribute-name </i>[ <i>predicate(s) </i>]
+<dd style="margin-left: 5.0em"><dt><b>EXPECT-ALL ?</b><i>attribute-name predicate(s)</i>
+<dd style="margin-left: 5.0em">Specifies that the response must/may include the named attribute and that all occurrences of that attribute must match the given predicates.
 <dt><b>FILE filename</b>
 <dd style="margin-left: 5.0em">Specifies a file to include at the end of the request. This is typically used when sending a test print file.
 <dt><b>GROUP tag</b>
@@ -247,6 +250,9 @@ Specifies the maximum number of times to repeat if the <b>REPEAT-MATCH</b> or <b
 <dd style="margin-left: 5.0em">Requires that at least one value of the <b>EXPECT</b> attribute matches the boolean value given.
 <dt><b>WITH-VALUE "/</b><i>regular expression</i><b>/"</b>
 <dd style="margin-left: 5.0em">Requires that at least one value of the <b>EXPECT</b> attribute matches the regular expression, which must conform to the POSIX regular expression syntax. Comparisons are case-sensitive.
+<dt><b>WITH-VALUE-FROM </b><i>attribute-name</i>
+<dd style="margin-left: 5.0em">Requires that the value(s) of the <b>EXPECT</b> attribute matches the value(s) in the specified attribute.
+For example, "EXPECT job-sheets WITH-VALUE-FROM job-sheets-supported" requires that the "job-sheets" value is listed as a value of the "job-sheets-supported" attribute.
 </dl>
 <h3><a name="STATUS_PREDICATES">Status Predicates</a></h3>
 The following predicates are understood following the <b>STATUS</b> test directive:
@@ -495,7 +501,7 @@ IANA IPP Registry (<a href="http://www.iana.org/assignments/ipp-registrations)">
 PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp)">http://www.pwg.org/ipp)</a>,
 RFC 2911 (<a href="http://tools.ietf.org/html/rfc3911">http://tools.ietf.org/html/rfc3911</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2014 by Apple Inc.
+Copyright &copy; 2007-2015 by Apple Inc.

 </body>
 </html>
@@ -79,6 +79,7 @@ This option cannot be specified with the <i>-P</i> option (PPD file) and is inte
 Use the <i>-m</i> option with the
 <a href="man-lpinfo.html?TOPIC=Man+Pages"><b>lpinfo</b>(8)</a>
 command to get a list of supported models.
+The model "raw" clears any existing interface script or PPD file and the model "everywhere" queries the printer referred to by the specified IPP <i>device-uri</i>.
 <dt><b>-o cupsIPPSupplies=true</b>
 <dd style="margin-left: 5.0em"><dt><b>-o cupsIPPSupplies=false</b>
 <dd style="margin-left: 5.0em">Specifies whether IPP supply level values should be reported.
@@ -161,6 +162,13 @@ Finally, the CUPS version of <b>lpadmin</b> may ask the user for an access passw
 This differs from the System V version which requires the root user to execute this command.
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 The CUPS version of <b>lpadmin</b> does not support all of the System V or Solaris printing system configuration options.
+<h2 class="title"><a name="EXAMPLE">Example</a></h2>
+Create an IPP Everywhere print queue:
+<pre class="man">
+
+    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+
+</pre>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <a href="man-cupsaccept.html?TOPIC=Man+Pages"><b>cupsaccept</b>(8),</a>
 <a href="man-cupsenable.html?TOPIC=Man+Pages"><b>cupsenable</b>(8),</a>
@@ -168,7 +176,7 @@ The CUPS version of <b>lpadmin</b> does not support all of the System V or Solar
 <a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2014 by Apple Inc.
+Copyright &copy; 2007-2015 by Apple Inc.

 </body>
 </html>
@@ -5,7 +5,7 @@
 	<title>Developing PostScript Printer Drivers	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>Introduction to the PPD Compiler	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -5,7 +5,7 @@
 	<title>Developing Raster Printer Drivers	</title>
 	<meta name="keywords" content="Programming">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -14,7 +14,7 @@

 <H2 CLASS="title"><A NAME="OVERVIEW">Overview</A></H2>

-<P>CUPS is developed by Apple Inc. and distributed as open source software under a combination of GNU GPL2 and GNU LGPL2 licenses with exceptions to allow linking to OpenSSL (which has a GPL-incompatible license) and for developers on Apple's operating systems to develop CUPS-based software until alternate license terms. Significant contributions to CUPS must be licensed to Apple using the <A HREF="https://www.cups.org/AppleContributorAgreement_2011-03-10.pdf">Apple Contributor Agreement</A>.</P>
+<P>CUPS is developed by Apple Inc. and distributed as open source software under a combination of GNU GPL2 and GNU LGPL2 licenses with exceptions to allow developers on Apple's operating systems to develop CUPS-based software under alternate license terms. Significant contributions to CUPS must be licensed to Apple using the <A HREF="https://www.cups.org/AppleContributorAgreement_2011-03-10.pdf">Apple Contributor Agreement</A>.</P>

 <P>Apple releases updates to the CUPS software approximately every three months. Each release has a version number consisting of the major version (currently 1), minor version (currently 6), and patch version (starting at 0) separated by the period, for example "1.6.0". Releases where only the patch version number changes will contain only bug fixes to the previous release, for example "1.6.1" includes bug fixes for the "1.6.0" release. New features require the major or minor version numbers to change, for example "1.6.0" release contains new features compared to the "1.5.3" release. Multiple beta and "candidate" releases generally precede each new feature release, for example "1.5b1", "1.5b2", and "1.5rc1" preceded the "1.5.0" release. Finally, we also post regular Subversion snapshot releases, for example "1.6svn-r10486", which represent a snapshot of the development for the next feature release.</P>

@@ -5,7 +5,7 @@
 	<title>CUPS PPD Extensions	</title>
 	<meta name="keywords" content="Specifications">
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-	<meta name="creator" content="Mini-XML v2.7">
+	<meta name="creator" content="Mini-XML v2.8">
 <style type="text/css"><!--
 BODY {
  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <link rel="stylesheet" href="/cups.css" type="text/css">
+    <link rel="shortcut icon" href="/apple-touch-icon.png" type="image/png">
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=9">
+    <meta name="viewport" content="width=device-width">
+	<title>Home - CUPS @CUPS_VERSION@@CUPS_REVISION@</title>
+  </head>
+  <body>
+    <div class="header">
+      <ul>
+	<li><a href="http://www.cups.org/" target="_blank">CUPS.org</a></li>
+	<li><a class="active" href="/">Начало</a></li>
+	<li><a href="/admin">Администрирование</a></li>
+	<li><a href="/classes/">Группы</a></li>
+	<li><a href="/help/">Справка</a></li>
+	<li><a href="/jobs/">Задания</a></li>
+	<li><a href="/printers/">Принтеры</a></li>
+      </ul>
+    </div>
+    <div class="body">
+      <div class="row">
+	<h1>CUPS 2.0.1</h1>
+	<P>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <A HREF="http://www.apple.com/">Apple Inc.</A> для операционной системы Mac OS<SUP>&reg;</SUP> X и других UNIX<SUP>&reg;</SUP>-подобных операционных систем.</P>
+      </div>
+      <div class="row">
+	<div class="thirds">
+	  <H2>CUPS для пользователей</H2>
+	  <P><A HREF="help/overview.html">Введение в CUPS</A></P>
+	  <P><A HREF="help/options.html">Печать из командной строки</A></P>
+	  <P><A HREF="http://www.cups.org/lists.php?LIST=cups">Форум пользователей</A></P>
+	</div>
+	<div class="thirds">
+	  <H2>CUPS для администраторов</H2>
+	  <P><A HREF="admin">Добавление принтеров и групп</A></P>
+	  <P><A HREF="help/policies.html">Управление доступом</A></P>
+	  <P><A HREF="help/network.html">Использование сетевых принтеров</A></P>
+	  <p><a href="help/man-cupsd.conf.html">Справочник по cupsd.conf</a></p>
+	</div>
+	<div class="thirds">
+
+	  <H2>CUPS для разработчиков</H2>
+	  <P><A HREF="help/api-overview.html">Введение в разработку CUPS</A></P>
+	  <P><A HREF="help/api-cups.html">CUPS API</A></P>
+	  <P><A HREF="help/api-filter.html">Разработка фильтров и модулей</A></P>
+	  <P><A HREF="help/api-httpipp.html">API доступа по HTTP и IPP</A></P>
+	  <P><A HREF="http://www.cups.org/lists.php?LIST=cups-devel">Форум разработчиков</A></P>
+</div>
+      </div>
+    </div>
+    <div class="footer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2014) компании Apple Inc. Все права защищены.</div>
+  </body>
+</html>
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
+# "$Id: Makefile 12568 2015-03-25 13:49:23Z msweet $"
 #
 #   Filter makefile for CUPS.
 #
@@ -367,6 +367,12 @@ rastertopwg:	rastertopwg.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)

+rastertopwg-static:	rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ rastertopwg.o libcupsimage.a \
+		../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
+		$(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+

 #
 # testraster
@@ -398,5 +404,5 @@ include Dependencies


 #
-# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
+# End of "$Id: Makefile 12568 2015-03-25 13:49:23Z msweet $".
 #
@@ -1,9 +1,9 @@
 /*
- * "$Id: error.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id: error.c 12747 2015-06-24 15:55:05Z msweet $"
 *
 * Raster error handling for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -56,6 +56,8 @@ _cupsRasterAddError(const char *f,	/* I - Printf-style error message */
  ssize_t	bytes;			/* Bytes in message string */


+  DEBUG_printf(("_cupsRasterAddError(f=\"%s\", ...)", f));
+
  va_start(ap, f);
  bytes = vsnprintf(s, sizeof(s), f, ap);
  va_end(ap);
@@ -63,6 +65,8 @@ _cupsRasterAddError(const char *f,	/* I - Printf-style error message */
  if (bytes <= 0)
    return;

+  DEBUG_printf(("1_cupsRasterAddError: %s", s));
+
  bytes ++;

  if ((size_t)bytes >= sizeof(s))
@@ -185,7 +189,7 @@ get_error_buffer(void)
  * Initialize the global data exactly once...
  */

-  DEBUG_puts("get_error_buffer()");
+  DEBUG_puts("3get_error_buffer()");

  pthread_once(&raster_key_once, raster_init);

@@ -196,7 +200,7 @@ get_error_buffer(void)
  if ((buf = (_cups_raster_error_t *)pthread_getspecific(raster_key))
          == NULL)
  {
-    DEBUG_puts("get_error_buffer: allocating memory for thread...");
+    DEBUG_puts("4get_error_buffer: allocating memory for thread.");

   /*
    * No, allocate memory as set the pointer for the key...
@@ -205,7 +209,7 @@ get_error_buffer(void)
    buf = calloc(1, sizeof(_cups_raster_error_t));
    pthread_setspecific(raster_key, buf);

-    DEBUG_printf(("    buf=%p\n", buf));
+    DEBUG_printf(("4get_error_buffer: buf=%p", buf));
  }

 /*
@@ -225,8 +229,7 @@ raster_init(void)
 {
  pthread_key_create(&raster_key, raster_destructor);

-  DEBUG_printf(("raster_init(): raster_key=%x(%u)\n", (unsigned)raster_key,
-                (unsigned)raster_key));
+  DEBUG_printf(("3raster_init(): raster_key=%x(%u)", (unsigned)raster_key, (unsigned)raster_key));
 }


@@ -241,7 +244,7 @@ raster_destructor(void *value)		/* I - Data to free */
 					/* Error buffer */


-  DEBUG_printf(("raster_destructor(value=%p)\n", value));
+  DEBUG_printf(("3raster_destructor(value=%p)", value));

  if (buf->start)
    free(buf->start);
@@ -272,5 +275,5 @@ get_error_buffer(void)


 /*
- * End of "$Id: error.c 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id: error.c 12747 2015-06-24 15:55:05Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: gziptoany.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id: gziptoany.c 12655 2015-05-22 17:26:40Z msweet $"
 *
 * GZIP/raw pre-filter for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1993-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -40,7 +40,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  * Check command-line...
  */

-  if (argc != 7)
+  if (argc < 6 || argc > 7)
  {
    _cupsLangPrintf(stderr,
                    _("Usage: %s job-id user title copies options [file]"),
@@ -62,8 +62,14 @@ main(int  argc,				/* I - Number of command-line arguments */
  * Open the file...
  */

-  if ((fp = cupsFileOpen(argv[6], "r")) == NULL)
+  if (argc == 6)
  {
+    copies = 1;
+    fp     = cupsFileStdin();
+  }
+  else if ((fp = cupsFileOpen(argv[6], "r")) == NULL)
+  {
+    fprintf(stderr, "DEBUG: Unable to open \"%s\".\n", argv[6]);
    _cupsLangPrintError("ERROR", _("Unable to open print file"));
    return (1);
  }
@@ -85,7 +91,8 @@ main(int  argc,				/* I - Number of command-line arguments */
 	_cupsLangPrintFilter(stderr, "ERROR",
 			     _("Unable to write uncompressed print data: %s"),
 			     strerror(errno));
-	cupsFileClose(fp);
+        if (argc == 7)
+	  cupsFileClose(fp);

 	return (1);
      }
@@ -97,12 +104,13 @@ main(int  argc,				/* I - Number of command-line arguments */
  * Close the file and return...
  */

-  cupsFileClose(fp);
+  if (argc == 7)
+    cupsFileClose(fp);

  return (0);
 }


 /*
- * End of "$Id: gziptoany.c 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id: gziptoany.c 12655 2015-05-22 17:26:40Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: interpret.c 11848 2014-05-07 00:26:44Z msweet $"
+ * "$Id: interpret.c 12746 2015-06-24 13:28:36Z msweet $"
 *
 * PPD command interpreter for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1993-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -91,8 +91,8 @@ static int		setpagedevice(_cups_ps_stack_t *st,
 			                cups_page_header2_t *h,
 			                int *preferred_bits);
 #ifdef DEBUG
-static void		DEBUG_object(_cups_ps_obj_t *obj);
-static void		DEBUG_stack(_cups_ps_stack_t *st);
+static void		DEBUG_object(const char *prefix, _cups_ps_obj_t *obj);
+static void		DEBUG_stack(const char *prefix, _cups_ps_stack_t *st);
 #endif /* DEBUG */


@@ -547,8 +547,8 @@ _cupsRasterExecPS(
  while ((obj = scan_ps(st, &codeptr)) != NULL)
  {
 #ifdef DEBUG
-    DEBUG_printf(("_cupsRasterExecPS: Stack (%d objects)\n", st->num_objs));
-    DEBUG_object(obj);
+    DEBUG_printf(("_cupsRasterExecPS: Stack (%d objects)", st->num_objs));
+    DEBUG_object("_cupsRasterExecPS", obj);
 #endif /* DEBUG */

    switch (obj->type)
@@ -561,11 +561,11 @@ _cupsRasterExecPS(
          pop_stack(st);

 	  if (cleartomark_stack(st))
-	    _cupsRasterAddError("cleartomark: Stack underflow!\n");
+	    _cupsRasterAddError("cleartomark: Stack underflow.\n");

 #ifdef DEBUG
-          DEBUG_puts("    dup: ");
-	  DEBUG_stack(st);
+          DEBUG_puts("1_cupsRasterExecPS:    dup");
+	  DEBUG_stack("_cupsRasterExecPS", st);
 #endif /* DEBUG */
          break;

@@ -577,7 +577,7 @@ _cupsRasterExecPS(

 #ifdef DEBUG
            DEBUG_puts("_cupsRasterExecPS: copy");
-	    DEBUG_stack(st);
+	    DEBUG_stack("_cupsRasterExecPS", st);
 #endif /* DEBUG */
          }
          break;
@@ -588,7 +588,7 @@ _cupsRasterExecPS(

 #ifdef DEBUG
          DEBUG_puts("_cupsRasterExecPS: dup");
-	  DEBUG_stack(st);
+	  DEBUG_stack("_cupsRasterExecPS", st);
 #endif /* DEBUG */
          break;

@@ -600,7 +600,7 @@ _cupsRasterExecPS(

 #ifdef DEBUG
            DEBUG_puts("_cupsRasterExecPS: index");
-	    DEBUG_stack(st);
+	    DEBUG_stack("_cupsRasterExecPS", st);
 #endif /* DEBUG */
          }
          break;
@@ -611,7 +611,7 @@ _cupsRasterExecPS(

 #ifdef DEBUG
          DEBUG_puts("_cupsRasterExecPS: pop");
-	  DEBUG_stack(st);
+	  DEBUG_stack("_cupsRasterExecPS", st);
 #endif /* DEBUG */
          break;

@@ -630,7 +630,7 @@ _cupsRasterExecPS(

 #ifdef DEBUG
              DEBUG_puts("_cupsRasterExecPS: roll");
-	      DEBUG_stack(st);
+	      DEBUG_stack("_cupsRasterExecPS", st);
 #endif /* DEBUG */
            }
 	  }
@@ -642,7 +642,7 @@ _cupsRasterExecPS(

 #ifdef DEBUG
          DEBUG_puts("_cupsRasterExecPS: setpagedevice");
-	  DEBUG_stack(st);
+	  DEBUG_stack("_cupsRasterExecPS", st);
 #endif /* DEBUG */
          break;

@@ -653,10 +653,9 @@ _cupsRasterExecPS(
 	  break;

      case CUPS_PS_OTHER :
-          _cupsRasterAddError("Unknown operator \"%s\"!\n", obj->value.other);
+          _cupsRasterAddError("Unknown operator \"%s\".\n", obj->value.other);
 	  error = 1;
-          DEBUG_printf(("_cupsRasterExecPS: Unknown operator \"%s\"!\n",
-	                obj->value.other));
+          DEBUG_printf(("_cupsRasterExecPS: Unknown operator \"%s\".", obj->value.other));
          break;
    }

@@ -675,8 +674,8 @@ _cupsRasterExecPS(
    error_stack(st, "Stack not empty:");

 #ifdef DEBUG
-    DEBUG_puts("_cupsRasterExecPS: Stack not empty:");
-    DEBUG_stack(st);
+    DEBUG_puts("_cupsRasterExecPS: Stack not empty");
+    DEBUG_stack("_cupsRasterExecPS", st);
 #endif /* DEBUG */

    delete_stack(st);
@@ -977,7 +976,7 @@ roll_stack(_cups_ps_stack_t *st,	/* I - Stack */
  int			n;		/* Index into array */


-  DEBUG_printf(("    roll_stack(st=%p, s=%d, c=%d)\n", st, s, c));
+  DEBUG_printf(("3roll_stack(st=%p, s=%d, c=%d)", st, s, c));

 /*
  * Range check input...
@@ -1435,7 +1434,7 @@ setpagedevice(
  * Now pull /name and value pairs from the dictionary...
  */

-  DEBUG_puts("setpagedevice: Dictionary:");
+  DEBUG_puts("3setpagedevice: Dictionary:");

  for (obj ++; obj < end; obj ++)
  {
@@ -1450,8 +1449,8 @@ setpagedevice(
    obj ++;

 #ifdef DEBUG
-    DEBUG_printf(("setpagedevice: /%s ", name));
-    DEBUG_object(obj);
+    DEBUG_printf(("4setpagedevice: /%s ", name));
+    DEBUG_object("setpagedevice", obj);
 #endif /* DEBUG */

   /*
@@ -1601,7 +1600,7 @@ setpagedevice(
      * Ignore unknown name+value...
      */

-      DEBUG_printf(("    Unknown name (\"%s\") or value...\n", name));
+      DEBUG_printf(("4setpagedevice: Unknown name (\"%s\") or value...\n", name));

      while (obj[1].type != CUPS_PS_NAME && obj < end)
        obj ++;
@@ -1618,91 +1617,92 @@ setpagedevice(
 */

 static void
-DEBUG_object(_cups_ps_obj_t *obj)	/* I - Object to print */
+DEBUG_object(const char *prefix,	/* I - Prefix string */
+             _cups_ps_obj_t *obj)	/* I - Object to print */
 {
  switch (obj->type)
  {
    case CUPS_PS_NAME :
-	DEBUG_printf(("/%s\n", obj->value.name));
+	DEBUG_printf(("4%s: /%s\n", prefix, obj->value.name));
 	break;

    case CUPS_PS_NUMBER :
-	DEBUG_printf(("%g\n", obj->value.number));
+	DEBUG_printf(("4%s: %g\n", prefix, obj->value.number));
 	break;

    case CUPS_PS_STRING :
-	DEBUG_printf(("(%s)\n", obj->value.string));
+	DEBUG_printf(("4%s: (%s)\n", prefix, obj->value.string));
 	break;

    case CUPS_PS_BOOLEAN :
 	if (obj->value.boolean)
-	  DEBUG_puts("true");
+	  DEBUG_printf(("4%s: true", prefix));
 	else
-	  DEBUG_puts("false");
+	  DEBUG_printf(("4%s: false", prefix));
 	break;

    case CUPS_PS_NULL :
-	DEBUG_puts("null");
+	DEBUG_printf(("4%s: null", prefix));
 	break;

    case CUPS_PS_START_ARRAY :
-	DEBUG_puts("[");
+	DEBUG_printf(("4%s: [", prefix));
 	break;

    case CUPS_PS_END_ARRAY :
-	DEBUG_puts("]");
+	DEBUG_printf(("4%s: ]", prefix));
 	break;

    case CUPS_PS_START_DICT :
-	DEBUG_puts("<<");
+	DEBUG_printf(("4%s: <<", prefix));
 	break;

    case CUPS_PS_END_DICT :
-	DEBUG_puts(">>");
+	DEBUG_printf(("4%s: >>", prefix));
 	break;

    case CUPS_PS_START_PROC :
-	DEBUG_puts("{");
+	DEBUG_printf(("4%s: {", prefix));
 	break;

    case CUPS_PS_END_PROC :
-	DEBUG_puts("}");
+	DEBUG_printf(("4%s: }", prefix));
 	break;

    case CUPS_PS_CLEARTOMARK :
-	DEBUG_puts("--cleartomark--");
+	DEBUG_printf(("4%s: --cleartomark--", prefix));
        break;

    case CUPS_PS_COPY :
-	DEBUG_puts("--copy--");
+	DEBUG_printf(("4%s: --copy--", prefix));
        break;

    case CUPS_PS_DUP :
-	DEBUG_puts("--dup--");
+	DEBUG_printf(("4%s: --dup--", prefix));
        break;

    case CUPS_PS_INDEX :
-	DEBUG_puts("--index--");
+	DEBUG_printf(("4%s: --index--", prefix));
        break;

    case CUPS_PS_POP :
-	DEBUG_puts("--pop--");
+	DEBUG_printf(("4%s: --pop--", prefix));
        break;

    case CUPS_PS_ROLL :
-	DEBUG_puts("--roll--");
+	DEBUG_printf(("4%s: --roll--", prefix));
        break;

    case CUPS_PS_SETPAGEDEVICE :
-	DEBUG_puts("--setpagedevice--");
+	DEBUG_printf(("4%s: --setpagedevice--", prefix));
        break;

    case CUPS_PS_STOPPED :
-	DEBUG_puts("--stopped--");
+	DEBUG_printf(("4%s: --stopped--", prefix));
        break;

    case CUPS_PS_OTHER :
-	DEBUG_printf(("--%s--\n", obj->value.other));
+	DEBUG_printf(("4%s: --%s--", prefix, obj->value.other));
 	break;
  }
 }
@@ -1713,18 +1713,19 @@ DEBUG_object(_cups_ps_obj_t *obj)	/* I - Object to print */
 */

 static void
-DEBUG_stack(_cups_ps_stack_t *st)	/* I - Stack */
+DEBUG_stack(const char       *prefix,	/* I - Prefix string */
+            _cups_ps_stack_t *st)	/* I - Stack */
 {
  int			c;		/* Looping var */
  _cups_ps_obj_t	*obj;		/* Current object on stack */


  for (obj = st->objs, c = st->num_objs; c > 0; c --, obj ++)
-    DEBUG_object(obj);
+    DEBUG_object(prefix, obj);
 }
 #endif /* DEBUG */


 /*
- * End of "$Id: interpret.c 11848 2014-05-07 00:26:44Z msweet $".
+ * End of "$Id: interpret.c 12746 2015-06-24 13:28:36Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: pstops.c 12358 2014-12-11 17:42:22Z msweet $"
+ * "$Id: pstops.c 12655 2015-05-22 17:26:40Z msweet $"
 *
 * PostScript filter for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1993-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -265,7 +265,11 @@ main(int  argc,				/* I - Number of command-line args */
    if ((fp = cupsFileOpen(argv[6], "r")) == NULL)
    {
      if (!JobCanceled)
+      {
+        fprintf(stderr, "DEBUG: Unable to open \"%s\".\n", argv[6]);
        _cupsLangPrintError("ERROR", _("Unable to open print file"));
+      }
+
      return (1);
    }
  }
@@ -3401,5 +3405,5 @@ write_options(


 /*
- * End of "$Id: pstops.c 12358 2014-12-11 17:42:22Z msweet $".
+ * End of "$Id: pstops.c 12655 2015-05-22 17:26:40Z msweet $".
 */
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster.c 12453 2015-01-30 15:42:19Z msweet $"
+ * "$Id: raster.c 12747 2015-06-24 15:55:05Z msweet $"
 *
 * Raster file routines for CUPS.
 *
@@ -50,6 +50,9 @@ struct _cups_raster_s			/**** Raster stream data ****/
 			*bufptr,	/* Current (read) position in buffer */
 			*bufend;	/* End of current (read) buffer */
  size_t		bufsize;	/* Buffer size */
+#ifdef DEBUG
+  size_t		iocount;	/* Number of bytes read/written */
+#endif /* DEBUG */
 };


@@ -193,7 +196,7 @@ cupsRasterOpenIO(
        r->sync == CUPS_RASTER_REVSYNCv2)
      r->swapped = 1;

-    DEBUG_printf(("r->swapped=%d, r->sync=%08x\n", r->swapped, r->sync));
+    DEBUG_printf(("1cupsRasterOpenIO: r->swapped=%d, r->sync=%08x\n", r->swapped, r->sync));
  }
  else
  {
@@ -287,6 +290,8 @@ cupsRasterReadHeader2(
  * Get the raster header...
  */

+  DEBUG_printf(("cupsRasterReadHeader2(r=%p, h=%p)", r, h));
+
  if (!cups_raster_read_header(r))
  {
    memset(h, 0, sizeof(cups_page_header2_t));
@@ -325,9 +330,16 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
  unsigned	count;			/* Repetition count */


+  DEBUG_printf(("cupsRasterReadPixels(r=%p, p=%p, len=%u)", r, p, len));
+
  if (r == NULL || r->mode != CUPS_RASTER_READ || r->remaining == 0 ||
      r->header.cupsBytesPerLine == 0)
+  {
+    DEBUG_puts("1cupsRasterReadPixels: Returning 0.");
    return (0);
+  }
+
+  DEBUG_printf(("1cupsRasterReadPixels: compressed=%d, remaining=%u", r->compressed, r->remaining));

  if (!r->compressed)
  {
@@ -338,7 +350,10 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
    r->remaining -= len / r->header.cupsBytesPerLine;

    if (cups_raster_io(r, p, len) < (ssize_t)len)
+    {
+      DEBUG_puts("1cupsRasterReadPixels: Read error, returning 0.");
      return (0);
+    }

   /*
    * Swap bytes as needed...
@@ -354,6 +369,8 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
    * Return...
    */

+    DEBUG_printf(("1cupsRasterReadPixels: Returning %u", len));
+
    return (len);
  }

@@ -382,7 +399,10 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
      */

      if (!cups_raster_read(r, &byte, 1))
+      {
+	DEBUG_puts("1cupsRasterReadPixels: Read error, returning 0.");
 	return (0);
+      }

      r->count = (unsigned)byte + 1;

@@ -399,7 +419,10 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
 	*/

        if (!cups_raster_read(r, &byte, 1))
+	{
+	  DEBUG_puts("1cupsRasterReadPixels: Read error, returning 0.");
 	  return (0);
+	}

 	if (byte & 128)
 	{
@@ -413,7 +436,10 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
 	    count = (unsigned)bytes;

          if (!cups_raster_read(r, temp, count))
+	  {
+	    DEBUG_puts("1cupsRasterReadPixels: Read error, returning 0.");
 	    return (0);
+	  }

 	  temp  += count;
 	  bytes -= count;
@@ -434,7 +460,10 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
 	  bytes -= count;

          if (!cups_raster_read(r, temp, r->bpp))
+	  {
+	    DEBUG_puts("1cupsRasterReadPixels: Read error, returning 0.");
 	    return (0);
+	  }

 	  temp  += r->bpp;
 	  count -= r->bpp;
@@ -506,6 +535,8 @@ cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
    p         += bytes;
  }

+  DEBUG_printf(("1cupsRasterReadPixels: Returning %u", len));
+
  return (len);
 }

@@ -706,14 +737,10 @@ cupsRasterWriteHeader2(
    fh.cupsInteger[0]        = htonl(r->header.cupsInteger[0]);
    fh.cupsInteger[1]        = htonl(r->header.cupsInteger[1]);
    fh.cupsInteger[2]        = htonl(r->header.cupsInteger[2]);
-    fh.cupsInteger[3]        = htonl((unsigned)(r->header.cupsImagingBBox[0] *
-                                                r->header.HWResolution[0]));
-    fh.cupsInteger[4]        = htonl((unsigned)(r->header.cupsImagingBBox[1] *
-                                                r->header.HWResolution[1]));
-    fh.cupsInteger[5]        = htonl((unsigned)(r->header.cupsImagingBBox[2] *
-                                                r->header.HWResolution[0]));
-    fh.cupsInteger[6]        = htonl((unsigned)(r->header.cupsImagingBBox[3] *
-                                                r->header.HWResolution[1]));
+    fh.cupsInteger[3]        = htonl((unsigned)(r->header.cupsImagingBBox[0] * r->header.HWResolution[0] / 72.0));
+    fh.cupsInteger[4]        = htonl((unsigned)(r->header.cupsImagingBBox[1] * r->header.HWResolution[1] / 72.0));
+    fh.cupsInteger[5]        = htonl((unsigned)(r->header.cupsImagingBBox[2] * r->header.HWResolution[0] / 72.0));
+    fh.cupsInteger[6]        = htonl((unsigned)(r->header.cupsImagingBBox[3] * r->header.HWResolution[1] / 72.0));
    fh.cupsInteger[7]        = htonl(0xffffff);

    return (cups_raster_io(r, (unsigned char *)&fh, sizeof(fh)) == sizeof(fh));
@@ -799,10 +826,15 @@ cupsRasterWritePixels(cups_raster_t *r,	/* I - Raster stream */
      * Write the byte-swapped buffer...
      */

-      return ((unsigned)cups_raster_io(r, r->buffer, len));
+      bytes = cups_raster_io(r, r->buffer, len);
    }
    else
-      return ((unsigned)cups_raster_io(r, p, len));
+      bytes = cups_raster_io(r, p, len);
+
+    if (bytes < len)
+      return (0);
+    else
+      return (len);
  }

 /*
@@ -826,7 +858,7 @@ cupsRasterWritePixels(cups_raster_t *r,	/* I - Raster stream */

      if (memcmp(p, r->pcurrent, (size_t)bytes))
      {
-        if (!cups_raster_write(r, r->pixels))
+        if (cups_raster_write(r, r->pixels) <= 0)
 	  return (0);

 	r->count = 0;
@@ -855,10 +887,15 @@ cupsRasterWritePixels(cups_raster_t *r,	/* I - Raster stream */
 	  r->remaining --;

 	  if (r->remaining == 0)
-	    return ((unsigned)cups_raster_write(r, r->pixels));
+	  {
+	    if (cups_raster_write(r, r->pixels) <= 0)
+	      return (0);
+	    else
+	      return (len);
+	  }
 	  else if (r->count == 256)
 	  {
-	    if (cups_raster_write(r, r->pixels) == 0)
+	    if (cups_raster_write(r, r->pixels) <= 0)
 	      return (0);

 	    r->count = 0;
@@ -895,7 +932,10 @@ cupsRasterWritePixels(cups_raster_t *r,	/* I - Raster stream */
 	r->remaining --;

 	if (r->remaining == 0)
-	  return ((unsigned)cups_raster_write(r, r->pixels));
+	{
+	  if (cups_raster_write(r, r->pixels) <= 0)
+	    return (0);
+	}
      }
    }
  }
@@ -915,9 +955,13 @@ cups_raster_read_header(
  size_t	len;			/* Length for read/swap */


+  DEBUG_printf(("3cups_raster_read_header(r=%p), r->mode=%d", r, r ? r->mode : 0));
+
  if (r == NULL || r->mode != CUPS_RASTER_READ)
    return (0);

+  DEBUG_printf(("4cups_raster_read_header: r->iocount=" CUPS_LLFMT, CUPS_LLCAST r->iocount));
+
 /*
  * Get the length of the raster header...
  */
@@ -927,6 +971,8 @@ cups_raster_read_header(
  else
    len = sizeof(cups_page_header2_t);

+  DEBUG_printf(("4cups_raster_read_header: len=%d", (int)len));
+
 /*
  * Read the header...
  */
@@ -934,7 +980,10 @@ cups_raster_read_header(
  memset(&(r->header), 0, sizeof(r->header));

  if (cups_raster_read(r, (unsigned char *)&(r->header), len) < (ssize_t)len)
+  {
+    DEBUG_printf(("4cups_raster_read_header: EOF, r->iocount=" CUPS_LLFMT, CUPS_LLCAST r->iocount));
    return (0);
+  }

 /*
  * Swap bytes as needed...
@@ -946,21 +995,19 @@ cups_raster_read_header(
 		temp;			/* Temporary copy */


-    DEBUG_puts("Swapping header bytes...");
+    DEBUG_puts("4cups_raster_read_header: Swapping header bytes.");

    for (len = 81, s = &(r->header.AdvanceDistance);
 	 len > 0;
 	 len --, s ++)
    {
-      DEBUG_printf(("%08x =>", *s));
-
      temp = *s;
      *s   = ((temp & 0xff) << 24) |
             ((temp & 0xff00) << 8) |
             ((temp & 0xff0000) >> 8) |
             ((temp & 0xff000000) >> 24);

-      DEBUG_printf((" %08x\n", *s));
+      DEBUG_printf(("4cups_raster_read_header: %08x => %08x", temp, *s));
    }
  }

@@ -970,7 +1017,9 @@ cups_raster_read_header(

  cups_raster_update(r);

-  return (r->header.cupsBytesPerLine != 0 && r->header.cupsHeight != 0 && (r->header.cupsBytesPerLine % r->bpp) == 0);
+  DEBUG_printf(("4cups_raster_read_header: cupsBitsPerPixel=%u, cupsBitsPerColor=%u, cupsBytesPerLine=%u, cupsWidth=%u, cupsHeight=%u, r->bpp=%d", r->header.cupsBitsPerPixel, r->header.cupsBitsPerColor, r->header.cupsBytesPerLine, r->header.cupsWidth, r->header.cupsHeight, r->bpp));
+
+  return (r->header.cupsBitsPerPixel != 0 && r->header.cupsBitsPerColor != 0 && r->header.cupsBytesPerLine != 0 && r->header.cupsHeight != 0 && (r->header.cupsBytesPerLine % r->bpp) == 0);
 }


@@ -987,20 +1036,31 @@ cups_raster_io(cups_raster_t *r,	/* I - Raster stream */
 		total;			/* Total bytes read/written */


-  DEBUG_printf(("4cups_raster_io(r=%p, buf=%p, bytes=" CUPS_LLFMT ")", r, buf, CUPS_LLCAST bytes));
+  DEBUG_printf(("5cups_raster_io(r=%p, buf=%p, bytes=" CUPS_LLFMT ")", r, buf, CUPS_LLCAST bytes));

  for (total = 0; total < (ssize_t)bytes; total += count, buf += count)
  {
    count = (*r->iocb)(r->ctx, buf, bytes - (size_t)total);

-    DEBUG_printf(("5cups_raster_io: count=%d, total=%d", (int)count,
-                  (int)total));
+    DEBUG_printf(("6cups_raster_io: count=%d, total=%d", (int)count, (int)total));
    if (count == 0)
+    {
+      DEBUG_puts("6cups_raster_io: Returning 0.");
      return (0);
+    }
    else if (count < 0)
+    {
+      DEBUG_puts("6cups_raster_io: Returning -1 on error.");
      return (-1);
+    }
+
+#ifdef DEBUG
+    r->iocount += (size_t)count;
+#endif /* DEBUG */
  }

+  DEBUG_printf(("6cups_raster_io: Returning " CUPS_LLFMT ".", CUPS_LLCAST total));
+
  return (total);
 }

@@ -1019,7 +1079,7 @@ cups_raster_read(cups_raster_t *r,	/* I - Raster stream */
 		total;			/* Total bytes read */


-  DEBUG_printf(("cups_raster_read(r=%p, buf=%p, bytes=" CUPS_LLFMT ")\n", r, buf, CUPS_LLCAST bytes));
+  DEBUG_printf(("5cups_raster_read(r=%p, buf=%p, bytes=" CUPS_LLFMT ")\n", r, buf, CUPS_LLCAST bytes));

  if (!r->compressed)
    return (cups_raster_io(r, buf, bytes));
@@ -1029,6 +1089,8 @@ cups_raster_read(cups_raster_t *r,	/* I - Raster stream */
  */

  count = (ssize_t)(2 * r->header.cupsBytesPerLine);
+  if (count < 65536)
+    count = 65536;

  if ((size_t)count > r->bufsize)
  {
@@ -1061,7 +1123,7 @@ cups_raster_read(cups_raster_t *r,	/* I - Raster stream */
  {
    count = (ssize_t)bytes - total;

-    DEBUG_printf(("count=" CUPS_LLFMT ", remaining=" CUPS_LLFMT ", buf=%p, bufptr=%p, bufend=%p...\n", CUPS_LLCAST count, CUPS_LLCAST remaining, buf, r->bufptr, r->bufend));
+    DEBUG_printf(("6cups_raster_read: count=" CUPS_LLFMT ", remaining=" CUPS_LLFMT ", buf=%p, bufptr=%p, bufend=%p", CUPS_LLCAST count, CUPS_LLCAST remaining, buf, r->bufptr, r->bufend));

    if (remaining == 0)
    {
@@ -1077,6 +1139,10 @@ cups_raster_read(cups_raster_t *r,	/* I - Raster stream */

 	r->bufptr = r->buffer;
 	r->bufend = r->buffer + remaining;
+
+#ifdef DEBUG
+        r->iocount += (size_t)remaining;
+#endif /* DEBUG */
      }
      else
      {
@@ -1089,6 +1155,10 @@ cups_raster_read(cups_raster_t *r,	/* I - Raster stream */
 	if (count <= 0)
 	  return (0);

+#ifdef DEBUG
+        r->iocount += (size_t)count;
+#endif /* DEBUG */
+
 	continue;
      }
    }
@@ -1138,6 +1208,8 @@ cups_raster_read(cups_raster_t *r,	/* I - Raster stream */
    }
  }

+  DEBUG_printf(("6cups_raster_read: Returning %ld", (long)total));
+
  return (total);
 }

@@ -1240,6 +1312,9 @@ cups_raster_update(cups_raster_t *r)	/* I - Raster stream */
  else
    r->bpp = (r->header.cupsBitsPerColor + 7) / 8;

+  if (r->bpp == 0)
+    r->bpp = 1;
+
 /*
  * Set the number of remaining rows...
  */
@@ -1284,13 +1359,16 @@ cups_raster_write(
 			count;		/* Count */


-  DEBUG_printf(("cups_raster_write(r=%p, pixels=%p)\n", r, pixels));
+  DEBUG_printf(("3cups_raster_write(r=%p, pixels=%p)\n", r, pixels));

 /*
  * Allocate a write buffer as needed...
  */

  count = r->header.cupsBytesPerLine * 2;
+  if (count < 65536)
+    count = 65536;
+
  if ((size_t)count > r->bufsize)
  {
    if (r->buffer)
@@ -1299,7 +1377,10 @@ cups_raster_write(
      wptr = malloc(count);

    if (!wptr)
+    {
+      DEBUG_printf(("4cups_raster_write: Unable to allocate " CUPS_LLFMT " bytes for raster buffer: %s", CUPS_LLCAST count, strerror(errno)));
      return (-1);
+    }

    r->buffer  = wptr;
    r->bufsize = count;
@@ -1372,6 +1453,8 @@ cups_raster_write(
    }
  }

+  DEBUG_printf(("4cups_raster_write: Writing " CUPS_LLFMT " bytes.", CUPS_LLCAST (wptr - r->buffer)));
+
  return (cups_raster_io(r, r->buffer, (size_t)(wptr - r->buffer)));
 }

@@ -1396,7 +1479,12 @@ cups_read_fd(void          *ctx,	/* I - File descriptor as pointer */
  while ((count = read(fd, buf, bytes)) < 0)
 #endif /* WIN32 */
    if (errno != EINTR && errno != EAGAIN)
+    {
+      DEBUG_printf(("4cups_read_fd: %s", strerror(errno)));
      return (-1);
+    }
+
+  DEBUG_printf(("4cups_read_fd: Returning %d bytes.", (int)count));

  return (count);
 }
@@ -1448,12 +1536,15 @@ cups_write_fd(void          *ctx,	/* I - File descriptor pointer */
  while ((count = write(fd, buf, bytes)) < 0)
 #endif /* WIN32 */
    if (errno != EINTR && errno != EAGAIN)
+    {
+      DEBUG_printf(("4cups_write_fd: %s", strerror(errno)));
      return (-1);
+    }

  return (count);
 }


 /*
- * End of "$Id: raster.c 12453 2015-01-30 15:42:19Z msweet $".
+ * End of "$Id: raster.c 12747 2015-06-24 15:55:05Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: rastertoepson.c 12124 2014-08-28 15:37:22Z msweet $"
+ * "$Id: rastertoepson.c 12617 2015-05-06 20:28:22Z msweet $"
 *
 * EPSON ESC/P and ESC/P2 filter for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1993-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -274,7 +274,7 @@ StartPage(

  if (header->cupsCompression || DotBytes)
  {
-    if ((CompBuffer = calloc(2, header->cupsWidth)) == NULL)
+    if ((CompBuffer = calloc(2, header->cupsWidth + 1)) == NULL)
    {
      fputs("ERROR: Unable to allocate memory\n", stderr);
      exit(1);
@@ -655,13 +655,19 @@ OutputLine(
        }

        for (width = header->cupsWidth, tempptr = CompBuffer;
-             width > 0;
+             width > 1;
             width -= 2, tempptr += 2, oddptr += DotBytes * 2,
 	         evenptr += DotBytes * 2)
        {
          evenptr[0] = tempptr[0];
          oddptr[0]  = tempptr[1];
        }
+
+        if (width == 1)
+        {
+          evenptr[0] = tempptr[0];
+          oddptr[0]  = tempptr[1];
+        }
      }
      else
      {
@@ -873,6 +879,9 @@ OutputRows(
 	putchar(0);
      }

+      if (dot_count & 1)
+        putchar(*ptr);
+
     /*
      * Move the head back and print the odd bytes...
      */
@@ -901,6 +910,9 @@ OutputRows(
 	putchar(0);
        putchar(*ptr);
      }
+
+      if (dot_count & 1)
+        putchar(0);
    }
    else
      pwrite(dot_ptr, dot_count);
@@ -1138,5 +1150,5 @@ main(int  argc,				/* I - Number of command-line arguments */


 /*
- * End of "$Id: rastertoepson.c 12124 2014-08-28 15:37:22Z msweet $".
+ * End of "$Id: rastertoepson.c 12617 2015-05-06 20:28:22Z msweet $".
 */
@@ -1,9 +1,9 @@
 /*
- * "$Id: rastertohp.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id: rastertohp.c 12574 2015-03-26 16:36:18Z msweet $"
 *
 * Hewlett-Packard Page Control Language filter for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
 * Copyright 1993-2007 by Easy Software Products.
 *
 * These coded instructions, statements, and computer programs are the
@@ -354,7 +354,7 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
  * Allocate memory for a line of graphics...
  */

-  if ((Planes[0] = malloc(header->cupsBytesPerLine)) == NULL)
+  if ((Planes[0] = malloc(header->cupsBytesPerLine + NumPlanes)) == NULL)
  {
    fputs("ERROR: Unable to allocate memory\n", stderr);
    exit(1);
@@ -369,7 +369,7 @@ StartPage(ppd_file_t         *ppd,	/* I - PPD file */
    BitBuffer = NULL;

  if (header->cupsCompression)
-    CompBuffer = malloc(header->cupsBytesPerLine * 2);
+    CompBuffer = malloc(header->cupsBytesPerLine * 2 + 2);
  else
    CompBuffer = NULL;
 }
@@ -871,5 +871,5 @@ main(int  argc,				/* I - Number of command-line arguments */


 /*
- * End of "$Id: rastertohp.c 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id: rastertohp.c 12574 2015-03-26 16:36:18Z msweet $".
 */
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Michael Sweet	be91b849f0	Import CUPS v2.1rc1	2016-03-15 10:43:21 -04:00
Michael Sweet	c8d724e6bb	Import CUPS v2.1b1	2016-03-15 10:43:16 -04:00
Michael Sweet	00d0ae86f6	Import CUPS v2.0.4	2016-03-15 10:40:47 -04:00
Michael Sweet	a215cf8413	Import CUPS v2.0.3	2016-03-15 10:40:44 -04:00