Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.6.2@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -1,244 +0,0 @@
-CHANGES-1.6.txt
---------------
-
-CHANGES IN CUPS V1.6.4
-
-	- Removed some duplicate size definitions for some ISO sizes that were
-	  causing problems (<rdar://problem/14722721>)
-	- The IPP backend did not add the "last-document" attribute
-	  (<rdar://problem/114660379>)
-	- Added a SyncOnClose directive to cups-files.conf to force cupsd to
-	  call fsync before closing any configuration/state files it writes
-	  (<rdar://problem/14523043>)
-	- Added USB quirk rule for Lexmark E238 (<rdar://problem/14493054>)
-	- Closed server connections were still not always detected
-	  (<rdar://problem/14484313>)
-	- The libusb-based USB backend now loads its list of quirks from files
-	  in /usr/share/cups/usb instead of using a hardcoded table
-	  (<rdar://problem/14442769>)
-	- The scheduler did not properly register ICC color profiles with
-	  colord (<rdar://problem/14455625>)
-
-
-CHANGES IN CUPS V1.6.3
-
-	- The configure script now prefers Clang over GCC.
-	- Fixed a compile problem on AIX (STR #4307)
-	- The default IPP version did not always get set before creating a new
-	  IPP request message (<rdar://problem/14401718>)
-	- The lp, lpq, lpr, and lpstat now display an error message advising the
-	  use of the /version=1.1 ServerName option (<rdar://problem/14290628>)
-	- Added documentation about the /version=1.1 option to ServerName in
-	  client.conf (<rdar://problem/14216262>)
-	- httpStatus(HTTP_ERROR) did not return a useful error message
-	  (<rdar://problem/14217326>)
-	- The lp, lpq, lpr, and lpstat commands incorrectly ignored the default
-	  printer set in the lpoptions file (<rdar://problem/14216472>)
-	- Fixed a URI encoding issue for hostnames containing the ` (backquote)
-	  character (<rdar://problem/14243133>)
-	- Added support for RFC 6874's IPv6 link local address format in URIs
-	  (<rdar://problem/13979453>)
-	- The USB backend could crash on libusb-based systems if USB was
-	  disabled in the BIOS (<rdar://problem/13875729>)
-	- Fixed a rounding error in the PWG media size mapping code
-	  (<rdar://problem/13493241>)
-	- Fixed several ipptool test files that used old STATUS names.
-	- Kerberos credentials could get truncated when printing to a shared
-	  printer.
-	- Printing using "ipps" URIs was not encrypted.
-	- Insecure ICC profiles prevented installation of user profiles for a
-	  printer on OS X.
-	- Added more USB quirks for the libusb-based backend (STR #4311,
-	  <rdar://problem/13736470>)
-	- The Russian web interface templates were broken (STR #4310)
-	- The scheduler no longer tries to do Kerberos authentication over the
-	  loopback interface.
-	- The IPP backend could fail to pause a job for authentication
-	  (STR #4298)
-	- Fixed a regression on the handling of auth keys on OS X if the
-	  cups-files.conf was not present or did not contain a SystemAuthKey
-	  value.
-	- The scheduler incorrectly did a reverse lookup of the server address
-	  when HostNameLookups was turned off (STR #4302)
-	- The scheduler incorrectly computed the final content type value when
-	  null filters were present.
-
-
-CHANGES IN CUPS V1.6.2
-
-	- Documentation fixes (STR #4229, STR #4239, STR #4234, STR #4248,
-	  STR #4259)
-	- Security: All file, directory, user, and group settings are now stored
-	  in a separate cups-files.conf configuration file that cannot be set
-	  through the CUPS web interface or APIs (STR #4223)
-	- Added a Czech localization (STR #4201)
-	- Added a French localization (STR #4247)
-	- Added a Russian localization (STR #4228, STR #4285)
-	- Updated the Catalan localization (STR #4202)
-	- Local certificate authentication did not guard against an empty
-	  certification file (STR #4293)
-	- The scheduler did not reject device URIs with spaces.
-	- Added USB quirk rule for Epson Stylus Photo 750 (STR #4286)
-	- The IPP backend could crash if the printer disconnects early
-	  (STR #4284)
-	- cupsGetPPD did not work with statically-configured CUPS shared
-	  queues (STR #4178)
-	- The scheduler did not support long MIME media types (STR #4270)
-	- The cupsfilter command did not set the CHARSET environment variable
-	  for the text filters (STR #4273)
-	- The lp command did not show errors for unknown "--foo" (STR #4261)
-	- Bad IPP responses could crash ipptool (STR #4262)
-	- Updated USB quirk rules for Canon and Xerox printers (STR #4217,
-	  STR #4263)
-	- Added USB blacklisting for printers that require a custom backend
-	  (STR #4218)
-	- The PPD compiler did not correctly JCL options (STR #4115, STR #4203)
-	- The ipptool program now supports DEFINE-MATCH and DEFINE-NO-MATCH
-	  predicates for STATUS directives.
-	- Fixed a problem with local Kerberos authentication (STR #4140)
-	- Coverity scan: fixed some minor issues (STR #4242)
-	- The scheduler did not remove color profiles after deleting a printer
-	  (STR #4232, STR #4276)
-	- The CUPS library did not always detect a timed out connection to the
-	  server which could cause temporary loss of printing from applications
-	  (STR #4187)
-	- The ipptool program now supports variable substitution in OPERATION
-	  and DELAY directives (STR #4175)
-	- The IPP backend now stops queues when the server configuration
-	  prevents successful job submission (STR #4125)
-	- The XML output of ipptool contained empty dictionaries (STR #4136)
-	- The scheduler did not delete job control backup files (STR #4244)
-	- cupsGetPPD3 could return a local PPD instead of the correct remote
-	  PPD.
-	- The scheduler incorrectly advertised auth-info-required for local
-	  queues needing local authentication (STR #4205)
-	- CUPS 1.6 clients using the ServerName directive in client.conf did not
-	  work with CUPS 1.3.x or older servers (STR #4231, STR #4291)
-	- The SNMP backend now tries to work around broken printers that use a
-	  newline to separate key/value pairs.
-	- The IPP backend did not send a cancel request to printers when a job
-	  was canceled and the printer did not support Create-Job.
-	- Fixed EPM packaging files (STR #4199)
-	- OpenBSD build fix (STR #4195, STR #4196, STR #4197)
-	- The scheduler could crash when using Avahi (STR #4183, STR #4192,
-	  STR #4200, STR #4213)
-	- The IPP backend could get stuck in an endless loop on certain network
-	  errors (STR #4194)
-	- 32-bit builds failed on Debian (STR #4133)
-	- The scheduler no longer accepts or sends job description attributes.
-	- The IPP backend now works around some conformance issues for broken
-	  printers (STR #4190)
-	- cupsBackendReport() now filters out all control characters from the
-	  reported 1284 device IDs (STR #4124)
-	- The scheduler no longer allows job-name values that are not valid
-	  network Unicode strings (STR #4072)
-	- The web interface did not preserve the order of classes, jobs, or
-	  printers (STR #4170)
-	- The network backends now support disabling of SNMP supply level
-	  queries via the "snmp" URI option (STR #4106)
-	- The IPP backend did not specify the compression used (STR #4181)
-	- ipptool did not support octetString values.
-	- The scheduler did not recognize dnssd: or ipps: URIs as Bonjour shared
-	  queues (STR #4158)
-	- Applications could not get the PPD file for statically-configured
-	  Bonjour-shared print queues (STR #4159)
-	- The cupsd.conf file included obsolete browsing directives (STR #4157)
-	- Fixed a USB backend compatibility issue on systems using libusb
-	  (STR #4155, STR #4191)
-	- Some Bonjour features were not available on systems with Avahi
-	  (STR #4156)
-	- CUPS now includes the port number in the Host: header for HTTP
-	  requests.
-	- Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
-	  out.
-
-
-CHANGES IN CUPS V1.6.1
-
-	- Documentation fix (STR #4149)
-	- RPM packaging fixes (STR #4129, #4145)
-	- The Japanese and English web interface headers were swapped
-	  (STR #4148)
-
-
-CHANGES IN CUPS V1.6.0
-
-	- Document changes (STR #4131)
-	- Added new Catalan (STR #4107) and Spanish (STR #4137) localizations.
-
-
-CHANGES IN CUPS V1.6rc1
-
-	- Added a new Japanese localization (STR #4122)
-	- The SNMP backend no longer exits if it is unable to obtain an IPv6
-	  socket (STR #4109)
-	- The LPD backend incorrectly used "localhost" in the control file
-	  instead of the current hostname.
-
-
-CHANGES IN CUPS V1.6b1
-
-	- Documentation updates (STR #3927, STR #3980, STR #4010, STR #4068)
-	- The scheduler now consolidates all PPD updates from filters at the
-	  end of the job (STR #4075)
-	- CUPS now supports color management using colord (STR #3808)
-	- CUPS now supports Bonjour using Avahi (STR #3066)
-	- The PreserveJobFiles and PreserveJobHistory directives now support
-	  specification of a time interval (STR #3143)
-	- PPD files can now be archived in (gzip'd) tar files to further reduce
-	  the disk space used by PPD files (STR #3772)
-	- The network backends now deal with printers that report their levels
-	  in percent but do not specify a maximum capacity of 100 (STR #3551)
-	- The network backends now report full/almost-full waste bins in
-	  printers along with end-of-life for cleaning pads (STR #4017)
-	- Added a configure option to set the permissions of the installed
-	  cupsd (STR #3459)
-	- Added a new WITH-ALL-VALUES directive to ipptool EXPECT predicates
-	  (STR #3949)
-	- CUPS now supports a User directive in client.conf and the CUPS_USER
-	  environment variable for overriding the default username (STR #3114)
-	- Now set the PJL USERNAME variable as needed (STR #3100)
-	- Added support for usernames and passwords longer than 32 characters
-	  (STR #2856)
-	- Added a new MaxHoldTime directive to automatically cancel jobs that
-	  have been held indefinitely after a specific number of seconds
-	  (STR #2291)
-	- The LPD backend now uses the originating host name when it is not the
-	  local system (STR #2053)
-	- CUPS now prefers the suffix "dpcm" when reporting resolution in dots-
-	  per-centimeter (STR #4006)
-	- The configure script and build system no longer support building of
-	  separate 32-bit and 64-bit libraries.
-	- The "brightness", "columns", "fitplot", "gamma", "hue",
-	  "natural-scaling", "penwidth", "position", "ppi", "saturation", and
-	  "scaling" options are not longer supported (STR #4010)
-	- The "page-bottom", "page-left", "page-right", "page-top",
-	  "prettyprint", and "wrap" options have been deprecated (STR #4010)
-	- The scheduler now reports the standard "number-of-documents" attribute
-	  instead of the CUPS-specific "document-count" attribute in
-	  job objects.
-	- Added new destination connection and enumeration functions (STR #3924)
-	- Added new option, localization, and job submission functions that do
-	  not depend on PPD files (STR #3925)
-	- Added a new MaxJobTime directive for cupsd that specifies the maximum
-	  amount of time allowed for a job to complete before it is canceled.
-	- The default password callback now supports passwords up to 127
-	  characters.
-	- The scheduler now supports a DefaultAuthType of "auto" to
-	  automatically choose between Basic (username/password) and Negotiate
-	  (Kerberos) authentication.
-	- cupsSideChannelSNMPGet/Walk now support OIDs and values up to 64k in
-	  length.
-	- CUPS no longer supports automatic remote printers or implicit classes
-	  via the CUPS, LDAP, or SLP protocols (STR #3922, STR #3923)
-	- The PPD APIs are now deprecated and will be removed in a future
-	  version of CUPS (STR #3927)
-	- The default IPP version for requests is now 2.0 (STR #3929)
-	- The IPP APIs no longer expose the ipp_t or ipp_attribute_t structures
-	  and instead provide accessor functions (STR #3928)
-	- The scheduler will no longer run programs with group write permission.
-	- The PHP module has been removed (STR #3932)
-	- The bannertops, commandtoescpx, commandtopclx, imagetops,
-	  imagetoraster, pdftops, rastertoescpx, rastertopclx, and texttops
-	  filters have been removed (STR #3930)
-	- The serial and parallel backends have been removed (STR 3935)
@@ -1,250 +0,0 @@
-CHANGES-1.7.txt
---------------
-
-CHANGES IN CUPS V1.7.5
-
-	- Security: Addressed some more situations where symlinked files would
-	  be served by the web interface (STR #4455)
-	- The LPD backend did not work with some versions of glibc (STR #4452)
-	- CGI scripts did not work (STR #4454)
-	- The cupsd.conf man page did not list the ErrorPolicy directive
-	  (STR #4457)
-	- Updated the Brazilian Portuguese translation (STR #4456)
-
-
-CHANGES IN CUPS V1.7.4
-
-	- Security: The web interface incorrectly served symlinked files and
-	  files that were not world-readable, potentially leading to a
-	  disclosure of information (STR #4450)
-	- The CUPS headers incorrectly needed libdispatch for blocks support
-	  (STR #4397)
-	- CUPS did not compile when Avahi or mDNSResponder was not present
-	  (STR #4402, STR #4424)
-	- The "snmp" option did not work with the network backends (STR #4422)
-	- The User directive in client.conf did not override the USER
-	  environment variable (STR #4426)
-	- The web interface now properly shows a "Go" button for all text-based
-	  browsers (STR #4425)
-	- The MaxJobTime directive now properly supports time values (STR #4434)
-	- The RPM spec file did not work due to the new Brazilian Portuguese
-	  localization (STR #4436)
-	- Fixed an "IPP read error" issue (STR #4440)
-	- Fixed the --disable-libusb configure option (STR #4439)
-	- Fixed the debug output from the DNS-SD backend when using Avahi
-	  (STR #4444)
-	- Fixed a bug in the CUPS_SC_GET_DEVICE_ID handling by the network
-	  backends (STR #4447)
-	- Added USB quirk rule for Lexmark E230 (STR #4448)
-
-
-CHANGES IN CUPS V1.7.3
-
-	- Added Brazilian Portuguese translation (STR #4409)
-	- Fixed mapping of OutputBin values such as "Tray1"
-	  (<rdar://problem/16685606>)
-	- Several ippGet* functions incorrectly returned -1 instead of 0 on
-	  error.
-	- The cupsGetResponse function did not work properly with
-	  CUPS_HTTP_DEFAULT (<rdar://problem/16762593>)
-	- The IPP backend did not abort a job when the printer did not validate
-	  the supplied options (<rdar://problem/16836752>)
-	- Fixed an authentication race condition in cupsSendRequest (STR #4403)
-	- The scheduler did not add the "job-hold-until-specified" reason when
-	  holding a job using the lp command (STR #4405)
-	- The configure script incorrectly added libgcrypt as a GNU TLS
-	  dependency (STR #4399)
-	- cupsGetDestMediaCount did not work for CUPS_MEDIA_FLAGS DEFAULT
-	  (STR #4414)
-	- Auto-typing of PWG Raster files did not work (STR #4417)
-	- IPP queues using hardcoded credentials would ask for credentials
-	  (STR #4371)
-	- Dates in non-UTF-8 locales did not display correctly (STR #4388)
-	- The RPM spec file now looks for libusb-devel 1.0 or later.
-	- Fixed the "create-printer-subscription.test" file for IPPTOOL
-	  (STR #4420)
-
-
-CHANGES IN CUPS V1.7.2
-
-	- Security: The scheduler now blocks URLs containing embedded HTML
-	  (STR #4356)
-	- Documentation fixes (STR #3259, STR #4346, STR #4355)
-	- Fixed the Japanese localization (STR #4385)
-	- Added a German localization (STR #4363)
-	- The cupsfilter command incorrectly read the cupsd.conf file; it now
-	  reads the cups-files.conf file instead.
-	- Fixed OS X builds with Xcode 5.x (<rdar://problem/15914959>)
-	- Fixed SSL support on Windows (STR #4358)
-	- Fixed documentation and naming of Create-Job/Printer-Subscriptions
-	  operations (STR #4389)
-	- Phone numbers in fax jobs were not properly filtered for IPP FaxOut
-	  (<rdar://problem/16351701>)
-	- Updated Linux "relro" support (STR #4349)
-	- Fixed a memory leak in the label printer driver (STR #4393)
-	- cupsEnumDests did not set the "is_default" field (STR #4332)
-	- cupsDoIORequest could miss the server status, causing failed lpadmin
-	  and other administrative commands (STR #4386)
-	- cupsEnumDests didn't always call the callback function (STR #4380)
-	- "lp -i job-id -H hold" did not work (STR #nnn)
-	- CUPS didn't compile on older platforms (STR #4338)
-	- Several libcups files did not have the Apple license exception
-	  notice (STR #4361)
-	- Fixed a D-BUS threading issue that caused the scheduler to crash
-	  (STR #4347)
-	- The scheduler now automatically reconnects to Avahi as needed
-	  (STR #4370, STR #4373)
-	- The scheduler did not handle GET requests for the log files properly
-	  (STR #3265)
-	- The dnssd backend did not always report all discovered printers using
-	  Avahi (STR #4365)
-	- The Zebra printer driver did not properly handle negative "label top"
-	  values (STR #4354)
-	- The scheduler did not always update the MakeModel value in
-	  printers.conf after updating the driver (STR #4264)
-	- The LPD mini daemon did not support print jobs larger than 2GB
-	  (STR #4351)
-	- Fixed a bug in the status reading code when sending a compressed data
-	  stream to an IPP printer/server (<rdar://problem/16019623>)
-	- The IPP backend might not include all job attributes in Validate-Job
-	  operations (<rdar://problem/16025435>)
-	- Fixed some clang-reported issues (<rdar://problem/15936066>)
-
-
-CHANGES IN CUPS V1.7.1
-
-	- Security: the lppasswd program incorrectly used settings from
-	  ~/.cups/client.conf (STR #4319)
-	- Auto debug logging was broken in 1.7.0 (<rdar://problem/15331639>)
-	- Some gzip'd PPD files could not be used (<rdar://problem/15386424>)
-	- Cleaned up some job logging in the scheduler
-	  (<rdar://problem/15332672>)
-	- ATTR messages could cause string pool memory corruption in the
-	  scheduler (<rdar://problem/15382819>)
-	- The RPM spec file did not list the build requirements; this was on
-	  purpose, but now we are listing the Red Hat package names
-	  (<rdar://problem/15375760>, STR #4322)
-	- Printing to a raw queue could result in corrupt output due to
-	  opportunistic compression (<rdar://problem/15008524>)
-	- The GNU TLS support code triggered many compiler warnings due to the
-	  use of old GNU TLS compatibility type names
-	  (<rdar://problem/15392966>)
-	- The "make check" test suite did not work on Linux without the
-	  cups-filters package installed (<rdar://problem/14292998>)
-	- Japanese PPDs using with the Shift-JIS encoding did not work
-	  (<rdar://problem/15427759>)
-	- "tel:" URIs incorrectly had slashes (<rdar://problem/15418463>)
-	- The libusb-based USB backend incorrectly used write timeouts
-	  (<rdar://problem/15564888>)
-	- Shared printers could become inaccessible after a few days on OS X
-	  (<rdar://problem/15426838>)
-	- The IPP backend did not wait for a busy printer to become available
-	  before attempting to print (<rdar://problem/15465667>)
-	- CUPS did not support "auto-monochrome" or "process-monochrome" for the
-	  "print-color-mode" option (<rdar://problem/15482520>)
-	- Using "@IF(name)" in an Allow or Deny rule did not work (STR #4328)
-	- lpq and lpstat did not list jobs in the correct order when priorities
-	  were specified (STR #4326)
-	- The D-BUS notifier did not remove its lockfile (STR #4314)
-	- CUPS incorrectly used the USER environment variable when the name did
-	  not match the user ID (STR #4327)
-
-
-CHANGES IN CUPS V1.7.0
-
-	- Updated the Japanese localization.
-	- The lpadmin command did not send the PPD name from the "-m" option
-	  (<rdar://problem/15264697>)
-	- Network backends now use the prtMarkerSuppliesClass property to
-	  determine the direction of supply level values
-	  (<rdar://problem/14302628>)
-	- The scheduler did not remove backup PPD files when a printer was
-	  deleted (<rdar://problem/15065555>)
-	- The scheduler incorrectly responded to HEAD requests when the web
-	  interface was disabled (<rdar://problem/15090332>)
-	- The scheduler did not respond using the hostname specified by the
-	  client (<rdar://problem/14583574>)
-	- Fax queues did not work when shared via Bonjour
-	  (<rdar://problem/14498310>)
-	- Error messages from the scheduler were not localized using the
-	  language specified in the client's IPP request
-	  (<rdar://problem/14128011>)
-	- Added an Italian localization (<rdar://problem/14481578>)
-	- Fixed a couple memory leaks in ippfind that were reported by Clang.
-	- Fixed a compile issue on 64-bit Linux with Clang - need to use the
-	  -pie option instead of -Wl,-pie now (<rdar://problem/14480938>)
-	- The ippfind utility reported the wrong port numbers when compiled
-	  against Avahi (<rdar://problem/14508324>)
-	- httpGetFd, httpGetFile, httpPutFd, and httpPutFile did not
-	  automatically reconnect if the server closed the connecion after the
-	  previous response.
-	- Fixed a compile error in libcups (<rdar://problem/14467141>)
-	- The scheduler incorrectly did not pass a FINAL_CONTENT_TYPE
-	  environment variable to the filters or backend
-	  (<rdar://problem/14355011>)
-	- The cups-exec helper program could fail randomly on OS X due to
-	  sandbox violations when closing excess file descriptors
-	  (<rdar://problem/14421943>)
-	- The scheduler incorrectly did not use the kqueue interface on OS X.
-
-
-CHANGES IN CUPS V1.7rc1
-
-	- Printer xxx-default values were not reported by Get-Printer-Attributes
-	  or lpoptions (<rdar://problem/14401795>)
-	- Fixed deprecation warnings for many functions on OS X so they are tied
-	  to the deployment version when building (<rdar://problem/14210079>)
-	- Fixed a build issue on ARM-based Linux systems - unable to validate
-	  va_list arguments.
-	- Added a new ippfind tool for finding IPP printers and other Bonjour
-	  services (<rdar://problem/13876199>)
-	- Fixed some issues with conversion of PWG media size names to
-	  hundredths of millimeters (<rdar://problem/14065748>)
-	- The IPP backend could crash on OS X when printing to a Kerberized
-	  printer (<rdar://problem/14040186>)
-	- The ipptool program now automatically extends timeouts when the
-	  output buffer is filled (<rdar://problem/14016099>)
-	- The ipptool program now supports the --help and --version options.
-	- The ipptool program did not continue past include file errors by
-	  default (<rdar://problem/13875803>)
-	- The ipptool program now supports FILE-ID and TEST-ID directives and
-	  includes their values in its XML output (<rdar://problem/13876038>)
-	- The ipptool program now supports WITH-HOSTNAME, WITH-RESOURCE, and
-	  WITH-SCHEME expect predicates to compare the corresponding URI
-	  components (<rdar://problem/13876091>)
-
-
-CHANGES IN CUPS V1.7b1
-
-	- The configure script now supports a --with-rundir option to change
-	  the transient run-time state directory from the default to other
-	  locations like /run/cups (STR #4306)
-	- The scheduler now supports PPD lookups for classes (STR #4296)
-	- The cupsfilter program did not set the FINAL_CONTENT_TYPE
-	  environment variable for filters.
-	- Added a new "-x" option to the cancel command (STR #4103)
-	- Made the PWG media handling APIs public (STR #4267)
-	- Implemented ready media support for the cupsGetDestMediaXxx APIs
-	  (STR #4289)
-	- Added new cupsFindDestDefault, cupsFindDestReady, and
-	  cupsFindDestSupported APIs (STR #4289)
-	- Added new cupsGetDestMediaByIndex, cupsGetDestMediaCount, and
-	  cupsGetDestMediaDefault APIs (STR #4289)
-	- Added new ippGet/SetOctetString APIs for getting and setting an
-	  octetString value (STR #4289)
-	- Added new ippCreateRequestedArray API for generating a array of
-	  attributes from the requested-attributes attribute.
-	- The ipptool utility now supports compression, conditional tests based
-	  on the presence of files, and new DEFINE predicates for STATUS.
-	- Added new IPP APIs for checking values (STR #4167)
-	- Added new IPP APis for adding and setting formatted strings.
-	- Added new HTTP APIs to support basic server functionality via libcups.
-	- The dnssd backend now generates a 1284 device ID as needed (STR #3702)
-	- CUPS now supports compressing and decompressing streamed data
-	  (STR #4168)
-	- CUPS now supports higher-level PIN printing, external accounting
-	  systems, and "print here" printing environments (STR #4169)
-	- IRIX is no longer a supported operating system (STR #4092)
-	- The PPD compiler now supports JCL options properly (STR #4115)
-	- The web interface now checks whether the web browser has cookies
-	  enabled and displays a suitable error message (STR #4141)
@@ -1,215 +0,0 @@
-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,168 +0,0 @@
-CHANGES-IPPTOOL.txt - 2015-05-15
--------------------------------
-
-This file provides a list of changes to the ipptool binary distribution posted
-on CUPS.org.
-
-2014-05-15
-
-	- Added support for simultaneous XML and test output from ipptool.
-	- Added support for PAUSE directive in ipptool test files.
-
-
-2013-07-15
-
-	- New ippfind tool now included with ipptool.
-	- Added support for automatically extending the timeout when all of the
-	  request data has not yet been written (all platforms but Windows
-	  which does not support it...)
-	- Fixed several ipptool test files that used old STATUS names.
-
-
-2013-04-18
-
-	- Fixed some HTTP issues with authentication and compression.
-	- The IPP/1.1 test file did not allow for sufficient retries when
-	  printing.
-	- The IPP/1.1 test file did not allow for empty printer-name values.
-	- The IPP Everywhere test file contained numerous errors.
-	- The color.jpg test file used a progressive mode instead of the
-	  baseline JPEG mode.
-	- The IPP/1.1 test file referenced "color.jpeg" instead of "color.jpg".
-
-
-2013-01-31
-
-	- Added support for DEFINE-MATCH and DEFINE-NO-MATCH as STATUS
-	  predicates.
-	- Added support for WITH-VALUE and resolution values.
-	- Added support for SKIP-IF-MISSING (skip test if file is missing)
-	- Added support for octetString values.
-	- Added support for document compression in Print-Job and Send-Document
-	  requests.
-	- Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
-	  out.
-	- Fixed a bug where bad IPP responses would cause ipptool to crash.
-
-
-2012-02-28
-
-	- Changed behavior of WITH-VALUES "/regex/" to not require all values to
-	  match.
-	- Added WITH-ALL-VALUES directive for EXPECT predicates that require all
-	  values to match.
-	- Updated test files to use WITH-ALL-VALUES where necessary.
-	- Updated test files to use new ABNF for media names from PWG Media
-	  Names 2.0.
-
-
-2012-02-06
-
-	- Fixed the packaging of ipptool on Windows (removed unnecessary DLLs)
-	- Fixed an crash in ipptool when mixing DISPLAY with -I and a failed
-	  request.
-	- Added a Print-Job test file.
-	- Added a "setdebug" batch file for Windows
-	- Added support for a CUPS_DISABLE_ASYNC_CONNECT environment variable.
-
-
-2012-01-10
-
-	- Fixed an issue with the IPP/1.1 test file where the "waiting for job
-	  completion" test did not work.
-	- The attribute groups out of order error was not shown for the
-	  operation-attributes-tag group.
-
-
-2011-12-02
-
-	- Fixed a truncated XML output bug that would happen for certain errors.
-	- Fixed the order-of-groups tests.
-	- Fixed "WITH-VALUE >N" for rangeOfInteger attributes.
-	- The Windows installer was missing the get-printer-attributes.test
-	  file.
-	- The Linux binaries are now compiled for all LSB 4.x-compliant Linux
-	  distributions.
-	- The Linux binaries no longer support SSL or TLS.
-
-
-2011-10-05
-
-	- Fixed a crasher bug that showed up on Windows.
-	- The IPP/1.1 test would hang if the initial Print-Job test failed.
-	- Fixed a typo in the IPP/2.0 test.
-
-
-2011-10-03
-
-	- Using OF-TYPE with the "no-value" or "unknown" out-of-band value tags
-	  now works without special WITH-VALUE strings.
-	- ipptool now shows an error when an attribute appears more than once
-	  within the same attribute group.
-	- ipptool did not display attributes as specified by the DISPLAY
-	  directive when a test error failed.
-	- Fixed one spot where DEFINE-VALUE was still treated as an error when
-	  the EXPECT test failed.
-	- uriScheme values were not displayed properly.
-	- Updated the IPP/1.1 tests to properly validate support for
-	  job-hold-until-default and job-hold-until-supported when the Hold-Job
-	  operation is supported.
-	- Updated the IPP/1.1 tests to properly check for the various standard
-	  media sizes for the printing tests.
-	- Updated the IPP/1.1 tests to accept "no-value" for media-default an
-	  orientation-requested-default.
-	- Updated the IPP/1.1 tests to accept "unknown" for job-state.
-	- Updated the IPP/1.1 tests to not perform the bogus URI printing tests
-	  unless the "document-uri" variable is defined.
-	- Updated the IPP/2.0 tests to properly validate media-col
-	  "media-xxx-supported" attributes.
-	- Updated the IPP/2.2 tests to properly validate media-ready and
-	  media-col-ready.
-
-
-2011-09-28
-
-	- Test output now includes a summary and overall score at the end.
-	- The MATCH-VALUE predicate now correctly deals with a failed EXPECT
-	  condition.
-	- The IPP/1.1 test suite now looks for legacy media names and uses them
-	  if the corresponding PWG standard names are not present.
-	- The IPP/1.1 test suite now tests the Print-Job+Release-Job when the
-	  printer supports the job-hold-until attribute, Hold-Job operation, and
-	  Release-Job operation.
-
-
-2011-09-21
-
-	- Fixes for HTTP chunking, timeout, and encryption issues reported by
-	  various users.
-	- Greatly improved IPP tests with added IPP/2.2 tests.
-	- New test documents - 1-page and 4-page mixed A4/Letter PDF/PS and a
-	  couple JPEGs.
-	- New REPEAT directives to programmatically repeat tests as needed.
-
-
-2011-08-16
-
-	- The Windows version no longer requires Visual Studio to be installed.
-	- The Windows version now supports SSL.
-	- Added "ipps" URI support.
-	- Added a new "-T" option.
-	- Added support for fractional seconds for the -i option and DELAY
-	  directive.
-	- Added support for authentication.
-	- Added DEFINE-MATCH, DEFINE-NO-MATCH, DEFINE-VALUE, IF-NOT-DEFINED,
-	  IGNORE-ERRORS, SKIP-IF-DEFINED, SKIP-IF-NOT-DEFINED,
-	  SKIP-PREVIOUS-ERROR directives.
-	- WITH-VALUE now supports variable expansion.
-	- Updated the IPP/1.1 conformance test to skip the "my-jobs different
-	  user" test if the printer URI contains a username.
-	- Updated the IPP conformance tests to validate media, media-default,
-	  and media-supported values.
-	- No longer error out if a Printer returns a different version number in
-	  the response when the request contains the version 0.0.
-
-
-2010-10-16
-
-	- Initial release of standalone binary.
@@ -1,132 +1,182 @@
-CHANGES.txt - 2.1.3 - 2016-02-05
+CHANGES.txt - 1.6.2 - 2013-03-18
 --------------------------------

-CHANGES IN CUPS V2.1.3

-	- The default password function did not work on some platforms
-	  (STR #4750)
-	- The scheduler should not exit under memory pressure
-	  (<rdar://problem/23255001>)
-	- The EPL2 and ZPL sample drivers did not properly support the CutMedia
-	  option.
-	- Pending subscriptions would prevent the scheduler from idle exiting
-	  (STR #4754)
-	- Fixed some issues in ipptool for skipped tests
-	  (<rdar://problem/24137160>)
-	- The "lp -H resume" command did not reset the "job-state-reasons"
-	  attribute value (STR #4752)
-	- The scheduler did not allow access to resource files (icons, etc.)
-	  when the web interface was disabled (STR #4755)
-	- Localization fix (STR #4756)
+CHANGES IN CUPS V1.6.2
+
+	- Documentation fixes (STR #4229, STR #4239, STR #4234, STR #4248,
+	  STR #4259)
+	- Security: All file, directory, user, and group settings are now stored
+	  in a separate cups-files.conf configuration file that cannot be set
+	  through the CUPS web interface or APIs (STR #4223)
+	- Added a Czech localization (STR #4201)
+	- Added a French localization (STR #4247)
+	- Added a Russian localization (STR #4228, STR #4285)
+	- Updated the Catalan localization (STR #4202)
+	- Local certificate authentication did not guard against an empty
+	  certification file (STR #4293)
+	- The scheduler did not reject device URIs with spaces.
+	- Added USB quirk rule for Epson Stylus Photo 750 (STR #4286)
+	- The IPP backend could crash if the printer disconnects early
+	  (STR #4284)
+	- cupsGetPPD did not work with statically-configured CUPS shared
+	  queues (STR #4178)
+	- The scheduler did not support long MIME media types (STR #4270)
+	- The cupsfilter command did not set the CHARSET environment variable
+	  for the text filters (STR #4273)
+	- The lp command did not show errors for unknown "--foo" (STR #4261)
+	- Bad IPP responses could crash ipptool (STR #4262)
+	- Updated USB quirk rules for Canon and Xerox printers (STR #4217,
+	  STR #4263)
+	- Added USB blacklisting for printers that require a custom backend
+	  (STR #4218)
+	- The PPD compiler did not correctly JCL options (STR #4115, STR #4203)
+	- The ipptool program now supports DEFINE-MATCH and DEFINE-NO-MATCH
+	  predicates for STATUS directives.
+	- Fixed a problem with local Kerberos authentication (STR #4140)
+	- Coverity scan: fixed some minor issues (STR #4242)
+	- The scheduler did not remove color profiles after deleting a printer
+	  (STR #4232, STR #4276)
+	- The CUPS library did not always detect a timed out connection to the
+	  server which could cause temporary loss of printing from applications
+	  (STR #4187)
+	- The ipptool program now supports variable substitution in OPERATION
+	  and DELAY directives (STR #4175)
+	- The IPP backend now stops queues when the server configuration
+	  prevents successful job submission (STR #4125)
+	- The XML output of ipptool contained empty dictionaries (STR #4136)
+	- The scheduler did not delete job control backup files (STR #4244)
+	- cupsGetPPD3 could return a local PPD instead of the correct remote
+	  PPD.
+	- The scheduler incorrectly advertised auth-info-required for local
+	  queues needing local authentication (STR #4205)
+	- CUPS 1.6 clients using the ServerName directive in client.conf did not
+	  work with CUPS 1.3.x or older servers (STR #4231, STR #4291)
+	- The SNMP backend now tries to work around broken printers that use a
+	  newline to separate key/value pairs.
+	- The IPP backend did not send a cancel request to printers when a job
+	  was canceled and the printer did not support Create-Job.
+	- Fixed EPM packaging files (STR #4199)
+	- OpenBSD build fix (STR #4195, STR #4196, STR #4197)
+	- The scheduler could crash when using Avahi (STR #4183, STR #4192,
+	  STR #4200, STR #4213)
+	- The IPP backend could get stuck in an endless loop on certain network
+	  errors (STR #4194)
+	- 32-bit builds failed on Debian (STR #4133)
+	- The scheduler no longer accepts or sends job description attributes.
+	- The IPP backend now works around some conformance issues for broken
+	  printers (STR #4190)
+	- cupsBackendReport() now filters out all control characters from the
+	  reported 1284 device IDs (STR #4124)
+	- The scheduler no longer allows job-name values that are not valid
+	  network Unicode strings (STR #4072)
+	- The web interface did not preserve the order of classes, jobs, or
+	  printers (STR #4170)
+	- The network backends now support disabling of SNMP supply level
+	  queries via the "snmp" URI option (STR #4106)
+	- The IPP backend did not specify the compression used (STR #4181)
+	- ipptool did not support octetString values.
+	- The scheduler did not recognize dnssd: or ipps: URIs as Bonjour shared
+	  queues (STR #4158)
+	- Applications could not get the PPD file for statically-configured
+	  Bonjour-shared print queues (STR #4159)
+	- The cupsd.conf file included obsolete browsing directives (STR #4157)
+	- Fixed a USB backend compatibility issue on systems using libusb
+	  (STR #4155, STR #4191)
+	- Some Bonjour features were not available on systems with Avahi
+	  (STR #4156)
+	- CUPS now includes the port number in the Host: header for HTTP
+	  requests.
+	- Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
+	  out.


-CHANGES IN CUPS V2.1.2
+CHANGES IN CUPS V1.6.1

-	- Re-release of CUPS 2.1.1 as CUPS 2.1.2 due to error in tagging of the
-	  2.1.1 release (pulled content from the 2.2.x tree instead)
+	- Documentation fix (STR #4149)
+	- RPM packaging fixes (STR #4129, #4145)
+	- The Japanese and English web interface headers were swapped
+	  (STR #4148)


-CHANGES IN CUPS V2.1.1
+CHANGES IN CUPS V1.6.0

-	- Security hardening fixes (<rdar://problem/23131948>,
-	  <rdar://problem/23132108>, <rdar://problem/23132353>,
-	  <rdar://problem/23132803>, <rdar://problem/23133230>,
-	  <rdar://problem/23133393>, <rdar://problem/23133466>,
-	  <rdar://problem/23133833>, <rdar://problem/23133998>,
-	  <rdar://problem/23134228>, <rdar://problem/23134299>,
-	  <rdar://problem/23134356>, <rdar://problem/23134415>,
-	  <rdar://problem/23134506>, <rdar://problem/23135066>,
-	  <rdar://problem/23135122>, <rdar://problem/23135207>,
-	  <rdar://problem/23144290>, <rdar://problem/23144358>,
-	  <rdar://problem/23144461>)
-	- The cupsGetPPD* functions did not work with IPP printers (STR #4725)
-	- Some older HP LaserJet printers need a delayed close when printing
-	  using the libusb-based USB backend (STR #4549)
-	- The libusb-based USB backend did not unload the kernel usblp module
-	  if it was preventing the backend from accessing the printer
-	  (STR #4707)
-	- Current Primera printers were incorrectly reported as Fargo printers
-	  (STR #4708)
-	- The IPP backend did not always handle jobs getting canceled at the
-	  printer (<rdar://problem/22716820>)
-	- Scheduler logging change (STR #4728)
-	- Added USB quirk for Canon MP530 (STR #4730)
-	- The scheduler did not deliver job notifications for jobs submitted to
-	  classes (STR #4733)
-	- Changing the printer-is-shared value for a remote queue did not
-	  produce an error (STR #4738)
-	- The IPP backend incorrectly included the job-password attribute in
-	  Validate-Job requests (<rdar://problem/23531939>)
-	- Updated localizations (STR #4709)
+	- Document changes (STR #4131)
+	- Added new Catalan (STR #4107) and Spanish (STR #4137) localizations.


-CHANGES IN CUPS V2.1.0
+CHANGES IN CUPS V1.6rc1

-	- Fixed more scheduler crash bugs in the new logging code (STR #4687,
-	  STR #4690)
-	- The scheduler did not use the ConfigFilePerm setting when copying PPD
-	  files or interface scripts attached to a request (STR #4703)
-	- Now support new Chinese locale IDs and their correct fallback locales
-	  (<rdar://problem/22086642>, <rdar://problem/22130168>)
-	- "make check" incorrectly reported an expectation of 18 warning
-	  messages when 8 were expected (STR #4684)
-	- The new PDF file type rule did not work (STR #4692)
-	- The scheduler did not update the jobs.cache file when job files were
-	  expired (STR #4706)
-	- Fixed some configure script issues (STR #4694, STR #4695, STR #4698)
-	- Documentation updates (STR #4691, STR #4693)
+	- Added a new Japanese localization (STR #4122)
+	- The SNMP backend no longer exits if it is unable to obtain an IPv6
+	  socket (STR #4109)
+	- The LPD backend incorrectly used "localhost" in the control file
+	  instead of the current hostname.


-CHANGES IN CUPS V2.1rc1
-
-	- 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.1b1
-
-	- 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 V1.6b1

+	- Documentation updates (STR #3927, STR #3980, STR #4010, STR #4068)
+	- The scheduler now consolidates all PPD updates from filters at the
+	  end of the job (STR #4075)
+	- CUPS now supports color management using colord (STR #3808)
+	- CUPS now supports Bonjour using Avahi (STR #3066)
+	- The PreserveJobFiles and PreserveJobHistory directives now support
+	  specification of a time interval (STR #3143)
+	- PPD files can now be archived in (gzip'd) tar files to further reduce
+	  the disk space used by PPD files (STR #3772)
+	- The network backends now deal with printers that report their levels
+	  in percent but do not specify a maximum capacity of 100 (STR #3551)
+	- The network backends now report full/almost-full waste bins in
+	  printers along with end-of-life for cleaning pads (STR #4017)
+	- Added a configure option to set the permissions of the installed
+	  cupsd (STR #3459)
+	- Added a new WITH-ALL-VALUES directive to ipptool EXPECT predicates
+	  (STR #3949)
+	- CUPS now supports a User directive in client.conf and the CUPS_USER
+	  environment variable for overriding the default username (STR #3114)
+	- Now set the PJL USERNAME variable as needed (STR #3100)
+	- Added support for usernames and passwords longer than 32 characters
+	  (STR #2856)
+	- Added a new MaxHoldTime directive to automatically cancel jobs that
+	  have been held indefinitely after a specific number of seconds
+	  (STR #2291)
+	- The LPD backend now uses the originating host name when it is not the
+	  local system (STR #2053)
+	- CUPS now prefers the suffix "dpcm" when reporting resolution in dots-
+	  per-centimeter (STR #4006)
+	- The configure script and build system no longer support building of
+	  separate 32-bit and 64-bit libraries.
+	- The "brightness", "columns", "fitplot", "gamma", "hue",
+	  "natural-scaling", "penwidth", "position", "ppi", "saturation", and
+	  "scaling" options are not longer supported (STR #4010)
+	- The "page-bottom", "page-left", "page-right", "page-top",
+	  "prettyprint", and "wrap" options have been deprecated (STR #4010)
+	- The scheduler now reports the standard "number-of-documents" attribute
+	  instead of the CUPS-specific "document-count" attribute in
+	  job objects.
+	- Added new destination connection and enumeration functions (STR #3924)
+	- Added new option, localization, and job submission functions that do
+	  not depend on PPD files (STR #3925)
+	- Added a new MaxJobTime directive for cupsd that specifies the maximum
+	  amount of time allowed for a job to complete before it is canceled.
+	- The default password callback now supports passwords up to 127
+	  characters.
+	- The scheduler now supports a DefaultAuthType of "auto" to
+	  automatically choose between Basic (username/password) and Negotiate
+	  (Kerberos) authentication.
+	- cupsSideChannelSNMPGet/Walk now support OIDs and values up to 64k in
+	  length.
+	- CUPS no longer supports automatic remote printers or implicit classes
+	  via the CUPS, LDAP, or SLP protocols (STR #3922, STR #3923)
+	- The PPD APIs are now deprecated and will be removed in a future
+	  version of CUPS (STR #3927)
+	- The default IPP version for requests is now 2.0 (STR #3929)
+	- The IPP APIs no longer expose the ipp_t or ipp_attribute_t structures
+	  and instead provide accessor functions (STR #3928)
+	- The scheduler will no longer run programs with group write permission.
+	- The PHP module has been removed (STR #3932)
+	- The bannertops, commandtoescpx, commandtopclx, imagetops,
+	  imagetoraster, pdftops, rastertoescpx, rastertopclx, and texttops
+	  filters have been removed (STR #3930)
+	- The serial and parallel backends have been removed (STR 3935)
@@ -1,4 +1,4 @@
-CREDITS.txt - 2013-07-23
+CREDITS.txt - 2012-07-16
 ------------------------

 Few projects are completed by one person, and CUPS is no exception.  We'd
@@ -39,7 +39,6 @@ like to thank the following individuals for their contributions:
    Vincenzo Reale                 - Italian localization.
    Petter Reinholdtsen            - HP-UX compiler stuff.
    Juan Pablo González Riopedre   - Spanish localization.
-    Giovanni Scafora               - Italian localization.
    Opher Shachar                  - Hebrew localization.
    Stuart Stevens                 - HP JetDirect IPP information.
    Andrea Suatoni                 - IRIX desktop integration and testing.
@@ -1,4 +1,4 @@
-INSTALL - CUPS v2.1.3 - 2016-02-05
+INSTALL - CUPS v1.6.2 - 2013-03-18
 ----------------------------------

 This file describes how to compile and install CUPS from source code. For more
@@ -29,16 +29,18 @@ BEFORE YOU BEGIN
    Compaq, HP, SGI, and Sun.  BSD users should use GNU make (gmake) since BSD
    make does not support "include".

-    Besides these tools you'll want ZLIB library for compression support, the
-    CDSA, GNU TLS, or OpenSSL libraries for encryption support, and either MIT
-    (1.6.3 or higher) or Heimdal Kerberos for Kerberos support.  CUPS will
-    compile and run without these, however you'll miss out on many of the
-    features provided by CUPS.
+    Besides these tools you'll want the JPEG, PNG, TIFF, and ZLIB libraries for
+    image support, the CDSA, GNU TLS, or OpenSSL libraries for encryption
+    support, the OpenLDAP and OpenSLP libraries for directory services support,
+    and either MIT (1.6.3 or higher) or Heimdal Kerberos for Kerberos support.
+    CUPS will compile and run without these, however you'll miss out on many of
+    the features provided by CUPS.

-    Also, please note that CUPS does not include print filters to support PDF
-    or raster printing.  You *must* download GPL Ghostscript and/or the Open
-    Printing CUPS filters package separately to print on operating systems
-    other than OS X.
+    Also, please note that CUPS does not include the Ghostscript-based
+    PostScript filter needed by non-PostScript printers.  You *must* download
+    GPL Ghostscript separately from the CUPS web site if you want to print
+    PostScript files to non-PostScript printers on operating systems other than
+    OS X.


 COMPILING THE SUBVERSION REPOSITORY CODE
@@ -98,11 +100,6 @@ CONFIGURATION
    and diagnose a variety of common problems - use the "--enable-unit-tests"
    configure option to run them at build time.

-    On OS X, use the "--with-archflags" option to build with the correct set of
-    architectures:
-
-        ./configure --with-archflags="-arch i386 -arch x86_64" ...
-
    Once you have configured things, just type:

 	make ENTER
@@ -141,10 +138,6 @@ INSTALLING THE SOFTWARE

 	gmake install ENTER

-    Use the BUILDROOT variable to install to an alternate root directory:
-
-        make BUILDROOT=/some/other/root/directory install ENTER
-
    You can also build binary packages that can be installed on other machines
    using the RPM spec file ("packaging/cups.spec") or EPM list file
    ("packaging/cups.list").  The latter also supports building of binary RPMs,
@@ -156,7 +149,7 @@ INSTALLING THE SOFTWARE

    The EPM software is available at:

-	http://www.msweet.org/
+	http://www.epmhome.org/


 CREATING BINARY DISTRIBUTIONS WITH EPM
@@ -174,11 +167,17 @@ CREATING BINARY DISTRIBUTIONS WITH EPM
    following:

 	epm       - Builds a script + tarfile package
+	aix       - Builds an AIX package
 	bsd       - Builds a *BSD package
 	deb       - Builds a Debian package
+	depot     - Builds a HP-UX package (also swinstall)
+	inst      - Builds an IRIX package (also tardist)
 	pkg       - Builds a Solaris package
 	rpm       - Builds a RPM package
+	setld     - Build a Tru64 UNIX package
 	slackware - Build a Slackware package
+	swinstall - Build a HP-UX package (also depot)
+	tardist   - Builds an IRIX package (also inst)


 GETTING DEBUG LOGGING FROM CUPS
@@ -200,9 +199,10 @@ GETTING DEBUG LOGGING FROM CUPS
 REPORTING PROBLEMS

    If you have problems, READ THE DOCUMENTATION FIRST!  If the documentation
-    does not solve your problems, please post a message on the users forum at:
+    does not solve your problems, please post a message on the "cups.general"
+    forum at:

-        http://www.cups.org/
+        http://www.cups.org/newsgroups.php

    Include your operating system and version, compiler and version, and any
    errors or problems you've run into.  The "config.log" file and the output
@@ -1,4 +1,4 @@
-IPPTOOL.txt - 2013-07-15
+IPPTOOL.txt - 2012-02-06
 ------------------------

 See the file CHANGES-IPPTOOL.txt for a list of changes to this software.
@@ -6,46 +6,14 @@ See the file CHANGES-IPPTOOL.txt for a list of changes to this software.

 INTRODUCTION

-    CUPS includes two user programs for IPP printers.  The first is called
-    ipptool and can be used to send arbitrary IPP requests to a CUPS server or
-    IPP printer.  This tool started life as part of the CUPS automated test
-    suite and has grown to support complex conformance tests and a simple way
-    to query printer, job, and subscription attributes.
-
-    The second program called ippfind that can be used to find IPP printers
-    that have registered themselves using Bonjour (DNS-SD, mDNS, and Zeroconf)
-    and run commands such as ipptool.
+    CUPS includes a user program called ipptool that can be used to send
+    arbitrary IPP requests to a CUPS server or IPP printer.  This tool started
+    life as part of the CUPS automated test suite and has grown to support
+    complex conformance tests and a simple way to query printer, job, and
+    subscription attributes.


-READING THE DOCUMENTATION
-
-    Full documentation on the ipptool command can be found in the
-    "man-ipptool.html" and "man-ipptoolfile.html" files; the latter describes
-    the test file format supported by ipptool.
-
-    Full documentation on the ippfind command can be found in the
-    "man-ippfind.html" file.
-
-
-IPPFIND BASIC USAGE
-
-    The ippfind command can be used to discover IPP printers on your network.
-    For example, the following command prints the printer URI of registered IPP
-    printers:
-
-        ippfind
-
-    To find all color IPP printers, run:
-
-        ippfind --txt-color T
-
-    And to run the IPP Everywhere conformance test file on every registered IPP
-    printer, run the following command:
-
-        ippfind _ipp._tcp,_print --exec ipptool -t '{}' ipp-everywhere.test \;
-
-
-IPPTOOL BASIC USAGE
+BASIC USAGE

    The ipptool command requires a printer URI and one or more "test" files that
    describe the operations, attributes to display, and expected status and
@@ -86,29 +54,19 @@ STANDARD TEST FILES
                                            state change notifications
        get-completed-jobs.test             Shows a list of completed jobs
        get-jobs.test                       Shows a list of pending jobs
-        get-notifications.test              Shows events for an ippget
-	                                    subscription.
        get-printer-attributes.test         Shows printer attributes
-        get-subscriptions.test              Shows a list of subscriptions
        ipp-1.1.test                        IPP/1.1 conformance test suite
        ipp-2.0.test                        IPP/2.0 conformance test suite
        ipp-2.1.test                        IPP/2.1 conformance test suite
        ipp-2.2.test                        IPP/2.2 conformance test suite
-        ipp-everywhere.test                 IPP Everywhere conformance test
-                                            suite
        print-job.test                      Prints a file
-        print-job-deflate.test              Prints a file, compressing with
-                                            deflate.
-        print-job-gzip.test                 Prints a file, compressing with gzip
-        validate-job.test                   Validates attributes for a job
-                                            submission.


 CONFORMANCE TESTS

-    We provide basic IPP conformance tests for IPP/1.1, IPP/2.0, IPP/2.1,
-    IPP/2.2, and IPP Everywhere.  For a given printer URI, the following
-    commands perform tests at each level:
+    We provide basic IPP conformance tests for IPP/1.1, IPP/2.0, IPP/2.1, and
+    IPP/2.2.  For a given printer URI, the following commands perform tests at
+    each level:

        ipptool -tf filename [options] -I printer-uri ipp-1.1.test
        ipptool -tf filename [options] -I -V 2.0 printer-uri ipp-2.0.test
@@ -146,7 +104,6 @@ CONFORMANCE TESTS
        -S           Test IPP over HTTPS (default for ipps: URIs)
        -T seconds   Set a timeout for responses in seconds
        -v           Be verbose, showing all attributes sent and received
-        -X           Produce XML (Apple plist) output

    The printer-uri must be a URI supported by the printer using the "ipp" or
    "ipps" scheme, for example:
@@ -155,7 +112,7 @@ CONFORMANCE TESTS
        ipps://192.168.0.1/ipp/print

    Print-by-reference (URL) printing can be tested by defining the document-uri
-    variable as a URL, for example:
+    variable to a URL, for example:

        ipptool -tf filename -d document-uri=url -I printer-uri ipp-1.1.test

@@ -171,40 +128,37 @@ CONFORMANCE TESTS
    printer.


-IPP EVERYWHERE TESTING
+READING THE DOCUMENTATION

-    The IPP Everywhere tests use sample PWG raster files available from:
-
-        ftp://ftp.pwg.org/pub/pwg/ipp/examples
-
-    Extract the corresponding ZIP archives into the current directory before
-    running the ipp-everywhere.test file.  The test file will attempt to print
-    each PWG Raster file that is supported by the printer being tested - up to
-    372 pages including the 90 pages produced by the regular IPP test suite.
+    The command usage is described in the ipptest(1) man page, while the file
+    format is described in the ipptestfile(5) man page.  Both are provided in
+    HTML format with the standalone releases of ipptool.


 GETTING SUPPORT AND OTHER RESOURCES

-    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide
+    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide many
    discussion forums which are available at:

-	http://www.cups.org/
+	http://www.cups.org/newsgroups.php
+
+    See the CUPS web site at "http://www.cups.org/" for other resources.


 REPORTING BUGS

-    If you believe you have discovered a bug in ippfind or ipptool, please fill
-    out the bug form at:
+    If you believe you have discovered a bug in ipptool, please fill out the
+    bug form at:

 	http://www.cups.org/str.php

-    Be sure to identify the version of CUPS and ippfind/ipptool (if you
-    downloaded the standalone version) you are using, the printer (if any) and
-    firmware version, and include any files that apply.
+    Be sure to identify the version of CUPS and ipptool (if you downloaded the
+    standalone version) you are using, the printer (if any) and firmware
+    version, and include any files that apply.

-    If you downloaded the standalone version of ippfind/ipptool, please also
-    re-run the command with debug logging enabled.  Run the following commands
-    on Windows to enable debug logging:
+    If you downloaded the standalone version of ipptool, please also re-run the
+    test with debug logging enabled.  Run the following commands on Windows to
+    enable debug logging:

        setdebug.bat

@@ -213,14 +167,14 @@ REPORTING BUGS
 	CUPS_DEBUG_LOG=ipptool.log; export CUPS_DEBUG_LOG
 	CUPS_DEBUG_LEVEL=6; export CUPS_DEBUG_LEVEL

-    Then when you run the ippfind or ipptool command a new "ipptool.log" file
-    will be created with detailed information - attach this file to the bug you
-    file as well.
+    Then when you run the ipptool command a new "ipptool.log" file will be
+    created with detailed information - attach this file to the bug you file
+    as well.


 LEGAL STUFF

-    CUPS is Copyright 2007-2013 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2012 by Apple Inc.  CUPS and the CUPS logo are
    trademarks of Apple Inc.

    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
@@ -1,6 +1,6 @@
                          CUPS License Agreement

-		      Copyright 2007-2013 by Apple Inc.
+		      Copyright 2007-2012 by Apple Inc.
 			     1 Infinite Loop
 			  Cupertino, CA 95014 USA

@@ -10,9 +10,9 @@
 INTRODUCTION

 CUPS(tm) is provided under the GNU General Public License ("GPL")
-and GNU Library General Public License ("LGPL"), Version 2, with an
-exception for Apple operating systems. A copy of the exception and
-licenses follow this introduction.
+and GNU Library General Public License ("LGPL"), Version 2, with
+exceptions for Apple operating systems and the OpenSSL toolkit. A
+copy of the exceptions and licenses follow this introduction.

 The GNU LGPL applies to the CUPS and CUPS Imaging libraries
 located in the "cups" and "filter" subdirectories of the CUPS
@@ -45,7 +45,7 @@ application, driver, or filter.
 LICENSE EXCEPTIONS

 In addition, as the copyright holder of CUPS, Apple Inc. grants
-the following special exception:
+the following special exceptions:

     1. Apple Operating System Development License Exception;

@@ -86,8 +86,14 @@ the following special exception:
 	     This file is subject to the Apple OS-Developed
 	     Software exception.

-No developer is required to provide this exception in a derived
-work.
+     2. OpenSSL Toolkit License Exception;
+
+	a. Apple Inc. explicitly allows the compilation and
+	   distribution of the CUPS software with the OpenSSL
+	   Toolkit.
+
+No developer is required to provide these exceptions in a
+derived work.


 KERBEROS SUPPORT CODE
@@ -1,16 +1,16 @@
 #
-# "$Id: Makedefs.in 12519 2015-02-17 13:10:19Z msweet $"
+# "$Id$"
 #
-# Common makefile definitions for CUPS.
+#   Common makefile definitions for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+#   These coded instructions, statements, and computer programs are the
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #

 #
@@ -121,9 +121,9 @@ INSTALLXPC	=	@INSTALLXPC@
 #

 ALL_CFLAGS	=	-I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(ONDEMANDFLAGS) $(OPTIONS)
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 ALL_CXXFLAGS	=	-I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(ONDEMANDFLAGS) $(OPTIONS)
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 ARCHFLAGS	=	@ARCHFLAGS@
 ARFLAGS		=	@ARFLAGS@
 BACKLIBS	=	@BACKLIBS@
@@ -138,16 +138,13 @@ DNSSD_BACKEND	=	@DNSSD_BACKEND@
 DSOFLAGS	=	-L../cups @DSOFLAGS@
 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS	=	@DNSSDLIBS@
-IPPFIND_BIN	=	@IPPFIND_BIN@
-IPPFIND_MAN	=	@IPPFIND_MAN@
+LAUNCHDLIBS	=	@LAUNCHDLIBS@
 LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
 			-L../scheduler @LDARCHFLAGS@ \
 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
+LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ)
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
 LIBS		=	$(LINKCUPS) $(COMMONLIBS)
-ONDEMANDFLAGS	=	@ONDEMANDFLAGS@
-ONDEMANDLIBS	=	@ONDEMANDLIBS@
 OPTIM		=	@OPTIM@
 OPTIONS		=
 PAMLIBS		=	@PAMLIBS@
@@ -201,6 +198,8 @@ DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
 DOCDIR		=	$(BUILDROOT)@CUPS_DOCROOT@
 ICONDIR		=	@ICONDIR@
 INCLUDEDIR	=	$(BUILDROOT)$(includedir)
+INITDIR		=	@INITDIR@
+INITDDIR	=	@INITDDIR@
 LIBDIR		=	$(BUILDROOT)$(libdir)
 LOCALEDIR	= 	$(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR		= 	$(BUILDROOT)@CUPS_LOGDIR@
@@ -215,7 +214,9 @@ REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR		=	$(BUILDROOT)@sbindir@
 SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
+SMFMANIFESTDIR	= 	@SMFMANIFESTDIR@
 STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
+XINETD		=	@XINETD@

 MAN1EXT		=	@MAN1EXT@
 MAN5EXT		=	@MAN5EXT@
@@ -226,15 +227,8 @@ MAN8DIR		=	@MAN8DIR@
 PAMDIR		=	@PAMDIR@
 PAMFILE		=	@PAMFILE@

+DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
 DBUSDIR		=	@DBUSDIR@
-INITDIR		=	@INITDIR@
-INITDDIR	=	@INITDDIR@
-LAUNCHD_DIR	=	@LAUNCHD_DIR@
-SMFMANIFESTDIR	= 	@SMFMANIFESTDIR@
-SYSTEMD_DIR	=	@SYSTEMD_DIR@
-XINETD		=	@XINETD@
-
-USBQUIRKS	=	@USBQUIRKS@


 #
@@ -264,5 +258,5 @@ USBQUIRKS	=	@USBQUIRKS@


 #
-# End of "$Id: Makedefs.in 12519 2015-02-17 13:10:19Z msweet $"
+# End of "$Id$"
 #
@@ -1,16 +1,16 @@
 #
-# "$Id: Makefile 12414 2015-01-21 00:02:04Z msweet $"
+# "$Id$"
 #
-# Top-level Makefile for CUPS.
+#   Top-level Makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+#   These coded instructions, statements, and computer programs are the
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #

 include Makedefs
@@ -98,18 +98,22 @@ clean:

 distclean:	clean
 	$(RM) Makedefs config.h config.log config.status
-	$(RM) conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf
 	$(RM) cups-config
-	$(RM) data/testprint
-	$(RM) desktop/cups.desktop
-	$(RM) doc/index.html
-	$(RM) 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
+	$(RM) conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf
+	$(RM) doc/help/ref-cupsd-conf.html doc/help/standard.html doc/index.html
+	$(RM) man/client.conf.man
+	$(RM) man/cups-deviced.man man/cups-driverd.man
+	$(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
+	$(RM) man/cupsd.conf.man man/drv.man man/lpoptions.man
 	$(RM) packaging/cups.list
-	$(RM) 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
+	$(RM) packaging/cups-desc.plist packaging/cups-info.plist
 	$(RM) templates/header.tmpl
+	$(RM) desktop/cups.desktop
+	$(RM) scheduler/cups.sh scheduler/cups-lpd.xinetd
+	$(RM) scheduler/org.cups.cups-lpd.plist scheduler/cups.xml
 	-$(RM) doc/*/index.html
 	-$(RM) templates/*/header.tmpl
-	-$(RM) -r autom4te*.cache clang cups/charmaps cups/locale
+	-$(RM) -r autom4te*.cache clang cups/charmaps cups/locale driver/test


 #
@@ -124,11 +128,8 @@ depend:


 #
-# Run the Clang static code analysis tool on the sources, available here:
-#
-#    http://clang-analyzer.llvm.org
-#
-# At least checker-231 is required.
+# Run the clang.llvm.org static code analysis tool on the C sources.
+# (at least checker-231 is required for scan-build to work this way)
 #

 .PHONY: clang clang-changes
@@ -139,26 +140,6 @@ clang-changes:
 	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) all


-#
-# Run the STACK tool on the sources, available here:
-#
-#    http://css.csail.mit.edu/stack/
-#
-# Do the following to pass options to configure:
-#
-#    make CONFIGFLAGS="--foo --bar" stack
-#
-
-.PHONY: stack
-stack:
-	stack-build ./configure $(CONFIGFLAGS)
-	stack-build $(MAKE) $(MFLAGS) clean all
-	poptck
-	$(MAKE) $(MFLAGS) distclean
-	$(RM) */*.ll
-	$(RM) */*.ll.out
-
-
 #
 # Generate a ctags file...
 #
@@ -261,7 +242,7 @@ debugcheck:	all unittests


 #
-# Create HTML documentation using Mini-XML's mxmldoc (http://www.msweet.org/)...
+# Create HTML documentation...
 #

 apihelp:
@@ -278,7 +259,7 @@ framedhelp:


 #
-# Create an Xcode docset using Mini-XML's mxmldoc (http://www.msweet.org/)...
+# Create an Xcode docset...
 #

 docset:	apihelp
@@ -314,12 +295,12 @@ sloc:


 #
-# Make software distributions using EPM (http://www.msweet.org/)...
+# Make software distributions using EPM (http://www.epmhome.org/)...
 #

 EPMFLAGS	=	-v --output-dir dist $(EPMARCH)

-bsd deb pkg slackware:
+aix bsd deb depot inst pkg setld slackware swinstall tardist:
 	epm $(EPMFLAGS) -f $@ cups packaging/cups.list

 epm:
@@ -335,6 +316,7 @@ dist:	all
 	case `uname` in \
 		*BSD*) $(MAKE) $(MFLAGS) bsd;; \
 		Darwin*) $(MAKE) $(MFLAGS) osx;; \
+		IRIX*) $(MAKE) $(MFLAGS) tardist;; \
 		Linux*) test ! -x /usr/bin/rpm || $(MAKE) $(MFLAGS) rpm;; \
 		SunOS*) $(MAKE) $(MFLAGS) pkg;; \
 	esac
@@ -348,5 +330,5 @@ dist:	all


 #
-# End of "$Id: Makefile 12414 2015-01-21 00:02:04Z msweet $".
+# End of "$Id$".
 #
@@ -1,4 +1,4 @@
-README - CUPS v2.1.3 - 2016-02-05
+README - CUPS v1.6.2 - 2013-03-18
 ---------------------------------

 Looking for compile instructions?  Read the file "INSTALL.txt" instead...
@@ -41,10 +41,10 @@ READING THE DOCUMENTATION

 GETTING SUPPORT AND OTHER RESOURCES

-    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide two
-    mailing lists which are available at:
+    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide many
+    discussion forums which are available at:

-	http://www.cups.org/lists.php
+	http://www.cups.org/newsgroups.php

    See the CUPS web site at "http://www.cups.org/" for other resources.

@@ -78,6 +78,10 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
 	-----------------------------  ------------------------------
 	Dymo Label Printers            drv:///sample.drv/dymo.ppd
 	Intellitech Intellibar         drv:///sample.drv/intelbar.ppd
+	EPSON Stylus Color Series      drv:///sample.drv/stcolor.ppd
+	EPSON Stylus Photo Series      drv:///sample.drv/stphoto.ppd
+	EPSON Stylus New Color Series  drv:///sample.drv/stcolor2.ppd
+	EPSON Stylus New Photo Series  drv:///sample.drv/stphoto2.ppd
 	EPSON 9-pin Series             drv:///sample.drv/epson9.ppd
 	EPSON 24-pin Series            drv:///sample.drv/epson24.ppd
 	Generic PCL Laser Printer      drv:///sample.drv/generpcl.ppd
@@ -109,7 +113,11 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
        lpadmin -p printername -E -v lpd://11.22.33.44/ -m ppd-name

    The sample drivers provide basic printing capabilities, but generally do not
-    exercise the full potential of the printers or CUPS.
+    exercise the full potential of the printers or CUPS.  The CUPS web site
+    provides links and drivers:
+
+        http://www.cups.org/ppd.php      PPD files
+	http://www.cups.org/links.php    Links to other drivers


 PRINTING FILES
@@ -126,8 +134,8 @@ PRINTING FILES
 	lpr -o media=A4 -o resolution=600dpi filename

    CUPS recognizes many types of images files as well as PDF, PostScript,
-    and text files, so you can print those files directly rather than through
-    an application.
+    HP-GL/2, and text files, so you can print those files directly rather than
+    through an application.

    If you have an application that generates output specifically for your
    printer then you need to use the "-oraw" or "-l" options:
@@ -135,16 +143,19 @@ PRINTING FILES
 	lp -o raw filename
 	lpr -l filename

-    This will prevent the filters from misinterpreting your print file.
+    This will prevent the filters from misinterpreting your print
+    file.


 LEGAL STUFF

-    CUPS is Copyright 2007-2015 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2013 by Apple Inc.  CUPS and the CUPS logo are
    trademarks of Apple Inc.

    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

+    This software is based in part on the work of the Independent JPEG Group.
+
    CUPS is provided under the terms of version 2 of the GNU General Public
    License and GNU Library General Public License. This program is distributed
    in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
@@ -1,77 +1,70 @@
 ipp.o: ipp.c backend-private.h ../cups/cups-private.h \
  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
-  ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
-  ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
-lpd.o: lpd.c ../cups/http-private.h ../config.h ../cups/language.h \
-  ../cups/array.h ../cups/versioning.h ../cups/http.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h \
-  backend-private.h ../cups/cups-private.h ../cups/string-private.h \
-  ../cups/debug-private.h ../cups/array-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
+  ../cups/array-private.h
+lpd.o: lpd.c ../cups/http-private.h ../config.h ../cups/http.h \
+  ../cups/versioning.h ../cups/array.h ../cups/md5-private.h \
+  ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
+  ../cups/cups-private.h ../cups/string-private.h \
+  ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
 dnssd.o: dnssd.c backend-private.h ../cups/cups-private.h \
  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
-  ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
-  ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
 snmp.o: snmp.c backend-private.h ../cups/cups-private.h \
  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
-  ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
-  ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
-socket.o: socket.c ../cups/http-private.h ../config.h ../cups/language.h \
-  ../cups/array.h ../cups/versioning.h ../cups/http.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h \
-  backend-private.h ../cups/cups-private.h ../cups/string-private.h \
-  ../cups/debug-private.h ../cups/array-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
+socket.o: socket.c ../cups/http-private.h ../config.h ../cups/http.h \
+  ../cups/versioning.h ../cups/array.h ../cups/md5-private.h \
+  ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
+  ../cups/cups-private.h ../cups/string-private.h \
+  ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
 test1284.o: test1284.c ../cups/string-private.h ../config.h ieee1284.c \
  backend-private.h ../cups/cups-private.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
-  ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
-  ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
 testbackend.o: testbackend.c ../cups/string-private.h ../config.h \
  ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
-  ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
+  ../cups/http.h ../cups/array.h ../cups/language.h \
  ../cups/sidechannel.h
 testsupplies.o: testsupplies.c backend-private.h ../cups/cups-private.h \
  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
-  ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
-  ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
 usb.o: usb.c backend-private.h ../cups/cups-private.h \
  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
-  ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
-  ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h usb-darwin.c \
-  ../cups/file-private.h
+  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
+  usb-darwin.c ../cups/file-private.h
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 11859 2014-05-08 22:42:44Z msweet $"
+# "$Id$"
 #
 #   Backend makefile for CUPS.
 #
-#   Copyright 2007-2014 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -23,8 +23,8 @@ include ../Makedefs

 # RBACKENDS are installed mode 0700 so cupsd will run them as root...
 #
-# UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
-# an unprivileged user...
+# UBACKENDS are installed mode 0755 so cupsd will run them as an unprivileged
+# user...
 #
 # See http://www.cups.org/documentation.php/api-filter.html for more info...
 RBACKENDS =	\
@@ -33,8 +33,7 @@ RBACKENDS =	\
 		$(DNSSD_BACKEND)
 UBACKENDS =	\
 		snmp \
-		socket
-ULBACKENDS =	\
+		socket \
 		usb
 UNITTESTS =	\
 		test1284 \
@@ -43,8 +42,7 @@ UNITTESTS =	\
 TARGETS =	\
 		libbackend.a \
 		$(RBACKENDS) \
-		$(UBACKENDS) \
-		$(ULBACKENDS)
+		$(UBACKENDS)
 LIBOBJS	=	\
 		ieee1284.o \
 		network.o \
@@ -73,7 +71,7 @@ all:	$(TARGETS)
 # Make library targets...
 #

-libs:	$(ULBACKENDS)
+libs:


 #
@@ -111,11 +109,6 @@ install:	all install-data install-headers install-libs install-exec
 #

 install-data:
-	if test "x$(USBQUIRKS)" != x; then \
-		echo Installing USB quirks in $(USBQUIRKS); \
-		$(INSTALL_DIR) -m 755 $(USBQUIRKS); \
-		$(INSTALL_DATA) org.cups.usb-quirks $(USBQUIRKS); \
-	fi


 #
@@ -141,9 +134,8 @@ install-exec:	$(INSTALLXPC)
 	fi
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(RBACKENDS) $(UBACKENDS); do \
+		for file in $(TARGETS); do \
 			cp $$file $(SYMROOT); \
-			dsymutil $(SYMROOT)/$$file; \
 		done \
 	fi

@@ -169,18 +161,6 @@ install-headers:
 #

 install-libs:
-	echo Installing backends in $(SERVERBIN)/backend
-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
-	for file in $(ULBACKENDS); do \
-		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
-	done
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(ULBACKENDS); do \
-			cp $$file $(SYMROOT); \
-			dsymutil $(SYMROOT)/$$file; \
-		done \
-	fi


 #
@@ -193,7 +173,7 @@ uninstall:
 		$(RM) $(SERVERBIN)/apple/$$file; \
 	done
 	-$(RMDIR) $(SERVERBIN)/apple
-	for file in $(RBACKENDS) $(UBACKENDS) $(ULBACKENDS); do \
+	for file in $(RBACKENDS) $(UBACKENDS); do \
 		$(RM) $(SERVERBIN)/backend/$$file; \
 	done
 	for file in $(IPPALIASES); do \
@@ -315,5 +295,5 @@ include Dependencies


 #
-# End of "$Id: Makefile 11859 2014-05-08 22:42:44Z msweet $".
+# End of "$Id$".
 #
@@ -1,18 +1,18 @@
 /*
- * "$Id: backend-private.h 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id$"
 *
- * Backend support definitions for CUPS.
+ *   Backend support definitions for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
 */

 #ifndef _CUPS_BACKEND_PRIVATE_H_
@@ -313,7 +313,7 @@ extern int		backendGetDeviceID(int fd, char *device_id,
 					   int uri_size);
 extern int		backendGetMakeModel(const char *device_id,
 			                    char *make_model,
-				            size_t make_model_size);
+				            int make_model_size);
 extern int		backendNetworkSideCB(int print_fd, int device_fd,
 			                     int snmp_fd, http_addr_t *addr,
 					     int use_bc);
@@ -334,5 +334,5 @@ extern int		backendWaitLoop(int snmp_fd, http_addr_t *addr,


 /*
- * End of "$Id: backend-private.h 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,17 +1,33 @@
 /*
- * "$Id: dnssd.c 12970 2015-11-13 20:02:51Z msweet $"
+ * "$Id$"
 *
- * DNS-SD discovery backend for CUPS.
+ *   DNS-SD discovery backend for CUPS.
 *
- * Copyright 2008-2015 by Apple Inc.
+ *   Copyright 2008-2012 by Apple Inc.
 *
- * 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"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   main()		     - Browse for printers.
+ *   browse_callback()	     - Browse devices.
+ *   browse_local_callback() - Browse local devices.
+ *   client_callback()       - Avahi client callback function.
+ *   compare_devices()	     - Compare two devices.
+ *   exec_backend()	     - Execute the backend that corresponds to the
+ *			       resolved service name.
+ *   device_type()	     - Get DNS-SD type enumeration from string.
+ *   get_device()	     - Create or update a device.
+ *   query_callback()	     - Process query data.
+ *   find_device()	     - Find a device from its name and domain.
+ *   sigterm_handler()	     - Handle termination signals.
+ *   unquote()		     - Unquote a name string.
 */

 /*
@@ -61,8 +77,7 @@ typedef struct
 		*domain,		/* Domain name */
 		*fullName,		/* Full name */
 		*make_and_model,	/* Make and model from TXT record */
-		*device_id,		/* 1284 device ID from TXT record */
-		*uuid;			/* UUID from TXT record */
+		*device_id;		/* 1284 device ID from TXT record */
  cups_devtype_t type;			/* Device registration type */
  int		priority,		/* Priority associated with type */
 		cups_shared,		/* CUPS shared printer? */
@@ -80,7 +95,6 @@ static int		job_canceled = 0;
 static AvahiSimplePoll	*simple_poll = NULL;
 					/* Poll information */
 static int		got_data = 0;	/* Got data from poll? */
-static int		browsers = 0;	/* Number of running browsers */
 #endif /* HAVE_AVAHI */


@@ -123,7 +137,7 @@ static void		client_callback(AvahiClient *client,
 #endif /* HAVE_AVAHI */

 static int		compare_devices(cups_device_t *a, cups_device_t *b);
-static void		exec_backend(char **argv) __attribute__((noreturn));
+static void		exec_backend(char **argv);
 static cups_device_t	*get_device(cups_array_t *devices,
 			            const char *serviceName,
 			            const char *regtype,
@@ -318,7 +332,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 (0);
+    return (1);
  }

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

-  browsers = 6;
  avahi_service_browser_new(client, AVAHI_IF_UNSPEC,
 			    AVAHI_PROTO_UNSPEC,
 			    "_fax-ipp._tcp", NULL, 0,
@@ -500,15 +513,9 @@ main(int  argc,				/* I - Number of command-line args */
          {
 	    unquote(uriName, best->fullName, sizeof(uriName));

-            if (best->uuid)
-	      httpAssembleURIf(HTTP_URI_CODING_ALL, device_uri,
-	                       sizeof(device_uri), "dnssd", NULL, uriName, 0,
-			       best->cups_shared ? "/cups?uuid=%s" : "/?uuid=%s",
-			       best->uuid);
-	    else
-	      httpAssembleURI(HTTP_URI_CODING_ALL, device_uri,
-	                      sizeof(device_uri), "dnssd", NULL, uriName, 0,
-			      best->cups_shared ? "/cups" : "/");
+	    httpAssembleURI(HTTP_URI_CODING_ALL, device_uri, sizeof(device_uri),
+			    "dnssd", NULL, uriName, 0,
+			    best->cups_shared ? "/cups" : "/");

 	    cupsBackendReport("network", device_uri, best->make_and_model,
 	                      best->name, best->device_id, NULL);
@@ -539,15 +546,9 @@ main(int  argc,				/* I - Number of command-line args */
      {
 	unquote(uriName, best->fullName, sizeof(uriName));

-	if (best->uuid)
-	  httpAssembleURIf(HTTP_URI_CODING_ALL, device_uri,
-			   sizeof(device_uri), "dnssd", NULL, uriName, 0,
-			   best->cups_shared ? "/cups?uuid=%s" : "/?uuid=%s",
-			   best->uuid);
-	else
-	  httpAssembleURI(HTTP_URI_CODING_ALL, device_uri,
-			  sizeof(device_uri), "dnssd", NULL, uriName, 0,
-			  best->cups_shared ? "/cups" : "/");
+	httpAssembleURI(HTTP_URI_CODING_ALL, device_uri, sizeof(device_uri),
+			"dnssd", NULL, uriName, 0,
+			best->cups_shared ? "/cups" : "/");

 	cupsBackendReport("network", device_uri, best->make_and_model,
 			  best->name, best->device_id, NULL);
@@ -557,11 +558,7 @@ main(int  argc,				/* I - Number of command-line args */

      fprintf(stderr, "DEBUG: sent=%d, count=%d\n", sent, count);

-#ifdef HAVE_AVAHI
-      if (sent == cupsArrayCount(devices) && browsers == 0)
-#else
      if (sent == cupsArrayCount(devices))
-#endif /* HAVE_AVAHI */
 	break;
    }
  }
@@ -713,12 +710,9 @@ browse_callback(
 	break;

    case AVAHI_BROWSER_REMOVE:
+    case AVAHI_BROWSER_ALL_FOR_NOW:
    case AVAHI_BROWSER_CACHE_EXHAUSTED:
        break;
-
-    case AVAHI_BROWSER_ALL_FOR_NOW:
-	browsers--;
-	break;
  }
 }

@@ -830,8 +824,8 @@ exec_backend(char **argv)		/* I - Command-line arguments */
 * 'device_type()' - Get DNS-SD type enumeration from string.
 */

-static cups_devtype_t			/* O - Device type */
-device_type(const char *regtype)	/* I - Service registration type */
+static int
+device_type(const char *regtype)
 {
 #ifdef HAVE_AVAHI
  if (!strcmp(regtype, "_ipp._tcp"))
@@ -921,6 +915,9 @@ get_device(cups_array_t *devices,	/* I - Device array */
  * Yes, add the device...
  */

+  fprintf(stderr, "DEBUG: Found \"%s.%s%s\"...\n", serviceName, regtype,
+	  replyDomain);
+
  device           = calloc(sizeof(cups_device_t), 1);
  device->name     = strdup(serviceName);
  device->domain   = strdup(replyDomain);
@@ -936,7 +933,8 @@ get_device(cups_array_t *devices,	/* I - Device array */
 #ifdef HAVE_DNSSD
  DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
 #else /* HAVE_AVAHI */
-  avahi_service_name_join(fullName, kDNSServiceMaxDomainName, serviceName, regtype, replyDomain);
+  avahi_service_name_join(fullName, kDNSServiceMaxDomainName,
+			   serviceName, regtype, replyDomain);
 #endif /* HAVE_DNSSD */

  device->fullName = strdup(fullName);
@@ -1033,7 +1031,6 @@ query_callback(
 		value[256],		/* Value string */
 		make_and_model[512],	/* Manufacturer and model */
 		model[256],		/* Model */
-		pdl[256],		/* PDL */
 		device_id[2048];	/* 1284 device ID */


@@ -1082,9 +1079,8 @@ query_callback(

  device_id[0]      = '\0';
  make_and_model[0] = '\0';
-  pdl[0]            = '\0';

-  strlcpy(model, "Unknown", sizeof(model));
+  strcpy(model, "Unknown");

  for (data = rdata, dataend = data + rdlen;
       data < dataend;
@@ -1104,7 +1100,7 @@ query_callback(
    datanext = data + datalen;

    for (ptr = key; data < datanext && *data != '='; data ++)
-      *ptr++ = (char)*data;
+      *ptr++ = *data;
    *ptr = '\0';

    if (data < datanext && *data == '=')
@@ -1112,7 +1108,7 @@ query_callback(
      data ++;

      if (data < datanext)
-	memcpy(value, data, (size_t)(datanext - data));
+	memcpy(value, data, datanext - data);
      value[datanext - data] = '\0';

      fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
@@ -1132,14 +1128,15 @@ query_callback(
      */

      ptr = device_id + strlen(device_id);
-      snprintf(ptr, sizeof(device_id) - (size_t)(ptr - device_id), "%s:%s;", key + 4, value);
+      snprintf(ptr, sizeof(device_id) - (ptr - device_id), "%s:%s;",
+	       key + 4, value);
    }

    if (!_cups_strcasecmp(key, "usb_MFG") || !_cups_strcasecmp(key, "usb_MANU") ||
 	!_cups_strcasecmp(key, "usb_MANUFACTURER"))
-      strlcpy(make_and_model, value, sizeof(make_and_model));
+      strcpy(make_and_model, value);
    else if (!_cups_strcasecmp(key, "usb_MDL") || !_cups_strcasecmp(key, "usb_MODEL"))
-      strlcpy(model, value, sizeof(model));
+      strcpy(model, value);
    else if (!_cups_strcasecmp(key, "product") && !strstr(value, "Ghostscript"))
    {
      if (value[0] == '(')
@@ -1151,20 +1148,18 @@ query_callback(
 	if ((ptr = value + strlen(value) - 1) > value && *ptr == ')')
 	  *ptr = '\0';

-	strlcpy(model, value + 1, sizeof(model));
+	strcpy(model, value + 1);
      }
      else
-	strlcpy(model, value, sizeof(model));
+	strcpy(model, value);
    }
    else if (!_cups_strcasecmp(key, "ty"))
    {
-      strlcpy(model, value, sizeof(model));
+      strcpy(model, value);

      if ((ptr = strchr(model, ',')) != NULL)
 	*ptr = '\0';
    }
-    else if (!_cups_strcasecmp(key, "pdl"))
-      strlcpy(pdl, value, sizeof(pdl));
    else if (!_cups_strcasecmp(key, "priority"))
      device->priority = atoi(value);
    else if ((device->type == CUPS_DEVICE_IPP ||
@@ -1181,8 +1176,6 @@ query_callback(
      if (device->type == CUPS_DEVICE_PRINTER)
 	device->sent = 1;
    }
-    else if (!_cups_strcasecmp(key, "UUID"))
-      device->uuid = strdup(value);
  }

  if (device->device_id)
@@ -1203,7 +1196,7 @@ query_callback(
      * Assume the first word is the make...
      */

-      memcpy(make_and_model, model, (size_t)(ptr - model));
+      memcpy(make_and_model, model, ptr - model);
      make_and_model[ptr - model] = '\0';

      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s",
@@ -1211,45 +1204,6 @@ query_callback(
    }
  }

-  if (device_id[0] &&
-      !strstr(device_id, "CMD:") &&
-      !strstr(device_id, "COMMAND SET:") &&
-      (strstr(pdl, "application/pdf") ||
-       strstr(pdl, "application/postscript") ||
-       strstr(pdl, "application/vnd.hp-PCL") ||
-       strstr(pdl, "image/")))
-  {
-    value[0] = '\0';
-    if (strstr(pdl, "application/pdf"))
-      strlcat(value, ",PDF", sizeof(value));
-    if (strstr(pdl, "application/postscript"))
-      strlcat(value, ",PS", sizeof(value));
-    if (strstr(pdl, "application/vnd.hp-PCL"))
-      strlcat(value, ",PCL", sizeof(value));
-    for (ptr = strstr(pdl, "image/"); ptr; ptr = strstr(ptr, "image/"))
-    {
-      char *valptr = value + strlen(value);
-      					/* Pointer into value */
-
-      if (valptr < (value + sizeof(value) - 1))
-        *valptr++ = ',';
-
-      ptr += 6;
-      while (isalnum(*ptr & 255) || *ptr == '-' || *ptr == '.')
-      {
-        if (isalnum(*ptr & 255) && valptr < (value + sizeof(value) - 1))
-          *valptr++ = (char)toupper(*ptr++ & 255);
-        else
-          break;
-      }
-
-      *valptr = '\0';
-    }
-
-    ptr = device_id + strlen(device_id);
-    snprintf(ptr, sizeof(device_id) - (size_t)(ptr - device_id), "CMD:%s;", value + 1);
-  }
-
  if (device_id[0])
    device->device_id = strdup(device_id);
  else
@@ -1281,7 +1235,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;
 }
@@ -1322,5 +1276,5 @@ unquote(char       *dst,		/* I - Destination buffer */


 /*
- * End of "$Id: dnssd.c 12970 2015-11-13 20:02:51Z msweet $".
+ * End of "$Id$".
 */
@@ -1,18 +1,24 @@
 /*
- * "$Id: ieee1284.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id$"
 *
- * IEEE-1284 support functions for CUPS.
+ *   IEEE-1284 support functions for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   backendGetDeviceID()  - Get the IEEE-1284 device ID string and
+ *                           corresponding URI.
+ *   backendGetMakeModel() - Get the make and model string from the device ID.
 */

 /*
@@ -20,6 +26,7 @@
 */

 #include "backend-private.h"
+#include <cups/cups-private.h>


 /*
@@ -141,7 +148,8 @@ backendGetDeviceID(
 		* Read the 1284 device ID...
 		*/

-		if ((length = read(devparportfd, device_id, (size_t)device_id_size - 1)) >= 2)
+		if ((length = read(devparportfd, device_id,
+				   device_id_size - 1)) >= 2)
 		{
 		  device_id[length] = '\0';
 		  got_id = 1;
@@ -170,7 +178,8 @@ backendGetDeviceID(
      * bytes.  The 1284 spec says the length is stored MSB first...
      */

-      length = (int)((((unsigned)device_id[0] & 255) << 8) + ((unsigned)device_id[1] & 255));
+      length = (((unsigned)device_id[0] & 255) << 8) +
+	       ((unsigned)device_id[1] & 255);

     /*
      * Check to see if the length is larger than our buffer; first
@@ -179,7 +188,8 @@ backendGetDeviceID(
      */

      if (length > device_id_size || length < 14)
-	length = (int)((((unsigned)device_id[1] & 255) << 8) + ((unsigned)device_id[0] & 255));
+	length = (((unsigned)device_id[1] & 255) << 8) +
+		 ((unsigned)device_id[0] & 255);

      if (length > device_id_size)
 	length = device_id_size;
@@ -211,7 +221,7 @@ backendGetDeviceID(

 	length -= 2;

-	memmove(device_id, device_id + 2, (size_t)length);
+	memmove(device_id, device_id + 2, length);
 	device_id[length] = '\0';
      }
    }
@@ -277,7 +287,7 @@ backendGetDeviceID(
  */

  if (make_model)
-    backendGetMakeModel(device_id, make_model, (size_t)make_model_size);
+    backendGetMakeModel(device_id, make_model, make_model_size);

 /*
  * Then generate a device URI...
@@ -362,7 +372,7 @@ int					/* O - 0 on success, -1 on failure */
 backendGetMakeModel(
    const char *device_id,		/* O - 1284 device ID */
    char       *make_model,		/* O - Make/model */
-    size_t     make_model_size)		/* I - Size of buffer */
+    int        make_model_size)		/* I - Size of buffer */
 {
  int		num_values;		/* Number of keys and values */
  cups_option_t	*values;		/* Keys and values */
@@ -371,7 +381,9 @@ backendGetMakeModel(
 		*des;			/* Description string */


-  DEBUG_printf(("backendGetMakeModel(device_id=\"%s\", make_model=%p, make_model_size=" CUPS_LLFMT ")\n", device_id, make_model, CUPS_LLCAST make_model_size));
+  DEBUG_printf(("backendGetMakeModel(device_id=\"%s\", "
+                "make_model=%p, make_model_size=%d)\n", device_id,
+		make_model, make_model_size));

 /*
  * Range check input...
@@ -475,5 +487,5 @@ backendGetMakeModel(


 /*
- * End of "$Id: ieee1284.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id$".
 */
@@ -1,18 +1,27 @@
 /*
- * "$Id: lpd.c 13040 2016-01-11 20:29:13Z msweet $"
+ * "$Id$"
 *
- * Line Printer Daemon backend for CUPS.
+ *   Line Printer Daemon backend for CUPS.
 *
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   main()            - Send a file to the printer or server.
+ *   lpd_command()     - Send an LPR command sequence and wait for a reply.
+ *   lpd_queue()       - Queue a file using the Line Printer Daemon protocol.
+ *   lpd_write()       - Write a buffer of data to an LPD server.
+ *   rresvport_af()    - A simple implementation of rresvport_af().
+ *   sigterm_handler() - Handle 'terminate' signals that stop the backend.
 */

 /*
@@ -84,7 +93,7 @@ static int	lpd_queue(const char *hostname, http_addrlist_t *addrlist,
 			  int copies, int banner, int format, int order,
 			  int reserve, int manual_copies, int timeout,
 			  int contimeout, const char *orighost);
-static ssize_t	lpd_write(int lpd_fd, char *buffer, size_t length);
+static int	lpd_write(int lpd_fd, char *buffer, int length);
 #ifndef HAVE_RRESVPORT_AF
 static int	rresvport_af(int *port, int family);
 #endif /* !HAVE_RRESVPORT_AF */
@@ -384,8 +393,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
         */

         snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
-                        !_cups_strcasecmp(value, "yes") ||
-                        !_cups_strcasecmp(value, "true");
+                        _cups_strcasecmp(value, "yes") ||
+                        _cups_strcasecmp(value, "true");
      }
      else if (!_cups_strcasecmp(name, "timeout"))
      {
@@ -472,7 +481,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    _cupsLangPrintFilter(stderr, "INFO", _("Copying print data."));

    if (bytes > 0)
-      write(fd, buffer, (size_t)bytes);
+      write(fd, buffer, bytes);

    backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
 		   backendNetworkSideCB);
@@ -583,7 +592,7 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
 {
  va_list	ap;		/* Argument pointer */
  char		buf[1024];	/* Output buffer */
-  ssize_t	bytes;		/* Number of bytes to output */
+  int		bytes;		/* Number of bytes to output */
  char		status;		/* Status from command */


@@ -608,9 +617,9 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
  * Send the command...
  */

-  fprintf(stderr, "DEBUG: Sending command string (" CUPS_LLFMT " bytes)...\n", CUPS_LLCAST bytes);
+  fprintf(stderr, "DEBUG: Sending command string (%d bytes)...\n", bytes);

-  if (lpd_write(fd, buf, (size_t)bytes) < bytes)
+  if (lpd_write(fd, buf, bytes) < bytes)
  {
    perror("DEBUG: Unable to send LPD command");
    return (-1);
@@ -625,7 +634,7 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
  if (recv(fd, &status, 1, 0) < 1)
  {
    _cupsLangPrintFilter(stderr, "WARNING", _("The printer did not respond."));
-    status = (char)errno;
+    status = errno;
  }

  fprintf(stderr, "DEBUG: lpd_command returning %d\n", status);
@@ -671,7 +680,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
  int			have_supplies;	/* Printer supports supply levels? */
  int			copy;		/* Copies written */
  time_t		start_time;	/* Time of first connect */
-  ssize_t		nbytes;		/* Number of bytes written */
+  size_t		nbytes;		/* Number of bytes written */
  off_t			tbytes;		/* Total bytes written */
  char			buffer[32768];	/* Output buffer */
 #ifdef WIN32
@@ -698,7 +707,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
    */

    fprintf(stderr, "DEBUG: Connecting to %s:%d for printer %s\n", hostname,
-            httpAddrPort(&(addrlist->addr)), printer);
+            _httpAddrPort(&(addrlist->addr)), printer);
    _cupsLangPrintFilter(stderr, "INFO", _("Connecting to printer."));

    for (lport = reserve == RESERVE_RFC1179 ? 732 : 1024, addr = addrlist,
@@ -773,7 +782,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	return (CUPS_BACKEND_FAILED);
      }

-      if (!connect(fd, &(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr))))
+      if (!connect(fd, &(addr->addr.addr), httpAddrLength(&(addr->addr))))
 	break;

      error = errno;
@@ -837,7 +846,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	      break;
        }

-	sleep((unsigned)delay);
+	sleep(delay);

 	if (delay < 30)
 	  delay += 5;
@@ -880,7 +889,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */

    fprintf(stderr, "DEBUG: Connected to %s:%d (local port %d)...\n",
 	    httpAddrString(&(addr->addr), addrname, sizeof(addrname)),
-	    httpAddrPort(&(addr->addr)), lport);
+	    _httpAddrPort(&(addr->addr)), lport);

   /*
    * See if the printer supports SNMP...
@@ -958,7 +967,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */

    if (banner)
    {
-      snprintf(cptr, sizeof(control) - (size_t)(cptr - control),
+      snprintf(cptr, sizeof(control) - (cptr - control),
               "C%.31s\n"	/* RFC 1179, Section 7.2 - class name <= 31 chars */
 	       "L%s\n",
               localhost, user);
@@ -967,13 +976,13 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */

    while (copies > 0)
    {
-      snprintf(cptr, sizeof(control) - (size_t)(cptr - control), "%cdfA%03d%.15s\n",
+      snprintf(cptr, sizeof(control) - (cptr - control), "%cdfA%03d%.15s\n",
               format, (int)getpid() % 1000, localhost);
      cptr   += strlen(cptr);
      copies --;
    }

-    snprintf(cptr, sizeof(control) - (size_t)(cptr - control),
+    snprintf(cptr, sizeof(control) - (cptr - control),
             "UdfA%03d%.15s\n"
 	     "N%.131s\n",	/* RFC 1179, Section 7.2 - sourcefile name <= 131 chars */
             (int)getpid() % 1000, localhost, title);
@@ -1003,9 +1012,9 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      fprintf(stderr, "DEBUG: Sending control file (%u bytes)\n",
 	      (unsigned)strlen(control));

-      if ((size_t)lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
+      if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
      {
-	status = (char)errno;
+	status = errno;
 	perror("DEBUG: Unable to write control file");

      }
@@ -1015,7 +1024,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	{
 	  _cupsLangPrintFilter(stderr, "WARNING",
 	                       _("The printer did not respond."));
-	  status = (char)errno;
+	  status = errno;
 	}
      }

@@ -1065,7 +1074,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 			       _("Spooling job, %.0f%% complete."),
 			       100.0 * tbytes / filestats.st_size);

-	  if (lpd_write(fd, buffer, (size_t)nbytes) < nbytes)
+	  if (lpd_write(fd, buffer, nbytes) < nbytes)
 	  {
 	    perror("DEBUG: Unable to send print file to printer");
            break;
@@ -1078,11 +1087,11 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      if (mode == MODE_STANDARD)
      {
 	if (tbytes < filestats.st_size)
-	  status = (char)errno;
+	  status = errno;
 	else if (lpd_write(fd, "", 1) < 1)
 	{
 	  perror("DEBUG: Unable to send trailing nul to printer");
-	  status = (char)errno;
+	  status = errno;
 	}
 	else
 	{
@@ -1136,9 +1145,9 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      fprintf(stderr, "DEBUG: Sending control file (%lu bytes)\n",
 	      (unsigned long)strlen(control));

-      if ((size_t)lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
+      if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
      {
-	status = (char)errno;
+	status = errno;
 	perror("DEBUG: Unable to write control file");
      }
      else
@@ -1147,7 +1156,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	{
 	  _cupsLangPrintFilter(stderr, "WARNING",
 			       _("The printer did not respond."));
-	  status = (char)errno;
+	  status = errno;
 	}
      }

@@ -1160,8 +1169,6 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	                     _("Control file sent successfully."));
    }

-    fputs("STATE: +cups-waiting-for-job-completed\n", stderr);
-
   /*
    * Collect the final supply levels as needed...
    */
@@ -1197,32 +1204,32 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 * 'lpd_write()' - Write a buffer of data to an LPD server.
 */

-static ssize_t				/* O - Number of bytes written or -1 on error */
-lpd_write(int     lpd_fd,		/* I - LPD socket */
-          char    *buffer,		/* I - Buffer to write */
-	  size_t  length)		/* I - Number of bytes to write */
+static int				/* O - Number of bytes written or -1 on error */
+lpd_write(int  lpd_fd,			/* I - LPD socket */
+          char *buffer,			/* I - Buffer to write */
+	  int  length)			/* I - Number of bytes to write */
 {
-  ssize_t	bytes,			/* Number of bytes written */
-		total;			/* Total number of bytes written */
+  int	bytes,				/* Number of bytes written */
+	total;				/* Total number of bytes written */


  if (abort_job)
    return (-1);

  total = 0;
-  while ((bytes = send(lpd_fd, buffer, length - (size_t)total, 0)) >= 0)
+  while ((bytes = send(lpd_fd, buffer, length - total, 0)) >= 0)
  {
    total  += bytes;
    buffer += bytes;

-    if ((size_t)total == length)
+    if (total == length)
      break;
  }

  if (bytes < 0)
    return (-1);
  else
-    return (total);
+    return (length);
 }


@@ -1251,7 +1258,7 @@ rresvport_af(int *port,			/* IO - Port number to bind to */
  */

  memset(&addr, 0, sizeof(addr));
-  addr.addr.sa_family = (sa_family_t)family;
+  addr.addr.sa_family = family;

 /*
  * Try to bind the socket to a reserved port...
@@ -1269,7 +1276,7 @@ rresvport_af(int *port,			/* IO - Port number to bind to */
    * Try binding the port to the socket; return if all is OK...
    */

-    if (!bind(fd, (struct sockaddr *)&addr, httpAddrLength(&addr)))
+    if (!bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
      return (fd);

   /*
@@ -1278,7 +1285,11 @@ rresvport_af(int *port,			/* IO - Port number to bind to */

    if (errno != EADDRINUSE)
    {
-      httpAddrClose(NULL, fd);
+#  ifdef WIN32
+      closesocket(fd);
+#  else
+      close(fd);
+#  endif /* WIN32 */

      return (-1);
    }
@@ -1320,5 +1331,5 @@ sigterm_handler(int sig)		/* I - Signal */


 /*
- * End of "$Id: lpd.c 13040 2016-01-11 20:29:13Z msweet $".
+ * End of "$Id$".
 */
@@ -1,18 +1,23 @@
 /*
- * "$Id: network.c 12124 2014-08-28 15:37:22Z msweet $"
+ * "$Id$"
 *
- * Common backend network APIs for CUPS.
+ *   Common backend network APIs for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   backendCheckSideChannel() - Check the side-channel for pending requests.
+ *   backendNetworkSideCB()    - Handle common network side-channel commands.
 */

 /*
@@ -21,7 +26,11 @@

 #include "backend-private.h"
 #include <limits.h>
-#include <sys/select.h>
+#ifdef __hpux
+#  include <sys/time.h>
+#else
+#  include <sys/select.h>
+#endif /* __hpux */


 /*
@@ -91,7 +100,7 @@ backendNetworkSideCB(

    case CUPS_SC_CMD_GET_BIDI :
 	status  = CUPS_SC_STATUS_OK;
-        data[0] = (char)use_bc;
+        data[0] = use_bc;
        datalen = 1;
        break;

@@ -130,13 +139,13 @@ backendNetworkSideCB(
 	    for (dataptr = data + strlen(data) + 1;
 	         count > 0 && dataptr < (data + sizeof(data) - 1);
 	         count --, dataptr += strlen(dataptr))
-	      strlcpy(dataptr, snmp_value, sizeof(data) - (size_t)(dataptr - data));
+	      strlcpy(dataptr, snmp_value, sizeof(data) - (dataptr - data));

 	    fprintf(stderr, "DEBUG: Returning %s %s\n", data,
 	            data + strlen(data) + 1);

 	    status  = CUPS_SC_STATUS_OK;
-	    datalen = (int)(dataptr - data);
+	    datalen = dataptr - data;
 	    break;
          }

@@ -159,7 +168,7 @@ backendNetworkSideCB(
          {
 	    if (_cupsSNMPRead(snmp_fd, &packet, 1.0))
 	    {
-	      size_t	i;		/* Looping var */
+	      int	i;		/* Looping var */


              if (!_cupsSNMPOIDToString(packet.object_name, data, sizeof(data)))
@@ -174,31 +183,35 @@ backendNetworkSideCB(
 	      switch (packet.object_type)
 	      {
 	        case CUPS_ASN1_BOOLEAN :
-		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%d", packet.object_value.boolean);
+		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
+		             packet.object_value.boolean);
 	            datalen += (int)strlen(dataptr);
 		    break;

 	        case CUPS_ASN1_INTEGER :
-		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%d",
+		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
 		             packet.object_value.integer);
 	            datalen += (int)strlen(dataptr);
 		    break;

 	        case CUPS_ASN1_BIT_STRING :
 	        case CUPS_ASN1_OCTET_STRING :
-		    if (packet.object_value.string.num_bytes < (sizeof(data) - (size_t)(dataptr - data)))
+		    if (packet.object_value.string.num_bytes < 0)
+		      i = 0;
+		    else if (packet.object_value.string.num_bytes <
+			     (sizeof(data) - (dataptr - data)))
 		      i = packet.object_value.string.num_bytes;
 		    else
-		      i = sizeof(data) - (size_t)(dataptr - data);
+		      i = (int)(sizeof(data) - (dataptr - data));

 		    memcpy(dataptr, packet.object_value.string.bytes, i);

-                    datalen += (int)i;
+                    datalen += i;
 		    break;

 	        case CUPS_ASN1_OID :
 		    _cupsSNMPOIDToString(packet.object_value.oid, dataptr,
-		                         sizeof(data) - (size_t)(dataptr - data));
+		                         sizeof(data) - (dataptr - data));
 	            datalen += (int)strlen(dataptr);
 		    break;

@@ -207,27 +220,32 @@ backendNetworkSideCB(
 		         i < packet.object_value.string.num_bytes &&
 			     dataptr < (data + sizeof(data) - 3);
 			 i ++, dataptr += 2)
-		      sprintf(dataptr, "%02X", packet.object_value.string.bytes[i]);
+		      sprintf(dataptr, "%02X",
+		              packet.object_value.string.bytes[i]);
 	            datalen += (int)strlen(dataptr);
 		    break;

                case CUPS_ASN1_COUNTER :
-		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%u", packet.object_value.counter);
+		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
+		             packet.object_value.counter);
 	            datalen += (int)strlen(dataptr);
 		    break;

                case CUPS_ASN1_GAUGE :
-		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%u", packet.object_value.gauge);
+		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%u",
+		             packet.object_value.gauge);
 	            datalen += (int)strlen(dataptr);
 		    break;

                case CUPS_ASN1_TIMETICKS :
-		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%u", packet.object_value.timeticks);
+		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%u",
+		             packet.object_value.timeticks);
 	            datalen += (int)strlen(dataptr);
 		    break;

                default :
-	            fprintf(stderr, "DEBUG: Unknown OID value type %02X.\n", packet.object_type);
+	            fprintf(stderr, "DEBUG: Unknown OID value type %02X!\n",
+		            packet.object_type);

 		case CUPS_ASN1_NULL_VALUE :
 		    dataptr[0] = '\0';
@@ -250,12 +268,6 @@ backendNetworkSideCB(
 	datalen = 0;
 	break;

-    case CUPS_SC_CMD_GET_CONNECTED :
-	status  = CUPS_SC_STATUS_OK;
-        data[0] = device_fd != -1;
-        datalen = 1;
-        break;
-
    case CUPS_SC_CMD_GET_DEVICE_ID :
        if (snmp_fd >= 0)
 	{
@@ -293,6 +305,12 @@ backendNetworkSideCB(
 	  break;
 	}

+    case CUPS_SC_CMD_GET_CONNECTED :
+	status  = CUPS_SC_STATUS_OK;
+        data[0] = device_fd != -1;
+        datalen = 1;
+        break;
+
    default :
        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
 	datalen = 0;
@@ -304,5 +322,5 @@ backendNetworkSideCB(


 /*
- * End of "$Id: network.c 12124 2014-08-28 15:37:22Z msweet $".
+ * End of "$Id$".
 */
@@ -1,243 +0,0 @@
-# USB backend 'quirks' file.
-#
-# This file lists known issues with various vendors or printers.  Each
-# line contains either a comment (starting with #) or the USB vendor ID,
-# product ID (omit for all vendor products), and a list of known issues:
-#
-#   blacklist     The printer is not functional with the USB backend.
-#   delay-close   Delay close/reset of selected interface
-#   no-reattach   Do no re-attach usblp kernel module after printing.
-#   soft-reset    Do a soft reset after printing for cleanup.
-#   unidir        Only supported unidirectional I/O
-#   usb-init      Needs vendor USB initialization string.
-#   vendor-class  Uses vendor-specific class or subclass.
-#   whitelist     The printer is functional with the USB backend.
-
-# HP DeskJet 895C
-0x03f0 0x0004 unidir
-
-# HP DeskJet 880C
-0x03f0 0x0104 unidir
-
-# HP DeskJet 815C
-0x03f0 0x0204 unidir
-
-# HP DeskJet 810C/812C
-0x03f0 0x0304 unidir
-
-# HP DeskJet 830C
-0x03f0 0x0404 unidir
-
-# HP DeskJet 885C
-0x03f0 0x0504 unidir
-
-# HP DeskJet 840C
-0x03f0 0x0604 unidir
-
-# HP DeskJet 816C
-0x03f0 0x0804 unidir
-
-# HP Deskjet 959C
-0x03f0 0x1104 unidir
-
-# NEC Picty900 (HP OEM)
-0x0409 0xefbe unidir
-
-# NEC Picty760 (HP OEM)
-0x0409 0xbef4 unidir
-
-# NEC Picty920 (HP OEM)
-0x0409 0xf0be unidir
-
-# NEC Picty800 (HP OEM)
-0x0409 0xf1be unidir
-
-# Lexmark International, Inc. (e250d), https://bugs.launchpad.net/bugs/1084164
-0x043d 0x00f3 no-reattach
-
-# Kyocera Mita FS 820, by zut <kernel@zut.de>
-0x0482 0x0010 unidir
-
-# Canon, Inc. PIXMA iP6000D Printer, https://bugs.launchpad.net/bugs/1160638
-0x04a9 0x1095 unidir
-
-# Canon, Inc. PIXMA iP4200 Printer, http://www.cups.org/str.php?L4155
-0x04a9 0x10a2 unidir
-
-# Canon, Inc. PIXMA iP4300 Printer, https://bugs.launchpad.net/bugs/1032385
-0x04a9 0x10b6 unidir
-
-# Canon, Inc. MP210 https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53
-0x04a9 0x1721 unidir
-
-# Canon, Inc. MP500 Printer, https://bugs.launchpad.net/bugs/1032456
-0x04a9 0x170c unidir
-
-# Canon, Inc. MP510 Printer, https://bugs.launchpad.net/bugs/1050009
-0x04a9 0x1717 unidir
-
-# Canon, Inc. MP550 Printer, http://www.cups.org/str.php?L4155
-0x04a9 0x173d unidir
-
-# Canon, Inc. MP560 Printer, http://www.cups.org/str.php?L4155
-0x04a9 0x173e unidir
-
-# Canon, Inc. MF4150 Printer, https://bugs.launchpad.net/bugs/1160638
-0x04a9 0x26a3 no-reattach
-
-# Brother Industries, Ltd HL-1250 Laser Printer, https://bugs.debian.org/712512
-0x04f9 0x0007 no-reattach
-
-# Brother Industries, Ltd HL-1430 Laser Printer, https://bugs.launchpad.net/bugs/1038695
-0x04f9 0x001a no-reattach
-
-# Brother Industries, Ltd HL-1440 Laser Printer, https://bugs.launchpad.net/bugs/1000253
-0x04f9 0x000d no-reattach unidir
-
-# Brother Industries, Ltd HL-1450 Laser Printer, https://bugs.launchpad.net/bugs/1000253
-0x04f9 0x000e no-reattach unidir
-
-# Oki Data Corp. Okipage 14ex Printer, https://bugs.launchpad.net/bugs/872483
-0x06bc 0x000b no-reattach
-
-# Oki Data Corp. B410d, https://bugs.launchpad.net/bugs/872483
-0x06bc 0x01c7 no-reattach
-
-# Seiko Epson Corp. Stylus Color 740 / Photo 750, http://bugs.debian.org/697970
-0x04b8 0x0001 no-reattach unidir
-
-# Seiko Epson Corp. Stylus Color 670, https://bugs.launchpad.net/bugs/872483
-0x04b8 0x0005 no-reattach
-
-# Seiko Epson Receipt Printer M129C
-0x04b8 0x0202 vendor-class
-
-# Prolific Technology, Inc. PL2305 Parallel Port (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485
-0x067b 0x2305 no-reattach soft-reset unidir
-
-# Xerox Phaser 3124 https://bugzilla.redhat.com/show_bug.cgi?id=867392
-0x0924 0x3ce9 no-reattach
-
-# Xerox WorkCentre 3210 https://bugs.launchpad.net/bugs/1102470
-0x0924 0x4293 no-reattach
-
-# QinHeng Electronics CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253
-0x1a86 0x7584 no-reattach
-
-# All Samsung devices, https://bugs.launchpad.net/bugs/1032456
-0x04e8 soft-reset
-
-# All Zebra devices, https://bugs.launchpad.net/bugs/1001028
-0x0a5f unidir
-
-# Canon CP-10
-0x04a9 0x304a blacklist
-
-# Canon CP-100
-0x04a9 0x3063 blacklist
-
-# Canon CP-200
-0x04a9 0x307c blacklist
-
-# Canon CP-300
-0x04a9 0x307d blacklist
-
-# Canon CP-220
-0x04a9 0x30bd blacklist
-
-# Canon CP-330
-0x04a9 0x30be blacklist
-
-# Canon SELPHY CP400
-0x04a9 0x30f6 blacklist
-
-# Canon SELPHY CP600
-0x04a9 0x310b blacklist
-
-# Canon SELPHY CP710
-0x04a9 0x3127 blacklist
-
-# Canon SELPHY CP510
-0x04a9 0x3128 blacklist
-
-# Canon SELPHY ES1
-0x04a9 0x3141 blacklist
-
-# Canon SELPHY CP730
-0x04a9 0x3142 blacklist
-
-# Canon SELPHY CP720
-0x04a9 0x3143 blacklist
-
-# Canon SELPHY CP750
-0x04a9 0x3170 blacklist
-
-# Canon SELPHY CP740
-0x04a9 0x3171 blacklist
-
-# Canon SELPHY ES2
-0x04a9 0x3185 blacklist
-
-# Canon SELPHY ES20
-0x04a9 0x3186 blacklist
-
-# Canon SELPHY CP770
-0x04a9 0x31aa blacklist
-
-# Canon SELPHY CP760
-0x04a9 0x31ab blacklist
-
-# Canon SELPHY ES30
-0x04a9 0x31b0 blacklist
-
-# Canon SELPHY CP780
-0x04a9 0x31dd blacklist
-
-# Canon SELPHY ES40
-0x04a9 0x31ee blacklist
-
-# Canon SELPHY CP800
-0x04a9 0x3214 blacklist
-
-# Canon SELPHY CP900
-0x04a9 0x3255 blacklist
-
-# Canon SELPHY CP810
-0x04a9 0x3256 blacklist
-
-# Canon SELPHY CP500
-0x04a9 0x30f5 blacklist
-
-# Canon SELPHY ES3
-0x04a9 0x31af blacklist
-
-# Canon SELPHY CP780
-0x04a9 0x31dd blacklist
-
-# Lexmark E238 (<rdar://problem/14493054>)
-0x043d 0x00d7 no-reattach
-
-# Lexmark E238 (STR #4448)
-0x043d 0x009a no-reattach
-
-# Canon MX310 (STR #4482)
-0x04a9 0x1728 unidir
-
-# Canon MX320 (STR #4482)
-0x04A9 0x1736 unidir
-
-# All Intermec devices (STR #4553)
-0x067e no-reattach
-
-# HP LaserJet 1150 (STR #4549)
-0x03f0 0x0f17 delay-close
-
-# HP LaserJet 1300 (STR #4549)
-0x03f0 0x1017 delay-close
-0x03f0 0x1117 delay-close
-
-# HP LaserJet 1320 (STR #4549)
-0x03f0 0x1d17 delay-close
-
-# Canon, Inc. MP530 Printer
-0x04a9 0x1712 unidir
@@ -1,18 +1,25 @@
 /*
- * "$Id: runloop.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id$"
 *
- * Common run loop APIs for CUPS backends.
+ *   Common run loop APIs for CUPS backends.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   backendDrainOutput() - Drain pending print data to the device.
+ *   backendRunLoop()     - Read and write print and back-channel data.
+ *   backendWaitLoop()    - Wait for input from stdin while handling
+ *                          side-channel queries.
 */

 /*
@@ -21,7 +28,11 @@

 #include "backend-private.h"
 #include <limits.h>
-#include <sys/select.h>
+#ifdef __hpux
+#  include <sys/time.h>
+#else
+#  include <sys/select.h>
+#endif /* __hpux */


 /*
@@ -102,7 +113,7 @@ backendDrainOutput(int print_fd,	/* I - Print file descriptor */

    for (print_ptr = print_buffer; print_bytes > 0;)
    {
-      if ((bytes = write(device_fd, print_ptr, (size_t)print_bytes)) < 0)
+      if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
      {
       /*
        * Write error - bail if we don't see an error we can retry...
@@ -282,7 +293,7 @@ backendRunLoop(
 	fprintf(stderr,
 	        "DEBUG: Received " CUPS_LLFMT " bytes of back-channel data\n",
 	        CUPS_LLCAST bc_bytes);
-        cupsBackChannelWrite(bc_buffer, (size_t)bc_bytes, 1.0);
+        cupsBackChannelWrite(bc_buffer, bc_bytes, 1.0);
      }
      else if (bc_bytes < 0 && errno != EAGAIN && errno != EINTR)
      {
@@ -339,7 +350,7 @@ backendRunLoop(

    if (print_bytes && FD_ISSET(device_fd, &output))
    {
-      if ((bytes = write(device_fd, print_ptr, (size_t)print_bytes)) < 0)
+      if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
      {
       /*
        * Write error - bail if we don't see an error we can retry...
@@ -528,5 +539,5 @@ backendWaitLoop(


 /*
- * End of "$Id: runloop.c 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,17 +1,24 @@
 /*
- * "$Id: snmp-supplies.c 12227 2014-10-21 13:42:04Z msweet $"
+ * "$Id$"
 *
- * SNMP supplies functions for CUPS.
+ *   SNMP supplies functions for CUPS.
 *
- * Copyright 2008-2014 by Apple Inc.
+ *   Copyright 2008-2012 by Apple Inc.
 *
- * 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"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   backendSNMPSupplies()   - Get the current supplies for a device.
+ *   backend_init_supplies() - Initialize the supplies list.
+ *   backend_walk_cb()       - Interpret the supply value responses.
+ *   utf16_to_utf8()         - Convert UTF-16 text to UTF-8.
 */

 /*
@@ -55,7 +62,6 @@ typedef struct				/**** Printer supply data ****/
  char	name[CUPS_SNMP_MAX_STRING],	/* Name of supply */
 	color[8];			/* Color: "#RRGGBB" or "none" */
  int	colorant,			/* Colorant index */
-	sclass,				/* Supply class */
 	type,				/* Supply type */
 	max_capacity,			/* Maximum capacity */
 	level;				/* Current level value */
@@ -142,13 +148,6 @@ static const int	prtMarkerSuppliesMaxCapacity[] =
 			(sizeof(prtMarkerSuppliesMaxCapacity) /
 			 sizeof(prtMarkerSuppliesMaxCapacity[0]));
 			 		/* Offset to supply index */
-static const int	prtMarkerSuppliesClass[] =
-			{ CUPS_OID_prtMarkerSuppliesClass, -1 },
-					/* Class OID */
-			prtMarkerSuppliesClassOffset =
-			(sizeof(prtMarkerSuppliesClass) /
-			 sizeof(prtMarkerSuppliesClass[0]));
-			 		/* Offset to supply index */
 static const int	prtMarkerSuppliesType[] =
 			{ CUPS_OID_prtMarkerSuppliesType, -1 },
 					/* Type OID */
@@ -164,7 +163,7 @@ static const int	prtMarkerSuppliesSupplyUnit[] =
 			 sizeof(prtMarkerSuppliesSupplyUnit[0]));
 					/* Offset to supply index */

-static const backend_state_t printer_states[] =
+static const backend_state_t const printer_states[] =
 			{
 			  /* { CUPS_TC_lowPaper, "media-low-report" }, */
 			  { CUPS_TC_noPaper | CUPS_TC_inputTrayEmpty, "media-empty-warning" },
@@ -181,7 +180,7 @@ static const backend_state_t printer_states[] =
 			  { CUPS_TC_outputFull, "output-area-full-warning" }
 			};

-static const backend_state_t supply_states[] =
+static const backend_state_t const supply_states[] =
 			{
 			  { CUPS_DEVELOPER_LOW, "developer-low-report" },
 			  { CUPS_DEVELOPER_EMPTY, "developer-empty-warning" },
@@ -258,9 +257,6 @@ backendSNMPSupplies(
      else
        percent = 50;

-      if (supplies[i].sclass == CUPS_TC_receptacleThatIsFilled)
-        percent = 100 - percent;
-
      if (percent <= 5)
      {
        switch (supplies[i].type)
@@ -297,7 +293,6 @@ backendSNMPSupplies(
              else
                new_supply_state |= CUPS_OPC_NEAR_EOL;
              break;
-#if 0 /* Because no two vendors report waste containers the same, disable SNMP reporting of same */
          case CUPS_TC_wasteInk :
          case CUPS_TC_wastePaper :
          case CUPS_TC_wasteToner :
@@ -308,7 +303,6 @@ backendSNMPSupplies(
              else
                new_supply_state |= CUPS_WASTE_ALMOST_FULL;
              break;
-#endif /* 0 */
          case CUPS_TC_cleanerUnit :
          case CUPS_TC_fuserCleaningPad :
              if (percent <= 1)
@@ -324,9 +318,9 @@ backendSNMPSupplies(

      if ((supplies[i].max_capacity > 0 || (quirks & CUPS_SNMP_CAPACITY)) &&
          supplies[i].level >= 0)
-        snprintf(ptr, sizeof(value) - (size_t)(ptr - value), "%d", percent);
+        sprintf(ptr, "%d", percent);
      else
-        strlcpy(ptr, "-1", sizeof(value) - (size_t)(ptr - value));
+        strcpy(ptr, "-1");
    }

    fprintf(stderr, "ATTR: marker-levels=%s\n", value);
@@ -464,34 +458,34 @@ backend_init_supplies(
 		  "other",
 		  "unknown",
 		  "toner",
-		  "waste-toner",
+		  "wasteToner",
 		  "ink",
-		  "ink-cartridge",
-		  "ink-ribbon",
-		  "waste-ink",
+		  "inkCartridge",
+		  "inkRibbon",
+		  "wasteInk",
 		  "opc",
 		  "developer",
-		  "fuser-oil",
-		  "solid-wax",
-		  "ribbon-wax",
-		  "waste-wax",
+		  "fuserOil",
+		  "solidWax",
+		  "ribbonWax",
+		  "wasteWax",
 		  "fuser",
-		  "corona-wire",
-		  "fuser-oil-wick",
-		  "cleaner-unit",
-		  "fuser-cleaning-pad",
-		  "transfer-unit",
-		  "toner-cartridge",
-		  "fuser-oiler",
+		  "coronaWire",
+		  "fuserOilWick",
+		  "cleanerUnit",
+		  "fuserCleaningPad",
+		  "transferUnit",
+		  "tonerCartridge",
+		  "fuserOiler",
 		  "water",
-		  "waste-water",
-		  "glue-water-additive",
-		  "waste-paper",
-		  "binding-supply",
-		  "banding-supply",
-		  "stitching-wire",
-		  "shrink-wrap",
-		  "paper-wrap",
+		  "wasteWater",
+		  "glueWaterAdditive",
+		  "wastePaper",
+		  "bindingSupply",
+		  "bandingSupply",
+		  "stitchingWire",
+		  "shrinkWrap",
+		  "paperWrap",
 		  "staples",
 		  "inserts",
 		  "covers"
@@ -567,20 +561,20 @@ backend_init_supplies(
   /*
    * Yes, read the cache file:
    *
-    *     3 num_supplies charset
+    *     2 num_supplies charset
    *     device description
    *     supply structures...
    */

    if (cupsFileGets(cachefile, value, sizeof(value)))
    {
-      if (sscanf(value, "3 %d%d", &num_supplies, &charset) == 2 &&
+      if (sscanf(value, "2 %d%d", &num_supplies, &charset) == 2 &&
          num_supplies <= CUPS_MAX_SUPPLIES &&
          cupsFileGets(cachefile, value, sizeof(value)))
      {
        if (!strcmp(description, value))
 	  cupsFileRead(cachefile, (char *)supplies,
-	               (size_t)num_supplies * sizeof(backend_supplies_t));
+	               num_supplies * sizeof(backend_supplies_t));
        else
 	{
 	  num_supplies = -1;
@@ -670,12 +664,12 @@ backend_init_supplies(

  if ((cachefile = cupsFileOpen(cachefilename, "w")) != NULL)
  {
-    cupsFilePrintf(cachefile, "3 %d %d\n", num_supplies, charset);
+    cupsFilePrintf(cachefile, "2 %d %d\n", num_supplies, charset);
    cupsFilePrintf(cachefile, "%s\n", description);

    if (num_supplies > 0)
      cupsFileWrite(cachefile, (char *)supplies,
-                    (size_t)num_supplies * sizeof(backend_supplies_t));
+                    num_supplies * sizeof(backend_supplies_t));

    cupsFileClose(cachefile);
  }
@@ -688,7 +682,7 @@ backend_init_supplies(
  */

  for (i = 0; i < num_supplies; i ++)
-    strlcpy(supplies[i].color, "none", sizeof(supplies[i].color));
+    strcpy(supplies[i].color, "none");

  _cupsSNMPWalk(snmp_fd, &current_addr, CUPS_SNMP_VERSION_1,
                _cupsSNMPDefaultCommunity(), prtMarkerColorantValue,
@@ -703,7 +697,7 @@ backend_init_supplies(
    if (i)
      *ptr++ = ',';

-    strlcpy(ptr, supplies[i].color, sizeof(value) - (size_t)(ptr - value));
+    strcpy(ptr, supplies[i].color);
  }

  fprintf(stderr, "ATTR: marker-colors=%s\n", value);
@@ -751,9 +745,9 @@ backend_init_supplies(
    type = supplies[i].type;

    if (type < CUPS_TC_other || type > CUPS_TC_covers)
-      strlcpy(ptr, "unknown", sizeof(value) - (size_t)(ptr - value));
+      strcpy(ptr, "unknown");
    else
-      strlcpy(ptr, types[type - CUPS_TC_other], sizeof(value) - (size_t)(ptr - value));
+      strcpy(ptr, types[type - CUPS_TC_other]);
  }

  fprintf(stderr, "ATTR: marker-types=%s\n", value);
@@ -820,7 +814,7 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
 	  if (!_cups_strcasecmp(colors[k][0],
 	                        (char *)packet->object_value.string.bytes))
 	  {
-	    strlcpy(supplies[j].color, colors[k][1], sizeof(supplies[j].color));
+	    strcpy(supplies[j].color, colors[k][1]);
 	    break;
 	  }
      }
@@ -975,25 +969,6 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
        packet->object_value.integer > 0)
      supplies[i - 1].max_capacity = packet->object_value.integer;
  }
-  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesClass))
-  {
-   /*
-    * Get marker class...
-    */
-
-    i = packet->object_name[prtMarkerSuppliesClassOffset];
-    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
-        packet->object_type != CUPS_ASN1_INTEGER)
-      return;
-
-    fprintf(stderr, "DEBUG2: prtMarkerSuppliesClass.1.%d = %d\n", i,
-            packet->object_value.integer);
-
-    if (i > num_supplies)
-      num_supplies = i;
-
-    supplies[i - 1].sclass = packet->object_value.integer;
-  }
  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesType))
  {
   /*
@@ -1057,9 +1032,9 @@ utf16_to_utf8(
  for (ptr = temp; srcsize >= 2;)
  {
    if (le)
-      ch = (cups_utf32_t)(src[0] | (src[1] << 8));
+      ch = src[0] | (src[1] << 8);
    else
-      ch = (cups_utf32_t)((src[0] << 8) | src[1]);
+      ch = (src[0] << 8) | src[1];

    src += 2;
    srcsize -= 2;
@@ -1070,13 +1045,13 @@ utf16_to_utf8(
      * Multi-word UTF-16 char...
      */

-      cups_utf32_t lch;			/* Lower word */
+      int lch;			/* Lower word */


      if (le)
-	lch = (cups_utf32_t)(src[0] | (src[1] << 8));
+	lch = src[0] | (src[1] << 8);
      else
-	lch = (cups_utf32_t)((src[0] << 8) | src[1]);
+	lch = (src[0] << 8) | src[1];

      if (lch >= 0xdc00 && lch <= 0xdfff)
      {
@@ -1093,10 +1068,10 @@ utf16_to_utf8(

  *ptr = '\0';

-  cupsUTF32ToUTF8(dst, temp, (int)dstsize);
+  cupsUTF32ToUTF8(dst, temp, dstsize);
 }


 /*
- * End of "$Id: snmp-supplies.c 12227 2014-10-21 13:42:04Z msweet $".
+ * End of "$Id$".
 */
@@ -1,18 +1,44 @@
 /*
- * "$Id: snmp.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id$"
 *
- * SNMP discovery backend for CUPS.
+ *   SNMP discovery backend for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   main()                    - Discover printers via SNMP.
+ *   add_array()               - Add a string to an array.
+ *   add_cache()               - Add a cached device...
+ *   add_device_uri()          - Add a device URI to the cache.
+ *   alarm_handler()           - Handle alarm signals...
+ *   compare_cache()           - Compare two cache entries.
+ *   debug_printf()            - Display some debugging information.
+ *   fix_make_model()          - Fix common problems in the make-and-model
+ *                               string.
+ *   free_array()              - Free an array of strings.
+ *   free_cache()              - Free the array of cached devices.
+ *   get_interface_addresses() - Get the broadcast address(es) associated with
+ *                               an interface.
+ *   list_device()             - List a device we found...
+ *   password_cb()             - Handle authentication requests.
+ *   probe_device()            - Probe a device to discover whether it is a
+ *                               printer.
+ *   read_snmp_conf()          - Read the snmp.conf file.
+ *   read_snmp_response()      - Read and parse a SNMP response...
+ *   run_time()                - Return the total running time...
+ *   scan_devices()            - Scan for devices using SNMP.
+ *   try_connect()             - Try connecting on a port...
+ *   update_cache()            - Update a cached device...
 */

 /*
@@ -506,16 +532,17 @@ fix_make_model(
    make_model[0] = 'H';
    make_model[1] = 'P';
    make_model[2] = ' ';
-    strlcpy(make_model + 3, mmptr, (size_t)make_model_size - 3);
+    strlcpy(make_model + 3, mmptr, make_model_size - 3);
  }
  else if (!_cups_strncasecmp(old_make_model, "deskjet", 7))
-    snprintf(make_model, (size_t)make_model_size, "HP DeskJet%s", old_make_model + 7);
+    snprintf(make_model, make_model_size, "HP DeskJet%s", old_make_model + 7);
  else if (!_cups_strncasecmp(old_make_model, "officejet", 9))
-    snprintf(make_model, (size_t)make_model_size, "HP OfficeJet%s", old_make_model + 9);
+    snprintf(make_model, make_model_size, "HP OfficeJet%s", old_make_model + 9);
  else if (!_cups_strncasecmp(old_make_model, "stylus_pro_", 11))
-    snprintf(make_model, (size_t)make_model_size, "EPSON Stylus Pro %s", old_make_model + 11);
+    snprintf(make_model, make_model_size, "EPSON Stylus Pro %s",
+             old_make_model + 11);
  else
-    strlcpy(make_model, old_make_model, (size_t)make_model_size);
+    strlcpy(make_model, old_make_model, make_model_size);

  if ((mmptr = strstr(make_model, ", Inc.,")) != NULL)
  {
@@ -726,7 +753,7 @@ probe_device(snmp_cache_t *device)	/* I - Device */
 	    * Insert hostname/address...
 	    */

-	    strlcpy(uriptr, device->addrname, sizeof(uri) - (size_t)(uriptr - uri));
+	    strlcpy(uriptr, device->addrname, sizeof(uri) - (uriptr - uri));
 	    uriptr += strlen(uriptr);
 	    format += 2;
 	  }
@@ -1206,7 +1233,7 @@ scan_devices(int ipv4,			/* I - SNMP IPv4 socket */
      for (addr = addrs; addr; addr = addr->next)
      {
 #ifdef AF_INET6
-        if (httpAddrFamily(&(addr->addr)) == AF_INET6)
+        if (_httpAddrFamily(&(addr->addr)) == AF_INET6)
 	  fd = ipv6;
 	else
 #endif /* AF_INET6 */
@@ -1308,7 +1335,7 @@ try_connect(http_addr_t *addr,		/* I - Socket address */
  debug_printf("DEBUG: %.3f Trying %s://%s:%d...\n", run_time(),
               port == 515 ? "lpd" : "socket", addrname, port);

-  if ((fd = socket(httpAddrFamily(addr), SOCK_STREAM, 0)) < 0)
+  if ((fd = socket(_httpAddrFamily(addr), SOCK_STREAM, 0)) < 0)
  {
    fprintf(stderr, "ERROR: Unable to create socket: %s\n",
            strerror(errno));
@@ -1319,7 +1346,7 @@ try_connect(http_addr_t *addr,		/* I - Socket address */

  alarm(1);

-  status = connect(fd, (void *)addr, (socklen_t)httpAddrLength(addr));
+  status = connect(fd, (void *)addr, httpAddrLength(addr));

  close(fd);
  alarm(0);
@@ -1364,5 +1391,5 @@ update_cache(snmp_cache_t *device,	/* I - Device */


 /*
- * End of "$Id: snmp.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id$".
 */
@@ -1,18 +1,23 @@
 /*
- * "$Id: socket.c 11907 2014-06-09 18:35:32Z msweet $"
+ * "$Id$"
 *
- * AppSocket backend for CUPS.
+ *   AppSocket backend for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   main()    - Send a file to the printer or server.
+ *   wait_bc() - Wait for back-channel data...
 */

 /*
@@ -41,7 +46,7 @@
 * Local functions...
 */

-static ssize_t	wait_bc(int device_fd, int secs);
+static int	wait_bc(int device_fd, int secs);


 /*
@@ -68,6 +73,10 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  int		print_fd;		/* Print file */
  int		copies;			/* Number of copies to print */
  time_t	start_time;		/* Time of first connect */
+#ifdef __APPLE__
+  time_t	current_time,		/* Current time */
+		wait_time;		/* Time to wait before shutting down socket */
+#endif /* __APPLE__ */
  int		contimeout;		/* Connection timeout */
  int		waiteof;		/* Wait for end-of-file? */
  int		port;			/* Port number */
@@ -245,8 +254,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
         */

         snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
-                        !_cups_strcasecmp(value, "yes") ||
-                        !_cups_strcasecmp(value, "true");
+                        _cups_strcasecmp(value, "yes") ||
+                        _cups_strcasecmp(value, "true");
      }
      else if (!_cups_strcasecmp(name, "contimeout"))
      {
@@ -380,7 +389,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	      break;
        }

-	sleep((unsigned)delay);
+	sleep(delay);

 	if (delay < 30)
 	  delay += 5;
@@ -401,7 +410,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

  fprintf(stderr, "DEBUG: Connected to %s:%d...\n",
 	  httpAddrString(&(addr->addr), addrname, sizeof(addrname)),
-	  httpAddrPort(&(addr->addr)));
+	  _httpAddrPort(&(addr->addr)));

 /*
  * Print everything...
@@ -410,7 +419,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  tbytes = 0;

  if (bytes > 0)
-    tbytes += write(device_fd, buffer, (size_t)bytes);
+    tbytes += write(device_fd, buffer, bytes);

  while (copies > 0 && tbytes >= 0)
  {
@@ -429,7 +438,16 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      _cupsLangPrintFilter(stderr, "INFO", _("Print file sent."));
  }

-  fputs("STATE: +cups-waiting-for-job-completed\n", stderr);
+#ifdef __APPLE__
+ /*
+  * Wait up to 5 seconds to get any pending back-channel data...
+  */
+
+  wait_time = time(NULL) + 5;
+  while (wait_time >= time(&current_time))
+    if (wait_bc(device_fd, wait_time - current_time) <= 0)
+      break;
+#endif /* __APPLE__ */

  if (waiteof)
  {
@@ -476,7 +494,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 * 'wait_bc()' - Wait for back-channel data...
 */

-static ssize_t				/* O - # bytes read or -1 on error */
+static int				/* O - # bytes read or -1 on error */
 wait_bc(int device_fd,			/* I - Socket */
        int secs)			/* I - Seconds to wait */
 {
@@ -506,7 +524,7 @@ wait_bc(int device_fd,			/* I - Socket */
    {
      fprintf(stderr, "DEBUG: Received %d bytes of back-channel data\n",
 	      (int)bytes);
-      cupsBackChannelWrite(buffer, (size_t)bytes, 1.0);
+      cupsBackChannelWrite(buffer, bytes, 1.0);
    }

    return (bytes);
@@ -517,5 +535,5 @@ wait_bc(int device_fd,			/* I - Socket */


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


 /*
- * End of "$Id: test1284.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,18 +1,25 @@
 /*
- * "$Id: testbackend.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id$"
 *
- * Backend test program for CUPS.
+ *   Backend test program for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   main()            - Run the named backend.
+ *   sigterm_handler() - Flag when we get SIGTERM.
+ *   usage()           - Show usage information.
+ *   walk_cb()         - Show results of cupsSideChannelSNMPWalk...
 */

 /*
@@ -90,7 +97,7 @@ main(int  argc,				/* I - Number of command-line args */
  if (getcwd(libpath, sizeof(libpath)) &&
      (ptr = strrchr(libpath, '/')) != NULL && !strcmp(ptr, "/backend"))
  {
-    strlcpy(ptr, "/cups", sizeof(libpath) - (size_t)(ptr - libpath));
+    strlcpy(ptr, "/cups", sizeof(libpath) - (ptr - libpath));
    if (!access(libpath, 0))
    {
 #ifdef __APPLE__
@@ -304,7 +311,7 @@ main(int  argc,				/* I - Number of command-line args */
 	  */

 	  if ((bytes = cupsBackChannelRead(buffer, sizeof(buffer), 0)) > 0)
-	    write(2, buffer, (size_t)bytes);
+	    write(2, buffer, bytes);

 	 /*
 	  * Throttle output to ~100hz...
@@ -332,7 +339,7 @@ main(int  argc,				/* I - Number of command-line args */
 	*/

        while ((bytes = cupsBackChannelRead(buffer, sizeof(buffer), 5.0)) > 0)
-	  write(2, buffer, (size_t)bytes);
+	  write(2, buffer, bytes);

 	exit(0);
      }
@@ -407,7 +414,7 @@ main(int  argc,				/* I - Number of command-line args */
        while ((bytes = cupsBackChannelRead(buffer, sizeof(buffer),
 	                                    timeout)) > 0)
 	{
-	  write(2, buffer, (size_t)bytes);
+	  write(2, buffer, bytes);
 	  timeout = 5.0;
 	}
 	write(2, "\nDEBUG: END\n", 12);
@@ -660,25 +667,10 @@ walk_cb(const char *oid,		/* I - OID */
 	int        datalen,		/* I - Length of data */
 	void       *context)		/* I - Context (unused) */
 {
-  char temp[80];
-
-  (void)context;
-
-  if ((size_t)datalen > (sizeof(temp) - 1))
-  {
-    memcpy(temp, data, sizeof(temp) - 1);
-    temp[sizeof(temp) - 1] = '\0';
-  }
-  else
-  {
-    memcpy(temp, data, (size_t)datalen);
-    temp[datalen] = '\0';
-  }
-
-  printf("CUPS_SC_CMD_SNMP_WALK %s, %d bytes (%s)\n", oid, datalen, temp);
+  printf("CUPS_SC_CMD_SNMP_WALK %s, %d bytes (%s)\n", oid, datalen, data);
 }


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


 /*
- * End of "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $".
+ * End of "$Id$".
 */
@@ -1,15 +1,33 @@
 /*
- * "$Id: usb-libusb.c 12881 2015-09-15 21:20:02Z msweet $"
+ * "$Id$"
 *
- * LIBUSB interface code for CUPS.
+ *   LIBUSB interface code for CUPS.
 *
- * Copyright 2007-2015 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * Contents:
+ *
+ *   list_devices()	  - List the available printers.
+ *   print_device()	  - Print a file to a USB device.
+ *   close_device()	  - Close the connection to the USB printer.
+ *   find_device()	  - Find or enumerate USB printers.
+ *   get_device_id()	  - Get the IEEE-1284 device ID for the printer.
+ *   list_cb()		  - List USB printers for discovery.
+ *   make_device_uri()	  - Create a device URI for a USB printer.
+ *   open_device()	  - Open a connection to the USB printer.
+ *   print_cb() 	  - Find a USB printer for printing.
+ *   printer_class_soft_reset()' - Do the soft reset request specific to
+ *                          printers
+ *   quirks()	 	  - Get the known quirks of a given printer model
+ *   read_thread()	  - Thread to read the backchannel data on.
+ *   sidechannel_thread() - Handle side-channel requests.
+ *   soft_reset()	  - Send a soft reset to the device.
 */

 /*
@@ -18,7 +36,6 @@

 #include <libusb.h>
 #include <cups/cups-private.h>
-#include <cups/dir.h>
 #include <pthread.h>
 #include <sys/select.h>
 #include <sys/types.h>
@@ -53,15 +70,15 @@ typedef struct usb_printer_s		/**** USB Printer Data ****/
 			read_endp,	/* Read endpoint */
 			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
 			usblp_attached,	/* "usblp" kernel module attached? */
-			reset_after_job;/* Set to 1 by print_device() */
-  unsigned		quirks;		/* Quirks flags */
+			reset_after_job; /* Set to 1 by print_device() */
+  unsigned int		quirks;		/* Quirks flags */
  struct libusb_device_handle *handle;	/* Open handle to device */
 } usb_printer_t;

 typedef int (*usb_cb_t)(usb_printer_t *, const char *, const char *,
                        const void *);

-typedef struct usb_globals_s		/* Global USB printer information */
+typedef struct usb_globals_s
 {
  usb_printer_t		*printer;	/* Printer */

@@ -88,42 +105,127 @@ typedef struct usb_globals_s		/* Global USB printer information */
 } usb_globals_t;

 /*
- * Quirks: various printer quirks are handled by this structure and its flags.
+ * Quirks: various printer quirks are handled by this table & its flags.
 *
- * The quirks table used to be compiled into the backend but is now loaded from
- * one or more files in the /usr/share/cups/usb directory.
+ * This is copied from the usblp kernel module. So we can easily copy and paste
+ * new quirks from the module.
 */

-#define USB_QUIRK_BLACKLIST	0x0001	/* Does not conform to the spec */
-#define USB_QUIRK_NO_REATTACH	0x0002	/* After printing we cannot re-attach
-					   the usblp kernel module */
-#define USB_QUIRK_SOFT_RESET	0x0004	/* After printing do a soft reset
-					   for clean-up */
-#define USB_QUIRK_UNIDIR	0x0008	/* Requires unidirectional mode */
-#define USB_QUIRK_USB_INIT	0x0010	/* Needs vendor USB init string */
-#define USB_QUIRK_VENDOR_CLASS	0x0020	/* Descriptor uses vendor-specific
+struct quirk_printer_struct {
+	int vendorId;
+	int productId;
+	unsigned int quirks;
+};
+
+#define USBLP_QUIRK_BIDIR	0x1	/* reports bidir but requires
+					   unidirectional mode (no INs/reads) */
+#define USBLP_QUIRK_USB_INIT	0x2	/* needs vendor USB init string */
+#define USBLP_QUIRK_BAD_CLASS	0x4	/* descriptor uses vendor-specific
 					   Class or SubClass */
-#define USB_QUIRK_DELAY_CLOSE	0x0040	/* Delay close */
-#define USB_QUIRK_WHITELIST	0x0000	/* no quirks */
-
-
-typedef struct usb_quirk_s		/* USB "quirk" information */
-{
-  int		vendor_id,		/* Affected vendor ID */
-		product_id;		/* Affected product ID or 0 for all */
-  unsigned	quirks;			/* Quirks bitfield */
-} usb_quirk_t;
-
+#define USBLP_QUIRK_BLACKLIST	0x8	/* these printers do not conform to the USB print spec */
+#define USBLP_QUIRK_RESET	0x4000	/* After printing do a reset
+					   for clean-up */
+#define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
+					   the usblp kernel module */

+static const struct quirk_printer_struct quirk_printers[] = {
+	{ 0x03f0, 0x0004, USBLP_QUIRK_BIDIR }, /* HP DeskJet 895C */
+	{ 0x03f0, 0x0104, USBLP_QUIRK_BIDIR }, /* HP DeskJet 880C */
+	{ 0x03f0, 0x0204, USBLP_QUIRK_BIDIR }, /* HP DeskJet 815C */
+	{ 0x03f0, 0x0304, USBLP_QUIRK_BIDIR }, /* HP DeskJet 810C/812C */
+	{ 0x03f0, 0x0404, USBLP_QUIRK_BIDIR }, /* HP DeskJet 830C */
+	{ 0x03f0, 0x0504, USBLP_QUIRK_BIDIR }, /* HP DeskJet 885C */
+	{ 0x03f0, 0x0604, USBLP_QUIRK_BIDIR }, /* HP DeskJet 840C */
+	{ 0x03f0, 0x0804, USBLP_QUIRK_BIDIR }, /* HP DeskJet 816C */
+	{ 0x03f0, 0x1104, USBLP_QUIRK_BIDIR }, /* HP Deskjet 959C */
+	{ 0x0409, 0xefbe, USBLP_QUIRK_BIDIR }, /* NEC Picty900 (HP OEM) */
+	{ 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */
+	{ 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */
+	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
+	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
+						  by zut <kernel@zut.de> */
+	{ 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200
+			    Printer, http://www.cups.org/str.php?L4155 */
+	{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
+			    Printer, https://bugs.launchpad.net/bugs/1032385 */
+	{ 0x04a9, 0x1721, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP210
+		      https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53 */
+	{ 0x04a9, 0x170c, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP500
+			    Printer, https://bugs.launchpad.net/bugs/1032456 */
+	{ 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
+			    Printer, https://bugs.launchpad.net/bugs/1050009 */
+	{ 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550
+			    Printer, http://www.cups.org/str.php?L4155 */
+	{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
+			    Printer, http://www.cups.org/str.php?L4155 */
+	{ 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
+						  HL-1430 Laser Printer,
+				     https://bugs.launchpad.net/bugs/1038695 */
+	{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR |
+			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
+						  HL-1440 Laser Printer,
+				     https://bugs.launchpad.net/bugs/1000253 */
+	{ 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp.
+						  Okipage 14ex Printer,
+				     https://bugs.launchpad.net/bugs/872483 */
+	{ 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d,
+				     https://bugs.launchpad.net/bugs/872483 */
+	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
+				     http://bugs.debian.org/697970 */
+	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
+						      Printer M129C */
+	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
+			  USBLP_QUIRK_NO_REATTACH |
+	                  USBLP_QUIRK_RESET },
+	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
+			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
+	{ 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210
+				     https://bugs.launchpad.net/bugs/1102470 */
+	/* Prolific Technology, Inc. PL2305 Parallel Port
+	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
+	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,
+				     https://bugs.launchpad.net/bugs/1032456 */
+	{ 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices,
+				     https://bugs.launchpad.net/bugs/1001028 */
+	/* Canon */
+	{ 0x04a9, 0x304a, USBLP_QUIRK_BLACKLIST }, /* Canon CP-10 */
+	{ 0x04a9, 0x3063, USBLP_QUIRK_BLACKLIST }, /* Canon CP-100 */
+	{ 0x04a9, 0x307c, USBLP_QUIRK_BLACKLIST }, /* Canon CP-200 */
+	{ 0x04a9, 0x307d, USBLP_QUIRK_BLACKLIST }, /* Canon CP-300 */
+	{ 0x04a9, 0x30bd, USBLP_QUIRK_BLACKLIST }, /* Canon CP-220 */
+	{ 0x04a9, 0x30be, USBLP_QUIRK_BLACKLIST }, /* Canon CP-330 */
+	{ 0x04a9, 0x30f6, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP400 */
+	{ 0x04a9, 0x310b, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP600 */
+	{ 0x04a9, 0x3127, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP710 */
+	{ 0x04a9, 0x3128, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP510 */
+	{ 0x04a9, 0x3141, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES1 */
+	{ 0x04a9, 0x3142, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP730 */
+	{ 0x04a9, 0x3143, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP720 */
+	{ 0x04a9, 0x3170, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP750 */
+	{ 0x04a9, 0x3171, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP740 */
+	{ 0x04a9, 0x3185, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES2 */
+	{ 0x04a9, 0x3186, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES20 */
+	{ 0x04a9, 0x31aa, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP770 */
+	{ 0x04a9, 0x31ab, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP760 */
+	{ 0x04a9, 0x31b0, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES30 */
+	{ 0x04a9, 0x31dd, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP780 */
+	{ 0x04a9, 0x31ee, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES40 */
+	{ 0x04a9, 0x3214, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP800 */
+	{ 0x04a9, 0x3255, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP900 */
+	{ 0x04a9, 0x3256, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP810 */
+	{ 0x04a9, 0x30F5, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP500 */
+	{ 0x04a9, 0x31AF, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES3 */
+	 /* MISSING PIDs: CP520, CP530, CP790 */
+	{ 0, 0 }
+};


 /*
 * Globals...
 */

-cups_array_t		*all_quirks;	/* Array of printer quirks */
 usb_globals_t		g = { 0 };	/* Globals */
-libusb_device		**all_list;	/* List of connected USB devices */
+libusb_device           **list;         /* List of connected USB devices */


 /*
@@ -131,24 +233,22 @@ libusb_device		**all_list;	/* List of connected USB devices */
 */

 static int		close_device(usb_printer_t *printer);
-static int		compare_quirks(usb_quirk_t *a, usb_quirk_t *b);
 static usb_printer_t	*find_device(usb_cb_t cb, const void *data);
-static unsigned		find_quirks(int vendor_id, int product_id);
 static int		get_device_id(usb_printer_t *printer, char *buffer,
 			              size_t bufsize);
 static int		list_cb(usb_printer_t *printer, const char *device_uri,
 			        const char *device_id, const void *data);
-static void		load_quirks(void);
 static char		*make_device_uri(usb_printer_t *printer,
 			                 const char *device_id,
 					 char *uri, size_t uri_size);
 static int		open_device(usb_printer_t *printer, int verbose);
 static int		print_cb(usb_printer_t *printer, const char *device_uri,
 			         const char *device_id, const void *data);
+static int		printer_class_soft_reset(usb_printer_t *printer);
+static unsigned int	quirks(int vendor, int product);
 static void		*read_thread(void *reference);
 static void		*sidechannel_thread(void *reference);
 static void		soft_reset(void);
-static int		soft_reset_printer(usb_printer_t *printer);


 /*
@@ -158,8 +258,6 @@ static int		soft_reset_printer(usb_printer_t *printer);
 void
 list_devices(void)
 {
-  load_quirks();
-
  fputs("DEBUG: list_devices\n", stderr);
  find_device(list_cb, NULL);
 }
@@ -202,8 +300,6 @@ print_device(const char *uri,		/* I - Device URI */
  const char	*val;			/* Option value */


-  load_quirks();
-
 /*
  * See if the side-channel descriptor is valid...
  */
@@ -229,9 +325,9 @@ print_device(const char *uri,		/* I - Device URI */

 /*
  * Some devices need a reset after finishing a job, these devices are
-  * marked with the USB_QUIRK_SOFT_RESET quirk.
+  * marked with the USBLP_QUIRK_RESET quirk.
  */
-  g.printer->reset_after_job = (g.printer->quirks & USB_QUIRK_SOFT_RESET ? 1 : 0);
+  g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);

 /*
  * If we are printing data from a print driver on stdin, ignore SIGTERM
@@ -477,7 +573,7 @@ print_device(const char *uri,		/* I - Device URI */
 	iostatus = libusb_bulk_transfer(g.printer->handle,
 					g.printer->write_endp,
 					print_buffer, g.print_bytes,
-					&bytes, 0);
+					&bytes, 60000);
       /*
 	* Ignore timeout errors, but retain the number of bytes written to
 	* avoid sending duplicate data...
@@ -500,7 +596,7 @@ print_device(const char *uri,		/* I - Device URI */
 	  iostatus = libusb_bulk_transfer(g.printer->handle,
 					  g.printer->write_endp,
 					  print_buffer, g.print_bytes,
-					  &bytes, 0);
+					  &bytes, 60000);
 	}

       /*
@@ -515,7 +611,7 @@ print_device(const char *uri,		/* I - Device URI */
 	  iostatus = libusb_bulk_transfer(g.printer->handle,
 					  g.printer->write_endp,
 					  print_buffer, g.print_bytes,
-					  &bytes, 0);
+					  &bytes, 60000);
        }

 	if (iostatus)
@@ -642,16 +738,13 @@ print_device(const char *uri,		/* I - Device URI */
  * Close the connection and input file and general clean up...
  */

-  if (g.printer->quirks & USB_QUIRK_DELAY_CLOSE)
-    sleep(1);
-
  close_device(g.printer);

 /*
  * Clean up ....
  */

-  libusb_free_device_list(all_list, 1);
+  libusb_free_device_list(list, 1);
  libusb_exit(NULL);

  return (status);
@@ -770,23 +863,6 @@ close_device(usb_printer_t *printer)	/* I - Printer */
 }


-/*
- * 'compare_quirks()' - Compare two quirks entries.
- */
-
-static int				/* O - Result of comparison */
-compare_quirks(usb_quirk_t *a,		/* I - First quirk entry */
-               usb_quirk_t *b)		/* I - Second quirk entry */
-{
-  int result;				/* Result of comparison */
-
-  if ((result = b->vendor_id - a->vendor_id) == 0)
-    result = b->product_id - a->product_id;
-
-  return (result);
-}
-
-
 /*
 * 'find_device()' - Find or enumerate USB printers.
 */
@@ -807,8 +883,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 					/* Pointer to current alternate setting */
  const struct libusb_endpoint_descriptor *endpptr = NULL;
 					/* Pointer to current endpoint */
-  ssize_t               err = 0,	/* Error code */
-                        numdevs,        /* number of connected devices */
+  ssize_t               numdevs,        /* number of connected devices */
                        i = 0;
  uint8_t		conf,		/* Current configuration */
 			iface,		/* Current interface */
@@ -827,14 +902,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
  * Initialize libusb...
  */

-  err = libusb_init(NULL);
-  if (err)
-  {
-    fprintf(stderr, "DEBUG: Unable to initialize USB access via libusb, "
-                    "libusb error %i\n", (int)err);
-    return (NULL);
-  }
-
+  libusb_init(NULL);
  numdevs = libusb_get_device_list(NULL, &list);
  fprintf(stderr, "DEBUG: libusb_get_device_list=%d\n", (int)numdevs);

@@ -859,13 +927,13 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
          !devdesc.idProduct)
 	continue;

-      printer.quirks = find_quirks(devdesc.idVendor, devdesc.idProduct);
+      printer.quirks = quirks(devdesc.idVendor, devdesc.idProduct);

     /*
      * Ignore blacklisted printers...
      */

-      if (printer.quirks & USB_QUIRK_BLACKLIST)
+      if (printer.quirks & USBLP_QUIRK_BLACKLIST)
        continue;

      for (conf = 0; conf < devdesc.bNumConfigurations; conf ++)
@@ -894,18 +962,18 @@ find_device(usb_cb_t   cb,		/* I - Callback function */

 	    if (((altptr->bInterfaceClass != LIBUSB_CLASS_PRINTER ||
 		  altptr->bInterfaceSubClass != 1) &&
-		 ((printer.quirks & USB_QUIRK_VENDOR_CLASS) == 0)) ||
+		 ((printer.quirks & USBLP_QUIRK_BAD_CLASS) == 0)) ||
 		(altptr->bInterfaceProtocol != 1 &&	/* Unidirectional */
 		 altptr->bInterfaceProtocol != 2) ||	/* Bidirectional */
 		altptr->bInterfaceProtocol < protocol)
 	      continue;

-	    if (printer.quirks & USB_QUIRK_VENDOR_CLASS)
+	    if (printer.quirks & USBLP_QUIRK_BAD_CLASS)
 	      fprintf(stderr, "DEBUG: Printer does not report class 7 and/or "
 		      "subclass 1 but works as a printer anyway\n");

-	    read_endp  = 0xff;
-	    write_endp = 0xff;
+	    read_endp  = -1;
+	    write_endp = -1;

 	    for (endp = 0, endpptr = altptr->endpoint;
 	         endp < altptr->bNumEndpoints;
@@ -919,7 +987,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 		  write_endp = endp;
 	      }

-            if (write_endp != 0xff)
+            if (write_endp >= 0)
 	    {
 	     /*
 	      * Save the best match so far...
@@ -957,7 +1025,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 	      {
 		fprintf(stderr, "DEBUG: Device protocol: %d\n",
 			printer.protocol);
-		if (printer.quirks & USB_QUIRK_UNIDIR)
+		if (printer.quirks & USBLP_QUIRK_BIDIR)
 		{
 		  printer.read_endp = -1;
 		  fprintf(stderr, "DEBUG: Printer reports bi-di support "
@@ -977,7 +1045,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 					   altsetting[printer.altset].
 					   endpoint[printer.write_endp].
 					   bEndpointAddress;
-		if (printer.quirks & USB_QUIRK_NO_REATTACH)
+		if (printer.quirks & USBLP_QUIRK_NO_REATTACH)
 		{
 		  printer.usblp_attached = 0;
 		  fprintf(stderr, "DEBUG: Printer does not like usblp "
@@ -1004,43 +1072,13 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
  * Clean up ....
  */

-  if (numdevs >= 0)
-    libusb_free_device_list(list, 1);
+  libusb_free_device_list(list, 1);
  libusb_exit(NULL);

  return (NULL);
 }


-/*
- * 'find_quirks()' - Find the quirks for the given printer, if any.
- *
- * First looks for an exact match, then looks for the vendor ID wildcard match.
- */
-
-static unsigned				/* O - Quirks flags */
-find_quirks(int vendor_id,		/* I - Vendor ID */
-            int product_id)		/* I - Product ID */
-{
-  usb_quirk_t	key,			/* Search key */
-		*match;			/* Matching quirk entry */
-
-
-  key.vendor_id  = vendor_id;
-  key.product_id = product_id;
-
-  if ((match = cupsArrayFind(all_quirks, &key)) != NULL)
-    return (match->quirks);
-
-  key.product_id = 0;
-
-  if ((match = cupsArrayFind(all_quirks, &key)) != NULL)
-    return (match->quirks);
-
-  return (USB_QUIRK_WHITELIST);
-}
-
-
 /*
 * 'get_device_id()' - Get the IEEE-1284 device ID for the printer.
 */
@@ -1069,7 +1107,8 @@ get_device_id(usb_printer_t *printer,	/* I - Printer */
  * bytes.  The 1284 spec says the length is stored MSB first...
  */

-  length = (int)((((unsigned)buffer[0] & 255) << 8) | ((unsigned)buffer[1] & 255));
+  length = (((unsigned)buffer[0] & 255) << 8) |
+	   ((unsigned)buffer[1] & 255);

 /*
  * Check to see if the length is larger than our buffer or less than 14 bytes
@@ -1080,7 +1119,8 @@ get_device_id(usb_printer_t *printer,	/* I - Printer */
  */

  if (length > bufsize || length < 14)
-    length = (int)((((unsigned)buffer[1] & 255) << 8) | ((unsigned)buffer[0] & 255));
+    length = (((unsigned)buffer[1] & 255) << 8) |
+	     ((unsigned)buffer[0] & 255);

  if (length > bufsize)
    length = bufsize;
@@ -1102,7 +1142,7 @@ get_device_id(usb_printer_t *printer,	/* I - Printer */
  * nul-terminate.
  */

-  memmove(buffer, buffer + 2, (size_t)length);
+  memmove(buffer, buffer + 2, length);
  buffer[length] = '\0';

  return (0);
@@ -1144,107 +1184,6 @@ list_cb(usb_printer_t *printer,		/* I - Printer */
 }


-/*
- * 'load_quirks()' - Load all quirks files in the /usr/share/cups/usb directory.
- */
-
-static void
-load_quirks(void)
-{
-  const char	*datadir;		/* CUPS_DATADIR environment variable */
-  char		filename[1024],		/* Filename */
-		line[1024];		/* Line from file */
-  cups_dir_t	*dir;			/* Directory */
-  cups_dentry_t	*dent;			/* Directory entry */
-  cups_file_t	*fp;			/* Quirks file */
-  usb_quirk_t	*quirk;			/* New quirk */
-
-
-  all_quirks = cupsArrayNew((cups_array_func_t)compare_quirks, NULL);
-
-  if ((datadir = getenv("CUPS_DATADIR")) == NULL)
-    datadir = CUPS_DATADIR;
-
-  snprintf(filename, sizeof(filename), "%s/usb", datadir);
-  if ((dir = cupsDirOpen(filename)) == NULL)
-  {
-    perror(filename);
-    return;
-  }
-
-  fprintf(stderr, "DEBUG: Loading USB quirks from \"%s\".\n", filename);
-
-  while ((dent = cupsDirRead(dir)) != NULL)
-  {
-    if (!S_ISREG(dent->fileinfo.st_mode))
-      continue;
-
-    snprintf(filename, sizeof(filename), "%s/usb/%s", datadir, dent->filename);
-    if ((fp = cupsFileOpen(filename, "r")) == NULL)
-    {
-      perror(filename);
-      continue;
-    }
-
-    while (cupsFileGets(fp, line, sizeof(line)))
-    {
-     /*
-      * Skip blank and comment lines...
-      */
-
-      if (line[0] == '#' || !line[0])
-        continue;
-
-     /*
-      * Add a quirk...
-      */
-
-      if ((quirk = calloc(1, sizeof(usb_quirk_t))) == NULL)
-      {
-        perror("DEBUG: Unable to allocate memory for quirk");
-        break;
-      }
-
-      if (sscanf(line, "%x%x", &quirk->vendor_id, &quirk->product_id) < 1)
-      {
-        fprintf(stderr, "DEBUG: Bad line: %s\n", line);
-        free(quirk);
-        continue;
-      }
-
-      if (strstr(line, " blacklist"))
-        quirk->quirks |= USB_QUIRK_BLACKLIST;
-
-      if (strstr(line, " delay-close"))
-        quirk->quirks |= USB_QUIRK_DELAY_CLOSE;
-
-      if (strstr(line, " no-reattach"))
-        quirk->quirks |= USB_QUIRK_NO_REATTACH;
-
-      if (strstr(line, " soft-reset"))
-        quirk->quirks |= USB_QUIRK_SOFT_RESET;
-
-      if (strstr(line, " unidir"))
-        quirk->quirks |= USB_QUIRK_UNIDIR;
-
-      if (strstr(line, " usb-init"))
-        quirk->quirks |= USB_QUIRK_USB_INIT;
-
-      if (strstr(line, " vendor-class"))
-        quirk->quirks |= USB_QUIRK_VENDOR_CLASS;
-
-      cupsArrayAdd(all_quirks, quirk);
-    }
-
-    cupsFileClose(fp);
-  }
-
-  fprintf(stderr, "DEBUG: Loaded %d quirks.\n", cupsArrayCount(all_quirks));
-
-  cupsDirClose(dir);
-}
-
-
 /*
 * 'make_device_uri()' - Create a device URI for a USB printer.
 */
@@ -1458,14 +1397,9 @@ open_device(usb_printer_t *printer,	/* I - Printer */
  else
  {
    printer->usblp_attached = 0;
-
-    if (errcode != LIBUSB_ERROR_NOT_SUPPORTED)
-    {
-      fprintf(stderr,
-              "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" "
-              "kernel module attached\n", devdesc.idVendor, devdesc.idProduct);
-      goto error;
-    }
+    fprintf(stderr, "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" kernel module attached\n",
+	      devdesc.idVendor, devdesc.idProduct);
+    goto error;
  }

 /*
@@ -1529,16 +1463,6 @@ open_device(usb_printer_t *printer,	/* I - Printer */

      goto error;
    }
-    else if ((errcode = libusb_detach_kernel_driver(printer->handle, printer->iface)) < 0)
-    {
-      fprintf(stderr,
-              "DEBUG: Failed to detach \"usblp\" module from %04x:%04x\n",
-              devdesc.idVendor, devdesc.idProduct);
-
-      goto error;
-    }
-
-    sleep (1);
  }

 /*
@@ -1686,6 +1610,65 @@ print_cb(usb_printer_t *printer,	/* I - Printer */
 }


+/*
+ * 'printer_class_soft_reset()' - Do the soft reset request specific to printers
+ *
+ * This soft reset is specific to the printer device class and is much less
+ * invasive than the general USB reset libusb_reset_device(). Especially it
+ * does never happen that the USB addressing and configuration changes. What
+ * is actually done is that all buffers get flushed and the bulk IN and OUT
+ * pipes get reset to their default states. This clears all stall conditions.
+ * See http://cholla.mmto.org/computers/linux/usb/usbprint11.pdf
+ */
+
+static int				/* O - 0 on success, < 0 on error */
+printer_class_soft_reset(usb_printer_t *printer) /* I - Printer */
+{
+  struct libusb_config_descriptor *confptr = NULL;
+                                        /* Pointer to current configuration */
+  int interface,
+      errcode;
+
+  if (libusb_get_config_descriptor(printer->device, printer->conf, &confptr)
+      < 0)
+    interface = printer->iface;
+  else
+    interface = confptr->interface[printer->iface].
+      altsetting[printer->altset].bInterfaceNumber;
+  libusb_free_config_descriptor(confptr);
+  if ((errcode = libusb_control_transfer(printer->handle,
+					 LIBUSB_REQUEST_TYPE_CLASS |
+					 LIBUSB_ENDPOINT_OUT |
+					 LIBUSB_RECIPIENT_OTHER,
+					 2, 0, interface, NULL, 0, 5000)) < 0)
+    errcode = libusb_control_transfer(printer->handle,
+				      LIBUSB_REQUEST_TYPE_CLASS |
+				      LIBUSB_ENDPOINT_OUT |
+				      LIBUSB_RECIPIENT_INTERFACE,
+				      2, 0, interface, NULL, 0, 5000);
+  return errcode;
+}
+
+
+/*
+ * 'quirks()' - Get the known quirks of a given printer model
+ */
+
+static unsigned int quirks(int vendor, int product)
+{
+  int i;
+
+  for (i = 0; quirk_printers[i].vendorId; i++)
+  {
+    if (vendor == quirk_printers[i].vendorId &&
+	(quirk_printers[i].productId == 0x0000 ||
+	 product == quirk_printers[i].productId))
+      return quirk_printers[i].quirks;
+  }
+  return 0;
+}
+
+
 /*
 * 'read_thread()' - Thread to read the backchannel data on.
 */
@@ -1734,7 +1717,7 @@ static void *read_thread(void *reference)
    {
      fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n",
              (int)rbytes);
-      cupsBackChannelWrite((const char *)readbuffer, (size_t)rbytes, 1.0);
+      cupsBackChannelWrite((const char *)readbuffer, rbytes, 1.0);
    }
    else if (readstatus == LIBUSB_ERROR_TIMEOUT)
      fputs("DEBUG: Got USB transaction timeout during read.\n", stderr);
@@ -1909,15 +1892,13 @@ sidechannel_thread(void *reference)
 * 'soft_reset()' - Send a soft reset to the device.
 */

-static void
-soft_reset(void)
+static void soft_reset(void)
 {
  fd_set	  input_set;		/* Input set for select() */
  struct timeval  tv;			/* Time value */
  char		  buffer[2048];		/* Buffer */
  struct timespec cond_timeout;		/* pthread condition timeout */

-
 /*
  * Send an abort once a second until the I/O lock is released by the main
  * thread...
@@ -1962,7 +1943,7 @@ soft_reset(void)
  * Send the reset...
  */

-  soft_reset_printer(g.printer);
+  printer_class_soft_reset(g.printer);

 /*
  * Release the I/O lock...
@@ -1976,51 +1957,6 @@ soft_reset(void)


 /*
- * 'soft_reset_printer()' - Do the soft reset request specific to printers
- *
- * This soft reset is specific to the printer device class and is much less
- * invasive than the general USB reset libusb_reset_device(). Especially it
- * does never happen that the USB addressing and configuration changes. What
- * is actually done is that all buffers get flushed and the bulk IN and OUT
- * pipes get reset to their default states. This clears all stall conditions.
- * See http://cholla.mmto.org/computers/linux/usb/usbprint11.pdf
- */
-
-static int				/* O - 0 on success, < 0 on error */
-soft_reset_printer(
-    usb_printer_t *printer)		/* I - Printer */
-{
-  struct libusb_config_descriptor *confptr = NULL;
-                                        /* Pointer to current configuration */
-  int interface,			/* Interface to reset */
-      errcode;				/* Error code */
-
-
-  if (libusb_get_config_descriptor(printer->device, printer->conf,
-                                   &confptr) < 0)
-    interface = printer->iface;
-  else
-    interface = confptr->interface[printer->iface].
-                         altsetting[printer->altset].bInterfaceNumber;
-
-  libusb_free_config_descriptor(confptr);
-
-  if ((errcode = libusb_control_transfer(printer->handle,
-					 LIBUSB_REQUEST_TYPE_CLASS |
-					 LIBUSB_ENDPOINT_OUT |
-					 LIBUSB_RECIPIENT_OTHER,
-					 2, 0, interface, NULL, 0, 5000)) < 0)
-    errcode = libusb_control_transfer(printer->handle,
-				      LIBUSB_REQUEST_TYPE_CLASS |
-				      LIBUSB_ENDPOINT_OUT |
-				      LIBUSB_RECIPIENT_INTERFACE,
-				      2, 0, interface, NULL, 0, 5000);
-
-  return (errcode);
-}
-
-
-/*
- * End of "$Id: usb-libusb.c 12881 2015-09-15 21:20:02Z msweet $".
+ * End of "$Id$".
 */

@@ -1,20 +1,27 @@
 /*
- * "$Id: usb-unix.c 12124 2014-08-28 15:37:22Z msweet $"
+ * "$Id$"
 *
- * USB port backend for CUPS.
+ *   USB port backend for CUPS.
 *
- * This file is included from "usb.c" when compiled on UNIX/Linux.
+ *   This file is included from "usb.c" when compiled on UNIX/Linux.
 *
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file.  If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   print_device() - Print a file to a USB device.
+ *   list_devices() - List all USB devices.
+ *   open_device()  - Open a USB device...
+ *   side_cb()      - Handle side-channel requests...
 */

 /*
@@ -146,7 +153,7 @@ print_device(const char *uri,		/* I - Device URI */

  tcgetattr(device_fd, &opts);

-  opts.c_lflag &= ~(unsigned)(ICANON | ECHO | ISIG);	/* Raw mode */
+  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */

  /**** No options supported yet ****/

@@ -250,6 +257,7 @@ list_devices(void)

    close(fd);
  }
+#elif defined(__sgi)
 #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
  int	i;			/* Looping var */
  int	fd;			/* File descriptor */
@@ -278,6 +286,8 @@ list_devices(void)
      close(fd);
    }
  }
+#elif defined(__hpux)
+#elif defined(__osf)
 #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
  int   i;                      /* Looping var */
  char  device[255];            /* Device filename */
@@ -603,5 +613,5 @@ side_cb(int         print_fd,		/* I - Print file */


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


 /*
- * End of "$Id: usb.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,28 +1,25 @@
 lpc.o: lpc.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/versioning.h ../cups/array-private.h \
-  ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
-  ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h
+  ../cups/debug-private.h ../cups/versioning.h ../cups/ipp-private.h \
+  ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
 lpq.o: lpq.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/versioning.h ../cups/array-private.h \
-  ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
-  ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h
+  ../cups/debug-private.h ../cups/versioning.h ../cups/ipp-private.h \
+  ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
 lpr.o: lpr.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/versioning.h ../cups/array-private.h \
-  ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
-  ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/thread-private.h
+  ../cups/debug-private.h ../cups/versioning.h ../cups/ipp-private.h \
+  ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
 lprm.o: lprm.c ../cups/cups-private.h ../cups/string-private.h \
  ../config.h ../cups/debug-private.h ../cups/versioning.h \
-  ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
-  ../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
-  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
+  ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/http-private.h ../cups/md5-private.h \
+  ../cups/language-private.h ../cups/transcode.h ../cups/language.h \
+  ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
+# "$Id$"
 #
 #   Berkeley commands makefile for CUPS.
 #
@@ -88,7 +88,6 @@ install-exec:
 		$(INSTALL_DIR) $(SYMROOT); \
 		for file in $(TARGETS); do \
 			cp $$file $(SYMROOT); \
-			dsymutil $(SYMROOT)/$$file; \
 		done \
 	fi

@@ -164,5 +163,5 @@ include Dependencies


 #
-# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
+# End of "$Id$".
 #
@@ -1,16 +1,24 @@
 /*
- * "$Id: lpc.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id$"
 *
- * "lpc" command for CUPS.
+ *   "lpc" command for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007-2012 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/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main()            - Parse options and commands.
+ *   compare_strings() - Compare two command-line strings.
+ *   do_command()      - Do an lpc command...
+ *   show_help()       - Show help messages.
+ *   show_status()     - Show printers.
 */

 /*
@@ -24,7 +32,7 @@
 * Local functions...
 */

-static int	compare_strings(const char *, const char *, size_t);
+static int	compare_strings(const char *, const char *, int);
 static void	do_command(http_t *, const char *, const char *);
 static void	show_help(const char *);
 static void	show_status(http_t *, const char *);
@@ -150,9 +158,9 @@ main(int  argc,				/* I - Number of command-line arguments */
 static int				/* O - -1 or 1 = no match, 0 = match */
 compare_strings(const char *s,		/* I - Command-line string */
                const char *t,		/* I - Option string */
-                size_t     tmin)	/* I - Minimum number of unique chars in option */
+                int        tmin)	/* I - Minimum number of unique chars in option */
 {
-  size_t	slen;			/* Length of command-line string */
+  int	slen;				/* Length of command-line string */


  slen = strlen(s);
@@ -438,5 +446,5 @@ show_status(http_t     *http,		/* I - HTTP connection to server */


 /*
- * End of "$Id: lpc.c 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,16 +1,27 @@
 /*
- * "$Id: lpq.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id$"
 *
- * "lpq" command for CUPS.
+ *   "lpq" command for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007-2012 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/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main()         - Parse options and commands.
+ *   show_jobs()    - Show jobs.
+ *   show_printer() - Show printer status.
+ *   usage()        - Show program usage.
+ */
+
+/*
+ * Include necessary headers...
 */

 /*
@@ -49,7 +60,8 @@ main(int  argc,				/* I - Number of command-line arguments */
 		all,			/* All printers */
 		interval,		/* Reporting interval */
 		longstatus;		/* Show file details */
-  cups_dest_t	*named_dest;		/* Named destination */
+  int		num_dests;		/* Number of destinations */
+  cups_dest_t	*dests;			/* Destinations */


  _cupsSetLocale(argv);
@@ -65,6 +77,8 @@ main(int  argc,				/* I - Number of command-line arguments */
  interval   = 0;
  longstatus = 0;
  all        = 0;
+  num_dests  = 0;
+  dests      = NULL;

  for (i = 1; i < argc; i ++)
    if (argv[i][0] == '+')
@@ -113,6 +127,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 	      if (i >= argc)
 	      {
 		httpClose(http);
+		cupsFreeDests(num_dests, dests);

 	        usage();
 	      }
@@ -125,14 +140,12 @@ main(int  argc,				/* I - Number of command-line arguments */

            http = connect_server(argv[0], http);

-            if ((named_dest = cupsGetNamedDest(http, dest, instance)) == NULL)
+            if (num_dests == 0)
+              num_dests = cupsGetDests2(http, &dests);
+
+            if (cupsGetDest(dest, instance, num_dests, dests) == NULL)
 	    {
-	      if (cupsLastError() == IPP_STATUS_ERROR_BAD_REQUEST ||
-		  cupsLastError() == IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED)
-		_cupsLangPrintf(stderr,
-				_("%s: Error - add '/version=1.1' to server "
-				  "name."), argv[0]);
-	      else if (instance)
+	      if (instance)
 		_cupsLangPrintf(stderr,
 		                _("%s: Error - unknown destination \"%s/%s\"."),
 		        	argv[0], dest, instance);
@@ -142,8 +155,6 @@ main(int  argc,				/* I - Number of command-line arguments */

 	      return (1);
 	    }
-
-	    cupsFreeDests(1, named_dest);
 	    break;

 	case 'a' : /* All printers */
@@ -181,8 +192,10 @@ main(int  argc,				/* I - Number of command-line arguments */

 	default :
 	    httpClose(http);
+	    cupsFreeDests(num_dests, dests);

 	    usage();
+	    break;
      }
    }
    else if (isdigit(argv[i][0] & 255))
@@ -194,17 +207,15 @@ main(int  argc,				/* I - Number of command-line arguments */

  if (dest == NULL && !all)
  {
-    if ((named_dest = cupsGetNamedDest(http, NULL, NULL)) == NULL)
-    {
-      if (cupsLastError() == IPP_STATUS_ERROR_BAD_REQUEST ||
-          cupsLastError() == IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED)
-      {
-	_cupsLangPrintf(stderr,
-	                _("%s: Error - add '/version=1.1' to server name."),
-			argv[0]);
-        return (1);
-      }
+    if (num_dests == 0)
+      num_dests = cupsGetDests2(http, &dests);

+    for (i = 0; i < num_dests; i ++)
+      if (dests[i].is_default)
+	dest = dests[i].name;
+
+    if (dest == NULL)
+    {
      val = NULL;

      if ((dest = getenv("LPDEST")) == NULL)
@@ -220,7 +231,7 @@ main(int  argc,				/* I - Number of command-line arguments */
      else
 	val = "LPDEST";

-      if (dest && val)
+      if (dest && !cupsGetDest(dest, NULL, num_dests, dests))
 	_cupsLangPrintf(stderr,
 	                _("%s: Error - %s environment variable names "
 			  "non-existent destination \"%s\"."), argv[0], val,
@@ -230,10 +241,9 @@ main(int  argc,				/* I - Number of command-line arguments */
 	                _("%s: Error - no default destination available."),
 			argv[0]);
      httpClose(http);
+      cupsFreeDests(num_dests, dests);
      return (1);
    }
-
-    dest = named_dest->name;
  }

 /*
@@ -250,7 +260,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    if (i && interval)
    {
      fflush(stdout);
-      sleep((unsigned)interval);
+      sleep(interval);
    }
    else
      break;
@@ -260,6 +270,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  * Close the connection to the server and return...
  */

+  cupsFreeDests(num_dests, dests);
  httpClose(http);

  return (0);
@@ -311,6 +322,9 @@ show_jobs(const char *command,		/* I - Command name */
  ipp_jstate_t	jobstate;		/* job-state */
  int		jobid,			/* job-id */
 		jobsize,		/* job-k-octets */
+#ifdef __osf__
+		jobpriority,		/* job-priority */
+#endif /* __osf__ */
 		jobcount,		/* Number of jobs */
 		jobcopies,		/* Number of copies */
 		rank;			/* Rank of job */
@@ -433,6 +447,9 @@ show_jobs(const char *command,		/* I - Command name */

      jobid       = 0;
      jobsize     = 0;
+#ifdef __osf__
+      jobpriority = 50;
+#endif /* __osf__ */
      jobstate    = IPP_JOB_PENDING;
      jobname     = "unknown";
      jobuser     = "unknown";
@@ -449,6 +466,12 @@ show_jobs(const char *command,		/* I - Command name */
 	    attr->value_tag == IPP_TAG_INTEGER)
 	  jobsize = attr->values[0].integer;

+#ifdef __osf__
+        if (!strcmp(attr->name, "job-priority") &&
+	    attr->value_tag == IPP_TAG_INTEGER)
+	  jobpriority = attr->values[0].integer;
+#endif /* __osf__ */
+
        if (!strcmp(attr->name, "job-state") &&
 	    attr->value_tag == IPP_TAG_ENUM)
 	  jobstate = (ipp_jstate_t)attr->values[0].integer;
@@ -486,9 +509,16 @@ show_jobs(const char *command,		/* I - Command name */
      }

      if (!longstatus && jobcount == 0)
+#ifdef __osf__
+	_cupsLangPuts(stdout,
+	              /* TRANSLATORS: Pri is job priority. */
+	              _("Rank   Owner      Pri  Job        Files"
+		        "                       Total Size"));
+#else
 	_cupsLangPuts(stdout,
 	              _("Rank    Owner   Job     File(s)"
 		        "                         Total Size"));
+#endif /* __osf__ */

      jobcount ++;

@@ -497,7 +527,7 @@ show_jobs(const char *command,		/* I - Command name */
      */

      if (jobstate == IPP_JOB_PROCESSING)
-	strlcpy(rankstr, "active", sizeof(rankstr));
+	strcpy(rankstr, "active");
      else
      {
       /*
@@ -529,9 +559,16 @@ show_jobs(const char *command,		/* I - Command name */
 	                namestr, 1024.0 * jobsize);
      }
      else
+#ifdef __osf__
+        _cupsLangPrintf(stdout,
+	                _("%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"),
+			rankstr, jobuser, jobpriority, jobid, jobname,
+			1024.0 * jobsize);
+#else
        _cupsLangPrintf(stdout,
 	                _("%-7s %-7.7s %-7d %-31.31s %.0f bytes"),
 			rankstr, jobuser, jobid, jobname, 1024.0 * jobsize);
+#endif /* __osf */

      if (attr == NULL)
        break;
@@ -641,5 +678,5 @@ usage(void)


 /*
- * End of "$Id: lpq.c 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,16 +1,20 @@
 /*
- * "$Id: lpr.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id$"
 *
- * "lpr" command for CUPS.
+ *   "lpr" command for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * Contents:
+ *
+ *   main() - Parse options and send files for printing.
 */

 /*
@@ -57,7 +61,6 @@ main(int  argc,				/* I - Number of command-line arguments */

  for (i = 1; i < argc; i ++)
    if (argv[i][0] == '-')
-    {
      switch (ch = argv[i][1])
      {
        case 'E' : /* Encrypt */
@@ -223,14 +226,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 		                              dest->options[j].value,
 					      num_options, &options);
 	    }
-	    else if (cupsLastError() == IPP_STATUS_ERROR_BAD_REQUEST ||
-		     cupsLastError() == IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED)
-	    {
-	      _cupsLangPrintf(stderr,
-			      _("%s: Error - add '/version=1.1' to server "
-				"name."), argv[0]);
-	      return (1);
-	    }
 	    break;

 	case '#' : /* Number of copies */
@@ -280,7 +275,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 			    argv[i][1]);
 	    return (1);
      }
-    }
    else if (num_files < 1000)
    {
     /*
@@ -326,14 +320,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 		                      dest->options[j].value,
 				      num_options, &options);
    }
-    else if (cupsLastError() == IPP_STATUS_ERROR_BAD_REQUEST ||
-	     cupsLastError() == IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED)
-    {
-      _cupsLangPrintf(stderr,
-		      _("%s: Error - add '/version=1.1' to server "
-			"name."), argv[0]);
-      return (1);
-    }
  }

  if (printer == NULL)
@@ -402,7 +388,7 @@ main(int  argc,				/* I - Number of command-line arguments */

    while (status == HTTP_CONTINUE &&
           (bytes = read(0, buffer, sizeof(buffer))) > 0)
-      status = cupsWriteRequestData(CUPS_HTTP_DEFAULT, buffer, (size_t)bytes);
+      status = cupsWriteRequestData(CUPS_HTTP_DEFAULT, buffer, bytes);

    if (status != HTTP_CONTINUE)
    {
@@ -432,5 +418,5 @@ main(int  argc,				/* I - Number of command-line arguments */


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


 /*
- * End of "$Id: lprm.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,72 +1,73 @@
 help-index.o: help-index.c cgi-private.h cgi.h ../cups/cups.h \
  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/pwg.h help-index.h \
+  ../cups/array.h ../cups/language.h help-index.h \
  ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h \
  ../cups/dir.h
 html.o: html.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language.h help-index.h ../cups/debug-private.h \
  ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h
 ipp-var.o: ipp-var.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language.h help-index.h ../cups/debug-private.h \
  ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h
 search.o: search.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language.h help-index.h ../cups/debug-private.h \
  ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h
 template.o: template.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language.h help-index.h ../cups/debug-private.h \
  ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h
 var.o: var.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language.h help-index.h ../cups/debug-private.h \
  ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h \
  ../cups/md5-private.h
 admin.o: admin.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language.h help-index.h ../cups/debug-private.h \
  ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h \
  ../cups/adminutil.h ../cups/ppd.h
 classes.o: classes.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language.h help-index.h ../cups/debug-private.h \
  ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h
 help.o: help.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language.h help-index.h ../cups/debug-private.h \
  ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h
 jobs.o: jobs.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language.h help-index.h ../cups/debug-private.h \
  ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h
-makedocset.o: makedocset.c cgi-private.h cgi.h ../cups/cups.h \
-  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/pwg.h help-index.h \
-  ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h
+makedocset.o: makedocset.c cgi.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h help-index.h
 printers.o: printers.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
+  ../cups/language.h help-index.h ../cups/debug-private.h \
  ../cups/language-private.h ../cups/transcode.h \
  ../cups/string-private.h ../config.h ../cups/ipp-private.h
 testcgi.o: testcgi.c cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h
+  ../cups/language.h help-index.h
 testhi.o: testhi.c cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h
+  ../cups/language.h help-index.h
 testtemplate.o: testtemplate.c cgi.h ../cups/cups.h ../cups/file.h \
  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h help-index.h
+  ../cups/language.h help-index.h
+websearch.o: websearch.c cgi.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h help-index.h
@@ -1,16 +1,16 @@
 #
-# "$Id: Makefile 12519 2015-02-17 13:10:19Z msweet $"
+# "$Id$"
 #
-# CGI makefile for CUPS.
+#   CGI makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
-# Copyright 1997-2006 by Easy Software Products.
+#   Copyright 2007-2012 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/".
+#   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/".
 #

 include ../Makedefs
@@ -32,7 +32,8 @@ OBJS	=	\
 		printers.o \
 		testcgi.o \
 		testhi.o \
-		testtemplate.o
+		testtemplate.o \
+		websearch.o
 CGIS	=	\
 		admin.cgi \
 		classes.cgi \
@@ -41,7 +42,8 @@ CGIS	=	\
 		printers.cgi
 LIBTARGETS =	\
 		libcupscgi.a \
-		$(LIBCUPSCGI)
+		$(LIBCUPSCGI) \
+		websearch

 UNITTARGETS =	\
 		testcgi \
@@ -80,7 +82,7 @@ unittests:	$(UNITTARGETS)

 clean:
 	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
-	$(RM) libcupscgi.so libcupscgi.dylib
+	$(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib


 #
@@ -118,7 +120,6 @@ install-exec:
 		$(INSTALL_DIR) $(SYMROOT); \
 		for file in $(CGIS); do \
 			cp $$file $(SYMROOT); \
-			dsymutil $(SYMROOT)/$$file; \
 		done \
 	fi

@@ -142,7 +143,7 @@ install-libs: $(INSTALLSTATIC)
 	echo Installing libraries in $(LIBDIR)...
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
 	$(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR)
-	if test $(LIBCUPSCGI) = "libcupscgi.so.1"; then \
+	if test $(LIBCUPSCGI) = "libcupscgi.so.1" -o $(LIBCUPSCGI) = "libcupscgi.sl.1"; then \
 		$(RM) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
 		$(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
 	fi
@@ -153,7 +154,6 @@ install-libs: $(INSTALLSTATIC)
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
 		cp $(LIBCUPSCGI) $(SYMROOT); \
-		dsymutil $(SYMROOT)/$(LIBCUPSCGI); \
 	fi

 installstatic:
@@ -175,6 +175,9 @@ uninstall:
 	$(RM) $(LIBDIR)/libcupscgi.1.dylib
 	$(RM) $(LIBDIR)/libcupscgi.a
 	$(RM) $(LIBDIR)/libcupscgi.dylib
+	$(RM) $(LIBDIR)/libcupscgi_s.a
+	$(RM) $(LIBDIR)/libcupscgi.sl
+	$(RM) $(LIBDIR)/libcupscgi.sl.1
 	$(RM) $(LIBDIR)/libcupscgi.so
 	$(RM) $(LIBDIR)/libcupscgi.so.1
 	-$(RMDIR) $(LIBDIR)
@@ -206,10 +209,10 @@ framedhelp:


 #
-# libcupscgi.so.1
+# libcupscgi.so.1, libcupscgi.sl.1
 #

-libcupscgi.so.1:	$(LIBOBJS)
+libcupscgi.so.1 libcupscgi.sl.1:	$(LIBOBJS)
 	echo Linking $@...
 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
 	$(RM) `basename $@ .1`
@@ -232,6 +235,17 @@ libcupscgi.1.dylib:	$(LIBOBJS) libcupscgi.exp
 	$(LN) $@ libcupscgi.dylib


+#
+# libcupscgi_s.a
+#
+
+libcupscgi_s.a:	$(LIBOBJS)
+	echo Creating $@...
+	$(DSO) $(DSOFLAGS) -o libcupscgi_s.o $(LIBOBJS) $(LIBS)
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ libcupscgi_s.o
+
+
 #
 # libcupscgi.la
 #
@@ -345,6 +359,17 @@ testtemplate:	testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 		$(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)


+#
+# websearch
+#
+
+websearch:	websearch.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ websearch.o libcupscgi.a \
+		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+		$(LIBZ) $(LIBGSSAPI)
+
+
 #
 # Dependencies...
 #
@@ -353,5 +378,5 @@ include Dependencies


 #
-# End of "$Id: Makefile 12519 2015-02-17 13:10:19Z msweet $".
+# End of "$Id$".
 #
@@ -1,16 +1,37 @@
 /*
- * "$Id: admin.c 12516 2015-02-12 20:18:11Z msweet $"
+ * "$Id$"
 *
- * Administration CGI for CUPS.
+ *   Administration CGI for CUPS.
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * Contents:
+ *
+ *   main()                    - Main entry for CGI.
+ *   choose_device_cb()        - Add a device to the device selection page.
+ *   do_add_rss_subscription() - Add a RSS subscription.
+ *   do_am_class()             - Add or modify a class.
+ *   do_am_printer()           - Add or modify a printer.
+ *   do_cancel_subscription()  - Cancel a subscription.
+ *   do_config_server()        - Configure server settings.
+ *   do_delete_class()         - Delete a class.
+ *   do_delete_printer()       - Delete a printer.
+ *   do_export()               - Export printers to Samba.
+ *   do_list_printers()        - List available printers.
+ *   do_menu()                 - Show the main menu.
+ *   do_set_allowed_users()    - Set the allowed/denied users for a queue.
+ *   do_set_default()          - Set the server default printer/class.
+ *   do_set_options()          - Configure the default options for a queue.
+ *   do_set_sharing()          - Set printer-is-shared value.
+ *   get_option_value()        - Return the value of an option.
+ *   get_points()              - Get a value in points.
 */

 /*
@@ -18,8 +39,6 @@
 */

 #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>
@@ -40,7 +59,12 @@ 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);
@@ -58,7 +82,6 @@ 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);


 /*
@@ -66,7 +89,8 @@ static char	*get_printer_ppd(const char *uri, char *buffer, size_t bufsize);
 */

 int					/* O - Exit status */
-main(void)
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
 {
  http_t	*http;			/* Connection to the server */
  const char	*op;			/* Operation name */
@@ -830,8 +854,7 @@ 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 */
-		evefile[1024] = "";	/* IPP Everywhere PPD file */
+		*uriptr;		/* Pointer into URI */
  int		maxrate;		/* Maximum baud rate */
  char		baudrate[255];		/* Baud rate string */
  const char	*name,			/* Pointer to class name */
@@ -939,13 +962,13 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
      else if (!_cups_strncasecmp(make, "laserjet", 8) ||
               !_cups_strncasecmp(make, "deskjet", 7) ||
               !_cups_strncasecmp(make, "designjet", 9))
-        strlcpy(make, "HP", sizeof(make));
+        strcpy(make, "HP");
      else if (!_cups_strncasecmp(make, "phaser", 6))
-        strlcpy(make, "Xerox", sizeof(make));
+        strcpy(make, "Xerox");
      else if (!_cups_strncasecmp(make, "stylus", 6))
-        strlcpy(make, "Epson", sizeof(make));
+        strcpy(make, "Epson");
      else
-        strlcpy(make, "Generic", sizeof(make));
+        strcpy(make, "Generic");

      if (!cgiGetVariable("CURRENT_MAKE"))
        cgiSetVariable("CURRENT_MAKE", make);
@@ -1149,7 +1172,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
      char		filename[1024];	/* PPD filename */
      ppd_file_t	*ppd;		/* PPD information */
      char		buffer[1024];	/* Buffer */
-      ssize_t		bytes;		/* Number of bytes */
+      int		bytes;		/* Number of bytes */
      http_status_t	get_status;	/* Status of GET */


@@ -1171,7 +1194,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
      else if ((fd = cupsTempFd(filename, sizeof(filename))) >= 0)
      {
 	while ((bytes = httpRead2(http, buffer, sizeof(buffer))) > 0)
-          write(fd, buffer, (size_t)bytes);
+          write(fd, buffer, bytes);

 	close(fd);

@@ -1188,10 +1211,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
 	}
 	else
 	{
-	  int linenum;			/* Line number */
-
 	  fprintf(stderr, "ERROR: Unable to open PPD file %s: %s\n",
-	          filename, ppdErrorString(ppdLastError(&linenum)));
+	          filename, ppdErrorString(ppdLastError(&bytes)));
 	}
      }
      else
@@ -1327,22 +1348,20 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                 NULL, uri);

-    if (!file)
-    {
-      var = cgiGetVariable("PPD_NAME");
-      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);
-    }
-
    ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-location",
                 NULL, cgiGetVariable("PRINTER_LOCATION"));

    ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-info",
                 NULL, cgiGetVariable("PRINTER_INFO"));

+    if (!file)
+    {
+      var = cgiGetVariable("PPD_NAME");
+      if (strcmp(var, "__no_change__"))
+	ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "ppd-name",
+		     NULL, var);
+    }
+
    strlcpy(uri, cgiGetVariable("DEVICE_URI"), sizeof(uri));

   /*
@@ -1361,7 +1380,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
      if ((uriptr = strchr(uri, '?')) == NULL)
        uriptr = uri + strlen(uri);

-      snprintf(uriptr, sizeof(uri) - (size_t)(uriptr - uri),
+      snprintf(uriptr, sizeof(uri) - (uriptr - uri),
               "?baud=%s+bits=%s+parity=%s+flow=%s",
               cgiGetVariable("BAUDRATE"), cgiGetVariable("BITS"),
 	       cgiGetVariable("PARITY"), cgiGetVariable("FLOW"));
@@ -1385,11 +1404,6 @@ 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/"));

@@ -1867,7 +1881,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
        if ((end = strstr(start, "\n")) == NULL)
 	  end = start + strlen(start);

-      cupsFileWrite(temp, start, (size_t)(end - start));
+      cupsFileWrite(temp, start, end - start);
      cupsFilePutChar(temp, '\n');

      if (*end == '\r')
@@ -1903,7 +1917,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    }
    else
    {
-      cgiSetVariable("refresh_page", "5;URL=/admin/");
+      cgiSetVariable("refresh_page", "5;URL=/admin/?OP=redirect");

      cgiStartHTML(cgiText(_("Edit Configuration File")));
      cgiCopyTemplateLang("restart.tmpl");
@@ -1992,9 +2006,9 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    * Allocate memory and load the file into a string buffer...
    */

-    if ((buffer = calloc(1, (size_t)info.st_size + 1)) != NULL)
+    if ((buffer = calloc(1, info.st_size + 1)) != NULL)
    {
-      cupsFileRead(cupsd, buffer, (size_t)info.st_size);
+      cupsFileRead(cupsd, buffer, info.st_size);
      cgiSetVariable("CUPSDCONF", buffer);
      free(buffer);
    }
@@ -2011,7 +2025,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
        (cupsd = cupsFileOpen(filename, "r")) != NULL)
    {
-      if ((buffer = calloc(1, 2 * (size_t)info.st_size + 1)) != NULL)
+      if ((buffer = calloc(1, 2 * info.st_size + 1)) != NULL)
      {
 	bufend = buffer + 2 * info.st_size - 1;

@@ -2021,7 +2035,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 	  if (ch == '\\' || ch == '\"')
 	  {
 	    *bufptr++ = '\\';
-	    *bufptr++ = (char)ch;
+	    *bufptr++ = ch;
 	  }
 	  else if (ch == '\n')
 	  {
@@ -2034,7 +2048,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 	    *bufptr++ = 't';
 	  }
 	  else if (ch >= ' ')
-	    *bufptr++ = (char)ch;
+	    *bufptr++ = ch;
 	}

 	*bufptr = '\0';
@@ -3868,7 +3882,7 @@ do_set_sharing(http_t *http)		/* I - HTTP connection */
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
               NULL, uri);

-  ippAddBoolean(request, IPP_TAG_OPERATION, "printer-is-shared", (char)atoi(shared));
+  ippAddBoolean(request, IPP_TAG_OPERATION, "printer-is-shared", atoi(shared));

 /*
  * Do the request and get back a response...
@@ -4082,7 +4096,7 @@ get_option_value(
      if ((val = cgiGetVariable(keyword)) == NULL)
 	return (NULL);

-      snprintf(bufptr, (size_t)(bufend - bufptr), "%s%s=", prefix, cparam->name);
+      snprintf(bufptr, bufend - bufptr, "%s%s=", prefix, cparam->name);
      bufptr += strlen(bufptr);
      prefix = " ";

@@ -4096,7 +4110,7 @@ get_option_value(
 		number > cparam->maximum.custom_real)
 	      return (NULL);

-	    snprintf(bufptr, (size_t)(bufend - bufptr), "%g", number);
+	    snprintf(bufptr, bufend - bufptr, "%g", number);
 	    break;

 	case PPD_CUSTOM_INT :
@@ -4106,7 +4120,7 @@ get_option_value(
 		integer > cparam->maximum.custom_int)
 	      return (NULL);

-	    snprintf(bufptr, (size_t)(bufend - bufptr), "%ld", integer);
+	    snprintf(bufptr, bufend - bufptr, "%ld", integer);
 	    break;

 	case PPD_CUSTOM_POINTS :
@@ -4124,7 +4138,7 @@ get_option_value(
 		number_points > cparam->maximum.custom_points)
 	      return (NULL);

-	    snprintf(bufptr, (size_t)(bufend - bufptr), "%g%s", number, uval);
+	    snprintf(bufptr, bufend - bufptr, "%g%s", number, uval);
 	    break;

 	case PPD_CUSTOM_PASSCODE :
@@ -4173,7 +4187,7 @@ get_option_value(
    if (bufptr == buffer || (bufend - bufptr) < 2)
      return (NULL);

-    memcpy(bufptr, "}", 2);
+    strcpy(bufptr, "}");
  }

  return (buffer);
@@ -4204,78 +4218,5 @@ get_points(double     number,		/* I - Original number */


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


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

 /*
- * End of "$Id: cgi.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,16 +1,23 @@
 /*
- * "$Id: classes.c 11928 2014-06-13 00:08:32Z msweet $"
+ * "$Id$"
 *
- * Class status CGI for CUPS.
+ *   Class status CGI for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007-2012 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/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main()             - Main entry for CGI.
+ *   do_class_op()      - Do a class operation.
+ *   show_all_classes() - Show all classes...
+ *   show_class()       - Show a single class.
 */

 /*
@@ -35,7 +42,8 @@ static void	show_class(http_t *http, const char *printer);
 */

 int					/* O - Exit status */
-main(void)
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
 {
  const char	*pclass;		/* Class name */
  const char	*user;			/* Username */
@@ -161,8 +169,8 @@ main(void)
      do_class_op(http, pclass, CUPS_ACCEPT_JOBS, cgiText(_("Accept Jobs")));
    else if (!strcmp(op, "reject-jobs"))
      do_class_op(http, pclass, CUPS_REJECT_JOBS, cgiText(_("Reject Jobs")));
-    else if (!strcmp(op, "cancel-jobs"))
-      do_class_op(http, pclass, IPP_OP_CANCEL_JOBS, cgiText(_("Cancel Jobs")));
+    else if (!strcmp(op, "purge-jobs"))
+      do_class_op(http, pclass, IPP_PURGE_JOBS, cgiText(_("Purge Jobs")));
    else if (!_cups_strcasecmp(op, "print-test-page"))
      cgiPrintTestPage(http, pclass);
    else if (!_cups_strcasecmp(op, "move-jobs"))
@@ -278,8 +286,8 @@ do_class_op(http_t      *http,		/* I - HTTP connection */
      cgiCopyTemplateLang("printer-accept.tmpl");
    else if (op == CUPS_REJECT_JOBS)
      cgiCopyTemplateLang("printer-reject.tmpl");
-    else if (op == IPP_OP_CANCEL_JOBS)
-      cgiCopyTemplateLang("printer-cancel-jobs.tmpl");
+    else if (op == IPP_PURGE_JOBS)
+      cgiCopyTemplateLang("printer-purge.tmpl");
  }

  cgiEndHTML();
@@ -546,5 +554,5 @@ show_class(http_t     *http,		/* I - Connection to server */


 /*
- * End of "$Id: classes.c 11928 2014-06-13 00:08:32Z msweet $".
+ * End of "$Id$".
 */
@@ -1,16 +1,34 @@
 /*
- * "$Id: help-index.c 12644 2015-05-19 21:22:35Z msweet $"
+ * "$Id$"
 *
- * Online help index routines for CUPS.
+ *   Online help index routines for CUPS.
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * Contents:
+ *
+ *   helpDeleteIndex()          - Delete an index, freeing all memory used.
+ *   helpFindNode()             - Find a node in an index.
+ *   helpLoadIndex()            - Load a help index from disk.
+ *   helpSaveIndex()            - Save a help index to disk.
+ *   helpSearchIndex()          - Search an index.
+ *   help_add_word()            - Add a word to a node.
+ *   help_compile_search()      - Convert a search string into a regular expression.
+ *   help_delete_node()         - Free all memory used by a node.
+ *   help_delete_word()         - Free all memory used by a word.
+ *   help_load_directory()      - Load a directory of files into an index.
+ *   help_load_file()           - Load a HTML files into an index.
+ *   help_new_node()            - Create a new node and add it to an index.
+ *   help_sort_nodes_by_name()  - Sort nodes by section, filename, and anchor.
+ *   help_sort_nodes_by_score() - Sort nodes by score and text.
+ *   help_sort_words()          - Sort words alphabetically.
 */

 /*
@@ -328,7 +346,7 @@ helpLoadIndex(const char *hifile,	/* I - Index filename */
 	    mtime = strtol(ptr, &ptr, 10);

 	  offset = strtoll(ptr, &ptr, 10);
-	  length = (size_t)strtoll(ptr, &ptr, 10);
+	  length = strtoll(ptr, &ptr, 10);

 	  while (isspace(*ptr & 255))
            ptr ++;
@@ -884,7 +902,7 @@ help_load_file(


  DEBUG_printf(("2help_load_file(hi=%p, filename=\"%s\", relative=\"%s\", "
-                "mtime=%ld)", hi, filename, relative, (long)mtime));
+                "mtime=%ld)", hi, filename, relative, mtime));

  if ((fp = cupsFileOpen(filename, "r")) == NULL)
    return (-1);
@@ -892,7 +910,7 @@ help_load_file(
  node   = NULL;
  offset = 0;

-  strlcpy(section, "Other", sizeof(section));
+  strcpy(section, "Other");

  while (cupsFileGets(fp, line, sizeof(line)))
  {
@@ -1001,14 +1019,14 @@ help_load_file(

        *ptr++ = ' ';

-        if (!cupsFileGets(fp, ptr, sizeof(line) - (size_t)(ptr - line) - 1))
+        if (!cupsFileGets(fp, ptr, sizeof(line) - (ptr - line) - 1))
 	  break;
      }

      *ptr = '\0';

      if (node)
-	node->length = (size_t)(offset - node->offset);
+	node->length = offset - node->offset;

      if (!*text)
      {
@@ -1161,9 +1179,9 @@ help_load_file(

 	for (text = ptr, ptr ++; *ptr && isalnum(*ptr & 255); ptr ++);

-	wordlen = (int)(ptr - text);
+	wordlen = ptr - text;

-        memcpy(temp, text, (size_t)wordlen);
+        memcpy(temp, text, wordlen);
 	temp[wordlen] = '\0';

        ptr --;
@@ -1188,7 +1206,7 @@ help_load_file(
  cupsFileClose(fp);

  if (node)
-    node->length = (size_t)(offset - node->offset);
+    node->length = offset - node->offset;

  return (0);
 }
@@ -1220,7 +1238,7 @@ help_new_node(const char   *filename,	/* I - Filename */

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


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

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


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


 /*
- * End of "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,16 +1,31 @@
 /*
- * "$Id: ipp-var.c 12768 2015-06-30 16:13:38Z msweet $"
+ * "$Id$"
 *
- * CGI <-> IPP variable routines for CUPS.
+ *   CGI <-> IPP variable routines for CUPS.
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * Contents:
+ *
+ *   cgiGetAttributes()    - Get the list of attributes that are needed by the
+ *                           template file.
+ *   cgiGetIPPObjects()    - Get the objects in an IPP response.
+ *   cgiMoveJobs()         - Move one or more jobs.
+ *   cgiPrintCommand()     - Print a CUPS command job.
+ *   cgiPrintTestPage()    - Print a test page.
+ *   cgiRewriteURL()       - Rewrite a printer URI into a web browser URL...
+ *   cgiSetIPPObjectVars() - Set CGI variables from an IPP object.
+ *   cgiSetIPPVars()       - Set CGI variables from an IPP response.
+ *   cgiShowIPPError()     - Show the last IPP error message.
+ *   cgiShowJobs()         - Show print jobs.
+ *   cgiText()             - Return localized text.
 */

 /*
@@ -50,7 +65,7 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
  {
    for (i = 0; lang[i] && i < 15; i ++)
      if (isalnum(lang[i] & 255))
-        locale[i] = (char)tolower(lang[i]);
+        locale[i] = tolower(lang[i]);
      else
        locale[i] = '_';

@@ -92,7 +107,7 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
  while ((ch = getc(in)) != EOF)
    if (ch == '\\')
      getc(in);
-    else if (ch == '{' && num_attrs < (int)(sizeof(attrs) / sizeof(attrs[0])))
+    else if (ch == '{' && num_attrs < (sizeof(attrs) / sizeof(attrs[0])))
    {
     /*
      * Grab the name...
@@ -108,13 +123,13 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
 	  if (ch == '_')
 	    *nameptr++ = '-';
 	  else
-            *nameptr++ = (char)ch;
+            *nameptr++ = ch;
 	}

      *nameptr = '\0';

      if (!strncmp(name, "printer_state_history", 21))
-        strlcpy(name, "printer_state_history", sizeof(name));
+        strcpy(name, "printer_state_history");

     /*
      * Possibly add it to the list of attributes...
@@ -222,9 +237,6 @@ 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 */
@@ -542,7 +554,7 @@ cgiPrintCommand(http_t     *http,	/* I - Connection to server */
  ipp_t		*request,		/* Get-Job-Attributes request */
 		*response;		/* Get-Job-Attributes response */
  ipp_attribute_t *attr;		/* Current job attribute */
-  static const char * const job_attrs[] =/* Job attributes we want */
+  static const char const *job_attrs[] =/* Job attributes we want */
 		{
 		  "job-state",
 		  "job-printer-state-message"
@@ -905,7 +917,7 @@ cgiRewriteURL(const char *uri,		/* I - Current URI */
      * Make URI relative to the current server...
      */

-      strlcpy(url, resource, (size_t)urlsize);
+      strlcpy(url, resource, urlsize);
    }
    else
    {
@@ -914,13 +926,17 @@ cgiRewriteURL(const char *uri,		/* I - Current URI */
      */

      if (userpass[0])
-	snprintf(url, (size_t)urlsize, "%s://%s@%s:%d%s", ishttps ? "https" : "http", userpass, hostname, port, resource);
+	snprintf(url, urlsize, "%s://%s@%s:%d%s",
+		 ishttps ? "https" : "http",
+		 userpass, hostname, port, resource);
      else
-	snprintf(url, (size_t)urlsize, "%s://%s:%d%s", ishttps ? "https" : "http", hostname, port, resource);
+	snprintf(url, urlsize, "%s://%s:%d%s",
+		 ishttps ? "https" : "http",
+		 hostname, port, resource);
    }
  }
  else
-    strlcpy(url, uri, (size_t)urlsize);
+    strlcpy(url, uri, urlsize);

  return (url);
 }
@@ -942,6 +958,7 @@ cgiSetIPPObjectVars(
 			*nameptr,	/* Pointer into name */
 			value[16384],	/* Value(s) */
 			*valptr;	/* Pointer into value */
+  struct tm		*date;		/* Date information */


  fprintf(stderr, "DEBUG2: cgiSetIPPObjectVars(obj=%p, prefix=\"%s\", "
@@ -1022,7 +1039,7 @@ cgiSetIPPObjectVars(
 	  *valptr++ = ' ';
        }

-        remaining = sizeof(value) - (size_t)(valptr - value);
+        remaining = sizeof(value) - (valptr - value);

        if (!strcmp(attr->values[i].string.text, "printer-stopped"))
 	  strlcpy(valptr, _("Printer Paused"), remaining);
@@ -1160,7 +1177,7 @@ cgiSetIPPObjectVars(
    for (i = 0; i < attr->num_values; i ++)
    {
      if (i)
-	strlcat(valptr, ", ", sizeof(value) - (size_t)(valptr - value));
+	strlcat(valptr, ", ", sizeof(value) - (valptr - value));

      valptr += strlen(valptr);

@@ -1169,28 +1186,36 @@ cgiSetIPPObjectVars(
 	case IPP_TAG_INTEGER :
 	case IPP_TAG_ENUM :
 	    if (strncmp(name, "time_at_", 8) == 0)
-	      _cupsStrDate(valptr, sizeof(value) - (size_t)(valptr - value), (time_t)ippGetInteger(attr, i));
+	    {
+	      time_t	t;		/* Temporary time value */
+
+              t    = (time_t)attr->values[i].integer;
+	      date = localtime(&t);
+
+	      strftime(valptr, sizeof(value) - (valptr - value), "%c", date);
+	    }
 	    else
-	      snprintf(valptr, sizeof(value) - (size_t)(valptr - value), "%d", ippGetInteger(attr, i));
+	      snprintf(valptr, sizeof(value) - (valptr - value),
+		       "%d", attr->values[i].integer);
 	    break;

 	case IPP_TAG_BOOLEAN :
-	    snprintf(valptr, sizeof(value) - (size_t)(valptr - value),
+	    snprintf(valptr, sizeof(value) - (valptr - value),
 	             "%d", attr->values[i].boolean);
 	    break;

 	case IPP_TAG_NOVALUE :
-	    strlcat(valptr, "novalue", sizeof(value) - (size_t)(valptr - value));
+	    strlcat(valptr, "novalue", sizeof(value) - (valptr - value));
 	    break;

 	case IPP_TAG_RANGE :
-	    snprintf(valptr, sizeof(value) - (size_t)(valptr - value),
+	    snprintf(valptr, sizeof(value) - (valptr - value),
 	             "%d-%d", attr->values[i].range.lower,
 		     attr->values[i].range.upper);
 	    break;

 	case IPP_TAG_RESOLUTION :
-	    snprintf(valptr, sizeof(value) - (size_t)(valptr - value),
+	    snprintf(valptr, sizeof(value) - (valptr - value),
 	             "%dx%d%s", attr->values[i].resolution.xres,
 		     attr->values[i].resolution.yres,
 		     attr->values[i].resolution.units == IPP_RES_PER_INCH ?
@@ -1205,7 +1230,21 @@ cgiSetIPPObjectVars(
 	      * Rewrite URIs...
 	      */

-	      cgiRewriteURL(attr->values[i].string.text, valptr, (int)(sizeof(value) - (size_t)(valptr - value)), NULL);
+              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) - (valptr - value),
+		         "<A HREF=\"%s\">%s</A>", url,
+			 strrchr(attr->values[i].string.text, '/') + 1);
+	      }
+	      else
+		cgiRewriteURL(attr->values[i].string.text, valptr,
+		              sizeof(value) - (valptr - value), NULL);
              break;
            }

@@ -1217,7 +1256,7 @@ cgiSetIPPObjectVars(
 	case IPP_TAG_LANGUAGE :
 	case IPP_TAG_MIMETYPE :
 	    strlcat(valptr, attr->values[i].string.text,
-	            sizeof(value) - (size_t)(valptr - value));
+	            sizeof(value) - (valptr - value));
 	    break;

        case IPP_TAG_BEGIN_COLLECTION :
@@ -1550,5 +1589,5 @@ cgiText(const char *message)		/* I - Message */


 /*
- * End of "$Id: ipp-var.c 12768 2015-06-30 16:13:38Z msweet $".
+ * End of "$Id$".
 */
@@ -1,16 +1,21 @@
 /*
- * "$Id: jobs.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id$"
 *
- * Job status CGI for CUPS.
+ *   Job status CGI for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007-2012 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/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main()      - Main entry for CGI.
+ *   do_job_op() - Do a job operation.
 */

 /*
@@ -32,7 +37,8 @@ static void	do_job_op(http_t *http, int job_id, ipp_op_t op);
 */

 int					/* O - Exit status */
-main(void)
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
 {
  http_t	*http;			/* Connection to the server */
  const char	*op;			/* Operation name */
@@ -176,7 +182,7 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
    char	url[1024];		/* Encoded URL */


-    strlcpy(url, "5;URL=", sizeof(url));
+    strcpy(url, "5;URL=");
    cgiFormEncode(url + 6, getenv("HTTP_REFERER"), sizeof(url) - 6);
    cgiSetVariable("refresh_page", url);
  }
@@ -204,5 +210,5 @@ do_job_op(http_t      *http,		/* I - HTTP connection */


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


 /*
- * End of "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $".
+ * End of "$Id$".
 */
@@ -1,16 +1,23 @@
 /*
- * "$Id: printers.c 11928 2014-06-13 00:08:32Z msweet $"
+ * "$Id$"
 *
- * Printer status CGI for CUPS.
+ *   Printer status CGI for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007-2012 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/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main()              - Main entry for CGI.
+ *   do_printer_op()     - Do a printer operation.
+ *   show_all_printers() - Show all printers...
+ *   show_printer()      - Show a single printer.
 */

 /*
@@ -36,7 +43,8 @@ static void	show_printer(http_t *http, const char *printer);
 */

 int					/* O - Exit status */
-main(void)
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
 {
  const char	*printer;		/* Printer name */
  const char	*user;			/* Username */
@@ -164,8 +172,8 @@ main(void)
      do_printer_op(http, printer, CUPS_ACCEPT_JOBS, cgiText(_("Accept Jobs")));
    else if (!strcmp(op, "reject-jobs"))
      do_printer_op(http, printer, CUPS_REJECT_JOBS, cgiText(_("Reject Jobs")));
-    else if (!strcmp(op, "cancel-jobs"))
-      do_printer_op(http, printer, IPP_OP_CANCEL_JOBS, cgiText(_("Cancel Jobs")));
+    else if (!strcmp(op, "purge-jobs"))
+      do_printer_op(http, printer, IPP_PURGE_JOBS, cgiText(_("Purge Jobs")));
    else if (!_cups_strcasecmp(op, "print-self-test-page"))
      cgiPrintCommand(http, printer, "PrintSelfTestPage",
                      cgiText(_("Print Self-Test Page")));
@@ -285,8 +293,8 @@ do_printer_op(http_t      *http,	/* I - HTTP connection */
      cgiCopyTemplateLang("printer-accept.tmpl");
    else if (op == CUPS_REJECT_JOBS)
      cgiCopyTemplateLang("printer-reject.tmpl");
-    else if (op == IPP_OP_CANCEL_JOBS)
-      cgiCopyTemplateLang("printer-cancel-jobs.tmpl");
+    else if (op == IPP_PURGE_JOBS)
+      cgiCopyTemplateLang("printer-purge.tmpl");
  }

  cgiEndHTML();
@@ -566,5 +574,5 @@ show_printer(http_t     *http,		/* I - Connection to server */


 /*
- * End of "$Id: printers.c 11928 2014-06-13 00:08:32Z msweet $".
+ * End of "$Id$".
 */
@@ -1,16 +1,22 @@
 /*
- * "$Id: search.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id$"
 *
- * Search routines for CUPS.
+ *   Search routines for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007-2011 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/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   cgiCompileSearch() - Compile a search string.
+ *   cgiDoSearch()      - Do a search of some text.
+ *   cgiFreeSearch()    - Free a compiled search context.
 */

 /*
@@ -32,12 +38,12 @@ cgiCompileSearch(const char *query)	/* I - Query string */
  char		*s,			/* Regular expression string */
 		*sptr,			/* Pointer into RE string */
 		*sword;			/* Pointer to start of word */
-  size_t	slen;			/* Allocated size of RE string */
+  int		slen;			/* Allocated size of RE string */
  const char	*qptr,			/* Pointer into query string */
 		*qend;			/* End of current word */
  const char	*prefix;		/* Prefix to add to next word */
  int		quoted;			/* Word is quoted */
-  size_t	wlen;			/* Word length */
+  int		wlen;			/* Word length */
  char		*lword;			/* Last word in query */


@@ -133,7 +139,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
      for (qend = qptr + 1; *qend && !isspace(*qend); qend ++);
    }

-    wlen = (size_t)(qend - qptr);
+    wlen = qend - qptr;

   /*
    * Look for logic words: AND, OR
@@ -168,7 +174,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
      * string + RE overhead...
      */

-      wlen = (size_t)(sptr - s) + 2 * 4 * wlen + 2 * strlen(prefix) + 11;
+      wlen = (sptr - s) + 2 * 4 * wlen + 2 * strlen(prefix) + 11;
      if (lword)
        wlen += strlen(lword);

@@ -202,7 +208,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
      * Add the prefix string...
      */

-      memcpy(sptr, prefix, strlen(prefix) + 1);
+      strcpy(sptr, prefix);
      sptr += strlen(sptr);

     /*
@@ -243,16 +249,16 @@ cgiCompileSearch(const char *query)	/* I - Query string */
 	  return (NULL);
 	}

-        memcpy(sptr, ".*|.*", 6);
+        strcpy(sptr, ".*|.*");
 	sptr += 5;

-	memcpy(sptr, lword2, strlen(lword2) + 1);
+	strcpy(sptr, lword2);
 	sptr += strlen(sptr);

-        memcpy(sptr, ".*", 3);
+        strcpy(sptr, ".*");
 	sptr += 2;

-	memcpy(sptr, lword, strlen(lword) + 1);
+	strcpy(sptr, lword);
 	sptr += strlen(sptr);

        free(lword);
@@ -281,7 +287,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
    free(lword);

  if (sptr > s)
-    memcpy(sptr, ".*", 3);
+    strcpy(sptr, ".*");
  else
  {
   /*
@@ -371,5 +377,5 @@ cgiFreeSearch(void *search)		/* I - Search context */


 /*
- * End of "$Id: search.c 11558 2014-02-06 18:33:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,16 +1,27 @@
 /*
- * "$Id: template.c 12700 2015-06-08 18:32:35Z msweet $"
+ * "$Id$"
 *
- * CGI template function.
+ *   CGI template function.
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007-2011 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/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   cgiCopyTemplateFile() - Copy a template file and replace all the
+ *                           '{variable}' strings with the variable value.
+ *   cgiCopyTemplateLang() - Copy a template file using a language...
+ *   cgiGetTemplateDir()   - Get the templates directory...
+ *   cgiSetServerVersion() - Set the server name and CUPS version...
+ *   cgi_copy()            - Copy the template file, substituting as needed...
+ *   cgi_puts()            - Put a string to the output file, quoting as
+ *                           needed...
 */

 #include "cgi-private.h"
@@ -255,7 +266,7 @@ cgi_copy(FILE *out,			/* I - Output file */
        else if (s > name && ch == '?')
 	  break;
 	else if (s < (name + sizeof(name) - 1))
-          *s++ = (char)ch;
+          *s++ = ch;

      *s = '\0';

@@ -432,7 +443,7 @@ cgi_copy(FILE *out,			/* I - Output file */
      *   {name~refex?true:false}    Regex match
      */

-      op = (char)ch;
+      op = ch;

      if (ch == '?')
      {
@@ -475,7 +486,7 @@ cgi_copy(FILE *out,			/* I - Output file */
 	    innerptr = innername;
 	    while ((ch = getc(in)) != EOF && ch != '}')
 	      if (innerptr < (innername + sizeof(innername) - 1))
-	        *innerptr++ = (char)ch;
+	        *innerptr++ = ch;
 	    *innerptr = '\0';

            if (innername[0] == '#')
@@ -487,26 +498,26 @@ cgi_copy(FILE *out,			/* I - Output file */
 	      if ((innerval = cgiGetArray(innername, atoi(innerptr) - 1)) == NULL)
 	        *s = '\0';
 	      else
-	        strlcpy(s, innerval, sizeof(compare) - (size_t)(s - compare));
+	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
 	    }
 	    else if (innername[0] == '?')
 	    {
 	      if ((innerval = cgiGetArray(innername + 1, element)) == NULL)
 		*s = '\0';
 	      else
-	        strlcpy(s, innerval, sizeof(compare) - (size_t)(s - compare));
+	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
            }
 	    else if ((innerval = cgiGetArray(innername, element)) == NULL)
-	      snprintf(s, sizeof(compare) - (size_t)(s - compare), "{%s}", innername);
+	      snprintf(s, sizeof(compare) - (s - compare), "{%s}", innername);
 	    else
-	      strlcpy(s, innerval, sizeof(compare) - (size_t)(s - compare));
+	      strlcpy(s, innerval, sizeof(compare) - (s - compare));

            s += strlen(s);
 	  }
          else if (ch == '\\')
-	    *s++ = (char)getc(in);
+	    *s++ = getc(in);
 	  else
-            *s++ = (char)ch;
+            *s++ = ch;

        *s = '\0';

@@ -542,7 +553,7 @@ cgi_copy(FILE *out,			/* I - Output file */
 	      if (regcomp(&re, compare, REG_EXTENDED | REG_ICASE))
 	      {
 	        fprintf(stderr,
-		        "ERROR: Unable to compile regular expression \"%s\"!\n",
+		        "ERROR: Unable to compile regular expresion \"%s\"!\n",
 			compare);
 		result = 0;
 	      }
@@ -648,7 +659,39 @@ cgi_puts(const char *s,			/* I - String to output */
  while (*s)
  {
    if (*s == '<')
-      fputs("&lt;", out);
+    {
+     /*
+      * 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);
+    }
    else if (*s == '>')
      fputs("&gt;", out);
    else if (*s == '\"')
@@ -686,5 +729,5 @@ cgi_puturi(const char *s,		/* I - String to output */


 /*
- * End of "$Id: template.c 12700 2015-06-08 18:32:35Z msweet $".
+ * End of "$Id$".
 */
@@ -1,16 +1,21 @@
 /*
- * "$Id: testcgi.c 11558 2014-02-06 18:33:34Z msweet $"
+ * "$Id$"
 *
- * CGI test program for CUPS.
+ *   CGI test program for CUPS.
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2005 by Easy Software Products.
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * Contents:
+ *
+ *   main()       - Test the help index code.
+ *   list_nodes() - List nodes in an array...
 */

 /*
@@ -25,7 +30,8 @@
 */

 int					/* O - Exit status */
-main(void)
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
 {
 /*
  * Test file upload/multi-part submissions...
@@ -65,5 +71,5 @@ main(void)


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


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


 /*
- * End of "$Id: testtemplate.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,20 +1,49 @@
 /*
- * "$Id: var.c 12621 2015-05-06 21:32:18Z msweet $"
+ * "$Id$"
 *
- * CGI form variable and array functions for CUPS.
+ *   CGI form variable and array functions for CUPS.
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2005 by Easy Software Products.
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2005 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/".
- */
-
-/*
- * Include necessary headers...
+ *   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/".
+ *
+ * Contents:
+ *
+ *   cgiCheckVariables()        - Check for the presence of "required"
+ *                                variables.
+ *   cgiClearVariables()        - Clear all form variables.
+ *   cgiGetArray()              - Get an element from a form array.
+ *   cgiGetCookie()             - Get a cookie value.
+ *   cgiGetFile()               - Get the file (if any) that was submitted in
+ *                                the form.
+ *   cgiGetSize()               - Get the size of a form array value.
+ *   cgiGetVariable()           - Get a CGI variable from the database.
+ *   cgiInitialize()            - Initialize the CGI variable "database".
+ *   cgiIsPOST()                - Determine whether this page was POSTed.
+ *   cgiSetArray()              - Set array element N to the specified string.
+ *   cgiSetCookie()             - Set a cookie value.
+ *   cgiSetSize()               - Set the array size.
+ *   cgiSetVariable()           - Set a CGI variable in the database.
+ *   cgi_add_variable()         - Add a form variable.
+ *   cgi_compare_variables()    - Compare two variables.
+ *   cgi_find_variable()        - Find a variable.
+ *   cgi_initialize_cookies()   - Initialize cookies.
+ *   cgi_initialize_get()       - Initialize form variables using the GET
+ *                                method.
+ *   cgi_initialize_multipart() - Initialize variables and file using the POST
+ *                                method.
+ *   cgi_initialize_post()      - Initialize variables using the POST method.
+ *   cgi_initialize_string()    - Initialize form variables from a string.
+ *   cgi_passwd()               - Catch authentication requests and notify the
+ *                                server.
+ *   cgi_set_sid()              - Set the CUPS session ID.
+ *   cgi_sort_variables()       - Sort all form variables for faster lookup.
+ *   cgi_unlink_file()          - Remove the uploaded form.
 */

 /*#define DEBUG*/
@@ -388,7 +417,7 @@ cgiSetArray(const char *name,		/* I - Name of variable */
      const char **temp;		/* Temporary pointer */

      temp = (const char **)realloc((void *)(var->values),
-                                    sizeof(char *) * (size_t)(element + 16));
+                                    sizeof(char *) * (element + 16));
      if (!temp)
        return;

@@ -437,9 +466,9 @@ cgiSetCookie(const char *name,		/* I - Name */
    printf(" expires=%s;", httpGetDateString2(expires, date, sizeof(date)));
  }
  if (secure)
-    puts(" httponly; secure;");
+    puts(" secure;");
  else
-    puts(" httponly;");
+    putchar('\n');
 }


@@ -466,7 +495,7 @@ cgiSetSize(const char *name,		/* I - Name of variable */
    const char **temp;			/* Temporary pointer */

    temp = (const char **)realloc((void *)(var->values),
-				  sizeof(char *) * (size_t)(size + 16));
+				  sizeof(char *) * (size + 16));
    if (!temp)
      return;

@@ -552,7 +581,7 @@ cgi_add_variable(const char *name,	/* I - Variable name */
    if (form_alloc == 0)
      temp_vars = malloc(sizeof(_cgi_var_t) * 16);
    else
-      temp_vars = realloc(form_vars, (size_t)(form_alloc + 16) * sizeof(_cgi_var_t));
+      temp_vars = realloc(form_vars, (form_alloc + 16) * sizeof(_cgi_var_t));

    if (!temp_vars)
      return;
@@ -563,7 +592,7 @@ cgi_add_variable(const char *name,	/* I - Variable name */

  var = form_vars + form_count;

-  if ((var->values = calloc((size_t)element + 1, sizeof(char *))) == NULL)
+  if ((var->values = calloc(element + 1, sizeof(char *))) == NULL)
    return;

  var->name            = _cupsStrAlloc(name);
@@ -603,7 +632,7 @@ cgi_find_variable(const char *name)	/* I - Name of variable */

  key.name = name;

-  return ((_cgi_var_t *)bsearch(&key, form_vars, (size_t)form_count, sizeof(_cgi_var_t),
+  return ((_cgi_var_t *)bsearch(&key, form_vars, form_count, sizeof(_cgi_var_t),
                           (int (*)(const void *, const void *))cgi_compare_variables));
 }

@@ -626,8 +655,6 @@ cgi_initialize_cookies(void)

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

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

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

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

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

    *ptr = '\0';

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

-    if (name[0] != '$' && !skip)
+    if (name[0] != '$')
      num_cookies = cupsAddOption(name, value, num_cookies, &cookies);
  }
 }
@@ -759,8 +769,8 @@ cgi_initialize_multipart(
 		*ptr,			/* Pointer into name/filename */
 		*end;			/* End of buffer */
  int		ch,			/* Character from file */
-		fd;			/* Temporary file descriptor */
-  size_t	blen;			/* Length of boundary string */
+		fd,			/* Temporary file descriptor */
+		blen;			/* Length of boundary string */


  DEBUG_printf(("cgi_initialize_multipart(boundary=\"%s\")\n", boundary));
@@ -825,22 +835,22 @@ cgi_initialize_multipart(

 	while ((ch = getchar()) != EOF)
 	{
-	  *ptr++ = (char)ch;
+	  *ptr++ = ch;

-          if ((size_t)(ptr - line) >= blen && !memcmp(ptr - blen, bstring, blen))
+          if ((ptr - line) >= blen && !memcmp(ptr - blen, bstring, blen))
 	  {
 	    ptr -= blen;
 	    break;
 	  }

-          if ((ptr - line - (int)blen) >= 8192)
+          if ((ptr - line - blen) >= 8192)
 	  {
 	   /*
 	    * Write out the first 8k of the buffer...
 	    */

 	    write(fd, line, 8192);
-	    memmove(line, line + 8192, (size_t)(ptr - line - 8192));
+	    memmove(line, line + 8192, ptr - line - 8192);
 	    ptr -= 8192;
 	  }
 	}
@@ -850,7 +860,7 @@ cgi_initialize_multipart(
 	*/

 	if (ptr > line)
-          write(fd, line, (size_t)(ptr - line));
+          write(fd, line, ptr - line);

 	close(fd);
      }
@@ -867,9 +877,9 @@ cgi_initialize_multipart(
 	while ((ch = getchar()) != EOF)
 	{
 	  if (ptr < end)
-	    *ptr++ = (char)ch;
+	    *ptr++ = ch;

-          if ((size_t)(ptr - line) >= blen && !memcmp(ptr - blen, bstring, blen))
+          if ((ptr - line) >= blen && !memcmp(ptr - blen, bstring, blen))
 	  {
 	    ptr -= blen;
 	    break;
@@ -969,12 +979,12 @@ cgi_initialize_multipart(
 static int				/* O - 1 if form data was read */
 cgi_initialize_post(void)
 {
-  char		*content_length,	/* Length of input data (string) */
-		*data;			/* Pointer to form data string */
-  size_t	length,			/* Length of input data */
-		tbytes;			/* Total number of bytes read */
-  ssize_t	nbytes;			/* Number of bytes read this read() */
-  int		status;			/* Return status */
+  char	*content_length,		/* Length of input data (string) */
+	*data;				/* Pointer to form data string */
+  int	length,				/* Length of input data */
+	nbytes,				/* Number of bytes read this read() */
+	tbytes,				/* Total number of bytes read */
+	status;				/* Return status */


  DEBUG_puts("cgi_initialize_post: Initializing variables using POST method...");
@@ -991,7 +1001,7 @@ cgi_initialize_post(void)
  * Get the length of the input stream and allocate a buffer for it...
  */

-  length = (size_t)strtol(content_length, NULL, 10);
+  length = atoi(content_length);
  data   = malloc(length + 1);

  if (data == NULL)
@@ -1001,8 +1011,8 @@ cgi_initialize_post(void)
  * Read the data into the buffer...
  */

-  for (tbytes = 0; tbytes < length; tbytes += (size_t)nbytes)
-    if ((nbytes = read(0, data + tbytes, (size_t)(length - tbytes))) < 0)
+  for (tbytes = 0; tbytes < length; tbytes += nbytes)
+    if ((nbytes = read(0, data + tbytes, length - tbytes)) < 0)
    {
      if (errno != EAGAIN)
      {
@@ -1116,7 +1126,7 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
              ch = *data - '0';
              if (ch > 9)
        	ch -= 7;
-              *s = (char)(ch << 4);
+              *s = ch << 4;

              data ++;
              ch = *data - '0';
@@ -1254,7 +1264,7 @@ cgi_sort_variables(void)
  if (form_count < 2)
    return;

-  qsort(form_vars, (size_t)form_count, sizeof(_cgi_var_t),
+  qsort(form_vars, form_count, sizeof(_cgi_var_t),
        (int (*)(const void *, const void *))cgi_compare_variables);

 #ifdef DEBUG
@@ -1297,5 +1307,5 @@ cgi_unlink_file(void)


 /*
- * End of "$Id: var.c 12621 2015-05-06 21:32:18Z msweet $".
+ * End of "$Id$".
 */
@@ -0,0 +1,116 @@
+/*
+ * "$Id$"
+ *
+ *   Web search program for www.cups.org.
+ *
+ *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * Usage:
+ *
+ *   websearch directory "search string"
+ *
+ * Contents:
+ *
+ *   main()       - Search a directory of help files.
+ *   list_nodes() - List matching nodes.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cgi.h"
+
+
+/*
+ * Local functions...
+ */
+
+static void	list_nodes(help_index_t *hi, const char *title,
+		           cups_array_t *nodes);
+
+
+/*
+ * 'main()' - Test the help index code.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
+{
+  help_index_t	*hi,			/* Help index */
+		*search;		/* Search index */
+  char		indexname[1024];	/* Name of index file */
+
+
+  if (argc != 3)
+  {
+    puts("Usage: websearch directory \"search terms\"");
+    return (1);
+  }
+
+ /*
+  * Load the help index...
+  */
+
+  snprintf(indexname, sizeof(indexname), "%s/.index", argv[1]);
+  hi = helpLoadIndex(indexname, argv[1]);
+
+ /*
+  * Do any searches...
+  */
+
+  search = helpSearchIndex(hi, argv[2], NULL, NULL);
+
+  if (search)
+    list_nodes(hi, argv[1], search->sorted);
+
+ /*
+  * Return with no errors...
+  */
+
+  return (0);
+}
+
+
+/*
+ * 'list_nodes()' - List nodes in an array...
+ */
+
+static void
+list_nodes(help_index_t *hi,		/* I - Help index */
+           const char   *title,		/* I - Title string */
+	   cups_array_t *nodes)		/* I - Nodes */
+{
+  help_node_t	*node,			/* Current node */
+		*file;			/* File node */
+
+
+  printf("%d\n", cupsArrayCount(nodes));
+  for (node = (help_node_t *)cupsArrayFirst(nodes);
+       node;
+       node = (help_node_t *)cupsArrayNext(nodes))
+  {
+    if (node->anchor)
+    {
+      file = helpFindNode(hi, node->filename, NULL);
+      printf("%d|%s#%s|%s|%s\n", node->score, node->filename, node->anchor,
+             node->text, file ? file->text : node->filename);
+    }
+    else
+      printf("%d|%s|%s|%s\n", node->score, node->filename, node->text,
+             node->text);
+  }
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 12533 2015-02-27 12:30:26Z msweet $"
+# "$Id$"
 #
 #   Configuration file makefile for CUPS.
 #
-#   Copyright 2007-2015 by Apple Inc.
+#   Copyright 2007-2011 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 12533 2015-02-27 12:30:26Z msweet $".
+# End of "$Id$".
 #
@@ -1,21 +1,19 @@
 #
-# File/directory/user/group configuration file for the CUPS scheduler.
+# "$Id$"
+#
+# Sample file/directory/user/group configuration file for the CUPS scheduler.
 # See "man cups-files.conf" for a complete description of this file.
 #

 # List of events that are considered fatal errors for the scheduler...
 #FatalErrors @CUPS_FATAL_ERRORS@

-# Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
-
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
 #User @CUPS_USER@
 #Group @CUPS_GROUP@

 # Administrator user group, used to match @SYSTEM in cupsd.conf policy rules...
-# This cannot contain the Group value for security reasons...
 SystemGroup @CUPS_SYSTEM_GROUPS@
@CUPS_SYSTEM_AUTHKEY@

@@ -75,8 +73,11 @@ PageLog @CUPS_LOGDIR@/page_log
 # Location of helper programs...
 #ServerBin @CUPS_SERVERBIN@

-# SSL/TLS keychain for the scheduler...
-#ServerKeychain @CUPS_SERVERKEYCHAIN@
+# SSL/TLS certificate for the scheduler...
+#ServerCertificate @CUPS_SERVERCERT@
+
+# SSL/TLS private key for the scheduler...
+#ServerKey @CUPS_SERVERKEY@

 # Location of other configuration files...
 #ServerRoot @CUPS_SERVERROOT@
@@ -91,3 +92,7 @@ PageLog @CUPS_LOGDIR@/page_log
 # scheduler startup and cannot be one of the standard (public) temporary
 # directory locations for security reasons...
 #TempDir @CUPS_REQUESTS@/tmp
+
+#
+# End of "$Id$".
+#
@@ -1,12 +1,13 @@
 #
-# Configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
+# "$Id$"
+#
+# Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
 # complete description of this file.
 #

 # Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug"
 # for troubleshooting...
 LogLevel @CUPS_LOG_LEVEL@
-@CUPS_PAGE_LOG_FORMAT@

 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
@@ -39,13 +40,6 @@ WebInterface @CUPS_WEBIF@
  Order allow,deny
 </Location>

-# Restrict access to log files...
-<Location /admin/log>
-  AuthType Default
-  Require user @SYSTEM
-  Order allow,deny
-</Location>
-
 # Set the default printer/job policies...
 <Policy default>
  # Job/subscription privacy...
@@ -134,3 +128,7 @@ WebInterface @CUPS_WEBIF@
    Order deny,allow
  </Limit>
 </Policy>
+
+#
+# End of "$Id$".
+#
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.convs.in 11025 2013-06-07 01:00:33Z msweet $"
+# "$Id$"
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
@@ -59,5 +59,5 @@ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
@DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-

 #
-# End of "$Id: mime.convs.in 11025 2013-06-07 01:00:33Z msweet $".
+# End of "$Id$".
 #
@@ -1,20 +1,20 @@
 #
-# "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $"
+# "$Id: mime.types 9871 2011-08-06 06:34:46Z mike $"
 #
-# Base MIME types file for CUPS.
+#   Base MIME types file for CUPS.
 #
-# DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
-# VERSIONS OF CUPS.  Instead, create a "local.types" file that
-# reflects your local configuration changes.
+#   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
+#   VERSIONS OF CUPS.  Instead, create a "local.types" file that
+#   reflects your local configuration changes.
 #
-# Copyright 2007-2015 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products.
+#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products.
 #
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+#   These coded instructions, statements, and computer programs are the
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #

 ########################################################################
@@ -37,7 +37,6 @@
 #                                       100=default, 200=highest)
 #   printable(offset,length)		True if bytes are printable 8-bit chars
 #					(CR, NL, TAB, BS, 32-126, 128-254)
-#   regex(offset,"regex")		True if bytes match regular expression
 #   string(offset,"string")		True if bytes are identical to string
 #   istring(offset,"string")		True if bytes are identical to
 #                                       case-insensitive string
@@ -71,7 +70,7 @@
 #

 #application/msword		doc string(0,<D0CF11E0A1B11AE1>)
-application/pdf			pdf regex(0,^[\n\r]*%PDF)
+application/pdf			pdf string(0,%PDF)
 application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
 				contains(0,128,<1B>%-12345X) + \
 				(contains(0,4096,"LANGUAGE=POSTSCRIPT") \
@@ -81,13 +80,6 @@ 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...
@@ -100,7 +92,7 @@ image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) +\
 				 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
 				 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
 				 char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef))
-image/pwg-raster		string(0,"RaS2") + string(4,PwgRaster<00>) priority(150)
+image/pwg-raster		string(0,"RaS2") + string(4,PwgRaster<00>) priority(100)
 image/tiff			tiff tif string(0,MM<002A>) string(0,II<2A00>)
 image/x-photocd			pcd string(2048,PCD_IPI)
 image/x-portable-anymap		pnm
@@ -131,7 +123,7 @@ application/x-shell		sh printable(0,1024) + string(0,#!) +\
 				(contains(2,80,/bash) contains(2,80,/ksh)\
 				 contains(2,80,/sh) contains(2,80,/zsh))
 application/x-csource		c cxx cpp cc C h hpp \
-				printable(0,1024) + ! css + \
+				printable(0,1024) + \
 				(string(0,/*) string(0,//)
 				 string(0,#include) contains(0,1024,<0a>#include) \
 				 string(0,#define) contains(0,1024,<0a>#define))
@@ -160,7 +152,7 @@ application/vnd.cups-pdf
 application/vnd.cups-postscript
 application/vnd.cups-ppd	ppd string(0,"*PPD-Adobe:")
 application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR") \
-				(string(0,"RaS2") + !string(4,PwgRaster<00>)) string(0,"2SaR") \
+				string(0,"RaS2") string(0,"2SaR") \
 				string(0,"RaS3") string(0,"3SaR")
 application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 				string(0,<1B>@) \
@@ -178,5 +170,5 @@ application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 application/octet-stream

 #
-# End of "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $".
+# End of "$Id: mime.types 9871 2011-08-06 06:34:46Z mike $".
 #
@@ -1,7 +1,13 @@
 #
-# SNMP configuration file for CUPS.  See "man cups-snmp.conf" for a complete
-# description of this file.
+# "$Id$"
+#
+#   Sample SNMP configuration file for CUPS.  See "man cups-snmp.conf" for a
+#   complete description of this file.
 #

@CUPS_SNMP_ADDRESS@
@CUPS_SNMP_COMMUNITY@
+
+#
+# End of "$Id$".
+#
@@ -1,38 +1,30 @@
 dnl
-dnl "$Id: cups-common.m4 12852 2015-08-28 13:29:21Z msweet $"
+dnl "$Id: cups-common.m4 10785 2013-01-08 16:29:26Z mike $"
 dnl
-dnl Common configuration stuff for CUPS.
+dnl   Common configuration stuff for CUPS.
 dnl
-dnl Copyright 2007-2015 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

+dnl We need at least autoconf 2.60...
+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.1.3
-
-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_VERSION="1.6.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_BUILD="cups-$CUPS_VERSION"

 AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" string ],
@@ -41,8 +33,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, "AC_PACKAGE_NAME v$CUPS_VERSION$CUPS_REVISION")
-AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "AC_PACKAGE_NAME/$CUPS_VERSION$CUPS_REVISION")
+AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION$CUPS_REVISION")
+AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "CUPS/$CUPS_VERSION$CUPS_REVISION")

 dnl Default compiler flags...
 CFLAGS="${CFLAGS:=}"
@@ -52,9 +44,9 @@ LDFLAGS="${LDFLAGS:=}"

 dnl Checks for programs...
 AC_PROG_AWK
-AC_PROG_CC(clang cc gcc)
+AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_CXX(clang++ c++ g++)
+AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(CHMOD,chmod)
@@ -97,7 +89,7 @@ fi
 AC_SUBST(INSTALLSTATIC)

 dnl Check for pkg-config, which is used for some other tests later on...
-AC_PATH_TOOL(PKGCONFIG, pkg-config)
+AC_PATH_PROG(PKGCONFIG, pkg-config)

 dnl Check for libraries...
 AC_SEARCH_LIBS(abs, m, AC_DEFINE(HAVE_ABS))
@@ -142,10 +134,11 @@ AC_CHECK_HEADER(stdint.h,AC_DEFINE(HAVE_STDINT_H))
 AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
 AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
 AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
+AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_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))
+AC_CHECK_HEADER(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H))

 dnl Checks for iconv.h and iconv_open
 AC_CHECK_HEADER(iconv.h,
@@ -154,9 +147,6 @@ AC_CHECK_HEADER(iconv.h,
 	AC_SEARCH_LIBS(iconv_open,iconv,
 		AC_DEFINE(HAVE_ICONV_H)
 		SAVELIBS="$SAVELIBS $LIBS")
-	AC_SEARCH_LIBS(libiconv_open,iconv,
-		AC_DEFINE(HAVE_ICONV_H)
-		SAVELIBS="$SAVELIBS $LIBS")
 	LIBS="$SAVELIBS")

 dnl Checks for Mini-XML (www.minixml.org)...
@@ -212,9 +202,6 @@ AC_CHECK_FUNCS(sigaction)
 dnl Checks for wait functions.
 AC_CHECK_FUNCS(waitpid wait3)

-dnl Check for posix_spawn
-AC_CHECK_FUNCS(posix_spawn)
-
 dnl See if the tm structure has the tm_gmtoff member...
 AC_MSG_CHECKING(for tm_gmtoff member in tm structure)
 AC_TRY_COMPILE([#include <time.h>],[struct tm t;
@@ -238,24 +225,18 @@ dnl See if we have libusb...
 AC_ARG_ENABLE(libusb, [  --enable-libusb         use libusb for USB printing])

 LIBUSB=""
-USBQUIRKS=""
 AC_SUBST(LIBUSB)
-AC_SUBST(USBQUIRKS)

 if test "x$PKGCONFIG" != x; then
-	if test x$enable_libusb != xno -a $uname != Darwin; then
+	if test x$enable_libusb = xyes -o $uname != Darwin; then
 		AC_MSG_CHECKING(for libusb-1.0)
 		if $PKGCONFIG --exists libusb-1.0; then
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_LIBUSB)
 			CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
 			LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
-			USBQUIRKS="\$(DATADIR)/usb"
 		else
 			AC_MSG_RESULT(no)
-			if test x$enable_libusb = xyes; then
-				AC_MSG_ERROR(libusb required for --enable-libusb.)
-			fi
 		fi
 	fi
 elif test x$enable_libusb = xyes; then
@@ -283,7 +264,6 @@ AC_CHECK_HEADER(zlib.h,
 	AC_DEFINE(HAVE_LIBZ)
 	LIBZ="-lz"
 	LIBS="$LIBS -lz"
-	AC_CHECK_LIB(z, inflateCopy, AC_DEFINE(HAVE_INFLATECOPY))
 	if test "x$GZIP" != z; then
 		INSTALL_GZIP="-z"
 	fi))
@@ -319,15 +299,20 @@ fi
 LIBS="$SAVELIBS"

 dnl Check for DBUS support
-AC_ARG_ENABLE(dbus, [  --disable-dbus           build without DBUS support])
+if test -d /etc/dbus-1; then
+	DBUSDIR="/etc/dbus-1"
+else
+	DBUSDIR=""
+fi
+
+AC_ARG_ENABLE(dbus, [  --enable-dbus           build with DBUS support])
 AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
 	DBUSDIR="$withval")

-DBUSDIR=""
 DBUS_NOTIFIER=""
 DBUS_NOTIFIERLIBS=""

-if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$uname" != xDarwin; then
+if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then
 	AC_MSG_CHECKING(for DBUS)
 	if $PKGCONFIG --exists dbus-1; then
 		AC_MSG_RESULT(yes)
@@ -340,12 +325,7 @@ if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$uname" != xDarwin; th
 		LIBS="$LIBS $DBUS_NOTIFIERLIBS"
 		AC_CHECK_FUNC(dbus_message_iter_init_append,
 			      AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND))
-		AC_CHECK_FUNC(dbus_threads_init,
-			      AC_DEFINE(HAVE_DBUS_THREADS_INIT))
 		LIBS="$SAVELIBS"
-		if test -d /etc/dbus-1; then
-			DBUSDIR="/etc/dbus-1"
-		fi
 	else
 		AC_MSG_RESULT(no)
 	fi
@@ -357,7 +337,6 @@ AC_SUBST(DBUS_NOTIFIERLIBS)

 dnl Extra platform-specific libraries...
 CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM"
-CUPS_DEFAULT_SYSTEM_AUTHKEY=""
 CUPS_SYSTEM_AUTHKEY=""
 INSTALLXPC=""

@@ -372,6 +351,7 @@ case $uname in
 		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H))
 		AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H))
 		AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H))
+		AC_CHECK_HEADER(IOKit/pwr_mgt/IOPMLibPrivate.h,AC_DEFINE(HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H))

 		dnl Check for dynamic store function...
 		AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName)
@@ -381,6 +361,9 @@ case $uname in
 		AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
 		AC_CHECK_FUNCS(mbr_uid_to_uuid)

+                dnl Check for the vproc_transaction_begin/end stuff...
+		AC_CHECK_FUNCS(vproc_transaction_begin)
+
 		dnl Need <dlfcn.h> header...
 		AC_CHECK_HEADER(dlfcn.h,AC_DEFINE(HAVE_DLFCN_H))

@@ -401,13 +384,10 @@ case $uname in

 			if test "x$default_adminkey" != xdefault; then
 				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
-				CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey"
 			elif grep -q system.print.operator /etc/authorization; then
 				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
-				CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin"
 			else
 				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
-				CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences"
 			fi

 			if test "x$default_operkey" != xdefault; then
@@ -445,7 +425,6 @@ esac

 AC_SUBST(CUPS_DEFAULT_PRINTOPERATOR_AUTH)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTOPERATOR_AUTH, "$CUPS_DEFAULT_PRINTOPERATOR_AUTH")
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SYSTEM_AUTHKEY, "$CUPS_DEFAULT_SYSTEM_AUTHKEY")
 AC_SUBST(CUPS_SYSTEM_AUTHKEY)
 AC_SUBST(INSTALLXPC)

@@ -474,5 +453,5 @@ esac
 AC_SUBST(BUILDDIRS)

 dnl
-dnl End of "$Id: cups-common.m4 12852 2015-08-28 13:29:21Z msweet $".
+dnl End of "$Id: cups-common.m4 10785 2013-01-08 16:29:26Z mike $".
 dnl
@@ -1,16 +1,16 @@
 dnl
-dnl "$Id: cups-compiler.m4 12742 2015-06-23 14:48:53Z msweet $"
+dnl "$Id: cups-compiler.m4 10190 2012-01-20 16:22:58Z mike $"
 dnl
-dnl Compiler stuff for CUPS.
+dnl   Compiler stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

 dnl Clear the debugging and non-shared library options unless the user asks
@@ -103,89 +103,57 @@ if test -n "$GCC"; then
 	fi

 	# Generate position-independent code as needed...
-	if test $PICFLAG = 1; then
+	if test $PICFLAG = 1 -a $uname != AIX; then
    		OPTIM="-fPIC $OPTIM"
 	fi

 	# The -fstack-protector option is available with some versions of
 	# GCC and adds "stack canaries" which detect when the return address
 	# has been overwritten, preventing many types of exploit attacks.
-	AC_MSG_CHECKING(whether compiler supports -fstack-protector)
+	AC_MSG_CHECKING(if GCC supports -fstack-protector)
 	OLDCFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fstack-protector"
 	AC_TRY_LINK(,,
-		if test "x$LSB_BUILD" = xy; then
-			# Can't use stack-protector with LSB binaries...
-			OPTIM="$OPTIM -fno-stack-protector"
-		else
-			OPTIM="$OPTIM -fstack-protector"
-		fi
+		OPTIM="$OPTIM -fstack-protector"
 		AC_MSG_RESULT(yes),
 		AC_MSG_RESULT(no))
 	CFLAGS="$OLDCFLAGS"

-	if test "x$LSB_BUILD" != xy; then
-		# The -fPIE option is available with some versions of GCC and
-		# adds randomization of addresses, which avoids another class of
-		# exploits that depend on a fixed address for common functions.
-		#
-		# Not available to LSB binaries...
-		AC_MSG_CHECKING(whether compiler supports -fPIE)
-		OLDCFLAGS="$CFLAGS"
-		case "$uname" in
-			Darwin*)
-				CFLAGS="$CFLAGS -fPIE -Wl,-pie"
-				AC_TRY_COMPILE(,,[
-					PIEFLAGS="-fPIE -Wl,-pie"
-					AC_MSG_RESULT(yes)],
-					AC_MSG_RESULT(no))
+	# The -fPIE option is available with some versions of GCC and adds
+	# randomization of addresses, which avoids another class of exploits
+	# that depend on a fixed address for common functions.
+	AC_MSG_CHECKING(if GCC supports -fPIE)
+	OLDCFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS -fPIE"
+	AC_TRY_COMPILE(,,
+		[case "$CC" in
+			*clang)
+				PIEFLAGS="-fPIE -Wl,-pie"
 				;;
-
 			*)
-				CFLAGS="$CFLAGS -fPIE -pie"
-				AC_TRY_COMPILE(,,[
-					PIEFLAGS="-fPIE -pie"
-					AC_MSG_RESULT(yes)],
-					AC_MSG_RESULT(no))
+				PIEFLAGS="-fPIE -pie"
 				;;
 		esac
-		CFLAGS="$OLDCFLAGS"
-	fi
+		AC_MSG_RESULT(yes)],
+		AC_MSG_RESULT(no))
+	CFLAGS="$OLDCFLAGS"

 	if test "x$with_optim" = x; 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"
-		AC_TRY_COMPILE(,,
-			[OPTIM="$OPTIM -Wsign-conversion"
-			AC_MSG_RESULT(yes)],
-			AC_MSG_RESULT(no))
-		CFLAGS="$OLDCFLAGS"
-
-		AC_MSG_CHECKING(whether compiler supports -Wno-tautological-compare)
-		OLDCFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS -Werror -Wno-tautological-compare"
-		AC_TRY_COMPILE(,,
-			[OPTIM="$OPTIM -Wno-tautological-compare"
-			AC_MSG_RESULT(yes)],
-			AC_MSG_RESULT(no))
-		CFLAGS="$OLDCFLAGS"
-
 		# Additional warning options for development testing...
 		if test -d .svn; then
-			OPTIM="-Werror $OPTIM"
+			OPTIM="-Wshadow -Werror $OPTIM"
+		else
+			AC_MSG_CHECKING(if GCC supports -Wno-tautological-compare)
+			OLDCFLAGS="$CFLAGS"
+			CFLAGS="$CFLAGS -Werror -Wno-tautological-compare"
+			AC_TRY_COMPILE(,,
+				[OPTIM="$OPTIM -Wno-tautological-compare"
+				AC_MSG_RESULT(yes)],
+				AC_MSG_RESULT(no))
+			CFLAGS="$OLDCFLAGS"
 		fi
 	fi

@@ -203,13 +171,60 @@ if test -n "$GCC"; then
 			# The -z relro option is provided by the Linux linker command to
 			# make relocatable data read-only.
 			if test x$enable_relro = xyes; then
-				RELROFLAGS="-Wl,-z,relro,-z,now"
+				RELROFLAGS="-Wl,-z,relro"
 			fi
 			;;
 	esac
 else
 	# Add vendor-specific compiler options...
 	case $uname in
+		AIX*)
+			if test -z "$OPTIM"; then
+				if test "x$with_optim" = x; then
+					OPTIM="-O2 -qmaxmem=6000"
+				else
+					OPTIM="$with_optim $OPTIM"
+				fi
+			fi
+			;;
+		HP-UX*)
+			if test -z "$OPTIM"; then
+				if test "x$with_optim" = x; then
+					OPTIM="+O2"
+				else
+					OPTIM="$with_optim $OPTIM"
+				fi
+			fi
+
+			CFLAGS="-Ae $CFLAGS"
+
+			if test $PICFLAG = 1; then
+				OPTIM="+z $OPTIM"
+			fi
+			;;
+        	IRIX)
+			if test -z "$OPTIM"; then
+				if test "x$with_optim" = x; then
+					OPTIM="-O2"
+				else
+					OPTIM="$with_optim $OPTIM"
+				fi
+			fi
+
+			if test "x$with_optim" = x; then
+				OPTIM="-fullwarn -woff 1183,1209,1349,1506,3201 $OPTIM"
+			fi
+			;;
+		OSF*)
+			# Tru64 UNIX aka Digital UNIX aka OSF/1
+			if test -z "$OPTIM"; then
+				if test "x$with_optim" = x; then
+					OPTIM="-O"
+				else
+					OPTIM="$with_optim"
+				fi
+			fi
+			;;
 		SunOS*)
 			# Solaris
 			if test -z "$OPTIM"; then
@@ -220,6 +235,20 @@ else
 				fi
 			fi

+			if test $PICFLAG = 1; then
+				OPTIM="-KPIC $OPTIM"
+			fi
+			;;
+		UNIX_SVR*)
+			# UnixWare
+			if test -z "$OPTIM"; then
+				if test "x$with_optim" = x; then
+					OPTIM="-O"
+				else
+					OPTIM="$with_optim $OPTIM"
+				fi
+			fi
+
 			if test $PICFLAG = 1; then
 				OPTIM="-KPIC $OPTIM"
 			fi
@@ -229,7 +258,7 @@ else
 			# should contribute the necessary options to
 			# cups-support@cups.org...
 			echo "Building CUPS with default compiler optimizations; contact"
-			echo "cups-devel@cups.org with uname and compiler options needed"
+			echo "cups-bugs@cups.org with uname and compiler options needed"
 			echo "for your platform, or set the CFLAGS and LDFLAGS environment"
 			echo "variables before running configure."
 			;;
@@ -238,13 +267,33 @@ fi

 # Add general compiler options per platform...
 case $uname in
+	HP-UX*)
+		# HP-UX 10.20 (at least) needs this definition to get the
+		# h_errno global...
+		OPTIM="$OPTIM -D_XOPEN_SOURCE_EXTENDED"
+
+		# HP-UX 11.00 (at least) needs this definition to get the
+		# u_short type used by the IP headers...
+		OPTIM="$OPTIM -D_INCLUDE_HPUX_SOURCE"
+
+		# HP-UX 11.23 (at least) needs this definition to get the
+		# IPv6 header to work...
+		OPTIM="$OPTIM -D_HPUX_SOURCE"
+		;;
+
 	Linux*)
 		# glibc 2.8 and higher breaks peer credentials unless you
 		# define _GNU_SOURCE...
 		OPTIM="$OPTIM -D_GNU_SOURCE"
 		;;
+
+	OSF*)
+		# Tru64 UNIX aka Digital UNIX aka OSF/1 need to be told
+		# to be POSIX-compliant...
+		OPTIM="$OPTIM -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_OSF_SOURCE"
+		;;
 esac

 dnl
-dnl End of "$Id: cups-compiler.m4 12742 2015-06-23 14:48:53Z msweet $".
+dnl End of "$Id: cups-compiler.m4 10190 2012-01-20 16:22:58Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-defaults.m4 12846 2015-08-26 18:26:22Z msweet $"
+dnl "$Id: cups-defaults.m4 10710 2012-11-26 18:26:01Z mike $"
 dnl
 dnl   Default cupsd configuration settings for CUPS.
 dnl
-dnl   Copyright 2007-2015 by Apple Inc.
+dnl   Copyright 2007-2012 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
@@ -78,21 +78,12 @@ AC_SUBST(CUPS_LOG_LEVEL)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_LEVEL, "$CUPS_LOG_LEVEL")

 dnl Default AccessLogLevel
-AC_ARG_WITH(access_log_level, [  --with-access-log-level set default AccessLogLevel value, default=none],
+AC_ARG_WITH(access_log_level, [  --with-access-log-level set default AccessLogLevel value, default=actions],
 	CUPS_ACCESS_LOG_LEVEL="$withval",
-	CUPS_ACCESS_LOG_LEVEL="none")
+	CUPS_ACCESS_LOG_LEVEL="actions")
 AC_SUBST(CUPS_ACCESS_LOG_LEVEL)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_ACCESS_LOG_LEVEL, "$CUPS_ACCESS_LOG_LEVEL")

-dnl Default PageLogFormat
-AC_ARG_ENABLE(page_logging, [  --enable-page-logging   enable page_log by default])
-if test "x$enable_page_logging" = xyes; then
-	CUPS_PAGE_LOG_FORMAT=""
-else
-	CUPS_PAGE_LOG_FORMAT="PageLogFormat"
-fi
-AC_SUBST(CUPS_PAGE_LOG_FORMAT)
-
 dnl Default Browsing
 AC_ARG_ENABLE(browsing, [  --disable-browsing      disable Browsing by default])
 if test "x$enable_browsing" = xno; then
@@ -409,5 +400,5 @@ AC_SUBST(CUPS_WEBIF)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)

 dnl
-dnl End of "$Id: cups-defaults.m4 12846 2015-08-26 18:26:22Z msweet $".
+dnl End of "$Id: cups-defaults.m4 10710 2012-11-26 18:26:01Z mike $".
 dnl
@@ -1,16 +1,16 @@
 dnl
-dnl "$Id: cups-directories.m4 11717 2014-03-21 16:42:53Z msweet $"
+dnl "$Id: cups-directories.m4 10622 2012-10-01 01:55:23Z mike $"
 dnl
-dnl Directory stuff for CUPS.
+dnl   Directory stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

 AC_PREFIX_DEFAULT(/)
@@ -102,11 +102,19 @@ fi
 dnl Fix "libdir" variable...
 if test "$libdir" = "\${exec_prefix}/lib"; then
 	case "$uname" in
+		IRIX*)
+			libdir="$exec_prefix/lib32"
+			;;
 		Linux*)
 			if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
 				libdir="$exec_prefix/lib64"
 			fi
 			;;
+		HP-UX*)
+			if test -d /usr/lib/hpux32; then
+				libdir="$exec_prefix/lib/hpux32"
+			fi
+			;;
 	esac
 fi

@@ -121,6 +129,126 @@ fi
 AC_SUBST(privateinclude)
 AC_SUBST(PRIVATEINCLUDE)

+dnl Setup init.d locations...
+AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
+AC_ARG_WITH(rclevels, [  --with-rclevels         set run levels for rc scripts],rclevels="$withval",rclevels="2 3 5")
+AC_ARG_WITH(rcstart, [  --with-rcstart          set start number for rc scripts],rcstart="$withval",rcstart="99")
+AC_ARG_WITH(rcstop, [  --with-rcstop           set stop number for rc scripts],rcstop="$withval",rcstop="00")
+AC_ARG_WITH(smfmanifestdir, [  --with-smfmanifestdir   set path for Solaris SMF manifest],smfmanifestdir="$withval",smfmanifestdir="")
+
+INITDIR=""
+INITDDIR=""
+RCLEVELS="$rclevels"
+RCSTART="$rcstart"
+RCSTOP="$rcstop"
+SMFMANIFESTDIR=""
+
+if test x$rcdir = x; then
+	case "$uname" in
+		AIX*)
+			INITDIR="/etc/rc.d"
+			;;
+
+		Darwin*)
+			# Darwin and MacOS X...
+			if test -x /sbin/launchd; then
+				INITDDIR="/System/Library/LaunchDaemons"
+			else
+				INITDDIR="/System/Library/StartupItems/PrintingServices"
+			fi
+			;;
+
+		FreeBSD* | OpenBSD* | MirBSD* | ekkoBSD*)
+			# FreeBSD and OpenBSD
+			;;
+
+		HP-UX*)
+			INITDIR="/sbin"
+			RCLEVELS="2"
+			RCSTART="380"
+			RCSTOP="620"
+			;;
+
+		IRIX*)
+			# IRIX
+			INITDIR="/etc"
+			RCSTART="60"
+			RCSTOP="25"
+			;;
+
+		Linux | GNU | GNU/k*BSD*)
+			# Linux/HURD seems to choose an init.d directory at random...
+			if test -d /sbin/init.d; then
+				# SuSE
+				INITDIR="/sbin/init.d"
+			else
+				if test -d /etc/init.d; then
+					# Others
+					INITDIR="/etc"
+				else
+					# RedHat
+					INITDIR="/etc/rc.d"
+				fi
+			fi
+			RCSTART="81"
+			RCSTOP="36"
+			;;
+
+		NetBSD*)
+			# NetBSD
+			INITDDIR="/etc/rc.d"
+			;;
+
+		OSF1*)
+			INITDIR="/sbin"
+			;;
+
+		SunOS*)
+			# Solaris
+			if test "x$smfmanifestdir" != x; then
+				SMFMANIFESTDIR=$smfmanifestdir
+			else
+				INITDIR="/etc"
+				RCSTART="81"
+			fi
+			;;
+
+		*)
+			INITDIR="/etc"
+			;;
+
+	esac
+elif test "x$rcdir" != xno; then
+	if test "x$rclevels" = x; then
+		INITDDIR="$rcdir"
+	else
+		INITDIR="$rcdir"
+	fi
+fi
+
+AC_SUBST(INITDIR)
+AC_SUBST(INITDDIR)
+AC_SUBST(RCLEVELS)
+AC_SUBST(RCSTART)
+AC_SUBST(RCSTOP)
+AC_SUBST(SMFMANIFESTDIR)
+
+dnl Xinetd support...
+AC_ARG_WITH(xinetd, [  --with-xinetd           set path for xinetd config files],XINETD="$withval",XINETD="")
+
+if test "x$XINETD" = x -a ! -x /sbin/launchd; then
+	for dir in /private/etc/xinetd.d /etc/xinetd.d /usr/local/etc/xinetd.d; do
+		if test -d $dir; then
+			XINETD="$dir"
+			break
+		fi
+	done
+elif test "x$XINETD" = xno; then
+	XINETD=""
+fi
+
+AC_SUBST(XINETD)
+
 dnl LPD sharing support...
 AC_ARG_WITH(lpdconfig, [  --with-lpdconfig        set URI for LPD config file],
 	LPDCONFIG="$withval", LPDCONFIG="")
@@ -237,6 +365,10 @@ if test "$localedir" = "\${datarootdir}/locale"; then
 			CUPS_LOCALEDIR="$datarootdir/locale"
 			;;

+		OSF1* | AIX*)
+			CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
+			;;
+
 		*)
 			# This is the standard System V location...
 			CUPS_LOCALEDIR="$exec_prefix/lib/locale"
@@ -290,20 +422,19 @@ AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
 AC_SUBST(CUPS_SERVERROOT)

 # Transient run-time state
-AC_ARG_WITH(rundir, [  --with-rundir           set transient run-time state directory],CUPS_STATEDIR="$withval",[
-	case "$uname" in
-		Darwin*)
-			# Darwin (OS X)
-			CUPS_STATEDIR="$CUPS_SERVERROOT"
-			;;
-		*)
-			# All others
-			CUPS_STATEDIR="$localstatedir/run/cups"
-			;;
-	esac])
+case "$uname" in
+	Darwin*)
+		# Darwin (OS X)
+		CUPS_STATEDIR="$CUPS_SERVERROOT"
+		;;
+	*)
+		# All others
+		CUPS_STATEDIR="$localstatedir/run/cups"
+		;;
+esac
 AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
 AC_SUBST(CUPS_STATEDIR)

 dnl
-dnl End of "$Id: cups-directories.m4 11717 2014-03-21 16:42:53Z msweet $".
+dnl End of "$Id: cups-directories.m4 10622 2012-10-01 01:55:23Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-dnssd.m4 12845 2015-08-26 18:23:53Z msweet $"
+dnl "$Id: cups-dnssd.m4 10471 2012-05-16 22:57:03Z mike $"
 dnl
 dnl   DNS Service Discovery (aka Bonjour) stuff for CUPS.
 dnl
-dnl   Copyright 2007-2015 by Apple Inc.
+dnl   Copyright 2007-2012 by Apple Inc.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Apple Inc. and are protected by Federal copyright
@@ -23,18 +23,14 @@ AC_ARG_WITH(dnssd-includes, [  --with-dnssd-includes   set directory for DNS Ser

 DNSSDLIBS=""
 DNSSD_BACKEND=""
-IPPFIND_BIN=""
-IPPFIND_MAN=""

-if test "x$PKGCONFIG" != x -a x$enable_avahi != xno -a x$uname != xDarwin; then
+if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
 	AC_MSG_CHECKING(for Avahi)
 	if $PKGCONFIG --exists avahi-client; then
 		AC_MSG_RESULT(yes)
 		CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
 		DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
 		DNSSD_BACKEND="dnssd"
-		IPPFIND_BIN="ippfind"
-		IPPFIND_MAN="ippfind.\$(MAN1EXT)"
 		AC_DEFINE(HAVE_AVAHI)
 	else
 		AC_MSG_RESULT(no)
@@ -49,8 +45,6 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then
 				AC_DEFINE(HAVE_DNSSD)
 				DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration"
 				DNSSD_BACKEND="dnssd"
-				IPPFIND_BIN="ippfind"
-				IPPFIND_MAN="ippfind.\$(MAN1EXT)"
 				;;
 			*)
 				# All others...
@@ -67,8 +61,6 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then
 					AC_DEFINE(HAVE_DNSSD)
 					DNSSDLIBS="-ldns_sd"
 					DNSSD_BACKEND="dnssd",
-					IPPFIND_BIN="ippfind"
-					IPPFIND_MAN="ippfind.\$(MAN1EXT)"
 					AC_MSG_RESULT(no))
 				LIBS="$SAVELIBS"
 				;;
@@ -78,9 +70,7 @@ fi

 AC_SUBST(DNSSDLIBS)
 AC_SUBST(DNSSD_BACKEND)
-AC_SUBST(IPPFIND_BIN)
-AC_SUBST(IPPFIND_MAN)

 dnl
-dnl End of "$Id: cups-dnssd.m4 12845 2015-08-26 18:23:53Z msweet $".
+dnl End of "$Id: cups-dnssd.m4 10471 2012-05-16 22:57:03Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl   "$Id: cups-gssapi.m4 11911 2014-06-10 13:54:53Z msweet $"
+dnl   "$Id: cups-gssapi.m4 10785 2013-01-08 16:29:26Z mike $"
 dnl
 dnl   GSSAPI/Kerberos library detection for CUPS.
 dnl
-dnl   Copyright 2007-2013 by Apple Inc.
+dnl   Copyright 2007-2012 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products.
 dnl
 dnl   This file contains Kerberos support code, copyright 2006 by
@@ -22,7 +22,7 @@ LIBGSSAPI=""
 AC_SUBST(LIBGSSAPI)

 if test x$enable_gssapi != xno; then
-	AC_PATH_TOOL(KRB5CONFIG, krb5-config)
+	AC_PATH_PROG(KRB5CONFIG, krb5-config)
 	if test "x$KRB5CONFIG" != x; then
 		case "$uname" in
 			Darwin)
@@ -71,9 +71,38 @@ if test x$enable_gssapi != xno; then
 	if test "x$LIBGSSAPI" != x; then
 		AC_CHECK_HEADER(krb5.h, AC_DEFINE(HAVE_KRB5_H))
 		if test -d /System/Library/Frameworks/GSS.framework; then
-			AC_CHECK_HEADER(GSS/gssapi.h, AC_DEFINE(HAVE_GSS_GSSAPI_H))
-			AC_CHECK_HEADER(GSS/gssapi_generic.h, AC_DEFINE(HAVE_GSS_GSSAPI_GENERIC_H))
-			AC_CHECK_HEADER(GSS/gssapi_spi.h, AC_DEFINE(HAVE_GSS_GSSAPI_SPI_H))
+			gssdir="/System/Library/Frameworks/GSS.framework"
+			AC_MSG_CHECKING(for GSS/gssapi.h presence)
+			if test -f $gssdir/Headers/gssapi.h; then
+				AC_DEFINE(HAVE_GSS_GSSAPI_H)
+				AC_MSG_RESULT(yes)
+			else
+				AC_MSG_RESULT(no)
+			fi
+			AC_MSG_CHECKING(for GSS/gssapi_generic.h presence)
+			if test -f $gssdir/Headers/gssapi_generic.h; then
+				AC_DEFINE(HAVE_GSSAPI_GENERIC_H)
+				AC_MSG_RESULT(yes)
+			else
+				AC_MSG_RESULT(no)
+			fi
+			AC_MSG_CHECKING(for GSS/gssapi_spi.h presence)
+			if test -f $gssdir/PrivateHeaders/gssapi_spi.h; then
+				AC_MSG_RESULT(yes)
+				AC_MSG_CHECKING(for GSS/gssapi_spi.h usability)
+				if test -s $gssdir/PrivateHeaders/gssapi_spi.h; then
+					AC_MSG_RESULT(yes)
+					AC_DEFINE(HAVE_GSS_GSSAPI_SPI_H)
+				else
+					AC_MSG_RESULT(no)
+				fi
+			else
+				AC_MSG_RESULT(no)
+				if test $uversion -ge 110 -a $uversion -lt 120; then
+					# Broken public headers in 10.7.x...
+					AC_MSG_ERROR(Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS.)
+				fi
+			fi
 		else
 			AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H))
 			AC_CHECK_HEADER(gssapi/gssapi.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_H))
@@ -129,5 +158,5 @@ AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")

 dnl
-dnl End of "$Id: cups-gssapi.m4 11911 2014-06-10 13:54:53Z msweet $".
+dnl End of "$Id: cups-gssapi.m4 10785 2013-01-08 16:29:26Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-largefile.m4 11324 2013-10-04 03:11:42Z msweet $"
+dnl "$Id: cups-largefile.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
 dnl   Large file support stuff for CUPS.
 dnl
@@ -48,5 +48,5 @@ fi
 AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))

 dnl
-dnl End of "$Id: cups-largefile.m4 11324 2013-10-04 03:11:42Z msweet $".
+dnl End of "$Id: cups-largefile.m4 9771 2011-05-12 05:21:56Z mike $".
 dnl
@@ -0,0 +1,43 @@
+dnl
+dnl "$Id: cups-launchd.m4 8983 2010-02-13 02:20:23Z mike $"
+dnl
+dnl   launchd stuff for CUPS.
+dnl
+dnl   Copyright 2007-2010 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
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl
+
+
+AC_ARG_ENABLE(launchd, [  --disable-launchd       disable launchd support])
+
+DEFAULT_LAUNCHD_CONF=""
+LAUNCHDLIBS=""
+
+if test x$enable_launchd != xno; then
+	AC_CHECK_FUNC(launch_msg, AC_DEFINE(HAVE_LAUNCHD))
+	AC_CHECK_HEADER(launch.h, AC_DEFINE(HAVE_LAUNCH_H))
+
+	case "$uname" in
+		Darwin*)
+			# Darwin, MacOS X
+			DEFAULT_LAUNCHD_CONF="/System/Library/LaunchDaemons/org.cups.cupsd.plist"
+			# liblaunch is already part of libSystem
+			;;
+		*)
+			# All others; this test will need to be updated
+			;;
+	esac
+fi
+
+AC_SUBST(DEFAULT_LAUNCHD_CONF)
+AC_SUBST(LAUNCHDLIBS)
+
+dnl
+dnl End of "$Id: cups-launchd.m4 8983 2010-02-13 02:20:23Z mike $".
+dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-libtool.m4 11324 2013-10-04 03:11:42Z msweet $"
+dnl "$Id: cups-libtool.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
 dnl   Libtool stuff for CUPS.
 dnl
@@ -35,5 +35,5 @@ if test x$LIBTOOL != x; then
 fi

 dnl
-dnl End of "$Id: cups-libtool.m4 11324 2013-10-04 03:11:42Z msweet $".
+dnl End of "$Id: cups-libtool.m4 9771 2011-05-12 05:21:56Z mike $".
 dnl
@@ -1,16 +1,16 @@
 dnl
-dnl "$Id: cups-manpages.m4 11342 2013-10-18 20:36:01Z msweet $"
+dnl "$Id: cups-manpages.m4 10424 2012-04-23 17:26:57Z mike $"
 dnl
-dnl Manpage stuff for CUPS.
+dnl   Manpage stuff for CUPS.
 dnl
-dnl Copyright 2007-2013 by Apple Inc.
-dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

 dnl Fix "mandir" variable...
@@ -22,12 +22,18 @@ fi

 if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
 	case "$uname" in
-        	Darwin* | Linux | GNU | *BSD*)
-        		# Darwin, MacOS X, Linux, GNU HURD, and *BSD
+        	Darwin* | Linux | GNU | *BSD* | AIX*)
+        		# Darwin, MacOS X, Linux, GNU HURD, *BSD, and AIX
        		mandir="/usr/share/man"
        		AMANDIR="/usr/share/man"
        		PMANDIR="/usr/share/man"
        		;;
+        	IRIX)
+        		# SGI IRIX
+        		mandir="/usr/share/catman/u_man"
+        		AMANDIR="/usr/share/catman/a_man"
+        		PMANDIR="/usr/share/catman/p_man"
+        		;;
        	*)
        		# All others
        		mandir="/usr/man"
@@ -45,8 +51,16 @@ AC_SUBST(PMANDIR)

 dnl Setup manpage extensions...
 case "$uname" in
-	SunOS*)
-		# Solaris
+	IRIX*)
+		# SGI IRIX
+		MAN1EXT=1
+		MAN5EXT=5
+		MAN7EXT=7
+		MAN8EXT=1m
+		MAN8DIR=1
+		;;
+	SunOS* | HP-UX*)
+		# Solaris and HP-UX
 		MAN1EXT=1
 		MAN5EXT=5
 		MAN7EXT=7
@@ -78,5 +92,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)

 dnl
-dnl End of "$Id: cups-manpages.m4 11342 2013-10-18 20:36:01Z msweet $".
+dnl End of "$Id: cups-manpages.m4 10424 2012-04-23 17:26:57Z mike $".
 dnl
@@ -1,24 +1,19 @@
 dnl
-dnl "$Id: cups-network.m4 12324 2014-12-09 20:28:39Z msweet $"
+dnl "$Id: cups-network.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Networking stuff for CUPS.
+dnl   Networking stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2011 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
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

-AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H),,[
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>])
+AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H))
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(gethostbyaddr, nsl)
 AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
@@ -71,6 +66,9 @@ fi
 AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
 AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)

+AC_CHECK_HEADERS(AppleTalk/at_proto.h,AC_DEFINE(HAVE_APPLETALK_AT_PROTO_H),,
+	[#include <netat/appletalk.h>])
+
 dnl
-dnl End of "$Id: cups-network.m4 12324 2014-12-09 20:28:39Z msweet $".
+dnl End of "$Id: cups-network.m4 9771 2011-05-12 05:21:56Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-opsys.m4 11324 2013-10-04 03:11:42Z msweet $"
+dnl "$Id: cups-opsys.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
 dnl   Operating system stuff for CUPS.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 2007-2011 by Apple Inc.
 dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -19,21 +19,17 @@ uversion=`uname -r | sed -e '1,$s/^[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\).*/\1\2/'`
 uarch=`uname -m`

 case "$uname" in
-	Darwin*)
-		uname="Darwin"
-		if test $uversion -lt 120; then
-			AC_MSG_ERROR([Sorry, this version of CUPS requires OS X 10.8 or higher.])
-		fi
-		;;
-
 	GNU* | GNU/*)
 		uname="GNU"
 		;;
+	IRIX*)
+		uname="IRIX"
+		;;
 	Linux*)
 		uname="Linux"
 		;;
 esac

 dnl
-dnl "$Id: cups-opsys.m4 11324 2013-10-04 03:11:42Z msweet $"
+dnl "$Id: cups-opsys.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
@@ -1,21 +1,26 @@
 dnl
-dnl "$Id: cups-pam.m4 11342 2013-10-18 20:36:01Z msweet $"
+dnl "$Id: cups-pam.m4 10424 2012-04-23 17:26:57Z mike $"
 dnl
 dnl   PAM stuff for CUPS.
 dnl
-dnl Copyright 2007-2013 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2012 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
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

 AC_ARG_ENABLE(pam, [  --disable-pam           disable PAM support])
 AC_ARG_WITH(pam_module, [  --with-pam-module       specify the PAM module to use])

+dnl Don't use PAM with AIX...
+if test $uname = AIX; then
+	enable_pam=no
+fi
+
 PAMDIR=""
 PAMFILE="pam.std"
 PAMLIBS=""
@@ -93,5 +98,5 @@ AC_SUBST(PAMMOD)
 AC_SUBST(PAMMODAUTH)

 dnl
-dnl End of "$Id: cups-pam.m4 11342 2013-10-18 20:36:01Z msweet $".
+dnl End of "$Id: cups-pam.m4 10424 2012-04-23 17:26:57Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-poll.m4 11324 2013-10-04 03:11:42Z msweet $"
+dnl "$Id: cups-poll.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
 dnl   Select/poll stuff for CUPS.
 dnl
@@ -18,5 +18,5 @@ AC_CHECK_FUNC(epoll_create, AC_DEFINE(HAVE_EPOLL))
 AC_CHECK_FUNC(kqueue, AC_DEFINE(HAVE_KQUEUE))

 dnl
-dnl End of "$Id: cups-poll.m4 11324 2013-10-04 03:11:42Z msweet $".
+dnl End of "$Id: cups-poll.m4 9771 2011-05-12 05:21:56Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-scripting.m4 11324 2013-10-04 03:11:42Z msweet $"
+dnl "$Id: cups-scripting.m4 9927 2011-08-27 09:28:30Z mike $"
 dnl
 dnl   Scripting configuration stuff for CUPS.
 dnl
@@ -85,5 +85,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi

 dnl
-dnl End of "$Id: cups-scripting.m4 11324 2013-10-04 03:11:42Z msweet $".
+dnl End of "$Id: cups-scripting.m4 9927 2011-08-27 09:28:30Z mike $".
 dnl
@@ -1,16 +1,16 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 11342 2013-10-18 20:36:01Z msweet $"
+dnl "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $"
 dnl
-dnl Shared library support for CUPS.
+dnl   Shared library support for CUPS.
 dnl
-dnl Copyright 2007-2013 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2012 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
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

 PICFLAG=1
@@ -34,7 +34,51 @@ if test x$enable_shared != xno; then
 			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
 			;;
-		Linux | GNU | *BSD*)
+		UNIX_S*)
+			LIBCUPS="lib$cupsbase.so.2"
+			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSIMAGE="libcupsimage.so.2"
+			LIBCUPSMIME="libcupsmime.so.1"
+			LIBCUPSPPDC="libcupsppdc.so.1"
+			DSO="\$(CC)"
+			DSOXX="\$(CXX)"
+			DSOFLAGS="$DSOFLAGS -Wl,-h,\`basename \$@\` -G \$(OPTIM)"
+			;;
+		HP-UX*)
+			case "$uarch" in
+				ia64)
+					LIBCUPS="lib$cupsbase.so.2"
+					LIBCUPSCGI="libcupscgi.so.1"
+					LIBCUPSIMAGE="libcupsimage.so.2"
+					LIBCUPSMIME="libcupsmime.so.1"
+					LIBCUPSPPDC="libcupsppdc.so.1"
+					DSO="\$(CC)"
+					DSOXX="\$(CXX)"
+					DSOFLAGS="$DSOFLAGS -Wl,-b,-z,+h,\`basename \$@\`"
+					;;
+				*)
+					LIBCUPS="lib$cupsbase.sl.2"
+					LIBCUPSCGI="libcupscgi.sl.1"
+					LIBCUPSIMAGE="libcupsimage.sl.2"
+					LIBCUPSMIME="libcupsmime.sl.1"
+					LIBCUPSPPDC="libcupsppdc.sl.1"
+					DSO="\$(LD)"
+					DSOXX="\$(LD)"
+					DSOFLAGS="$DSOFLAGS -b -z +h \`basename \$@\`"
+					;;
+			esac
+			;;
+		IRIX)
+			LIBCUPS="lib$cupsbase.so.2"
+			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSIMAGE="libcupsimage.so.2"
+			LIBCUPSMIME="libcupsmime.so.1"
+			LIBCUPSPPDC="libcupsppdc.so.1"
+			DSO="\$(CC)"
+			DSOXX="\$(CXX)"
+			DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
+			;;
+		OSF1* | Linux | GNU | *BSD*)
 			LIBCUPS="lib$cupsbase.so.2"
 			LIBCUPSCGI="libcupscgi.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
@@ -54,6 +98,17 @@ if test x$enable_shared != xno; then
 			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
 			;;
+		AIX*)
+			LIBCUPS="lib${cupsbase}_s.a"
+			LIBCUPSBASE="${cupsbase}_s"
+			LIBCUPSCGI="libcupscgi_s.a"
+			LIBCUPSIMAGE="libcupsimage_s.a"
+			LIBCUPSMIME="libcupsmime_s.a"
+			LIBCUPSPPDC="libcupsppdc_s.a"
+			DSO="\$(CC)"
+			DSOXX="\$(CXX)"
+			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)"
+			;;
 		*)
 			echo "Warning: shared libraries may not be supported.  Trying -shared"
 			echo "         option with compiler."
@@ -96,11 +151,19 @@ if test x$enable_shared = xno; then
 	EXTLINKCUPS="-lcups"
 	EXTLINKCUPSIMAGE="-lcupsimage"
 else
-	LINKCUPS="-l${cupsbase}"
-	LINKCUPSIMAGE="-lcupsimage"
+	if test $uname = AIX; then
+		LINKCUPS="-l${cupsbase}_s"
+		LINKCUPSIMAGE="-lcupsimage_s"

-	EXTLINKCUPS="-lcups"
-	EXTLINKCUPSIMAGE="-lcupsimage"
+		EXTLINKCUPS="-lcups_s"
+		EXTLINKCUPSIMAGE="-lcupsimage_s"
+	else
+		LINKCUPS="-l${cupsbase}"
+		LINKCUPSIMAGE="-lcupsimage"
+
+		EXTLINKCUPS="-lcups"
+		EXTLINKCUPSIMAGE="-lcupsimage"
+	fi
 fi

 AC_SUBST(EXTLINKCUPS)
@@ -123,6 +186,19 @@ if test "$DSO" != ":"; then
 	# need this option, even when the library is installed in a
 	# standard location...
 	case $uname in
+                HP-UX*)
+			# HP-UX needs the path, even for /usr/lib...
+			case "$uarch" in
+				ia64)
+					DSOFLAGS="-Wl,+s,+b,$libdir $DSOFLAGS"
+					;;
+				*)
+                			DSOFLAGS="+s +b $libdir $DSOFLAGS"
+					;;
+			esac
+                	LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
+                	EXPORT_LDFLAGS="-Wl,+s,+b,$libdir"
+			;;
                SunOS*)
                	# Solaris...
 			if test $exec_prefix != /usr; then
@@ -139,8 +215,8 @@ if test "$DSO" != ":"; then
 				EXPORT_LDFLAGS="-Wl,-R$libdir"
 			fi
 			;;
-                Linux | GNU)
-                        # Linux, and HURD...
+                IRIX | Linux | GNU)
+                        # IRIX, Linux, and HURD...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
 				LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
@@ -158,5 +234,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)

 dnl
-dnl End of "$Id: cups-sharedlibs.m4 11342 2013-10-18 20:36:01Z msweet $".
+dnl End of "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $".
 dnl
@@ -1,26 +1,34 @@
 dnl
-dnl "$Id: cups-ssl.m4 12645 2015-05-20 01:20:52Z msweet $"
+dnl "$Id: cups-ssl.m4 10710 2012-11-26 18:26:01Z mike $"
 dnl
-dnl TLS stuff for CUPS.
+dnl   OpenSSL/GNUTLS stuff for CUPS.
 dnl
-dnl Copyright 2007-2015 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

 AC_ARG_ENABLE(ssl, [  --disable-ssl           disable SSL/TLS support])
 AC_ARG_ENABLE(cdsassl, [  --enable-cdsassl        use CDSA for SSL/TLS support, default=first])
 AC_ARG_ENABLE(gnutls, [  --enable-gnutls         use GNU TLS for SSL/TLS support, default=second])
+AC_ARG_ENABLE(openssl, [  --enable-openssl        use OpenSSL for SSL/TLS support, default=third])
+AC_ARG_WITH(openssl-libs, [  --with-openssl-libs     set directory for OpenSSL library],
+    LDFLAGS="-L$withval $LDFLAGS"
+    DSOFLAGS="-L$withval $DSOFLAGS",)
+AC_ARG_WITH(openssl-includes, [  --with-openssl-includes set directory for OpenSSL includes],
+    CFLAGS="-I$withval $CFLAGS"
+    CPPFLAGS="-I$withval $CPPFLAGS",)

 SSLFLAGS=""
 SSLLIBS=""
 have_ssl=0
-CUPS_SERVERKEYCHAIN=""
+CUPS_SERVERCERT=""
+CUPS_SERVERKEY=""

 if test x$enable_ssl != xno; then
    dnl Look for CDSA...
@@ -30,7 +38,7 @@ if test x$enable_ssl != xno; then
 	    	have_ssl=1
 		AC_DEFINE(HAVE_SSL)
 		AC_DEFINE(HAVE_CDSASSL)
-		CUPS_SERVERKEYCHAIN="/Library/Keychains/System.keychain"
+		CUPS_SERVERCERT="/Library/Keychains/System.keychain"

 		dnl Check for the various security headers...
 		AC_CHECK_HEADER(Security/SecureTransportPriv.h,
@@ -51,19 +59,41 @@ if test x$enable_ssl != xno; then
 		AC_CHECK_HEADER(Security/SecIdentitySearchPriv.h,
 		    AC_DEFINE(HAVE_SECIDENTITYSEARCHPRIV_H))

-		AC_DEFINE(HAVE_CSSMERRORSTRING)
-		AC_DEFINE(HAVE_SECKEYCHAINOPEN)])
-
-		if test $uversion -ge 150; then
-			AC_DEFINE(HAVE_SSLSETENABLEDCIPHERS)
+		dnl Check for SecCertificateCopyData..
+		AC_MSG_CHECKING(for SecCertificateCopyData)
+		if test $uversion -ge 100; then
+		    AC_DEFINE(HAVE_SECCERTIFICATECOPYDATA)
+		    AC_MSG_RESULT(yes)
+		else
+		    AC_MSG_RESULT(no)
 		fi
+
+		dnl Check for SecIdentitySearchCreateWithPolicy...
+		AC_MSG_CHECKING(for SecIdentitySearchCreateWithPolicy)
+		if test $uversion -ge 80; then
+		    AC_DEFINE(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY)
+		    AC_MSG_RESULT(yes)
+		else
+		    AC_MSG_RESULT(no)
+		fi
+
+		dnl Check for SecPolicyCreateSSL...
+		AC_MSG_CHECKING(for SecPolicyCreateSSL)
+		if test $uversion -ge 110; then
+		    AC_DEFINE(HAVE_SECPOLICYCREATESSL)
+		    AC_MSG_RESULT(yes)
+		else
+		    AC_MSG_RESULT(no)
+		fi])
+
+		AC_DEFINE(HAVE_CSSMERRORSTRING)
 	fi
    fi

    dnl Then look for GNU TLS...
    if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
-    	AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
-    	AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
+    	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
+    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
 	if $PKGCONFIG --exists gnutls; then
 	    have_ssl=1
 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
@@ -79,15 +109,60 @@ if test x$enable_ssl != xno; then
 	fi

 	if test $have_ssl = 1; then
-	    CUPS_SERVERKEYCHAIN="ssl"
+	    CUPS_SERVERCERT="ssl/server.crt"
+	    CUPS_SERVERKEY="ssl/server.key"

-	    SAVELIBS="$LIBS"
-	    LIBS="$LIBS $SSLLIBS"
-	    AC_CHECK_FUNC(gnutls_transport_set_pull_timeout_function, AC_DEFINE(HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION))
-	    AC_CHECK_FUNC(gnutls_priority_set_direct, AC_DEFINE(HAVE_GNUTLS_PRIORITY_SET_DIRECT))
-	    LIBS="$SAVELIBS"
+            if $PKGCONFIG --exists gcrypt; then
+	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
+	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
+	    elif test "x$LIBGCRYPTCONFIG" != x; then
+	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
+	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
+	    fi
 	fi
    fi
+
+    dnl Check for the OpenSSL library last...
+    if test $have_ssl = 0 -a "x$enable_openssl" != "xno"; then
+	AC_CHECK_HEADER(openssl/ssl.h,[
+	    dnl Save the current libraries so the crypto stuff isn't always
+	    dnl included...
+	    SAVELIBS="$LIBS"
+
+	    dnl Some ELF systems can't resolve all the symbols in libcrypto
+	    dnl if libcrypto was linked against RSAREF, and fail to link the
+	    dnl test program correctly, even though a correct installation
+	    dnl of OpenSSL exists.  So we test the linking three times in
+	    dnl case the RSAREF libraries are needed.
+
+	    for libcrypto in \
+		"-lcrypto" \
+		"-lcrypto -lrsaref" \
+		"-lcrypto -lRSAglue -lrsaref"
+	    do
+		AC_CHECK_LIB(ssl,SSL_new,
+		    [have_ssl=1
+		     SSLFLAGS="-DOPENSSL_DISABLE_OLD_DES_SUPPORT"
+		     SSLLIBS="-lssl $libcrypto"
+		     AC_DEFINE(HAVE_SSL)
+		     AC_DEFINE(HAVE_LIBSSL)],,
+		    $libcrypto)
+
+		if test "x${SSLLIBS}" != "x"; then
+		    break
+		fi
+	    done
+
+	    if test "x${SSLLIBS}" != "x"; then
+		CUPS_SERVERCERT="ssl/server.crt"
+		CUPS_SERVERKEY="ssl/server.key"
+
+		LIBS="$SAVELIBS $SSLLIBS"
+		AC_CHECK_FUNCS(SSL_set_tlsext_host_name)
+	    fi
+
+	    LIBS="$SAVELIBS"])
+    fi
 fi

 IPPALIASES="http"
@@ -95,11 +170,12 @@ if test $have_ssl = 1; then
    AC_MSG_RESULT([    Using SSLLIBS="$SSLLIBS"])
    AC_MSG_RESULT([    Using SSLFLAGS="$SSLFLAGS"])
    IPPALIASES="http https ipps"
-elif test x$enable_cdsa = xyes -o x$enable_gnutls = xyes; then
+elif test x$enable_cdsa = xyes -o x$enable_gnutls = xyes -o x$enable_openssl = xyes; then
    AC_MSG_ERROR([Unable to enable SSL support.])
 fi

-AC_SUBST(CUPS_SERVERKEYCHAIN)
+AC_SUBST(CUPS_SERVERCERT)
+AC_SUBST(CUPS_SERVERKEY)
 AC_SUBST(IPPALIASES)
 AC_SUBST(SSLFLAGS)
 AC_SUBST(SSLLIBS)
@@ -108,5 +184,5 @@ EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)

 dnl
-dnl End of "$Id: cups-ssl.m4 12645 2015-05-20 01:20:52Z msweet $".
+dnl End of "$Id: cups-ssl.m4 10710 2012-11-26 18:26:01Z mike $".
 dnl
@@ -1,192 +0,0 @@
-dnl
-dnl "$Id: cups-startup.m4 12857 2015-08-31 15:00:45Z msweet $"
-dnl
-dnl Launch-on-demand/startup stuff for CUPS.
-dnl
-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
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-ONDEMANDFLAGS=""
-ONDEMANDLIBS=""
-AC_SUBST(ONDEMANDFLAGS)
-AC_SUBST(ONDEMANDLIBS)
-
-dnl Launchd is used on OS X/Darwin...
-AC_ARG_ENABLE(launchd, [  --disable-launchd       disable launchd support])
-LAUNCHD_DIR=""
-AC_SUBST(LAUNCHD_DIR)
-
-if test x$enable_launchd != xno; then
-	AC_CHECK_FUNC(launch_msg, AC_DEFINE(HAVE_LAUNCHD))
-	if test $uversion -ge 140; then
-		AC_CHECK_FUNC(launch_activate_socket, [
-			AC_DEFINE(HAVE_LAUNCHD)
-			AC_DEFINE(HAVE_LAUNCH_ACTIVATE_SOCKET)])
-	fi
-	AC_CHECK_HEADER(launch.h, AC_DEFINE(HAVE_LAUNCH_H))
-
-	case "$uname" in
-		Darwin*)
-			# Darwin, MacOS X
-			LAUNCHD_DIR="/System/Library/LaunchDaemons"
-			# liblaunch is already part of libSystem
-			;;
-		*)
-			# All others; this test will need to be updated
-			;;
-	esac
-fi
-
-dnl Systemd is used on Linux...
-AC_ARG_ENABLE(systemd, [  --disable-systemd       disable systemd support])
-AC_ARG_WITH(systemd, [  --with-systemd          set directory for systemd service files],
-        SYSTEMD_DIR="$withval", SYSTEMD_DIR="")
-AC_SUBST(SYSTEMD_DIR)
-
-if test x$enable_systemd != xno; then
-	if test "x$PKGCONFIG" = x; then
-        	if test x$enable_systemd = xyes; then
-	        	AC_MSG_ERROR(Need pkg-config to enable systemd support.)
-                fi
-        else
-        	have_systemd=no
-        	AC_MSG_CHECKING(for libsystemd)
-                if $PKGCONFIG --exists libsystemd; then
-                        AC_MSG_RESULT(yes)
-                        have_systemd=yes
-                        ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd`
-                        ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd`
-		elif $PKGCONFIG --exists libsystemd-daemon; then
-			AC_MSG_RESULT(yes - legacy)
-                        have_systemd=yes
-			ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
-			ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
-
-			if $PKGCONFIG --exists libsystemd-journal; then
-				ONDEMANDFLAGS="$ONDEMANDFLAGS `$PKGCONFIG --cflags libsystemd-journal`"
-				ONDEMANDLIBS="$ONDEMANDLIBS `$PKGCONFIG --libs libsystemd-journal`"
-			fi
-                else
-                        AC_MSG_RESULT(no)
-                fi
-
-		if test $have_systemd = yes; then
-                        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
-                fi
-        fi
-fi
-
-dnl Solaris uses smf
-SMFMANIFESTDIR=""
-AC_SUBST(SMFMANIFESTDIR)
-AC_ARG_WITH(smfmanifestdir, [  --with-smfmanifestdir   set path for Solaris SMF manifest],SMFMANIFESTDIR="$withval")
-
-dnl Use init on other platforms...
-AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
-AC_ARG_WITH(rclevels, [  --with-rclevels         set run levels for rc scripts],rclevels="$withval",rclevels="2 3 5")
-AC_ARG_WITH(rcstart, [  --with-rcstart          set start number for rc scripts],rcstart="$withval",rcstart="")
-AC_ARG_WITH(rcstop, [  --with-rcstop           set stop number for rc scripts],rcstop="$withval",rcstop="")
-
-if test x$rcdir = x; then
-	if test x$LAUNCHD_DIR = x -a x$SYSTEMD_DIR = x -a x$SMFMANIFESTDIR = x; then
-                # Fall back on "init", the original service startup interface...
-                if test -d /sbin/init.d; then
-                        # SuSE
-                        rcdir="/sbin/init.d"
-                elif test -d /etc/init.d; then
-                        # Others
-                        rcdir="/etc"
-                else
-                        # RedHat, NetBSD
-                        rcdir="/etc/rc.d"
-                fi
-        else
-        	rcdir="no"
-	fi
-fi
-
-if test "x$rcstart" = x; then
-	case "$uname" in
-        	Linux | GNU | GNU/k*BSD*)
-                	# Linux
-                        rcstart="81"
-                      	;;
-
-		SunOS*)
-			# Solaris
-                        rcstart="81"
-			;;
-
-                *)
-                        # Others
-                        rcstart="99"
-                        ;;
-	esac
-fi
-
-if test "x$rcstop" = x; then
-	case "$uname" in
-        	Linux | GNU | GNU/k*BSD*)
-                	# Linux
-                        rcstop="36"
-                      	;;
-
-                *)
-                        # Others
-                        rcstop="00"
-                        ;;
-	esac
-fi
-
-INITDIR=""
-INITDDIR=""
-RCLEVELS="$rclevels"
-RCSTART="$rcstart"
-RCSTOP="$rcstop"
-AC_SUBST(INITDIR)
-AC_SUBST(INITDDIR)
-AC_SUBST(RCLEVELS)
-AC_SUBST(RCSTART)
-AC_SUBST(RCSTOP)
-
-if test "x$rcdir" != xno; then
-	if test "x$rclevels" = x; then
-		INITDDIR="$rcdir"
-	else
-		INITDIR="$rcdir"
-	fi
-fi
-
-dnl Xinetd support...
-AC_ARG_WITH(xinetd, [  --with-xinetd           set path for xinetd config files],xinetd="$withval",xinetd="")
-XINETD=""
-AC_SUBST(XINETD)
-
-if test "x$xinetd" = x; then
-	if test ! -x /sbin/launchd; then
-                for dir in /etc/xinetd.d /usr/local/etc/xinetd.d; do
-                        if test -d $dir; then
-                                XINETD="$dir"
-                                break
-                        fi
-                done
-        fi
-elif test "x$xinetd" != xno; then
-	XINETD="$xinetd"
-fi
-
-
-dnl
-dnl End of "$Id: cups-startup.m4 12857 2015-08-31 15:00:45Z msweet $".
-dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-threads.m4 11324 2013-10-04 03:11:42Z msweet $"
+dnl "$Id: cups-threads.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
 dnl   Threading stuff for CUPS.
 dnl
@@ -50,5 +50,5 @@ fi
 AC_SUBST(PTHREAD_FLAGS)

 dnl
-dnl End of "$Id: cups-threads.m4 11324 2013-10-04 03:11:42Z msweet $".
+dnl End of "$Id: cups-threads.m4 9771 2011-05-12 05:21:56Z mike $".
 dnl
@@ -1,16 +1,16 @@
 /*
- * "$Id: config.h.in 12687 2015-06-03 17:19:04Z msweet $"
+ * "$Id$"
 *
- * Configuration file for CUPS.
+ *   Configuration file for CUPS.
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 */

 #ifndef _CUPS_CONFIG_H_
@@ -32,7 +32,6 @@
 #define CUPS_DEFAULT_GROUP	"sys"
 #define CUPS_DEFAULT_SYSTEM_GROUPS	"sys root system"
 #define CUPS_DEFAULT_PRINTOPERATOR_AUTH	"@SYSTEM"
-#define CUPS_DEFAULT_SYSTEM_AUTHKEY	"system.print.admin"


 /*
@@ -93,7 +92,7 @@
 * Default MaxCopies value...
 */

-#define CUPS_DEFAULT_MAX_COPIES	9999
+#define CUPS_DEFAULT_MAX_COPIES	100


 /*
@@ -132,25 +131,23 @@


 /*
- * Do we have posix_spawn?
- */
-
-#undef HAVE_POSIX_SPAWN
-
-
-/*
- * Do we have ZLIB?
+ * Do we have various image libraries?
 */

+#undef HAVE_LIBPNG
 #undef HAVE_LIBZ
-#undef HAVE_INFLATECOPY
+#undef HAVE_LIBJPEG
+#undef HAVE_LIBTIFF


 /*
 * Do we have PAM stuff?
 */

+#ifndef HAVE_LIBPAM
 #define HAVE_LIBPAM 0
+#endif /* !HAVE_LIBPAM */
+
 #undef HAVE_PAM_PAM_APPL_H
 #undef HAVE_PAM_SET_ITEM
 #undef HAVE_PAM_SETCRED
@@ -170,6 +167,13 @@
 #undef HAVE_CRYPT_H


+/*
+ * Do we have <scsi/sg.h>?
+ */
+
+#undef HAVE_SCSI_SG_H
+
+
 /*
 * Use <stdint.h>?
 */
@@ -242,20 +246,6 @@
 #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?
 */
@@ -308,22 +298,15 @@

 #undef HAVE_CDSASSL
 #undef HAVE_GNUTLS
-#undef HAVE_SSPISSL
+#undef HAVE_LIBSSL
 #undef HAVE_SSL


 /*
- * Do we have the gnutls_transport_set_pull_timeout_function function?
+ * Do we have the SSL_set_tlsext_host_name function?
 */

-#undef HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION
-
-
-/*
- * Do we have the gnutls_priority_set_direct function?
- */
-
-#undef HAVE_GNUTLS_PRIORITY_SET_DIRECT
+#undef HAVE_SSL_SET_TLSEXT_HOST_NAME


 /*
@@ -341,6 +324,34 @@
 #undef HAVE_SECURETRANSPORTPRIV_H


+/*
+ * Do we have the SecCertificateCopyData function?
+ */
+
+#undef HAVE_SECCERTIFICATECOPYDATA
+
+
+/*
+ * Do we have the SecIdentitySearchCreateWithPolicy function?
+ */
+
+#undef HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY
+
+
+/*
+ * Do we have the SecPolicyCreateSSL function?
+ */
+
+#undef HAVE_SECPOLICYCREATESSL
+
+
+/*
+ * Do we have the SecPolicyCreateSSL function?
+ */
+
+#undef HAVE_SECPOLICYCREATESSL
+
+
 /*
 * Do we have the cssmErrorString function?
 */
@@ -348,27 +359,6 @@
 #undef HAVE_CSSMERRORSTRING


-/*
- * Do we have the SecGenerateSelfSignedCertificate function?
- */
-
-#undef HAVE_SECGENERATESELFSIGNEDCERTIFICATE
-
-
-/*
- * Do we have the SecKeychainOpen function?
- */
-
-#undef HAVE_SECKEYCHAINOPEN
-
-
-/*
- * Do we have (a working) SSLSetEnabledCiphers function?
- */
-
-#undef HAVE_SSLSETENABLEDCIPHERS
-
-
 /*
 * Do we have libpaper?
 */
@@ -474,6 +464,13 @@
 #undef HAVE_STRUCT_SOCKADDR_SA_LEN


+/*
+ * Do we have the AIX usersec.h header file?
+ */
+
+#undef HAVE_USERSEC_H
+
+
 /*
 * Do we have pthread support?
 */
@@ -487,14 +484,6 @@

 #undef HAVE_LAUNCH_H
 #undef HAVE_LAUNCHD
-#undef HAVE_LAUNCH_ACTIVATE_SOCKET
-
-
-/*
- * Do we have systemd support?
- */
-
-#undef HAVE_SYSTEMD


 /*
@@ -569,13 +558,19 @@
 #undef HAVE_NOTIFY_POST


+/*
+ * Do we have Darwin's IOKit private headers?
+ */
+
+#undef HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H
+
+
 /*
 * Do we have DBUS?
 */

 #undef HAVE_DBUS
 #undef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND
-#undef HAVE_DBUS_THREADS_INIT


 /*
@@ -652,7 +647,7 @@

 #ifdef HAVE_ARC4RANDOM
 #  define CUPS_RAND() arc4random()
-#  define CUPS_SRAND(v)
+#  define CUPS_SRAND(v) arc4random_stir()
 #elif defined(HAVE_RANDOM)
 #  define CUPS_RAND() random()
 #  define CUPS_SRAND(v) srandom(v)
@@ -665,6 +660,13 @@
 #endif /* HAVE_ARC4RANDOM */


+/*
+ * Do we have vproc_transaction_begin/end?
+ */
+
+#undef HAVE_VPROC_TRANSACTION_BEGIN
+
+
 /*
 * Do we have libusb?
 */
@@ -740,5 +742,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */

 /*
- * End of "$Id: config.h.in 12687 2015-06-03 17:19:04Z msweet $".
+ * End of "$Id$".
 */
@@ -1,23 +1,19 @@
 dnl
-dnl "$Id: configure.ac 13031 2016-01-04 14:43:04Z msweet $"
+dnl "$Id$"
 dnl
-dnl Configuration script for CUPS.
+dnl   Configuration script for CUPS.
 dnl
-dnl Copyright 2007-2016 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2013 by Apple Inc.
+dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file.  If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl

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

 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
@@ -36,7 +32,7 @@ sinclude(config-scripts/cups-ssl.m4)
 sinclude(config-scripts/cups-pam.m4)
 sinclude(config-scripts/cups-largefile.m4)
 sinclude(config-scripts/cups-dnssd.m4)
-sinclude(config-scripts/cups-startup.m4)
+sinclude(config-scripts/cups-launchd.m4)
 sinclude(config-scripts/cups-defaults.m4)
 sinclude(config-scripts/cups-scripting.m4)

@@ -70,9 +66,15 @@ AC_OUTPUT(Makedefs
 	  conf/pam.std
 	  conf/snmp.conf
 	  cups-config
+	  data/testprint
 	  desktop/cups.desktop
+	  doc/help/ref-cups-files-conf.html
+	  doc/help/ref-cupsd-conf.html
+	  doc/help/standard.html
 	  doc/index.html
 	  man/client.conf.man
+	  man/cups-deviced.man
+	  man/cups-driverd.man
 	  man/cups-files.conf.man
 	  man/cups-lpd.man
 	  man/cups-snmp.man
@@ -84,10 +86,6 @@ AC_OUTPUT(Makedefs
 	  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)
@@ -95,5 +93,5 @@ AC_OUTPUT(Makedefs
 chmod +x cups-config

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

 #
-# End of "$Id: cups-config.in 10996 2013-05-29 11:51:34Z msweet $".
+# End of "$Id$".
 #
@@ -1,318 +1,260 @@
 adminutil.o: adminutil.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h adminutil.h
-array.o: array.c ../cups/cups.h file.h versioning.h ipp.h http.h array.h \
-  language.h pwg.h string-private.h ../config.h debug-private.h \
-  array-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h adminutil.h
+array.o: array.c string-private.h ../config.h debug-private.h \
+  ../cups/versioning.h array-private.h ../cups/array.h
 attr.o: attr.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 auth.o: auth.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 backchannel.o: backchannel.c cups.h file.h versioning.h ipp.h http.h \
-  array.h language.h pwg.h
+  array.h language.h
 backend.o: backend.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h backend.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h backend.h
 conflicts.o: conflicts.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 custom.o: custom.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 debug.o: debug.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 dest.o: dest.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 dest-job.o: dest-job.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 dest-localization.o: dest-localization.c cups-private.h string-private.h \
-  ../config.h debug-private.h ../cups/versioning.h array-private.h \
-  ../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
-  ../cups/language.h md5-private.h language-private.h \
-  ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
-  ppd-private.h ../cups/ppd.h thread-private.h
+  ../config.h debug-private.h ../cups/versioning.h ipp-private.h \
+  ../cups/ipp.h http.h array.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h language.h pwg-private.h \
+  ../cups/cups.h file.h ppd-private.h ../cups/ppd.h thread-private.h
 dest-options.o: dest-options.c cups-private.h string-private.h \
-  ../config.h debug-private.h ../cups/versioning.h array-private.h \
-  ../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
-  ../cups/language.h md5-private.h language-private.h \
-  ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
-  ppd-private.h ../cups/ppd.h thread-private.h
+  ../config.h debug-private.h ../cups/versioning.h ipp-private.h \
+  ../cups/ipp.h http.h array.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h language.h pwg-private.h \
+  ../cups/cups.h file.h ppd-private.h ../cups/ppd.h thread-private.h
 dir.o: dir.c string-private.h ../config.h debug-private.h \
  ../cups/versioning.h dir.h
 emit.o: emit.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 encode.o: encode.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 file.o: file.c file-private.h cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 getdevices.o: getdevices.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
-getifaddrs.o: getifaddrs.c http-private.h ../config.h ../cups/language.h \
-  array.h versioning.h ../cups/http.h md5-private.h ipp-private.h \
-  ../cups/ipp.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+getifaddrs.o: getifaddrs.c http-private.h ../config.h ../cups/http.h \
+  versioning.h array.h md5-private.h ipp-private.h ../cups/ipp.h
 getputfile.o: getputfile.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 globals.o: globals.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 http.o: http.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 http-addr.o: http-addr.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 http-addrlist.o: http-addrlist.c cups-private.h string-private.h \
-  ../config.h debug-private.h ../cups/versioning.h array-private.h \
-  ../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
-  ../cups/language.h md5-private.h language-private.h \
-  ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
-  ppd-private.h ../cups/ppd.h thread-private.h
+  ../config.h debug-private.h ../cups/versioning.h ipp-private.h \
+  ../cups/ipp.h http.h array.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h language.h pwg-private.h \
+  ../cups/cups.h file.h ppd-private.h ../cups/ppd.h thread-private.h
 http-support.o: http-support.c cups-private.h string-private.h \
-  ../config.h debug-private.h ../cups/versioning.h array-private.h \
-  ../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
-  ../cups/language.h md5-private.h language-private.h \
-  ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
-  ppd-private.h ../cups/ppd.h thread-private.h
+  ../config.h debug-private.h ../cups/versioning.h ipp-private.h \
+  ../cups/ipp.h http.h array.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h language.h pwg-private.h \
+  ../cups/cups.h file.h ppd-private.h ../cups/ppd.h thread-private.h
 ipp.o: ipp.c cups-private.h string-private.h ../config.h debug-private.h \
-  ../cups/versioning.h array-private.h ../cups/array.h ipp-private.h \
-  ../cups/ipp.h http.h http-private.h ../cups/language.h md5-private.h \
-  language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
-  file.h pwg.h ppd-private.h ../cups/ppd.h thread-private.h
+  ../cups/versioning.h ipp-private.h ../cups/ipp.h http.h array.h \
+  http-private.h md5-private.h language-private.h ../cups/transcode.h \
+  language.h pwg-private.h ../cups/cups.h file.h ppd-private.h \
+  ../cups/ppd.h thread-private.h
 ipp-support.o: ipp-support.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 langprintf.o: langprintf.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 language.o: language.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 localize.o: localize.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 mark.o: mark.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 md5.o: md5.c md5-private.h string-private.h ../config.h
-md5passwd.o: md5passwd.c http-private.h ../config.h ../cups/language.h \
-  array.h versioning.h ../cups/http.h md5-private.h ipp-private.h \
-  ../cups/ipp.h string-private.h
+md5passwd.o: md5passwd.c http-private.h ../config.h ../cups/http.h \
+  versioning.h array.h md5-private.h ipp-private.h ../cups/ipp.h \
+  string-private.h
 notify.o: notify.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 options.o: options.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 page.o: page.c string-private.h ../config.h debug-private.h \
  ../cups/versioning.h ppd.h cups.h file.h ipp.h http.h array.h \
-  language.h pwg.h
+  language.h
 ppd.o: ppd.c cups-private.h string-private.h ../config.h debug-private.h \
-  ../cups/versioning.h array-private.h ../cups/array.h ipp-private.h \
-  ../cups/ipp.h http.h http-private.h ../cups/language.h md5-private.h \
-  language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
-  file.h pwg.h ppd-private.h ../cups/ppd.h thread-private.h
+  ../cups/versioning.h ipp-private.h ../cups/ipp.h http.h array.h \
+  http-private.h md5-private.h language-private.h ../cups/transcode.h \
+  language.h pwg-private.h ../cups/cups.h file.h ppd-private.h \
+  ../cups/ppd.h thread-private.h
 ppd-cache.o: ppd-cache.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
-pwg-media.o: pwg-media.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
-request.o: request.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
-sidechannel.o: sidechannel.c sidechannel.h versioning.h cups-private.h \
-  string-private.h ../config.h debug-private.h array-private.h \
-  ../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
-  ../cups/language.h md5-private.h language-private.h \
-  ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
  ppd-private.h ../cups/ppd.h thread-private.h
+pwg-media.o: pwg-media.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+request.o: request.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
+sidechannel.o: sidechannel.c sidechannel.h versioning.h cups-private.h \
+  string-private.h ../config.h debug-private.h ipp-private.h \
+  ../cups/ipp.h http.h array.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h language.h pwg-private.h \
+  ../cups/cups.h file.h ppd-private.h ../cups/ppd.h thread-private.h
 snmp.o: snmp.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h snmp-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h snmp-private.h
 snprintf.o: snprintf.c string-private.h ../config.h
-string.o: string.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+string.o: string.c string-private.h ../config.h debug-private.h \
+  ../cups/versioning.h thread-private.h array.h
 tempfile.o: tempfile.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 thread.o: thread.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
-tls.o: tls.c cups-private.h string-private.h ../config.h debug-private.h \
-  ../cups/versioning.h array-private.h ../cups/array.h ipp-private.h \
-  ../cups/ipp.h http.h http-private.h ../cups/language.h md5-private.h \
-  language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
-  file.h pwg.h ppd-private.h ../cups/ppd.h thread-private.h tls-darwin.c
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 transcode.o: transcode.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 usersys.o: usersys.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 util.o: util.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 testadmin.o: testadmin.c adminutil.h cups.h file.h versioning.h ipp.h \
-  http.h array.h language.h pwg.h string-private.h ../config.h
+  http.h array.h language.h string-private.h ../config.h
 testarray.o: testarray.c string-private.h ../config.h debug-private.h \
-  ../cups/versioning.h array-private.h ../cups/array.h dir.h
+  ../cups/versioning.h array.h dir.h
 testconflicts.o: testconflicts.c cups.h file.h versioning.h ipp.h http.h \
-  array.h language.h pwg.h ppd.h string-private.h ../config.h
+  array.h language.h ppd.h string-private.h ../config.h
 testcups.o: testcups.c string-private.h ../config.h cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h pwg.h ppd.h
-testdest.o: testdest.c cups.h file.h versioning.h ipp.h http.h array.h \
-  language.h pwg.h
+  versioning.h ipp.h http.h array.h language.h ppd.h
 testfile.o: testfile.c string-private.h ../config.h debug-private.h \
  ../cups/versioning.h file.h
-testhttp.o: testhttp.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+testhttp.o: testhttp.c string-private.h ../config.h http-private.h \
+  ../cups/http.h versioning.h array.h md5-private.h ipp-private.h \
+  ../cups/ipp.h
 testi18n.o: testi18n.c string-private.h ../config.h language-private.h \
  ../cups/transcode.h language.h array.h versioning.h
 testipp.o: testipp.c file.h versioning.h string-private.h ../config.h \
  ipp-private.h ../cups/ipp.h http.h array.h
 testoptions.o: testoptions.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 testlang.o: testlang.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 testppd.o: testppd.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h
 testpwg.o: testpwg.c ppd-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h pwg.h ../cups/ppd.h pwg-private.h \
+  ipp.h http.h array.h language.h ../cups/ppd.h pwg-private.h \
  file-private.h cups-private.h string-private.h ../config.h \
-  debug-private.h array-private.h ipp-private.h http-private.h \
-  md5-private.h language-private.h ../cups/transcode.h thread-private.h
+  debug-private.h ipp-private.h http-private.h md5-private.h \
+  language-private.h ../cups/transcode.h thread-private.h
 testsnmp.o: testsnmp.c cups-private.h string-private.h ../config.h \
-  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
-  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
-  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h ppd-private.h ../cups/ppd.h \
-  thread-private.h snmp-private.h
+  debug-private.h ../cups/versioning.h ipp-private.h ../cups/ipp.h \
+  http.h array.h http-private.h md5-private.h language-private.h \
+  ../cups/transcode.h language.h pwg-private.h ../cups/cups.h file.h \
+  ppd-private.h ../cups/ppd.h thread-private.h snmp-private.h
@@ -1,30 +1,22 @@
 #
-# "$Id: Makefile 12850 2015-08-27 19:29:06Z msweet $"
+# "$Id$"
 #
-# API library Makefile for CUPS.
+#   API library Makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
-# Copyright 1997-2006 by Easy Software Products, all rights reserved.
+#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+#   These coded instructions, statements, and computer programs are the
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
-# This file is subject to the Apple OS-Developed Software exception.
+#   This file is subject to the Apple OS-Developed Software exception.
 #

 include ../Makedefs

-
-#
-# Options to build libcups without the use of deprecated APIs...
-#
-
-OPTIONS	=	-D_CUPS_NO_DEPRECATED=1 -D_PPD_DEPRECATED=""
-
-
 #
 # Object files...
 #
@@ -76,17 +68,14 @@ LIBOBJS	=	\
 		string.o \
 		tempfile.o \
 		thread.o \
-		tls.o \
 		transcode.o \
 		usersys.o \
 		util.o
 TESTOBJS	= \
 		testadmin.o \
 		testarray.o \
-		testcache.o \
 		testconflicts.o \
 		testcups.o \
-		testdest.o \
 		testfile.o \
 		testhttp.o \
 		testi18n.o \
@@ -95,8 +84,7 @@ TESTOBJS	= \
 		testlang.o \
 		testppd.o \
 		testpwg.o \
-		testsnmp.o \
-		tlscheck.o
+		testsnmp.o
 OBJS	=	\
 		$(LIBOBJS) \
 		$(TESTOBJS)
@@ -117,7 +105,6 @@ HEADERS	=	\
 		ipp.h \
 		language.h \
 		ppd.h \
-		pwg.h \
 		raster.h \
 		sidechannel.h \
 		transcode.h \
@@ -151,10 +138,8 @@ LIBTARGETS =	\
 UNITTARGETS =	\
 		testadmin \
 		testarray \
-		testcache \
 		testconflicts \
 		testcups \
-		testdest \
 		testfile \
 		testhttp \
 		testi18n \
@@ -163,8 +148,7 @@ UNITTARGETS =	\
 		testoptions \
 		testppd \
 		testpwg \
-		testsnmp \
-		tlscheck
+		testsnmp

 TARGETS	=	\
 		$(LIBTARGETS)
@@ -197,7 +181,7 @@ unittests:	$(UNITTARGETS)

 clean:
 	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
-	$(RM) libcups.so libcups.dylib
+	$(RM) libcups.so libcups.sl libcups.dylib


 #
@@ -208,14 +192,6 @@ depend:
 	$(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies


-#
-# Run oclint to check code coverage...
-#
-
-oclint:
-	oclint -o=oclint.html -html $(LIBOBJS:.o=.c) -- $(ALL_CFLAGS)
-
-
 #
 # Install all targets...
 #
@@ -264,7 +240,7 @@ install-libs: $(INSTALLSTATIC)
 	echo Installing libraries in $(LIBDIR)...
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
 	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
-	if test $(LIBCUPS) = "libcups.so.2"; then \
+	if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
 		$(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
 		$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
 	fi
@@ -275,7 +251,6 @@ install-libs: $(INSTALLSTATIC)
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
 		cp $(LIBCUPS) $(SYMROOT); \
-		dsymutil $(SYMROOT)/$(LIBCUPS); \
 	fi

 installstatic:
@@ -293,6 +268,9 @@ uninstall:
 	$(RM) $(LIBDIR)/libcups.2.dylib
 	$(RM) $(LIBDIR)/$(LIBCUPSSTATIC)
 	$(RM) $(LIBDIR)/libcups.dylib
+	$(RM) $(LIBDIR)/libcups_s.a
+	$(RM) $(LIBDIR)/libcups.sl
+	$(RM) $(LIBDIR)/libcups.sl.2
 	$(RM) $(LIBDIR)/libcups.so
 	$(RM) $(LIBDIR)/libcups.so.2
 	-$(RMDIR) $(LIBDIR)
@@ -303,10 +281,10 @@ uninstall:


 #
-# libcups.so.2
+# libcups.so.2, libcups.sl.2
 #

-libcups.so.2:	$(LIBOBJS)
+libcups.so.2 libcups.sl.2:	$(LIBOBJS)
 	echo Linking $@...
 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) \
 		$(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
@@ -326,7 +304,7 @@ libcups.2.dylib:	$(LIBOBJS) $(LIBCUPSORDER)
 	echo Linking $@...
 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
 		-install_name $(libdir)/$@ \
-		-current_version 2.11.0 \
+		-current_version 2.10.0 \
 		-compatibility_version 2.0.0 \
 		-exported_symbols_list t.exp \
 		$(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
@@ -335,6 +313,19 @@ libcups.2.dylib:	$(LIBOBJS) $(LIBCUPSORDER)
 	$(LN) $@ libcups.dylib


+#
+# libcups_s.a
+#
+
+libcups_s.a:	$(LIBOBJS) libcups_s.exp
+	echo Creating $@...
+	$(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o \
+		$(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+		$(COMMONLIBS) $(LIBZ)
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ libcups_s.o
+
+
 #
 # libcups.la
 #
@@ -342,7 +333,7 @@ libcups.2.dylib:	$(LIBOBJS) $(LIBCUPSORDER)
 libcups.la:    $(LIBOBJS)
 	echo Linking $@...
 	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
-		-rpath $(LIBDIR) -version-info 2:11 $(LIBGSSAPI) $(SSLLIBS) \
+		-rpath $(LIBDIR) -version-info 2:10 $(LIBGSSAPI) $(SSLLIBS) \
 		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)


@@ -357,23 +348,6 @@ libcups.a:	$(LIBOBJS)
 	$(RANLIB) $@


-#
-# libcups2.def (Windows DLL exports file...)
-#
-
-libcups2.def: $(LIBOBJS) Makefile
-	echo Generating $@...
-	echo "LIBRARY libcups2" >libcups2.def
-	echo "VERSION 2.11" >>libcups2.def
-	echo "EXPORTS" >>libcups2.def
-	(nm $(LIBOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}'; \
-	 echo __cups_strcpy; echo __cups_strlcat; echo __cups_strlcpy) | \
-		grep -v -E \
-		    -e 'cups_debug|Apple|BackChannel|Backend|FileCheck|Filter|GSSService|SetNegotiate|SideChannel' \
-		    -e 'Block$$' | \
-		sed -e '1,$$s/^_//' | sort >>libcups2.def
-
-
 #
 # testadmin (dependency on static CUPS library is intentional)
 #
@@ -396,16 +370,6 @@ testarray:	testarray.o $(LIBCUPSSTATIC)
 	./testarray


-#
-# testcache (dependency on static CUPS library is intentional)
-#
-
-testcache:	testcache.o $(LIBCUPSSTATIC)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
-
-
 #
 # testconflicts (dependency on static CUPS library is intentional)
 #
@@ -426,16 +390,6 @@ testcups:	testcups.o $(LIBCUPSSTATIC)
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)


-#
-# testdest (dependency on static CUPS library is intentional)
-#
-
-testdest:	testdest.o $(LIBCUPSSTATIC)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
-
-
 #
 # testfile (dependency on static CUPS library is intentional)
 #
@@ -542,16 +496,6 @@ 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...
 #
@@ -574,8 +518,8 @@ apihelp:
 		--css ../doc/cups-printable.css \
 		--header api-cups.header --intro api-cups.shtml \
 		api-cups.xml \
-		cups.h pwg.h adminutil.c dest*.c language.c notify.c \
-		options.c pwg-media.c tempfile.c usersys.c \
+		cups.h adminutil.c dest*.c language.c notify.c \
+		options.c tempfile.c usersys.c \
 		util.c >../doc/help/api-cups.html
 	mxmldoc --tokens help/api-cups.html api-cups.xml >../doc/help/api-cups.tokens
 	$(RM) api-cups.xml
@@ -674,9 +618,8 @@ sloc:
 #

 include Dependencies
-tls.o: tls-darwin.c tls-gnutls.c tls-sspi.c


 #
-# End of "$Id: Makefile 12850 2015-08-27 19:29:06Z msweet $".
+# End of "$Id$".
 #
@@ -1,18 +1,29 @@
 /*
- * "$Id: adminutil.c 12945 2015-10-26 19:46:02Z msweet $"
+ * "$Id$"
 *
- * Administration utility API definitions for CUPS.
+ *   Administration utility API definitions for CUPS.
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 2001-2007 by Easy Software Products.
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2001-2007 by Easy Software Products.
 *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   cupsAdminCreateWindowsPPD()  - Create the Windows PPD file for a printer.
+ *   cupsAdminExportSamba()       - Export a printer to Samba.
+ *   cupsAdminGetServerSettings() - Get settings from the server.
+ *   cupsAdminSetServerSettings() - Set settings on the server.
+ *   do_samba_command()           - Do a SAMBA command.
+ *   get_cupsd_conf()             - Get the current cupsd.conf file.
+ *   invalidate_cupsd_cache()     - Invalidate the cached cupsd.conf settings.
+ *   write_option()               - Write a CUPS option to a PPD file.
 */

 /*
@@ -41,7 +52,7 @@ static int		do_samba_command(const char *command,
 					 FILE *logfile);
 static http_status_t	get_cupsd_conf(http_t *http, _cups_globals_t *cg,
 			               time_t last_update, char *name,
-				       size_t namelen, int *remote);
+				       int namelen, int *remote);
 static void		invalidate_cupsd_cache(_cups_globals_t *cg);
 static void		write_option(cups_file_t *dstfp, int order,
 			             const char *name, const char *text,
@@ -118,7 +129,7 @@ cupsAdminCreateWindowsPPD(
  * Get the supported banner pages, etc. for the printer...
  */

-  request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
+  request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);

  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
                   "localhost", 0, "/printers/%s", dest);
@@ -134,7 +145,7 @@ cupsAdminCreateWindowsPPD(
  */

  response = cupsDoRequest(http, request, "/");
-  if (!response || cupsLastError() > IPP_STATUS_OK_CONFLICTING)
+  if (!response || cupsLastError() > IPP_OK_CONFLICT)
  {
    unlink(src);
    return (NULL);
@@ -242,7 +253,7 @@ cupsAdminCreateWindowsPPD(
        snprintf(line, sizeof(line),
 	         _cupsLangString(language, _("Missing value on line %d.")),
 		 linenum);
-        _cupsSetError(IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR, line, 0);
+        _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, line, 0);

        cupsFileClose(srcfp);
        cupsFileClose(dstfp);
@@ -261,7 +272,7 @@ cupsAdminCreateWindowsPPD(
 	         _cupsLangString(language,
 		                 _("Missing double quote on line %d.")),
 	         linenum);
-        _cupsSetError(IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR, line, 0);
+        _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, line, 0);

        cupsFileClose(srcfp);
        cupsFileClose(dstfp);
@@ -280,7 +291,7 @@ cupsAdminCreateWindowsPPD(
 	         _cupsLangString(language,
 		                 _("Bad option + choice on line %d.")),
 	         linenum);
-        _cupsSetError(IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR, line, 0);
+        _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, line, 0);

        cupsFileClose(srcfp);
        cupsFileClose(dstfp);
@@ -308,7 +319,7 @@ cupsAdminCreateWindowsPPD(
 	}
      }

-      snprintf(ptr + 1, sizeof(line) - (size_t)(ptr - line + 1),
+      snprintf(ptr + 1, sizeof(line) - (ptr - line + 1),
               "%%cupsJobTicket: %s=%s\n\"\n*End", option, choice);

      cupsFilePrintf(dstfp, "*%% Changed for CUPS Windows Driver...\n%s\n",
@@ -323,7 +334,7 @@ cupsAdminCreateWindowsPPD(

  if (linenum == 0)
  {
-    _cupsSetError(IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR, _("Empty PPD file."), 1);
+    _cupsSetError(IPP_DOCUMENT_FORMAT_ERROR, _("Empty PPD file."), 1);

    cupsFileClose(dstfp);
    unlink(buffer);
@@ -413,7 +424,7 @@ cupsAdminExportSamba(

  if (!dest || !ppd || !samba_server || !samba_user || !samba_password)
  {
-    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);
+    _cupsSetError(IPP_INTERNAL_ERROR, strerror(EINVAL), 0);
    return (0);
  }

@@ -423,7 +434,7 @@ cupsAdminExportSamba(

  if ((fp = cupsTempFile2(authfile, sizeof(authfile))) == NULL)
  {
-    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, NULL, 0);
+    _cupsSetError(IPP_INTERNAL_ERROR, NULL, 0);
    return (0);
  }

@@ -476,7 +487,7 @@ cupsAdminExportSamba(
 	                       _("Unable to copy Windows 2000 printer "
 	                         "driver files (%d).")), status);

-      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -511,7 +522,7 @@ cupsAdminExportSamba(
 	                         _("Unable to copy CUPS printer driver "
 				   "files (%d).")), status);

-	_cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+	_cupsSetError(IPP_INTERNAL_ERROR, message, 0);

 	if (logfile)
 	  _cupsLangPuts(logfile, message);
@@ -554,7 +565,7 @@ cupsAdminExportSamba(
                	       _("Unable to install Windows 2000 printer "
 		        	 "driver files (%d).")), status);

-      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -599,7 +610,7 @@ cupsAdminExportSamba(
                	       _("Unable to copy Windows 9x printer "
 		        	 "driver files (%d).")), status);

-      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -628,7 +639,7 @@ cupsAdminExportSamba(
                	       _("Unable to install Windows 9x printer "
 		        	 "driver files (%d).")), status);

-      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -680,7 +691,7 @@ cupsAdminExportSamba(
 	                       _("Unable to copy 64-bit Windows printer "
 	                         "driver files (%d).")), status);

-      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -715,7 +726,7 @@ cupsAdminExportSamba(
 	                         _("Unable to copy 64-bit CUPS printer driver "
 				   "files (%d).")), status);

-	_cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+	_cupsSetError(IPP_INTERNAL_ERROR, message, 0);

 	if (logfile)
 	  _cupsLangPuts(logfile, message);
@@ -758,7 +769,7 @@ cupsAdminExportSamba(
                	       _("Unable to install Windows 2000 printer "
 		        	 "driver files (%d).")), status);

-      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);

      if (logfile)
 	_cupsLangPuts(logfile, message);
@@ -783,13 +794,13 @@ cupsAdminExportSamba(
 				"are installed.")),
              sizeof(message));

-    _cupsSetError(IPP_STATUS_ERROR_NOT_FOUND, message, 0);
+    _cupsSetError(IPP_NOT_FOUND, message, 0);
    _cupsLangPuts(logfile, message);
  }

  if (have_drivers == 0)
  {
-    _cupsSetError(IPP_STATUS_ERROR_NOT_FOUND, message, 0);
+    _cupsSetError(IPP_NOT_FOUND, message, 0);

    unlink(authfile);

@@ -810,7 +821,7 @@ cupsAdminExportSamba(
        		     _("Unable to set Windows printer driver (%d).")),
        		     status);

-    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+    _cupsSetError(IPP_INTERNAL_ERROR, message, 0);

    if (logfile)
      _cupsLangPuts(logfile, message);
@@ -871,9 +882,9 @@ cupsAdminGetServerSettings(
      */

      if (strcmp(cg->http->hostname, cg->server) ||
-          cg->ipp_port != httpAddrPort(cg->http->hostaddr) ||
+          cg->ipp_port != _httpAddrPort(cg->http->hostaddr) ||
 	  (cg->http->encryption != cg->encryption &&
-	   cg->http->encryption == HTTP_ENCRYPTION_NEVER))
+	   cg->http->encryption == HTTP_ENCRYPT_NEVER))
      {
       /*
 	* Need to close the current connection because something has changed...
@@ -890,13 +901,13 @@ cupsAdminGetServerSettings(

    if (!cg->http)
    {
-      if ((cg->http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC,
-                                   cupsEncryption(), 1, 0, NULL)) == NULL)
+      if ((cg->http = _httpCreate(cupsServer(), ippPort(), NULL,
+                                  cupsEncryption(), AF_UNSPEC)) == NULL)
      {
 	if (errno)
-	  _cupsSetError(IPP_STATUS_ERROR_SERVICE_UNAVAILABLE, NULL, 0);
+	  _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
 	else
-	  _cupsSetError(IPP_STATUS_ERROR_SERVICE_UNAVAILABLE,
+	  _cupsSetError(IPP_SERVICE_UNAVAILABLE,
 			_("Unable to connect to host."), 1);

 	if (num_settings)
@@ -914,7 +925,7 @@ cupsAdminGetServerSettings(

  if (!http || !num_settings || !settings)
  {
-    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);
+    _cupsSetError(IPP_INTERNAL_ERROR, strerror(EINVAL), 0);

    if (num_settings)
      *num_settings = 0;
@@ -933,7 +944,7 @@ cupsAdminGetServerSettings(
  */

  if ((status = get_cupsd_conf(http, cg, cg->cupsd_update, cupsdconf,
-                               sizeof(cupsdconf), &remote)) == HTTP_STATUS_OK)
+                               sizeof(cupsdconf), &remote)) == HTTP_OK)
  {
    if ((cupsd = cupsFileOpen(cupsdconf, "r")) == NULL)
    {
@@ -943,7 +954,7 @@ cupsAdminGetServerSettings(
      snprintf(message, sizeof(message),
               _cupsLangString(cupsLangDefault(), _("Open of %s failed: %s")),
               cupsdconf, strerror(errno));
-      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);
    }
  }
  else
@@ -1125,7 +1136,7 @@ cupsAdminGetServerSettings(
 					   cg->cupsd_num_settings,
 					   &(cg->cupsd_settings));
  }
-  else if (status != HTTP_STATUS_NOT_MODIFIED)
+  else if (status != HTTP_NOT_MODIFIED)
    invalidate_cupsd_cache(cg);

 /*
@@ -1175,7 +1186,6 @@ cupsAdminSetServerSettings(
 		in_cancel_job,		/* In a cancel-job section? */
 		in_admin_location,	/* In the /admin location? */
 		in_conf_location,	/* In the /admin/conf location? */
-		in_log_location,	/* In the /admin/log location? */
 		in_root_location;	/* In the / location? */
  const char	*val;			/* Setting value */
  int		share_printers,		/* Share local printers */
@@ -1189,7 +1199,6 @@ cupsAdminSetServerSettings(
 		wrote_loglevel,		/* Wrote the LogLevel line? */
 		wrote_admin_location,	/* Wrote the /admin location? */
 		wrote_conf_location,	/* Wrote the /admin/conf location? */
-		wrote_log_location,	/* Wrote the /admin/log location? */
 		wrote_root_location;	/* Wrote the / location? */
  int		indent;			/* Indentation */
  int		cupsd_num_settings;	/* New number of settings */
@@ -1211,7 +1220,7 @@ cupsAdminSetServerSettings(

  if (!http || !num_settings || !settings)
  {
-    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);
+    _cupsSetError(IPP_INTERNAL_ERROR, strerror(EINVAL), 0);

    return (0);
  }
@@ -1221,11 +1230,11 @@ cupsAdminSetServerSettings(
  */

  if (get_cupsd_conf(http, cg, 0, cupsdconf, sizeof(cupsdconf),
-                     &remote) == HTTP_STATUS_OK)
+                     &remote) == HTTP_OK)
  {
    if ((cupsd = cupsFileOpen(cupsdconf, "r")) == NULL)
    {
-      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, NULL, 0);
+      _cupsSetError(IPP_INTERNAL_ERROR, NULL, 0);
      return (0);
    }
  }
@@ -1389,7 +1398,7 @@ cupsAdminSetServerSettings(
    if (remote)
      unlink(cupsdconf);

-    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, NULL, 0);
+    _cupsSetError(IPP_INTERNAL_ERROR, NULL, 0);
    return (0);
  }

@@ -1403,14 +1412,12 @@ cupsAdminSetServerSettings(
  in_conf_location     = 0;
  in_default_policy    = 0;
  in_location          = 0;
-  in_log_location      = 0;
  in_policy            = 0;
  in_root_location     = 0;
  linenum              = 0;
  wrote_admin_location = 0;
  wrote_browsing       = 0;
  wrote_conf_location  = 0;
-  wrote_log_location   = 0;
  wrote_loglevel       = 0;
  wrote_policy         = 0;
  wrote_port_listen    = 0;
@@ -1554,10 +1561,8 @@ cupsAdminSetServerSettings(
      indent += 2;
      if (!strcmp(value, "/admin"))
 	in_admin_location = 1;
-      else if (!strcmp(value, "/admin/conf"))
+      if (!strcmp(value, "/admin/conf"))
 	in_conf_location = 1;
-      else if (!strcmp(value, "/admin/log"))
-	in_log_location = 1;
      else if (!strcmp(value, "/"))
 	in_root_location = 1;

@@ -1599,23 +1604,6 @@ cupsAdminSetServerSettings(
 	  cupsFilePrintf(temp, "  Allow %s\n",
 	                 remote_any > 0 ? "all" : "@LOCAL");
      }
-      else if (in_log_location && remote_admin >= 0)
-      {
-	wrote_log_location = 1;
-
-	if (remote_admin)
-          cupsFilePuts(temp, "  # Allow remote access to the log "
-	                     "files...\n");
-	else
-          cupsFilePuts(temp, "  # Restrict access to the log "
-	                     "files...\n");
-
-        cupsFilePuts(temp, "  Order allow,deny\n");
-
-	if (remote_admin)
-	  cupsFilePrintf(temp, "  Allow %s\n",
-	                 remote_any > 0 ? "all" : "@LOCAL");
-      }
      else if (in_root_location &&
               (remote_admin >= 0 || remote_any > 0 || share_printers >= 0))
      {
@@ -1642,7 +1630,6 @@ cupsAdminSetServerSettings(

      in_admin_location = 0;
      in_conf_location  = 0;
-      in_log_location   = 0;
      in_root_location  = 0;

      cupsFilePuts(temp, "</Location>\n");
@@ -1891,25 +1878,6 @@ cupsAdminSetServerSettings(
    cupsFilePuts(temp, "</Location>\n");
  }

-  if (!wrote_log_location && remote_admin >= 0)
-  {
-    if (remote_admin)
-      cupsFilePuts(temp,
-                   "# Allow remote access to the log files...\n");
-    else
-      cupsFilePuts(temp, "# Restrict access to the log files...\n");
-
-    cupsFilePuts(temp, "<Location /admin/log>\n"
-                       "  AuthType Default\n"
-                       "  Require user @SYSTEM\n"
-                       "  Order allow,deny\n");
-
-    if (remote_admin)
-      cupsFilePrintf(temp, "  Allow %s\n", remote_any > 0 ? "all" : "@LOCAL");
-
-    cupsFilePuts(temp, "</Location>\n");
-  }
-
  if (!wrote_policy && user_cancel_any >= 0)
  {
    cupsFilePuts(temp, "<Policy default>\n"
@@ -1986,7 +1954,7 @@ cupsAdminSetServerSettings(

  status = cupsPutFile(http, "/admin/conf/cupsd.conf", tempfile);

-  if (status == HTTP_STATUS_CREATED)
+  if (status == HTTP_CREATED)
  {
   /*
    * Updated OK, add the basic settings...
@@ -2056,7 +2024,7 @@ cupsAdminSetServerSettings(

  unlink(tempfile);

-  return (status == HTTP_STATUS_CREATED);
+  return (status == HTTP_CREATED);
 }


@@ -2152,7 +2120,7 @@ get_cupsd_conf(
    _cups_globals_t *cg,		/* I - Global data */
    time_t          last_update,	/* I - Last update time for file */
    char            *name,		/* I - Filename buffer */
-    size_t          namesize,		/* I - Size of filename buffer */
+    int             namesize,		/* I - Size of filename buffer */
    int             *remote)		/* O - Remote file? */
 {
  int		fd;			/* Temporary file descriptor */
@@ -2190,16 +2158,16 @@ get_cupsd_conf(
      snprintf(message, sizeof(message),
               _cupsLangString(cupsLangDefault(), _("stat of %s failed: %s")),
               name, strerror(errno));
-      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, message, 0);
+      _cupsSetError(IPP_INTERNAL_ERROR, message, 0);

      *name = '\0';

-      return (HTTP_STATUS_SERVER_ERROR);
+      return (HTTP_SERVER_ERROR);
    }
    else if (last_update && info.st_mtime <= last_update)
-      status = HTTP_STATUS_NOT_MODIFIED;
+      status = HTTP_NOT_MODIFIED;
    else
-      status = HTTP_STATUS_OK;
+      status = HTTP_OK;
  }
  else
 #endif /* !WIN32 */
@@ -2208,15 +2176,15 @@ get_cupsd_conf(
    * Read cupsd.conf via a HTTP GET request...
    */

-    if ((fd = cupsTempFd(name, (int)namesize)) < 0)
+    if ((fd = cupsTempFd(name, namesize)) < 0)
    {
      *name = '\0';

-      _cupsSetError(IPP_STATUS_ERROR_INTERNAL, NULL, 0);
+      _cupsSetError(IPP_INTERNAL_ERROR, NULL, 0);

      invalidate_cupsd_cache(cg);

-      return (HTTP_STATUS_SERVER_ERROR);
+      return (HTTP_SERVER_ERROR);
    }

    *remote = 1;
@@ -2231,7 +2199,7 @@ get_cupsd_conf(

    close(fd);

-    if (status != HTTP_STATUS_OK)
+    if (status != HTTP_OK)
    {
      unlink(name);
      *name = '\0';
@@ -2369,5 +2337,5 @@ write_option(cups_file_t     *dstfp,	/* I - PPD file */


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

 /*
- * End of "$Id: adminutil.h 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id$".
 */
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-array.header 7266 2008-01-29 02:15:29Z mike $"
+  "$Id: api-array.header 9771 2011-05-12 05:21:56Z mike $"

  Array API header for CUPS.

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $"
+  "$Id: api-array.shtml 9727 2011-04-28 21:20:12Z mike $"

  Array API introduction for CUPS.

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $"
+  "$Id: api-cups.header 9771 2011-05-12 05:21:56Z mike $"

  CUPS API header for CUPS.

@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-cups.shtml 7337 2008-02-22 04:44:04Z mike $"
+  "$Id: api-cups.shtml 9727 2011-04-28 21:20:12Z mike $"

  API introduction for CUPS.

-  Copyright 2007-2013 by Apple Inc.
+  Copyright 2007-2011 by Apple Inc.
  Copyright 1997-2006 by Easy Software Products, all rights reserved.

  These coded instructions, statements, and computer programs are the
@@ -183,7 +183,7 @@ int num_options = 0;
 <a href='#cups_option_t'>cups_option_t</a> *options = NULL;
 <a href='#cups_dest_t'>cups_dest_t</a> *dest;

-for (i = 0; i &lt; dest->num_options; i ++)
+for (i = 0; i < dest->num_options; i ++)
  num_options = <a href='#cupsAddOption'>cupsAddOption</a>(dest->options[i].name, dest->options[i].value,
                              num_options, &amp;options);
 </pre>
@@ -235,7 +235,7 @@ job_id = <a href='#cupsPrintFiles'>cupsPrintFiles</a>(dest->name, 3, files, "Tes

 <p>Finally, the <a href='#cupsCreateJob'><code>cupsCreateJob</code></a>
 function creates a new job with no files in it. Files are added using the
-<a href='#cupsStartDocument'><code>cupsStartDocument</code></a>,
+<a href='#cupsStartDocument'><code>cupsStartDocument</code></a>, 
 <a href='api-httpipp.html#cupsWriteRequestData'><code>cupsWriteRequestData</code></a>,
 and <a href='#cupsFinishDocument'><code>cupsFinishDocument</code></a> functions.
 The following example creates a job with 10 text files for printing:</p>
@@ -299,7 +299,7 @@ int num_jobs;
 <a href='#cups_job_t'>cups_job_t</a> *jobs;
 int i;
 ipp_jstate_t job_state = IPP_JOB_PENDING;
-
+ 
 while (job_state &lt; IPP_JOB_STOPPED)
 {
  /* Get my jobs (1) with any state (-1) */
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-filedir.header 7279 2008-01-31 01:50:44Z mike $"
+  "$Id: api-filedir.header 9771 2011-05-12 05:21:56Z mike $"

  File and Directory API header for CUPS.

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-filedir.shtml 7279 2008-01-31 01:50:44Z mike $"
+  "$Id: api-filedir.shtml 9727 2011-04-28 21:20:12Z mike $"

  File and directory API introduction for CUPS.

@@ -1,9 +1,9 @@
 <!--
-  "$Id: api-filter.header 7616 2008-05-28 00:34:13Z mike $"
+  "$Id: api-filter.header 9771 2011-05-12 05:21:56Z mike $"

  Filter and backend programming header for CUPS.

-  Copyright 2008-2014 by Apple Inc.
+  Copyright 2008-2011 by Apple Inc.

  These coded instructions, statements, and computer programs are the
  property of Apple Inc. and are protected by Federal copyright
--- a/Mostrar Mais
+++ b/Mostrar Mais