Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.5.1@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -1,3 +0,0 @@
-.git* export-ignore
-.mailmap export-ignore
-tools export-ignore
@@ -1,158 +0,0 @@
-*.a
-*.bck
-*.cgi
-*.dylib
-*.gz
-*.o
-*.so
-*.so.*
-*.tokens
-.buildrev
-autom4te.cache
-config.h
-config.log
-config.status
-cups-config
-Makedefs
-backend/dnssd
-backend/http
-backend/ipp
-backend/lpd
-backend/mdns
-backend/snmp
-backend/socket
-backend/test1284
-backend/testbackend
-backend/testsupplies
-backend/usb
-berkeley/lpc
-berkeley/lpq
-berkeley/lpr
-berkeley/lprm
-cgi-bin/makedocset
-cgi-bin/testcgi
-cgi-bin/testhi
-cgi-bin/testhi.index
-cgi-bin/testtemplate
-conf/cups-files.conf
-conf/cupsd.conf
-conf/mime.convs
-conf/pam.std
-conf/snmp.conf
-cups/locale/
-cups/test.pwg
-cups/testadmin
-cups/testarray
-cups/testcache
-cups/testconflicts
-cups/testcreds
-cups/testcups
-cups/testdest
-cups/testfile
-cups/testgetdests
-cups/testhttp
-cups/testi18n
-cups/testipp
-cups/testlang
-cups/testoptions
-cups/testppd
-cups/testpwg
-cups/testsnmp
-cups/tlscheck
-desktop/cups.desktop
-doc/index.html
-doc/*/index.html
-filter/commandtops
-filter/gziptoany
-filter/pstops
-filter/rasterbench
-filter/rastertoepson
-filter/rastertohp
-filter/rastertolabel
-filter/rastertopwg
-filter/test.raster
-filter/testclient
-filter/testraster
-locale/checkpo
-locale/po2strings
-locale/strings2po
-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
-man/mantohtml
-monitor/bcp
-monitor/tbcp
-notifier/dbus
-notifier/mailto
-notifier/rss
-notifier/testnotify
-packaging/cups.list
-org.cups.docset*
-patches
-ppdc/genstrings
-ppdc/ppd/
-ppdc/ppd2/
-ppdc/ppdc
-ppdc/ppdc-static
-ppdc/ppdhtml
-ppdc/ppdi
-ppdc/ppdi-static
-ppdc/ppdmerge
-ppdc/ppdpo
-ppdc/sample-import.drv
-ppdc/sample.c
-ppdc/testcatalog
-scheduler/convert
-scheduler/cups-deviced
-scheduler/cups-driverd
-scheduler/cups-exec
-scheduler/cups-lpd
-scheduler/cups-lpd.xinetd
-scheduler/cups.sh
-scheduler/cups.xml
-scheduler/cupsd
-scheduler/cupsfilter
-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
-scheduler/testlpd
-scheduler/testmime
-scheduler/testspeed
-scheduler/testsub
-systemv/accept
-systemv/cancel
-systemv/cupsaccept
-systemv/cupsaddsmb
-systemv/cupsctl
-systemv/cupsdisable
-systemv/cupsenable
-systemv/cupsreject
-systemv/cupstestdsc
-systemv/cupstestppd
-systemv/lp
-systemv/lpadmin
-systemv/lpinfo
-systemv/lpmove
-systemv/lpoptions
-systemv/lpstat
-systemv/reject
-templates/header.tmpl
-templates/*/header.tmpl
-test/cups-str-*.html
-test/*_log-*
-test/ippfind
-test/ippfind-static
-test/ippserver
-test/ippserver-shared
-test/ipptool
-test/ipptool-static
-xcode/CUPS.xcodeproj/project.xcworkspace/
-xcode/CUPS.xcodeproj/xcuserdata/
-
@@ -1,11 +0,0 @@
-# Prevent git from showing duplicate names with commands like "git shortlog"
-# See the manpage of git-shortlog for details.
-# The syntax is:
-# Name that should be used <email that should be used> Bad name <bad email>
-#
-# You can skip Bad name if it is the same as the one that should be used, and is unique.
-#
-# This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
-# gives no duplicates.
-Michael R Sweet <michaelrsweet@gmail.com> msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
-Michael R Sweet <michaelrsweet@gmail.com> Michael Sweet <msweet@msweet-imac.local>
@@ -1,90 +1,6 @@
 CHANGES-1.5.txt
 ---------------

-CHANGES IN CUPS V1.5.4
-
-	- Documentation updates (STR #4112, STR #4130, STR #4134)
-	- Fixes for libusb-based USB backend (STR #4128)
-	- The lpq command did not show the owner or title of jobs unless passed
-	  a username on the command-line (STR #4135)
-	- Localized empty strings contained the message catalog metadata
-	  (STR #4119)
-	- Fixed a crash in the libusb-based USB backend (STR #4099)
-	- The cups-lpd mini-daemon no longer handled jobs with multiple copies
-	  (STR #4118)
-	- Multiple libusb backend fixes (STR #4098, STR #4100)
-	- The IPP backend no longer tries to get the job status for printers
-	  that do not implement the required operation (STR #4083)
-	- Sending a document in an unsupported format to an IPP printer now
-	  automatically cancels the job (STR #4093)
-	- Fix some error reporting issues when printing from /dev/null and
-	  other unusual situations (STR #4015)
-	- The scheduler now sets the CUPS_MAX_MESSAGE environment variable for
-	  filters (STR #4074)
-	- Fixed a build issue when using older versions of autoconf (STR #4084)
-	- The IPP backend now treats the client-error-not-possible status code
-	  as a job history issue, allowing IPP printing to Windows to work
-	  (STR #4047)
-	- The IPP backend incorrectly included the document-format and
-	  compression attributes in Create-Job requests (STR #4086)
-	- The libusb-based USB backend did not work on non-Linux platforms
-	  (STR #4088)
-
-
-CHANGES IN CUPS V1.5.3
-
-	- httpReconnect() did not reset the read/write buffers (STR #4065)
-	- Compiling without threading support failed (STR #4060)
-	- Fixed compile problem with old versions of OpenSSL (STR #4036)
-	- The network backends did not check SNMP supply levels regularly
-	  (STR #4040)
-	- The online help always included the "help on help" text (STR #4042)
-	- Fixed a SSL handshake issue on OS X (STR #4045)
-	- The scheduler could crash if a PPD file contained an invalid paper
-	  size (STR #4049)
-	- The CUPS polling daemon did not reinitialize its connection to the
-	  remote server on errors in all cases (STR #4031)
-	- PostScript auto-configuration was slow and unreliable with some
-	  printers (STR #4028)
-	- Missing localizations caused empty output (STR #4033)
-	- The cups-driverd program could temporarily "forget" a PPD file if it
-	  was updated in place.
-	- The dnssd backend now prefers IPPS over IPP.
-	- The USB backend now uses and requires LIBUSB 1.0 or later (STR #3477)
-	- The LIBUSB-based USB backend now supports the back-channel (STR #2890)
-	- Changed how timeouts are implemented in the LPD backend (STR #4013)
-	- Added more supported color names for SNMP supplies (STR #3981)
-	- The default InputSlot setting was never used (STR #3957)
-	- POSIX ACLs are now set properly on certificate files (STR #3970)
-	- Supplies with commas in their names were not reported correctly
-	  (STR #4020)
-	- The cupsGetPPD3() function created a temporary file when one was not
-	  needed (STR #4018)
-	- The scheduler now ensures that job notifications contain a value for
-	  the notify-printer-uri attribute (STR #4014)
-	- The lp and lpr commands did not cancel jobs queued from stdin on an
-	  error (STR #4015)
-	- Fixed the IPP backend's handling of HTTP/1.0 compatibility (STR #3988)
-	- The IPP backend did not always setup username/password authentication
-	  for printers (STR #3985)
-	- The IPP backend no longer re-queues print jobs that are too large for
-	  the printer/server (STR #3977)
-	- The RPM spec file did not work (STR #4021, STR #4057)
-	- Encryption did not work when the server name ended with "."
-	  (STR #4011)
-	- The multi-purpose tray is now mapped to the IPP "by-pass-tray"
-	  (STR #4009)
-	- The correct media size was not always passed to IPP printers
-	  (STR #4001)
-	- Finishing options were not passed to IPP printers (STR #3995)
-	- Fixed iCloud-based Back to My Mac printing (STR #3996)
-
-
-CHANGES IN CUPS V1.5.2
-
-	- Reposted what should have been CUPS 1.5.1.
-
-
 CHANGES IN CUPS V1.5.1

 	- Documentation updates (STR #3885, STR #3886, STR #3946, STR #3969)
@@ -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,150 +0,0 @@
-CHANGES-2.1.txt
---------------
-
-CHANGES IN CUPS V2.1.4
-
-	- Fixed reporting of 1284 Device IDs (Issue #3835, PR #3836)
-	- Fixed printing of multiple files to raw queues (Issue #4782)
-	- The scheduler did not implement the Hold-New-Jobs opertion correctly
-	  (Issue #4767)
-	- The ipptool program truncated values at 8k (Issue #4786)
-	- The ipptool program did not correctly report uriScheme values in plist
-	  output (Issue #4785)
-	- The cups-lpd mini-daemon incorrectly included the document-name
-	  attribute when creating a job.  It should only be included when
-	  sending a job (Issue #4790)
-	- USB quirk updates (Issue #4778, Issue #4789)
-	- Documentation update (Issue #4772)
-
-
-CHANGES IN CUPS V2.1.3
-
-	- The default password function did not work on some platforms
-	  (Issue #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
-	  (Issue #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 (Issue #4752)
-	- cupsEncodeOptions2 incorrectly handled escaped values
-	  (<rdar://problem/19736672>)
-	- The scheduler did not allow access to resource files (icons, etc.)
-	  when the web interface was disabled (Issue #4755)
-	- Localization fix (Issue #4756)
-
-
-CHANGES IN CUPS V2.1.2
-
-	- 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)
-
-
-CHANGES IN CUPS V2.1.1
-
-	- 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 (Issue #4725)
-	- Some older HP LaserJet printers need a delayed close when printing
-	  using the libusb-based USB backend (Issue #4549)
-	- The libusb-based USB backend did not unload the kernel usblp module
-	  if it was preventing the backend from accessing the printer
-	  (Issue #4707)
-	- Current Primera printers were incorrectly reported as Fargo printers
-	  (Issue #4708)
-	- The IPP backend did not always handle jobs getting canceled at the
-	  printer (<rdar://problem/22716820>)
-	- Scheduler logging change (Issue #4728)
-	- Added USB quirk for Canon MP530 (Issue #4730)
-	- The scheduler did not deliver job notifications for jobs submitted to
-	  classes (Issue #4733)
-	- Changing the printer-is-shared value for a remote queue did not
-	  produce an error (Issue #4738)
-	- The IPP backend incorrectly included the job-password attribute in
-	  Validate-Job requests (<rdar://problem/23531939>)
-	- Updated localizations (Issue #4709)
-
-
-CHANGES IN CUPS V2.1.0
-
-	- Fixed more scheduler crash bugs in the new logging code (Issue #4687,
-	  Issue #4690)
-	- The scheduler did not use the ConfigFilePerm setting when copying PPD
-	  files or interface scripts attached to a request (Issue #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 (Issue #4684)
-	- The new PDF file type rule did not work (Issue #4692)
-	- The scheduler did not update the jobs.cache file when job files were
-	  expired (Issue #4706)
-	- Fixed some configure script issues (Issue #4694, Issue #4695, Issue #4698)
-	- Documentation updates (Issue #4691, Issue #4693)
-
-
-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 (Issue #4655, Issue #4658,
-	  Issue #4661)
-	- Fixed domain socket support on Linux (Issue #4679)
-	- Fixed signal handlers in the dnssd and usb backends (Issue #4671)
-	- <Limit All> in <Policy> sections now applies to all operations when
-	  used by itself (Issue #4659)
-	- Configure script changes for systemd support (Issue #4669)
-	- Updated autoconf sources to use newer form of AC_INIT (Issue #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 (Issue #4518)
-	- Added support for EXPECT-ALL directive in ipptool test files
-	  (Issue #4469)
-	- Added support for WITH-VALUE-FROM predicate in ipptool test files
-	  (Issue #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 (Issue #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
-	  (Issue #4589)
-	- The scheduler now validates ErrorPolicy values in config files
-	  (Issue #4591)
-	- Long cookies caused the web interface to stop working (Issue #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
-	  (Issue #4630)
-	- The scheduler now supports advanced ASL and journald logging when
-	  "syslog" output is configured (Issue #4474)
-	- The scheduler now supports logging to stderr when running in the
-	  foreground (Issue #4505)
-
@@ -0,0 +1,107 @@
+CHANGES-IPPTOOL.txt - 2012-01-10
+--------------------------------
+
+This file provides a list of changes to the ipptool binary distribution posted
+on cups.org.
+
+
+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,265 +0,0 @@
-CHANGES - 2.2.6 - 2017-11-01
-============================
-
-
-Changes in CUPS v2.2.6
----------------------
-
- DBUS notifications could crash the scheduler (Issue #5143)
- Added USB quirks rules for Canon MP540 and Samsung ML-2160 (Issue #5148)
- Fixed TLS cipher suite selection with GNU TLS (Issue #5145, Issue #5150)
- Localization updates (Issue #5152)
-
-
-Changes in CUPS v2.2.5
----------------------
-
- The scheduler's `-t` option did not force all errors to the standard error
-  file, making debugging of configuration problems hard (Issue #5041)
- Fixed a typo in the CUPS Programming Manual (Issue #5042)
- Fixed RPM packaging issue (Issue #5043, Issue #5044)
- The `cupsGetDests` function incorrectly returned an empty list of printers if
-  there was no default printer (Issue #5046)
- The `cupsGetDests` function waited too long for network printers (Issue #5049)
- Libtool support was completely broken with current libtool versions that use
-  an incompatible command-line syntax (Issue #5050)
- Fixed a build issue with `--enable-mallinfo` (Issue #5051)
- The ippserver test program contained a deadlock issue (Issue #5054)
- The `cupsLocalizeDest*` functions did not provide base localizations for
-  all registered IPP attributes and values (Issue #5056)
- The --enable-libtool configure option requires a path to the libtool program,
-  but doesn't document or check for it (Issue #5062)
- Fixed the `SSLOptions DenyCBC` option when using GNU TLS (Issue #5065)
- Fixed the `ServerTokens None` option (Issue #5065)
- Fixed the default `ServerAlias` value from `ServerName` (Issue #5072)
- Fixed the adminurl field in the TXT record for fully-qualified `ServerName`
-  values (Issue #5074)
- The scheduler now creates a PID file when not running on demand with a modern
-  service launcher (Issue #5080)
- The web interface did not support newer language identifiers used by Microsoft
-  web browsers (Issue #5803)
- Updated the cups-files.conf and cupsd.conf file documentation for missing
-  directives (Issue #5084)
- Fixed an Avahi-related crash bug in the scheduler (Issue #5085, Issue #5086)
- Fixed the interactions between the "print-quality" and "cupsPrintQuality"
-  options (Issue #5090)
- The IPP Everywhere PPD generator now sorts the supported resolutions before
-  choosing them for draft, normal, and best quality modes (Issue #5091)
- Fixed the localization unit test on Linux (Issue #5097)
- The CUPS library did not reuse domain sockets (Issue #5098)
- Fixed the "make check" target for some environments (Issue #5099)
- The scheduler woke up once per second to remove old temporary queues
-  (Issue #5100)
- Added USB quirk rule for Kyocera printer (Issue #5102, Issue #5103)
- Re-documented the limits of `file:///...` device URIs and moved the FileDevice
-  directive in `cups-files.conf` to the list of deprecated configuration
-  directives (Issue #5117)
- Added USB quirk rule for HP LaserJet 1160 printer (Issue #5121)
- Fixed the script interpreter detection in the configure script (Issue #5122)
- The network backends now retry on more error conditions (Issue #5123)
- Added a French translation of the web interface (Issue #5134)
- `cupsGetDests2` was not using the supplied HTTP connection (Issue #5135)
- `httpAddrConnect` leaked sockets in certain circumstances, causing some
-  printers to hang (rdar://31965686)
- Fixed an issue with Chinese localizations on macOS (rdar://32419311)
- The IPP backend now always sends the "finishings" attribute for printers that
-  support it because otherwise the client cannot override printer defaults
-  (rdar://33169732)
- The `cupsGetNamedDest` function did not use the local default printer
-  (rdar://33228500)
- The IPP backend incorrectly sent the "job-pages-per-set" attribute to PDF
-  printers (rdar://33250434)
- Fixed the `cups.strings` file that is used on macOS (rdar://33287650)
- CUPS now sends the `Date` HTTP header in IPP requests (rdar://33302034)
- The `ippCopyAttribute` function did not copy out-of-band values correctly
-  (rdar://33688003)
- Fixed the localization fallback code on macOS (rdar://33583699)
- The scheduler did not run with a high enough priority, causing problems on
-  busy systems (rdar://33789342)
- Added support for Japanese Kaku 1 envelope size (rdar://34774110)
- The `ipptool` program's `-P` option did not work correctly.
- The `ipptool` program did not compare URI scheme or hostname components
-  correctly for the WITH-ALL-HOSTNAMES, WITH-ALL-SCHEMES, WITH-HOSTNAME, or
-  WITH-SCHEME predicates.
-
-
-Changes in CUPS v2.2.4
----------------------
-
- The scheduler did not remove old job files (Issue #4987)
- cupsEnumDests did not return early when all printers had been discovered
-  (Issue #4989)
- The CUPS build system now supports cross-compilation (Issue #4897)
- Added a new CUPS Programming Manual to replace the aging API documentation.
- Added the `cupsAddIntegerOption` and `cupsGetIntegerOption` functions
-  (Issue #4992)
- The `cupsGetDests` and `cupsCreateJob` functions now support Bonjour printers
-  (Issue #4993)
- Added a USB quirk rule for Lexmark E260dn printers (Issue #4994)
- Fixed a potential buffer overflow in the `cupstestppd` utility (Issue #4996)
- IPP Everywhere improvements (Issue #4998)
- Fixed the "cancel all jobs" function in the web interface for several
-  languages (Issue #4999)
- Fixed issues with local queues (Issue #5003, Issue #5008, Issue #5009)
- The `lpstat` command now supports a `-e` option to enumerate local printers
-  (either previously added or on the network) that can be accessed
-  (Issue #5005)
- The `lp` and `lpr` commands now support printing to network printers that
-  haven't yet been added (Issue #5006)
- Fixed a typo in the mime.types file.
- Fixed a bug in the Spanish web interface template (Issue #5016)
- The `cupsEnumDests*` and `cupsGetDest*` functions now report the value of the
-  "printer-is-temporary" Printer Status attribute (Issue #5028)
- Added Chinese localization (Issue #5029)
- The `cupsCheckDestSupported` function did not support `NULL` values
-  (Issue #5031)
- Fixed some issues in the RPM spec file (Issue #5032)
- The `cupsConnectDest` function now supports the `CUPS_DEST_FLAGS_DEVICE` flag
-  for explicitly connecting to the device (printer) associated with the
-  destination.
- The `SSLOptions` directive in "client.conf" and "cupsd.conf" now supports
-  `DenyCBC` and `DenyTLS1.0` options (Issue #5037)
-
-
-Changes in CUPS v2.2.3
----------------------
-
- The IPP backend could get into an infinite loop for certain errors, causing a
-  hung queue (<rdar://problem/28008717>)
- The scheduler could pause responding to client requests in order to save state
-  changes to disk (<rdar://problem/28690656>)
- Added support for PPD finishing keywords (Issue #4960, Issue #4961,
-  Issue #4962)
- The IPP backend did not send a media-col attribute for just the source or type
-  (Issue #4963)
- IPP Everywhere print queues did not always support all print qualities
-  supported by the printer (Issue #4953)
- IPP Everywhere print queues did not always support all media types supported
-  by the printer (Issue #4953)
- The IPP Everywhere PPD generator did not return useful error messages
-  (Issue #4954)
- The IPP Everywhere finishings support did not work correctly with common UI or
-  command-line options (Issue #4976)
- Fixed an error handling issue for the network backends (Issue #4979)
- The default cupsd.conf file did not work on systems compiled without Kerberos
-  support (Issue #4947)
- The "reprint job" option was not available for some canceled jobs
-  (Issue #4915)
- Updated the job listing in the web interface (Issue #4978)
- Fixed some localization issues on macOS (<rdar://problem/27245567>)
-
-
-Changes in CUPS v2.2.2
----------------------
-
- Fixed some issues with the Zebra ZPL printer driver (Issue #4898)
- Fixed some issues with IPP Everywhere printer support (Issue #4893,
-  Issue #4909, Issue #4916, Issue #4921, Issue #4923, Issue #4932, Issue #4933,
-  Issue #4938)
- The rastertopwg filter could crash with certain input (Issue #4942)
- Optimized connection usage in the IPP backend (<rdar://problem/29547323>)
- The scheduler did not detect when an encrypted connection was closed by the
-  client on Linux (Issue #4901)
- The cups-lpd program did not catch all legacy usage of ISO-8859-1
-  (Issue #4899)
- Fixed builds on systems without a working poll() implementation (Issue #4905)
- Added a USB quirk rule for the Kyocera Ecosys P6026cdn (Issue #4900)
- The scheduler no longer creates log files on startup
-  (<rdar://problem/28332470>)
- The ippContainsString function now uses case-insensitive comparisons for
-  mimeMediaType, name, and text values in conformance with RFC 2911.
- The network backends now log the addresses that were found for a printer
-  (<rdar://problem/29268474>)
- Let's Encrypt certificates did not work when the hostname contained uppercase
-  letters (Issue #4919)
- Fixed reporting of printed pages in the web interface (Issue #4924)
- Updated systemd config files (Issue #4935)
- Updated documentation (PR #4896)
- Updated localizations (PR #4894, PR #4895, PR #4904, PR #4908, Issue #4946)
- Updated packaging files (Issue #4940)
-
-
-Changes in CUPS v2.2.1
----------------------
-
- Added "CreateSelfSignedCerts" directive for cups-files.conf to control whether
-  the scheduler automatically creates its own self-signed X.509 certificates for
-  TLS connections (Issue #4876)
- http*Connect did not handle partial failures (Issue #4870)
- Addressed some build warnings on Linux (Issue #4881)
- cupsHashData did not use the correct hashing algorithm
-  (<rdar://problem/28209220>)
- Updated man pages (PR #4885)
- Updated localizations (PR #4877, PR #4886)
-
-
-Changes in CUPS v2.2.0
----------------------
-
- Normalized the TLS certificate validation code and added additional error
-  messages to aid troubleshooting.
- The httpConnect functions did not work on Linux when cupsd was not running
-  (Issue #4870)
- The --no-remote-any option of cupsctl had no effect (Issue #4866)
- http*Connect did not return early when all addresses failed (Issue #4870)
-
-
-Changes in CUPS v2.2rc1
-----------------------
-
- Updated the list of supported IPP Everywhere media types.
- The IPP backend did not validate TLS credentials properly.
- The printer-state-message attribute was not cleared after a print job with no
-  errors (Issue #4851)
- The CUPS-Add-Modify-Class and CUPS-Add-Modify-Printer operations did not
-  always return an error for failed adds (Issue #4854)
- PPD files with names longer than 127 bytes did not work (Issue #4860)
- Updated localizations (Issue #4846, PR #4858)
-
-
-Changes in CUPS v2.2b2
----------------------
-
- Added Upstart support (PR #4825)
- CUPS now supports Let's Encrypt certificates on Linux.
-
-
-Changes in CUPS v2.2b1
----------------------
-
- All CUPS commands now support POSIX options (Issue #4813)
- The scheduler now restarts faster (Issue #4760)
- Improved performance of web interface with large numbers of jobs (Issue #3819)
- Encrypted printing can now be limited to only trusted printers and servers
-  (<rdar://problem/25711658>)
- The scheduler now advertises PWG Raster attributes for IPP Everywhere clients
-  (Issue #4428)
- The scheduler now logs informational messages for jobs at LogLevel "info"
-  (Issue #4815)
- The scheduler now uses the getgrouplist function when available (Issue #4611)
- The IPP backend no longer enables compression by default except for certain
-  raster formats that generally benefit from it (<rdar://problem/25166952>)
- The scheduler did not handle out-of-disk situations gracefully (Issue #4742)
- The LPD mini-daemon now detects invalid UTF-8 sequences in job, document, and
-  user names (Issue #4748)
- The IPP backend now continues on to the next job when the remote server/
-  printer puts the job on hold (<rdar://problem/24858548>)
- The scheduler did not cancel multi-document jobs immediately
-  (<rdar://problem/24854834>)
- The scheduler did not return non-shared printers to local clients unless they
-  connected to the domain socket (<rdar://problem/24566996>)
- The scheduler now reads the spool directory if one or more job cache entries
-  point to deleted jobs (<rdar://problem/24048846>)
- Added support for disc media sizes (<rdar://problem/20219536>)
- The httpAddrConnect and httpConnect* APIs now try connecting to multiple
-  addresses in parallel (<rdar://problem/20643153>)
- The cupsd domain socket is no longer world-accessible on macOS
-  (<rdar://problem/7542560>)
- Interface scripts are no longer supported for security reasons
-  (<rdar://problem/23135640>)
- Added a new cupsHashData API and support for hashed job passwords
-  (<rdar://problem/20221502>)
- Localization fixes (<rdar://problem/25292403>, <rdar://problem/25461517>,
-  Issue #4041, Issue #4796)
- Documentation changes (Issue #4624, Issue #4781)
- Packaging fixes (PR #4832)
@@ -0,0 +1,40 @@
+CHANGES.txt - 1.6b1 - 2012-01-30
+--------------------------------
+
+CHANGES IN CUPS V1.6b1
+
+	- 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,635 +0,0 @@
-# Contributing to CUPS
-
-CUPS is developed by Apple Inc. and distributed as open source software under a
-combination of GNU GPL2 and GNU LGPL2 licenses with exceptions to allow
-developers on Apple's operating systems to develop CUPS-based software under
-alternate license terms.  Significant contributions to CUPS must be licensed to
-Apple using the Apple Contributor Agreement:
-
-    https://www.cups.org/AppleContributorAgreement_2011-03-10.pdf
-
-Contributions should be submitted as attachments to bug reports on the CUPS web
-site.  Changes to existing source files should be submitted as unified diffs
-(both Subversion and Git produce this format by default) while new source files
-should be provided as-is or in an archive.  Github pull requests can also be
-used to submit changes.
-
-
-## HOW TO CONTACT THE DEVELOPERS
-
-The CUPS mailing lists are the primary means of asking questions and informally
-discussing issues and feature requests with the CUPS developers and other
-experienced CUPS users and developers.  The "cups" mailing list is intended for
-CUPS usage questions and new software announcements while the "cups-devel"
-mailing list provides a forum for CUPS developers and monitoring new bugs.
-
-
-## INTERFACES
-
-CUPS interfaces, including the C APIs and command-line arguments, environment
-variables, configuration files, and output format, are stable across patch
-versions and are generally backwards-compatible with interfaces used in prior
-major and minor versions.  However, program interfaces such as those used by
-the scheduler to run filter, port monitor, and backend processes for job
-processing should only be considered stable from the point of view of a
-filter, port monitor, or backend.  Software that simulates the scheduler in
-order to run those programs outside of CUPS must necessarily be updated when
-the corresponding interface is changed in a subsequent CUPS release, otherwise
-undefined behavior can occur.
-
-CUPS C APIs starting with an underscore (_) are considered to be private to
-CUPS and are not subject to the normal guarantees of stability between CUPS
-releases and must never be used in non-CUPS source code.  Similarly,
-configuration and state files written by CUPS are considered private if a
-corresponding man page is not provided with the CUPS release.  Never rely on
-undocumented files or formats when developing software for CUPS.  Always use a
-published C API to access data stored in a file to avoid compatibility problems
-in the future.
-
-
-## BUILD SYSTEM
-
-The CUPS build system uses GNU autoconf to tailor the library to the local
-operating system.  Project files for the current release of Microsoft Visual
-Studio are also provided for Microsoft Windows®.  To improve portability,
-makefiles must not make use of features unique to GNU make.  See the MAKEFILE
-GUIDELINES section for a description of the allowed make features and makefile
-guidelines.
-
-Additional GNU build programs such as GNU automake and GNU libtool must not be
-used.  GNU automake produces non-portable makefiles which depend on GNU-
-specific extensions, and GNU libtool is not portable or reliable enough for
-CUPS.
-
-
-## VERSION NUMBERING
-
-CUPS uses a three-part version number separated by periods to represent the
-major, minor, and patch release numbers.  Major release numbers indicate large
-design changes or backwards-incompatible changes to the CUPS API or CUPS
-Imaging API.  Minor release numbers indicate new features and other smaller
-changes which are backwards-compatible with previous CUPS releases.  Patch
-numbers indicate bug fixes to the previous feature or patch release.
-
-> Note:
->
-> When we talk about compatibility, we are talking about binary compatibility
-> for public APIs and output format compatibility for program interfaces.
-> Changes to configuration file formats or the default behavior of programs
-> are not generally considered incompatible as the upgrade process can
-> normally address such changes gracefully.
-
-Production releases use the plain version numbers:
-
-    MAJOR.MINOR.PATCH
-    1.0.0
-    ...
-    1.1.0
-    ...
-    1.1.23
-    ...
-    2.0.0
-    ...
-    2.1.0
-    2.1.1
-    2.1.2
-    2.1.3
-
-The first production release in a MAJOR.MINOR series (MAJOR.MINOR.0) is called
-a feature release.  Feature releases are the only releases that may contain new
-features.  Subsequent production releases in a MAJOR.MINOR series may only
-contain bug fixes.
-
-Beta-test releases are identified by appending the letter B to the major and
-minor version numbers followed by the beta release number:
-
-    MAJOR.MINORbNUMBER
-    2.2b1
-
-Release candidates are identified by appending the letters RC to the major and
-minor version numbers followed by the release candidate number:
-
-    MAJOR.MINORrcNUMBER
-    2.2rc1
-
-
-## CODING GUIDELINES
-
-Contributed source code must follow the guidelines below.  While the examples
-are for C and C++ source files, source code for other languages should conform
-to the same guidelines as allowed by the language.
-
-
-### SOURCE FILES
-
-All source files names must be 16 characters or less in length to ensure
-compatibility with older UNIX filesystems.  Source files containing functions
-have an extension of ".c" for C and ".cxx" for C++ source files.  All other
-"include" files have an extension of ".h".  Tabs are set to 8 characters or
-columns.
-
-> Note:
->
-> The ".cxx" extension is used because it is the only common C++ extension
-> between Linux, macOS, UNIX, and Windows.
-
-The top of each source file contains a header giving the purpose or nature of
-the source file and the copyright and licensing notice:
-
-    /*
-     * Description of file contents.
-     *
-     * Copyright 2016 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/".
-     */
-
-For source files that are subject to the Apple OS-Developed Software exception,
-the following additional comment appears after the contact information:
-
-     * This file is subject to the Apple OS-Developed Software exception.
-
-
-### HEADER FILES
-
-All public header files must include the "versioning.h" header file, or a header
-that does so.  Function declarations are then "decorated" with the correct
-_CUPS_API_major_minor macro to define its availability based on the build
-environment, for example:
-
-    extern int cupsDoThis(int foo, int bar) _CUPS_API_2_2;
-
-Private API header files must be named with the suffix "-private", for example
-the "cups.h" header file defines all of the public CUPS APIs while the
-"cups-private.h" header file defines all of the private CUPS APIs as well.
-Typically a private API header file will include the corresponding public API
-header file.
-
-
-### COMMENTS
-
-All source code utilizes block comments within functions to describe the
-operations being performed by a group of statements; avoid putting a comment
-per line unless absolutely necessary, and then consider refactoring the code
-so that it is not necessary.  C source files use the block comment format
-("/* comment */") since many vendor C compilers still do not support C99/C++
-comments ("// comment"):
-
-    /*
-     * Clear the state array before we begin...
-     */
-
-     for (i = 0; i < (sizeof(array) / sizeof(sizeof(array[0])); i ++)
-       array[i] = CUPS_STATE_IDLE;
-
-    /*
-     * Wait for state changes on another thread...
-     */
-
-     do
-     {
-       for (i = 0; i < (sizeof(array) / sizeof(sizeof(array[0])); i ++)
-         if (array[i] != CUPS_STATE_IDLE)
-           break;
-
-       if (i == (sizeof(array) / sizeof(array[0])))
-         sleep(1);
-     } while (i == (sizeof(array) / sizeof(array[0])));
-
-
-### INDENTATION
-
-All code blocks enclosed by brackets begin with the opening brace on a new
-line.  The code then follows starting on a new line after the brace and is
-indented 2 spaces.  The closing brace is then placed on a new line following
-the code at the original indentation:
-
-    {
-      int i; /* Looping var */
-
-     /*
-      * Process foobar values from 0 to 999...
-      */
-
-      for (i = 0; i < 1000; i ++)
-      {
-        do_this(i);
-        do_that(i);
-      }
-    }
-
-Single-line statements following "do", "else", "for", "if", and "while" are
-indented 2 spaces as well.  Blocks of code in a "switch" block are indented 4
-spaces after each "case" and "default" case:
-
-    switch (array[i])
-    {
-      case CUPS_STATE_IDLE :
-          do_this(i);
-          do_that(i);
-          break;
-
-      default :
-          do_nothing(i);
-          break;
-    }
-
-
-### SPACING
-
-A space follows each reserved word such as "if", "while", etc.  Spaces are not
-inserted between a function name and the arguments in parenthesis.
-
-
-### RETURN VALUES
-
-Parenthesis surround values returned from a function:
-
-    return (CUPS_STATE_IDLE);
-
-
-### FUNCTIONS
-
-Functions with a global scope have a lowercase prefix followed by capitalized
-words, e.g., "cupsDoThis", "cupsDoThat", "cupsDoSomethingElse", etc.  Private
-global functions begin with a leading underscore, e.g., "\_cupsDoThis",
-"\_cupsDoThat", etc.
-
-Functions with a local scope are declared "static" with lowercase names and
-underscores between words, e.g., "do\_this", "do\_that", "do\_something\_else", etc.
-
-Each function begins with a comment header describing what the function does,
-the possible input limits (if any), the possible output values (if any), and
-any special information needed:
-
-    /*
-     * 'do_this()' - Compute y = this(x).
-     *
-     * Notes: none.
-     */
-
-    static float       /* O - Inverse power value, 0.0 <= y <= 1.1 */
-    do_this(float x)   /* I - Power value (0.0 <= x <= 1.1) */
-    {
-      ...
-      return (y);
-    }
-
-Return/output values are indicated using an "O" prefix, input values are
-indicated using the "I" prefix, and values that are both input and output use
-the "IO" prefix for the corresponding in-line comment.
-
-The Mini-XML documentation generator also understands the following special
-text in the function description comment:
-
-    @deprecated@         - Marks the function as deprecated (not recommended
-                           for new development and scheduled for removal)
-    @since CUPS version@ - Marks the function as new in the specified version
-                           of CUPS.
-    @private@            - Marks the function as private (same as starting the
-                           function name with an underscore)
-
-
-### VARIABLES
-
-Variables with a global scope are capitalized, e.g., "ThisVariable",
-"ThatVariable", "ThisStateVariable", etc.  Globals in CUPS libraries are either
-part of the per-thread global values managed by the "\_cupsGlobals()" function
-or are suitably protected for concurrent access.  Global variables should be
-replaced by function arguments whenever possible.
-
-Variables with a local scope are lowercase with underscores between words,
-e.g., "this\_variable", "that\_variable", etc.  Any "local global" variables
-shared by functions within a source file are declared "static".  As for global
-variables, local static variables are suitably protected for concurrent access.
-
-Each variable is declared on a separate line and is immediately followed by a
-comment block describing the variable:
-
-    int         ThisVariable;    /* The current state of this */
-    static int  that_variable;   /* The current state of that */
-
-
-### TYPES
-
-All type names are lowercase with underscores between words and "\_t" appended
-to the end of the name, e.g., "cups\_this\_type\_t", "cups\_that\_type\_t", etc.
-Type names start with a prefix, typically "cups" or the name of the program,
-to avoid conflicts with system types.  Private type names start with an
-underscore, e.g., "\_cups\_this\_t", "\_cups\_that\_t", etc.
-
-Each type has a comment block immediately after the typedef:
-
-    typedef int cups_this_type_t;  /* This type is for CUPS foobar options. */
-
-
-### STRUCTURES
-
-All structure names are lowercase with underscores between words and "\_s"
-appended to the end of the name, e.g., "cups\_this\_s", "cups\_that\_s", etc.
-Structure names start with a prefix, typically "cups" or the name of the
-program, to avoid conflicts with system types.  Private structure names start
-with an underscore, e.g., "\_cups\_this\_s", "\_cups\_that\_s", etc.
-
-Each structure has a comment block immediately after the struct and each member
-is documented similar to the variable naming policy above:
-
-    struct cups_this_struct_s  /* This structure is for CUPS foobar options. */
-    {
-      int this_member;         /* Current state for this */
-      int that_member;         /* Current state for that */
-    };
-
-
-### CONSTANTS
-
-All constant names are uppercase with underscores between words, e.g.,
-"CUPS\_THIS\_CONSTANT", "CUPS\_THAT\_CONSTANT", etc.  Constants begin with an
-uppercase prefix, typically "CUPS" or the program name.  Private constants
-start with an underscore, e.g., "\_CUPS\_THIS\_CONSTANT", "\_CUPS\_THAT\_CONSTANT",
-etc.
-
-Typed enumerations should be used whenever possible to allow for type checking
-by the compiler.
-
-Comment blocks immediately follow each constant:
-
-    typedef enum cups_tray_e  /* Tray enumerations */
-    {
-      CUPS_TRAY_THIS,         /* This tray */
-      CUPS_TRAY_THAT          /* That tray */
-    } cups_tray_t;
-
-
-## MAKEFILE GUIDELINES
-
-The following is a guide to the makefile-based build system used by CUPS.
-These standards have been developed over the years to allow CUPS to be built on
-as many systems and environments as possible.
-
-
-### GENERAL ORGANIZATION
-
-The CUPS source code is organized functionally into a top-level makefile,
-include file, and subdirectories each with their own makefile and dependencies
-files.  The ".in" files are template files for the autoconf software and are
-used to generate a static version of the corresponding file.
-
-
-### MAKEFILE DOCUMENTATION
-
-Each makefile starts with the standard CUPS header containing the description
-of the file, and CUPS copyright and license notice:
-
-    #
-    # Makefile for ...
-    #
-    # Copyright 2016 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/".
-    #
-
-
-### PORTABLE MAKEFILE CONSTRUCTION
-
-CUPS uses a common subset of make program syntax to ensure that the software
-can be compiled "out of the box" on as many systems as possible.  The following
-is a list of assumptions we follow when constructing makefiles:
-
- Targets; we assume that the make program supports the notion of simple
-  targets of the form "name:" that perform tab-indented commands that follow
-  the target, e.g.:
-
-      target:
-      TAB target commands
-
- Dependencies; we assume that the make program supports recursive dependencies
-  on targets, e.g.:
-
-      target: foo bar
-      TAB target commands
-
-      foo: bla
-      TAB foo commands
-
-      bar:
-      TAB bar commands
-
-      bla:
-      TAB bla commands
-
- Variable Definition; we assume that the make program supports variable
-  definition on the command-line or in the makefile using the following form:
-
-      name=value
-
- Variable Substitution; we assume that the make program supports variable
-  substitution using the following forms:
-
-      - $(name); substitutes the value of "name",
-      - $(name:.old=.new); substitutes the value of "name" with the filename
-        extension ".old" changed to ".new",
-      - $(MAKEFLAGS); substitutes the command-line options passed to the
-        program without the leading hyphen (-),
-      - $$; substitutes a single $ character,
-      - $<; substitutes the current source file or dependency, and
-      - $@; substitutes the current target name.
-
- Suffixes; we assume that the make program supports filename suffixes with
-  assumed dependencies, e.g.:
-
-      .SUFFIXES: .c .o
-      .c.o:
-      TAB $(CC) $(CFLAGS) -o $@ -c $<
-
- Include Files; we assume that the make program supports the include
-  directive, e.g.:
-
-      include ../Makedefs
-      include Dependencies
-
- Comments; we assume that comments begin with a # character and proceed to the
-  end of the current line.
-
- Line Length; we assume that there is no practical limit to the length of
-  lines.
-
- Continuation of long lines; we assume that the \ character may be placed at
-  the end of a line to concatenate two or more lines in a makefile to form a
-  single long line.
-
- Shell; we assume a POSIX-compatible shell is present on the build system.
-
-
-### STANDARD VARIABLES
-
-The following variables are defined in the "Makedefs" file generated by the
-autoconf software:
-
- ALL_CFLAGS; the combined C compiler options,
- ALL_CXXFLAGS; the combined C++ compiler options,
- AMANDIR; the administrative man page installation directory (section 8/1m
-  depending on the platform),
- AR; the library archiver command,
- ARFLAGS; options for the library archiver command,
- AWK; the local awk command,
- BINDIR; the binary installation directory,
- BUILDROOT; optional installation prefix (defaults to DSTROOT),
- CC; the C compiler command,
- CFLAGS; options for the C compiler command,
- CHMOD; the chmod command,
- CXX; the C++ compiler command,
- CXXFLAGS; options for the C++ compiler command,
- DATADIR; the data file installation directory,
- DSO; the C shared library building command,
- DSOXX; the C++ shared library building command,
- DSOFLAGS; options for the shared library building command,
- INCLUDEDIR; the public header file installation directory,
- INSTALL; the install command,
- INSTALL_BIN; the program installation command,
- INSTALL_COMPDATA; the compressed data file installation command,
- INSTALL_CONFIG; the configuration file installation command,
- INSTALL_DATA; the data file installation command,
- INSTALL_DIR; the directory installation command,
- INSTALL_LIB; the library installation command,
- INSTALL_MAN; the documentation installation command,
- INSTALL_SCRIPT; the shell script installation command,
- LD; the linker command,
- LDFLAGS; options for the linker,
- LIBDIR; the library installation directory,
- LIBS; libraries for all programs,
- LN; the ln command,
- MAN1EXT; extension for man pages in section 1,
- MAN3EXT; extension for man pages in section 3,
- MAN5EXT; extension for man pages in section 5,
- MAN7EXT; extension for man pages in section 7,
- MAN8DIR; subdirectory for man pages in section 8,
- MAN8EXT; extension for man pages in section 8,
- MANDIR; the man page installation directory,
- OPTIM; common compiler optimization options,
- PRIVATEINCLUDE; the private header file installation directory,
- RM; the rm command,
- SHELL; the sh (POSIX shell) command,
- STRIP; the strip command,
- srcdir; the source directory.
-
-
-### STANDARD TARGETS
-
-The following standard targets are defined in each makefile:
-
- all; creates all target programs, libraries, and documentation files,
- clean; removes all target programs libraries, documentation files, and object
-  files,
- depend; generates automatic dependencies for any C or C++ source files (also
-  see "DEPENDENCIES"),
- distclean; removes autoconf-generated files in addition to those removed by
-  the "clean" target,
- install; installs all distribution files in their corresponding locations
-  (also see "INSTALL/UNINSTALL SUPPORT"),
- install-data; installs all data files in their corresponding locations (also
-  see "INSTALL/UNINSTALL SUPPORT"),
- install-exec; installs all executable files in their corresponding locations
-  (also see "INSTALL/UNINSTALL SUPPORT"),
- install-headers; installs all include files in their corresponding locations
-  (also see "INSTALL/UNINSTALL SUPPORT"),
- install-libs; installs all library files in their corresponding locations
-  (also see "INSTALL/UNINSTALL SUPPORT"), and
- uninstall; removes all distribution files from their corresponding locations
-  (also see "INSTALL/UNINSTALL SUPPORT").
-
-
-### OBJECT FILES
-
-Object files (the result of compiling a C or C++ source file) have the
-extension ".o".
-
-
-### PROGRAMS
-
-Program files are the result of linking object files and libraries together to
-form an executable file.  A typical program target looks like:
-
-    program: $(OBJS)
-    TAB echo Linking $@...
-    TAB $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-### STATIC LIBRARIES
-
-Static libraries have a prefix of "lib" and the extension ".a". A typical
-static library target looks like:
-
-    libname.a: $(OBJECTS)
-    TAB echo Creating $@...
-    TAB $(RM) $@
-    TAB $(AR) $(ARFLAGS) $@ $(OBJECTS)
-    TAB $(RANLIB) $@
-
-### SHARED LIBRARIES
-
-Shared libraries have a prefix of "lib" and the extension ".dylib" or ".so"
-depending on the operating system.  A typical shared library is composed of
-several targets that look like:
-
-    libname.so: $(OBJECTS)
-    TAB echo $(DSOCOMMAND) libname.so.$(DSOVERSION) ...
-    TAB $(DSOCOMMAND) libname.so.$(DSOVERSION) $(OBJECTS)
-    TAB $(RM) libname.so libname.so.$(DSOMAJOR)
-    TAB $(LN) libname.so.$(DSOVERSION) libname.so.$(DSOMAJOR)
-    TAB $(LN) libname.so.$(DSOVERSION) libname.so
-
-    libname.dylib: $(OBJECTS)
-    TAB echo $(DSOCOMMAND) libname.$(DSOVERSION).dylib ...
-    TAB $(DSOCOMMAND) libname.$(DSOVERSION).dylib \
-    TAB TAB -install_name $(libdir)/libname.$(DSOMAJOR).dylib \
-    TAB TAB -current_version libname.$(DSOVERSION).dylib \
-    TAB TAB -compatibility_version $(DSOMAJOR).0 \
-    TAB TAB $(OBJECTS) $(LIBS)
-    TAB $(RM) libname.dylib
-    TAB $(RM) libname.$(DSOMAJOR).dylib
-    TAB $(LN) libname.$(DSOVERSION).dylib libname.$(DSOMAJOR).dylib
-    TAB $(LN) libname.$(DSOVERSION).dylib libname.dylib
-
-### DEPENDENCIES
-
-Static dependencies are expressed in each makefile following the target, for
-example:
-
-    foo: bar
-
-Static dependencies are only used when it is not possible to automatically
-generate them.  Automatic dependencies are stored in a file named
-"Dependencies" and included at the end of the makefile.  The following "depend"
-target rule is used to create the automatic dependencies:
-
-    depend:
-    TAB $(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies
-
-We regenerate the automatic dependencies on an macOS system and express any
-non-macOS dependencies statically in the makefile.
-
-
-### INSTALL/UNINSTALL SUPPORT
-
-All makefiles contains install and uninstall rules which install or remove the
-corresponding software.  These rules must use the $(BUILDROOT) variable as a
-prefix to any installation directory so that CUPS can be installed in a
-temporary location for packaging by programs like rpmbuild.
-
-The $(INSTALL\_BIN), $(INSTALL\_COMPDATA), $(INSTALL\_CONFIG), $(INSTALL\_DATA),
-$(INSTALL\_DIR), $(INSTALL\_LIB), $(INSTALL\_MAN), and $(INSTALL\_SCRIPT) variables
-must be used when installing files so that the proper ownership and permissions
-are set on the installed files.
-
-The $(RANLIB) command must be run on any static libraries after installation
-since the symbol table is invalidated when the library is copied on some
-platforms.
-
@@ -1,10 +1,9 @@
-CREDITS - 2017-05-01
-====================
+CREDITS.txt - 2010-03-13
+------------------------

-Few projects are completed by one person, and CUPS is no exception.  We'd like
-to thank the following individuals for their contributions:
+Few projects are completed by one person, and CUPS is no exception.  We'd
+like to thank the following individuals for their contributions:

-    Niklas 'Nille' Åkerström       - Swedish localization.
    Nathaniel Barbour              - Lots of testing and feedback.
    N. Becker                      - setsid().
    Philippe Combes                - French localization and buttons script.
@@ -18,30 +17,26 @@ to thank the following individuals for their contributions:
    Wang Jian                      - CUPS RPM corrections.
    Roderick Johnstone             - Beta tester of the millenium.
    Till Kamppeter                 - Bug fixes, beta testing, evangelism.
+    I–aki Larra–aga                - Basque localization.
+    Kenshi Muto                    - Japanese localization, patches, and
+                                     testing.
    Tomohiro Kato                  - Japanese localization.
    Kiko                           - Bug fixes.
    Sergey V. Kovalyov             - ESP Print Pro and CUPS beta tester.
    Marek Laane                    - Estonian translation.
-    Iñaki Larrañaga                - Basque localization.
    Mark Lawrence                  - Microsoft interoperability testing.
    Jeff Licquia                   - Bug fixes, beta testing, evangelism.
    Jason McMullan                 - Original CUPS RPM distributions.
-    Àngel Mompó                    - Catalan localization.
    Wes Morgan                     - *BSD fixes.
-    Kenshi Muto                    - Japanese localization, patches, and
-                                     testing.
-    Brian Norris                   - Upstart support.
    Daniel Nylander                - Swedish localization.
-    Naruiko Ogasawara              - Japanese localization.
+    Niklas 'Nille' �kerstršm       - Swedish localization.
    Giulio Orsero                  - Bug fixes and testing.
    Michal Osowiecki               - Polish localization.
    Citra Paska                    - Indonesian localization.
    Kurt Pfeifle                   - Bug fixes, beta testing, evangelism.
    Vincenzo Reale                 - Italian localization.
    Petter Reinholdtsen            - HP-UX compiler stuff.
-    Juan Pablo González Riopedre   - Spanish localization.
-    Giovanni Scafora               - Italian localization.
-    Joachim Schwender              - German localization.
+    Juan Pablo Gonz‡lez Riopedre   - Spanish localization.
    Opher Shachar                  - Hebrew localization.
    Stuart Stevens                 - HP JetDirect IPP information.
    Andrea Suatoni                 - IRIX desktop integration and testing.
@@ -1,227 +0,0 @@
-INSTALL - CUPS v2.2.6 - 2017-11-01
-==================================
-
-This file describes how to compile and install CUPS from source code. For more
-information on CUPS see the file called "README.md".  A complete change log can
-be found in "CHANGES.md".
-
-Using CUPS requires additional third-party support software and printer drivers.
-These are typically included with your operating system distribution.  Apple
-does not endorse or support third-party support software for CUPS.
-
-> Note: Current versions of macOS DO NOT allow installation to /usr with the
-> default System Integrity Protection (SIP) settings.  In addition, we do not
-> recommend replacing the CUPS supplied with macOS because:
->
-> a. not all versions of CUPS are compatible with every macOS release,
->
-> b. code signing prevents replacement of system libraries and access to the
->    system keychain (needed for encrypted printer sharing), and
->
-> c. software updates will often replace parts of your local installation,
->    potentially rendering your system unusable.
->
-> Apple only supports using the Clang supplied with Xcode to build CUPS on
-> macOS.
-
-
-BEFORE YOU BEGIN
----------------
-
-You'll need ANSI-compliant C and C++ compilers, plus a make program and POSIX-
-compliant shell (/bin/sh).  The GNU compiler tools and Bash work well and we
-have tested the current CUPS code against several versions of GCC with excellent
-results.
-
-The makefiles used by the project should work with most versions of make.  We've
-tested them with GNU make as well as the make programs shipped by 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 GNU
-TLS library for encryption support on platforms other than iOS, macOS, or
-Windows, 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.
-
-On a stock Ubuntu install, the following command will install the required
-prerequisites:
-
-    sudo apt-get install autoconf build-essential libavahi-client-dev \
-         libgnutls28-dev libkrb5-dev libnss-mdns libpam-dev \
-         libsystemd-dev libusb-1.0-0-dev zlib1g-dev
-
-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 macOS.
-
-
-CONFIGURATION
-------------
-
-CUPS uses GNU autoconf, so you should find the usual "configure" script in the
-main CUPS source directory.  To configure CUPS for your system, type:
-
-    ./configure
-
-The default installation will put the CUPS software in the "/etc", "/usr", and
-"/var" directories on your system, which will overwrite any existing printing
-commands on your system.  Use the `--prefix` option to install the CUPS software
-in another location:
-
-    ./configure --prefix=/some/directory
-
-> Note: Current versions of macOS DO NOT allow installation to /usr with the
-> default System Integrity Protection (SIP) settings.
-
-To see a complete list of configuration options, use the `--help` option:
-
-    ./configure --help
-
-If any of the dependent libraries are not installed in a system default location
-(typically "/usr/include" and "/usr/lib") you'll need to set the CFLAGS,
-CPPFLAGS, CXXFLAGS, DSOFLAGS, and LDFLAGS environment variables prior to running
-configure:
-
-    setenv CFLAGS "-I/some/directory"
-    setenv CPPFLAGS "-I/some/directory"
-    setenv CXXFLAGS "-I/some/directory"
-    setenv DSOFLAGS "-L/some/directory"
-    setenv LDFLAGS "-L/some/directory"
-    ./configure ...
-
-or:
-
-    CFLAGS="-I/some/directory" \
-    CPPFLAGS="-I/some/directory" \
-    CXXFLAGS="-I/some/directory" \
-    DSOFLAGS="-L/some/directory" \
-    LDFLAGS="-L/some/directory" \
-    ./configure ...
-
-The `--enable-debug` option compiles CUPS with debugging information enabled.
-Additional debug logging support can be enabled using the
-`--enable-debug-printfs` option - these debug messages are enabled using the
-`CUPS_DEBUG_xxx` environment variables at run-time.
-
-CUPS also includes an extensive set of unit tests that can be used to find and
-diagnose a variety of common problems - use the "--enable-unit-tests" configure
-option to run them at build time.
-
-On macOS, 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
-
-or if you have FreeBSD, NetBSD, or OpenBSD type:
-
-    gmake ENTER
-
-to build the software.
-
-
-TESTING THE SOFTWARE
--------------------
-
-Aside from the built-in unit tests, CUPS includes an automated test framework
-for testing the entire printing system.  To run the tests, just type:
-
-    make check ENTER
-
-or if you have FreeBSD, NetBSD, or OpenBSD type:
-
-    gmake check ENTER
-
-The test framework runs a copy of the CUPS scheduler (cupsd) on port 8631 in
-/tmp/cups-$USER and produces a nice HTML report of the results.
-
-
-INSTALLING THE SOFTWARE
-----------------------
-
-Once you have built the software you need to install it.  The "install" target
-provides a quick way to install the software on your local system:
-
-    make install ENTER
-
-or for FreeBSD, NetBSD, or OpenBSD:
-
-    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, so
-it may be more convenient to use.
-
-You can find the RPM software at:
-
-    http://www.rpm.org/
-
-The EPM software is available at:
-
-    https://michaelrsweet.github.io/epm
-
-
-CREATING BINARY DISTRIBUTIONS WITH EPM
--------------------------------------
-
-The top level makefile supports generation of many types of binary distributions
-using EPM.  To build a binary distribution type:
-
-    make <format> ENTER
-
-or
-
-    gmake <format> ENTER
-
-for FreeBSD, NetBSD, and OpenBSD.  The <format> target is one of the following:
-
- "epm": Builds a script + tarfile package
- "bsd": Builds a *BSD package
- "deb": Builds a Debian package
- "pkg": Builds a Solaris package
- "rpm": Builds a RPM package
- "slackware": Build a Slackware package
-
-
-GETTING DEBUG LOGGING FROM CUPS
-------------------------------
-
-When configured with the `--enable-debug-printfs` option, CUPS compiles in
-additional debug logging support in the scheduler, CUPS API, and CUPS Imaging
-API.  The following environment variables are used to enable and control debug
-logging:
-
- `CUPS_DEBUG_FILTER`: Specifies a POSIX regular expression to control which
-  messages are logged.
- `CUPS_DEBUG_LEVEL`: Specifies a number from 0 to 9 to control the verbosity of
-  the logging. The default level is 1.
- `CUPS_DEBUG_LOG`: Specifies a log file to use.  Specify the name "-" to send
-  the messages to stderr.  Prefix a filename with "+" to append to an existing
-  file.  You can include a single "%d" in the filename to embed the current
-  process ID.
-
-
-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:
-
-    https://www.cups.org/
-
-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 from the
-configure script and make should also be sent, as it often helps to determine
-the cause of your problem.
-
-If you are running a version of Linux, be sure to provide the Linux distribution
-you have, too.
@@ -0,0 +1,207 @@
+INSTALL - CUPS v1.5.0 - 2011-07-25
+----------------------------------
+
+This file describes how to compile and install CUPS from source code. For more
+information on CUPS see the file called "README.txt".  A complete change log can
+be found in "CHANGES.txt".
+
+**** IF YOU HAVE A NON-POSTSCRIPT PRINTER AND ARE NOT       ****
+**** RUNNING MAC OS X, YOU WILL ALSO NEED TO INSTALL GPL    ****
+**** GHOSTSCRIPT WITH THE "cups" DRIVER AFTER YOU INSTALL   ****
+**** CUPS.                                                  ****
+
+
+BEFORE YOU BEGIN
+
+    You'll need ANSI-compliant C and C++ compilers, plus a make program and
+    POSIX-compliant shell (/bin/sh).  The GNU compiler tools and Bash work well
+    and we have tested the current CUPS code against several versions of GCC
+    with excellent results.
+
+    The makefiles used by the project should work with most versions of make.
+    We've tested them with GNU make as well as the make programs shipped by
+    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 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 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
+    Mac OS X.
+
+
+COMPILING THE SUBVERSION REPOSITORY CODE
+
+    The CUPS Subversion repository doesn't hold a copy of the pre-built
+    configure script.  You'll need to run the GNU autoconf software (2.60 or
+    higher) to create it:
+
+	autoconf
+
+
+CONFIGURATION
+
+    CUPS uses GNU autoconf, so you should find the usual "configure" script in
+    the main CUPS source directory.  To configure CUPS for your system, type:
+
+	./configure
+
+    The default installation will put the CUPS software in the "/etc", "/usr",
+    and "/var" directories on your system, which will overwrite any existing
+    printing commands on your system.  Use the "--prefix" option to install the
+    CUPS software in another location:
+
+	./configure --prefix=/some/directory
+
+    To see a complete list of configuration options, use the --help option:
+
+        ./configure --help
+
+    If any of the dependent libraries are not installed in a system default
+    location (typically "/usr/include" and "/usr/lib") you'll need to set the
+    CFLAGS, CPPFLAGS, CXXFLAGS, DSOFLAGS, and LDFLAGS environment variables
+    prior to running configure:
+
+	setenv CFLAGS "-I/some/directory"
+	setenv CPPFLAGS "-I/some/directory"
+	setenv CXXFLAGS "-I/some/directory"
+	setenv DSOFLAGS "-L/some/directory"
+	setenv LDFLAGS "-L/some/directory"
+	./configure ...
+
+    or:
+
+	CFLAGS="-I/some/directory" \
+	CPPFLAGS="-I/some/directory" \
+	CXXFLAGS="-I/some/directory" \
+	DSOFLAGS="-L/some/directory" \
+	LDFLAGS="-L/some/directory" \
+	./configure ...
+
+    The "--enable-debug" option compiles CUPS with debugging information
+    enabled.  Additional debug logging support can be enabled using the
+    "--enable-debug-printfs" option - these debug messages are enabled using the
+    CUPS_DEBUG_LOG environment variable at run-time.
+
+    CUPS also includes an extensive set of unit tests that can be used to find
+    and diagnose a variety of common problems - use the "--enable-unit-tests"
+    configure option to run them at build time.
+
+    Once you have configured things, just type:
+
+	make ENTER
+
+    or if you have FreeBSD, NetBSD, or OpenBSD type:
+
+	gmake ENTER
+
+    to build the software.
+
+
+TESTING THE SOFTWARE
+
+    Aside from the built-in unit tests, CUPS includes an automated test
+    framework for testing the entire printing system.  To run the tests, just
+    type:
+
+	make check ENTER
+
+    or if you have FreeBSD, NetBSD, or OpenBSD type:
+
+	gmake check ENTER
+
+    The test framework runs a copy of the CUPS scheduler (cupsd) on port 8631
+    in /tmp/cups-$USER and produces a nice HTML report of the results.
+
+
+INSTALLING THE SOFTWARE
+
+    Once you have built the software you need to install it.  The "install"
+    target provides a quick way to install the software on your local system:
+
+	make install ENTER
+
+    or for FreeBSD, NetBSD, or OpenBSD:
+
+	gmake 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,
+    so it may be more convenient to use.
+
+    You can find the RPM software at:
+
+	http://www.rpm.org/
+
+    The EPM software is available at:
+
+	http://www.epmhome.org/
+
+
+CREATING BINARY DISTRIBUTIONS WITH EPM
+
+    The top level makefile supports generation of many types of binary
+    distributions using EPM.  To build a binary distribution type:
+
+	make <format> ENTER
+
+    or
+
+	gmake <format> ENTER
+
+    for FreeBSD, NetBSD, and OpenBSD.  The <format> target is one of the
+    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
+
+    When configured with the "--enable-debug-printfs" option, CUPS compiles in
+    additional debug logging support in the scheduler, CUPS API, and CUPS
+    Imaging API.  The following environment variables are used to enable and
+    control debug logging:
+
+        CUPS_DEBUG_FILTER  Specifies a POSIX regular expression to control
+	                   which messages are logged.
+	CUPS_DEBUG_LEVEL   Specifies a number from 0 to 9 to control the
+	                   verbosity of the logging. The default level is 1.
+        CUPS_DEBUG_LOG     Specifies a log file to use.  Specify the name "-"
+	                   to send the messages to stderr.  Prefix a filename
+			   with "+" to append to an existing file.
+
+
+REPORTING PROBLEMS
+
+    If you have problems, READ THE DOCUMENTATION FIRST!  If the documentation
+    does not solve your problems, please post a message on the "cups.general"
+    forum at:
+
+        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
+    from the configure script and make should also be sent, as it often helps to
+    determine the cause of your problem.
+
+    If you are running a version of Linux, be sure to provide the Linux
+    distribution you have, too.
@@ -0,0 +1,145 @@
+IPPTOOL.txt - 2011-12-02
+------------------------
+
+See the file CHANGES-IPPTOOL.txt for a list of changes to this software.
+
+
+INTRODUCTION
+
+    Starting with CUPS 1.5, CUPS now installs 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.
+
+
+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
+    attribute values. Several standard files are included with CUPS, for example
+    to show a list of pending print jobs on a CUPS printer called "myprinter"
+    you'd run:
+
+        ipptool ipp://localhost/printers/myprinter get-jobs.test
+
+    which would produce something like this:
+
+	job-id job-state    job-name     job-originating-user-name
+	------ ------------ ------------ -------------------------
+	72     pending      testfile.pdf msweet
+	73     pending      testfile.ps  msweet
+	74     pending-held testfile.jpg msweet
+	75     pending-held testfile.txt msweet
+
+    To get output suitable for import into a spreadsheet, use the "-c" (CSV)
+    option:
+
+        ipptool -c ipp://localhost/printers/myprinter get-jobs.test
+
+    which will produce something like this:
+
+	job-id,job-state,job-name,job-originating-user-name
+	72,pending,testfile.pdf,msweet
+	73,pending,testfile.ps,msweet
+	74,pending-held,testfile.jpg,msweet
+	75,pending-held,testfile.txt,msweet
+
+
+CONFORMANCE TESTS
+
+    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
+        ipptool -tf filename [options] -I -V 2.1 printer-uri ipp-2.1.test
+        ipptool -tf filename [options] -I -V 2.2 printer-uri ipp-2.2.test
+
+    The filename must use a format supported by the printer; ipptool will guess
+    the MIME media type using the extension, otherwise application/octet stream
+    will be used.  The following standard test files are included:
+
+	color.jpg
+	document-a4.pdf
+	document-a4.ps
+	document-letter.pdf
+	document-letter.ps
+	gray.jpg
+	onepage-a4.pdf
+	onepage-a4.ps
+	onepage-letter.pdf
+	onepage-letter.ps
+
+    Print-by-reference (URL) printing can be tested by defining the document-uri
+    variable to a URL, for example:
+
+        ipptool -tf filename -d document-uri=url -I printer-uri ipp-1.1.test
+
+    The standard test files are available on cups.org under the "test"
+    directory, for example:
+
+	http://www.cups.org/test/document-a4.pdf
+
+    The "document" test files contain 4 pages each.  Doing the IPP conformance
+    tests will will produce up to 90 pages on various media, depending on the
+    printer.
+
+
+READING THE DOCUMENTATION
+
+    The command usage is described in the ipptest(1) man page, while the file
+    format is described in the ipptestfile(5) man page.
+
+
+GETTING SUPPORT AND OTHER RESOURCES
+
+    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide many
+    discussion forums which are available at:
+
+	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 ipptool, please fill out the
+    bug form at:
+
+	http://www.cups.org/str.php
+
+    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 ipptool, please also re-run the
+    test with debug logging enabled.  Run the following commands on Windows to
+    enable debug logging:
+
+	set CUPS_DEBUG_LOG=ipptool.log
+	set CUPS_DEBUG_LEVEL=6
+
+    For Linux and Mac OS X use:
+
+	CUPS_DEBUG_LOG=ipptool.log; export CUPS_DEBUG_LOG
+	CUPS_DEBUG_LEVEL=6; export CUPS_DEBUG_LEVEL
+
+    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-2011 by Apple Inc.  CUPS and the CUPS logo are
+    trademarks of Apple Inc.
+
+    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
+
+    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
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the "doc/help/license.html" or "LICENSE.txt" files for more information.
@@ -1,6 +1,6 @@
                          CUPS License Agreement

-		      Copyright 2007-2016 by Apple Inc.
+		      Copyright 2007-2011 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;

@@ -68,11 +68,11 @@ the following special exception:
 	   source code of the Apple OS-Developed Software.

 	b. An Apple Operating System means any operating system
-	   software developed and/or marketed by Apple Inc.,
-	   including but not limited to all existing releases and
-	   versions of Apple's Darwin, iOS, macOS, macOS Server, and
-	   tvOS products and all follow-on releases and future
-	   versions thereof.
+	   software developed and/or marketed by Apple Computer,
+	   Inc., including but not limited to all existing
+	   releases and versions of Apple's Darwin, Mac OS X,
+	   and Mac OS X Server products and all follow-on
+	   releases and future versions thereof.

 	c. This exception is only available for Apple
 	   OS-Developed Software and does not apply to software
@@ -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,22 +1,17 @@
 #
-# Common makefile definitions for CUPS.
+# "$Id$"
 #
-# Copyright 2007-2017 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#   Common makefile definitions for CUPS.
 #
-# 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
-# missing or damaged, see the license at "http://www.cups.org/".
+#   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/".
 #
-# CUPS version...
-#
-
-CUPS_VERSION    =       @CUPS_VERSION@
-

 #
 # Programs...
@@ -24,19 +19,16 @@ CUPS_VERSION    =       @CUPS_VERSION@

 AR		=	@AR@
 AWK		=	@AWK@
-CC		=	@LIBTOOL_CC@ @CC@
+CC		=	@LIBTOOL@ @CC@
 CHMOD		=	@CHMOD@
-CXX		=	@LIBTOOL_CXX@ @CXX@
+CXX		=	@LIBTOOL@ @CXX@
 DSO		=	@DSO@
 DSOXX		=	@DSOXX@
-GZIP		=	@GZIP@
+HTMLDOC		=	@HTMLDOC@
 INSTALL		=	@INSTALL@
 LD		=	@LD@
-LD_CC		=	@LD_CC@
-LD_CXX		=	@LD_CXX@
 LIBTOOL		=	@LIBTOOL@
 LN		=	@LN@ -sf
-MKDIR           =       @MKDIR@ -p
 MV		=	@MV@
 RANLIB		=	@RANLIB@
 RM		=	@RM@ -f
@@ -48,14 +40,13 @@ SHELL		=	/bin/sh
 # Installation programs...
 #

-INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
-INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
 INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA	=	$(INSTALL) -c -m 444
 INSTALL_DIR	=	$(INSTALL) -d
-INSTALL_LIB	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
 INSTALL_MAN	=	$(INSTALL) -c -m 444
-INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+INSTALL_SCRIPT	=	$(INSTALL) -c -m 555

 #
 # Default user, group, and system groups for the scheduler...
@@ -71,7 +62,6 @@ CUPS_PRIMARY_SYSTEM_GROUP =	@CUPS_PRIMARY_SYSTEM_GROUP@
 #

 CUPS_CONFIG_FILE_PERM = @CUPS_CONFIG_FILE_PERM@
-CUPS_CUPSD_FILE_PERM = @CUPS_CUPSD_FILE_PERM@
 CUPS_LOG_FILE_PERM = @CUPS_LOG_FILE_PERM@

 #
@@ -82,14 +72,6 @@ LANGUAGES	=	@LANGUAGES@
 INSTALL_LANGUAGES =	@INSTALL_LANGUAGES@
 UNINSTALL_LANGUAGES =	@UNINSTALL_LANGUAGES@

-#
-# Cross-compilation support: "local" target is used for any tools that are
-# built and run locally.
-#
-
-LOCALTARGET     =       @LOCALTARGET@
-
-
 #
 # Libraries...
 #
@@ -137,9 +119,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@
@@ -154,16 +136,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) $(SSLLIBS) $(LIBZ)
+LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ)
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
 LIBS		=	$(LINKCUPS) $(COMMONLIBS)
-ONDEMANDFLAGS	=	@ONDEMANDFLAGS@
-ONDEMANDLIBS	=	@ONDEMANDLIBS@
 OPTIM		=	@OPTIM@
 OPTIONS		=
 PAMLIBS		=	@PAMLIBS@
@@ -217,6 +196,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@
@@ -231,7 +212,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@
@@ -242,15 +225,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@


 #
@@ -277,3 +253,8 @@ USBQUIRKS	=	@USBQUIRKS@
 	echo -n Compressing $<...
 	$(RM) $@
 	gzip -v9 <$< >$@
+
+
+#
+# End of "$Id$"
+#
@@ -1,14 +1,16 @@
 #
-# Top-level Makefile for CUPS.
+# "$Id$"
 #
-# Copyright 2007-2016 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#   Top-level Makefile for CUPS.
 #
-# 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
-# missing or damaged, see the license at "http://www.cups.org/".
+#   Copyright 2007-2010 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/".
 #

 include Makedefs
@@ -96,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


 #
@@ -122,14 +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.
-#
-# Alternatively, use "--analyze -Xanalyzer -analyzer-output=text" for OPTIM (text
-# output instead of HTML...)
+# 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
@@ -140,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...
 #
@@ -262,18 +242,24 @@ debugcheck:	all unittests


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

 apihelp:
-	for dir in cups filter; do\
+	for dir in cgi-bin cups filter ppdc scheduler; do\
 		echo Generating API help in $$dir... ;\
 		(cd $$dir; $(MAKE) $(MFLAGS) apihelp) || exit 1;\
 	done

+framedhelp:
+	for dir in cgi-bin cups filter ppdc scheduler; do\
+		echo Generating framed API help in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) framedhelp) || exit 1;\
+	done
+

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

 docset:	apihelp
@@ -289,10 +275,10 @@ docset:	apihelp
 		doc/help/api-*.tokens
 	$(RM) doc/help/api-*.tokens
 	echo Indexing docset...
-	/Applications/Xcode.app/Contents/Developer/usr/bin/docsetutil index org.cups.docset
+	/Developer/usr/bin/docsetutil index org.cups.docset
 	echo Generating docset archive and feed...
 	$(RM) org.cups.docset.atom
-	/Applications/Xcode.app/Contents/Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
+	/Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
 		--atom org.cups.docset.atom \
 		--download-url http://www.cups.org/org.cups.docset.xar \
 		org.cups.docset
@@ -309,20 +295,28 @@ 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 epm pkg rpm slackware:
+aix bsd deb depot inst pkg setld slackware swinstall tardist:
 	epm $(EPMFLAGS) -f $@ cups packaging/cups.list

-.PHONY:	dist
+epm:
+	epm $(EPMFLAGS) -s packaging/installer.gif cups packaging/cups.list
+
+rpm:
+	epm $(EPMFLAGS) -f rpm -s packaging/installer.gif cups packaging/cups.list
+
+.PHONEY:	dist
 dist:	all
 	$(RM) -r dist
 	$(MAKE) $(MFLAGS) epm
 	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
@@ -333,3 +327,8 @@ dist:	all
 #

 .NOTPARALLEL:
+
+
+#
+# End of "$Id$".
+#
@@ -1,160 +0,0 @@
-README - CUPS v2.2.6 - 2017-11-01
-=================================
-
-Looking for compile instructions?  Read the file `INSTALL.md` instead...
-
-
-INTRODUCTION
------------
-
-
-CUPS is a standards-based, open source printing system developed by Apple Inc.
-for macOS® and other UNIX®-like operating systems.  CUPS uses the Internet
-Printing Protocol ("IPP") and provides System V and Berkeley command-line
-interfaces, a web interface, and a C API to manage printers and print jobs.  It
-supports printing to both local (parallel, serial, USB) and networked printers,
-and printers can be shared from one computer to another, even over the Internet!
-
-Internally, CUPS uses PostScript Printer Description ("PPD") files to describe
-printer capabilities and features and a wide variety of generic and device-
-specific programs to convert and print many types of files.  Sample drivers are
-included with CUPS to support many Dymo, EPSON, HP, Intellitech, OKIDATA, and
-Zebra printers.  Many more drivers are available online and (in some cases) on
-the driver CD-ROM that came with your printer.
-
-CUPS is licensed under the GNU General Public License and GNU Library General
-Public License versions 2.  See the file "LICENSE.txt" for more information.
-
-
-READING THE DOCUMENTATION
-------------------------
-
-Once you have installed the software you can access the documentation (and a
-bunch of other stuff) online at <http://localhost:631/>.
-
-If you're having trouble getting that far, the documentation is located under
-the `doc/help` and `man` directories.
-
-Please read the documentation before asking questions.
-
-
-GETTING SUPPORT AND OTHER RESOURCES
-----------------------------------
-
-If you have problems, *read the documentation first!*  We also provide two
-mailing lists which are available at <https://lists.cups.org/mailman/listinfo>.
-
-See the CUPS web site at <https://www.cups.org/> for other resources.
-
-
-SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
------------------------------------------------
-
-CUPS includes a web-based administration tool that allows you to manage
-printers, classes, and jobs on your server.  Open <http://localhost:631/admin/>
-in your browser to access the printer administration tools:
-
-*Do not* use the hostname for your machine - it will not work with the default
-CUPS configuration.  To enable administration access on other addresses, check
-the `Allow Remote Administration` box and click on the `Change Settings button.
-
-You will be asked for the administration password (root or any other user in the
-sys/system/root/admin/lpadmin group on your system) when performing any
-administrative function.
-
-
-SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
-----------------------------------------------
-
-CUPS currently uses PPD (PostScript Printer Description) files that describe
-printer capabilities and driver programs needed for each printer.  The
-`everywhere` PPD is used for nearly all modern networks printers sold since
-about 2009.  For example, the following command creates a print queue for a
-printer at address 11.22.33.44:
-
-    lpadmin -p printername -E -v ipp://11.22.33.44/ipp/print -m everywhere
-
-CUPS also includes several sample PPD files you can use for "legacy" printers:
-
-    Driver                         PPD Name
-    -----------------------------  ------------------------------
-    Dymo Label Printers            drv:///sample.drv/dymo.ppd
-    Intellitech Intellibar         drv:///sample.drv/intelbar.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
-    Generic PostScript Printer     drv:///sample.drv/generic.ppd
-    HP DeskJet Series              drv:///sample.drv/deskjet.ppd
-    HP LaserJet Series             drv:///sample.drv/laserjet.ppd
-    OKIDATA 9-Pin Series           drv:///sample.drv/okidata9.ppd
-    OKIDATA 24-Pin Series          drv:///sample.drv/okidat24.ppd
-    Zebra CPCL Label Printer       drv:///sample.drv/zebracpl.ppd
-    Zebra EPL1 Label Printer       drv:///sample.drv/zebraep1.ppd
-    Zebra EPL2 Label Printer       drv:///sample.drv/zebraep2.ppd
-    Zebra ZPL Label Printer        drv:///sample.drv/zebra.ppd
-
-You can run the `lpinfo -m` command to list all of the available drivers:
-
-    lpinfo -m
-
-Run the `lpinfo -v` command to list the available printers:
-
-    lpinfo -v
-
-Then use the correct URI to add the printer using the `lpadmin` command:
-
-    lpadmin -p printername -E -v device-uri -m ppd-name
-
-Current network printers typically use `ipp` or `ipps` URIS:
-
-    lpadmin -p printername -E -v ipp://11.22.33.44/ipp/print -m everywhere
-    lpadmin -p printername -E -v ipps://11.22.33.44/ipp/print -m everywhere
-
-Older network printers typically use `socket` or `lpd` URIs:
-
-    lpadmin -p printername -E -v socket://11.22.33.44 -m ppd-name
-    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.  Other drivers provide
-greater printing capabilities.
-
-
-PRINTING FILES
--------------
-
-CUPS provides both the System V `lp` and Berkeley `lpr` commands for printing:
-
-    lp filename
-    lpr filename
-
-Both the `lp` and `lpr` commands support printing options for the driver:
-
-    lp -o media=A4 -o resolution=600dpi filename
-    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.
-
-If you have an application that generates output specifically for your printer
-then you need to use the `-oraw` or `-l` options:
-
-    lp -o raw filename
-    lpr -l filename
-
-This will prevent the filters from misinterpreting your print file.
-
-
-LEGAL STUFF
-----------
-
-CUPS is copyright © 2007-2017 by Apple Inc.  CUPS and the CUPS logo are
-trademarks of Apple Inc.
-
-The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
-
-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 the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-`doc/help/license.html` or `LICENSE.txt` files for more information.
@@ -0,0 +1,164 @@
+README - CUPS v1.5.0 - 2011-07-25
+----------------------------------
+
+Looking for compile instructions?  Read the file "INSTALL.txt"
+instead...
+
+
+INTRODUCTION
+
+    CUPS is a standards-based, open source printing system developed by Apple
+    Inc. for Mac OS® X and other UNIX®-like operating systems.  CUPS uses the
+    Internet Printing Protocol ("IPP") and provides System V and Berkeley
+    command-line interfaces, a web interface, and a C API to manage printers and
+    print jobs.  It supports printing to both local (parallel, serial, USB) and
+    networked printers, and printers can be shared from one computer to another,
+    even over the Internet!
+
+    Internally, CUPS uses PostScript Printer Description ("PPD") files to
+    describe printer capabilities and features and a wide variety of generic
+    and device-specific programs to convert and print many types of files.
+    Sample drivers are included with CUPS to support many Dymo, EPSON, HP,
+    Intellitech, OKIDATA, and Zebra printers.  Many more drivers are available
+    online and (in some cases) on the driver CD-ROM that came with your printer.
+
+    CUPS is licensed under the GNU General Public License and GNU Library
+    General Public License versions 2.  See the file "LICENSE.txt" for more
+    information.
+
+
+READING THE DOCUMENTATION
+
+    Once you have installed the software you can access the documentation (and
+    a bunch of other stuff) online at:
+
+	http://localhost:631/
+
+    If you're having trouble getting that far, the documentation is located
+    under the "doc/help" directory.
+
+    Please read the documentation before asking questions.
+
+
+GETTING SUPPORT AND OTHER RESOURCES
+
+    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide many
+    discussion forums which are available at:
+
+	http://www.cups.org/newsgroups.php
+
+    See the CUPS web site at "http://www.cups.org/" for other resources.
+
+
+SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
+
+    CUPS includes a web-based administration tool that allows you to manage
+    printers, classes, and jobs on your server.  Open the following URL in your
+    browser to access the printer administration tools:
+
+	http://localhost:631/admin/
+
+    DO NOT use the hostname for your machine - it will not work with the default
+    CUPS configuration.  To enable administration access on other addresses,
+    check the "Allow Remote Administration" box and click on the "Change
+    Settings" button.
+
+    You will be asked for the administration password (root or any other user in
+    the sys/system/root/admin/lpadmin group on your system) when performing any
+    administrative function.
+
+
+SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
+
+    CUPS works best with PPD (PostScript Printer Description) files.  In a pinch
+    you can also use System V style printer interface scripts.
+
+    CUPS includes several sample PPD files you can use:
+
+	Driver                         PPD Name
+	-----------------------------  ------------------------------
+	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
+	Generic PostScript Printer     drv:///sample.drv/generic.ppd
+	HP DeskJet Series              drv:///sample.drv/deskjet.ppd
+	HP LaserJet Series             drv:///sample.drv/laserjet.ppd
+	OKIDATA 9-Pin Series           drv:///sample.drv/okidata9.ppd
+	OKIDATA 24-Pin Series          drv:///sample.drv/okidat24.ppd
+	Zebra CPCL Label Printer       drv:///sample.drv/zebracpl.ppd
+	Zebra EPL1 Label Printer       drv:///sample.drv/zebraep1.ppd
+	Zebra EPL2 Label Printer       drv:///sample.drv/zebraep2.ppd
+	Zebra ZPL Label Printer        drv:///sample.drv/zebra.ppd
+
+    Run the "lpinfo -m" command to list the available drivers:
+
+        lpinfo -m
+
+    Run the "lpinfo -v" command to list the available printers:
+
+        lpinfo -v
+
+    Then use the correct URI to add the printer using the "lpadmin" command:
+
+        lpadmin -p printername -E -v device-uri -m ppd-name
+
+    Network printers typically use "socket" or "lpd" URIs:
+
+        lpadmin -p printername -E -v socket://11.22.33.44 -m ppd-name
+        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.  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
+
+    CUPS provides both the System V "lp" and Berkeley "lpr" commands for
+    printing:
+
+	lp filename
+	lpr filename
+
+    Both the "lp" and "lpr" commands support printing options for the driver:
+
+	lp -o media=A4 -o resolution=600dpi filename
+	lpr -o media=A4 -o resolution=600dpi filename
+
+    CUPS recognizes many types of images files as well as PDF, PostScript,
+    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:
+
+	lp -o raw filename
+	lpr -l filename
+
+    This will prevent the filters from misinterpreting your print
+    file.
+
+
+LEGAL STUFF
+
+    CUPS is Copyright 2007-2011 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
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the "doc/help/license.html" or "LICENSE.txt" files for more information.
@@ -1,72 +1,72 @@
-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/thread-private.h \
-  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.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/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/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/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/thread-private.h \
-  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
+ipp.o: ipp.c backend-private.h ../cups/cups-private.h ../cups/cups.h \
+  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
+  ../cups/array.h ../cups/language.h ../cups/string-private.h \
+  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
+  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
+  ../cups/transcode.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/cups.h ../cups/file.h \
+  ../cups/language.h ../cups/string-private.h ../cups/debug-private.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/pwg-private.h \
+  ../cups/language-private.h ../cups/transcode.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/cups.h \
+  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
+  ../cups/array.h ../cups/language.h ../cups/string-private.h \
+  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
+  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
+  ../cups/transcode.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/cups.h \
+  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
+  ../cups/array.h ../cups/language.h ../cups/string-private.h \
+  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
+  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
+  ../cups/transcode.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/cups.h ../cups/file.h \
+  ../cups/language.h ../cups/string-private.h ../cups/debug-private.h \
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/pwg-private.h \
+  ../cups/language-private.h ../cups/transcode.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/thread-private.h \
-  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
+  backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h ../cups/debug-private.h ../cups/ppd-private.h \
+  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
+  ../cups/transcode.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/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
+  ../cups/http.h ../cups/array.h ../cups/language.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/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/thread-private.h \
-  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
-  usb-darwin.c ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/raster.h
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/pwg-private.h \
+  ../cups/http-private.h ../cups/md5-private.h ../cups/ipp-private.h \
+  ../cups/language-private.h ../cups/transcode.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/cups.h \
+  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
+  ../cups/array.h ../cups/language.h ../cups/string-private.h \
+  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
+  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
+  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
+  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
+  ../cups/backend.h ../cups/sidechannel.h usb-darwin.c \
+  ../cups/file-private.h
@@ -1,16 +1,18 @@
 #
-# Backend makefile for CUPS.
+# "$Id$"
 #
-# Copyright 2007-2017 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#   Backend makefile for CUPS.
 #
-# 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
-# missing or damaged, see the license at "http://www.cups.org/".
+#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
-# This file is subject to the Apple OS-Developed Software exception.
+#   These coded instructions, statements, and computer programs are the
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
+#
+#   This file is subject to the Apple OS-Developed Software exception.
 #

 include ../Makedefs
@@ -19,20 +21,13 @@ include ../Makedefs
 # Object files...
 #

-# 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...
-#
-# See http://www.cups.org/doc/api-filter.html for more info...
 RBACKENDS =	\
 		ipp \
 		lpd \
 		$(DNSSD_BACKEND)
 UBACKENDS =	\
 		snmp \
-		socket
-ULBACKENDS =	\
+		socket \
 		usb
 UNITTESTS =	\
 		test1284 \
@@ -41,8 +36,7 @@ UNITTESTS =	\
 TARGETS =	\
 		libbackend.a \
 		$(RBACKENDS) \
-		$(UBACKENDS) \
-		$(ULBACKENDS)
+		$(UBACKENDS)
 LIBOBJS	=	\
 		ieee1284.o \
 		network.o \
@@ -71,7 +65,7 @@ all:	$(TARGETS)
 # Make library targets...
 #

-libs:	$(ULBACKENDS)
+libs:


 #
@@ -86,7 +80,7 @@ unittests:	$(UNITTESTS)
 #

 clean:
-	$(RM) $(OBJS) $(TARGETS) $(UNITTESTS) $(LIBOBJS) http https ipps mdns socket-static
+	$(RM) $(OBJS) $(TARGETS) $(UNITTESTS) $(LIBOBJS) http https ipps mdns


 #
@@ -109,11 +103,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


 #
@@ -133,15 +122,14 @@ install-exec:	$(INSTALLXPC)
 		$(RM) $(SERVERBIN)/backend/$$file; \
 		$(LN) ipp $(SERVERBIN)/backend/$$file; \
 	done
-	if test "x$(DNSSD_BACKEND)" != x -a `uname` = Darwin; then \
+	if test "x$(DNSSD_BACKEND)" != x; then \
 		$(RM) $(SERVERBIN)/backend/mdns; \
 		$(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \
 	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

@@ -167,18 +155,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


 #
@@ -191,7 +167,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 \
@@ -207,7 +183,7 @@ uninstall:

 test1284:	test1284.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
+	$(CC) $(LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)


@@ -217,7 +193,7 @@ test1284:	test1284.o ../cups/$(LIBCUPSSTATIC)

 testbackend:	testbackend.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
+	$(CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)


@@ -227,7 +203,7 @@ testbackend:	testbackend.o ../cups/$(LIBCUPSSTATIC)

 testsupplies:	testsupplies.o libbackend.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
+	$(CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
 		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
 		$(COMMONLIBS) $(LIBZ)

@@ -249,11 +225,9 @@ libbackend.a:	$(LIBOBJS)

 dnssd:	dnssd.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
-	if test `uname` = Darwin; then \
-		$(RM) mdns; \
-		$(LN) dnssd mdns; \
-	fi
+	$(CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
+	$(RM) mdns
+	$(LN) dnssd mdns


 #
@@ -262,7 +236,7 @@ dnssd:	dnssd.o ../cups/$(LIBCUPS) libbackend.a

 ipp:	ipp.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
+	$(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
 	$(RM) http
 	$(LN) ipp http

@@ -273,7 +247,7 @@ ipp:	ipp.o ../cups/$(LIBCUPS) libbackend.a

 lpd:	lpd.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
+	$(CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)


 #
@@ -282,7 +256,7 @@ lpd:	lpd.o ../cups/$(LIBCUPS) libbackend.a

 snmp:	snmp.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
+	$(CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)


 #
@@ -291,13 +265,7 @@ snmp:	snmp.o ../cups/$(LIBCUPS) libbackend.a

 socket:	socket.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
-
-socket-static:	socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
-	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o socket-static socket.o libbackend.a \
-		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-		$(COMMONLIBS) $(LIBZ)
+	$(CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)


 #
@@ -306,7 +274,7 @@ socket-static:	socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a

 usb:	usb.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
+	$(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
 		$(BACKLIBS) $(LIBS)
 usb.o:	usb.c usb-darwin.c usb-libusb.c usb-unix.c

@@ -316,3 +284,8 @@ usb.o:	usb.c usb-darwin.c usb-libusb.c usb-unix.c
 #

 include Dependencies
+
+
+#
+# End of "$Id$".
+#
@@ -1,16 +1,18 @@
 /*
- * Backend support definitions for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Backend support definitions for CUPS.
 *
- * 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/".
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
 */

 #ifndef _CUPS_BACKEND_PRIVATE_H_
@@ -257,20 +259,6 @@ extern "C" {
 #define CUPS_TC_inserts				33
 #define CUPS_TC_covers				34

-#define CUPS_TC_tenThousandthsOfInches		3
-#define CUPS_TC_micrometers			4
-#define CUPS_TC_impressions			7
-#define CUPS_TC_sheets				8
-#define CUPS_TC_hours				11
-#define CUPS_TC_thousandthsOfOunces		12
-#define CUPS_TC_tenthsOfGrams			13
-#define CUPS_TC_hundrethsOfFluidOunces		14
-#define CUPS_TC_tenthsOfMilliliters		15
-#define CUPS_TC_feet				16
-#define CUPS_TC_meters				17
-#define CUPS_TC_items				18
-#define CUPS_TC_percent				19
-
 /* These come from RFC 3808 to define character sets we support */
 /* Also see http://www.iana.org/assignments/character-sets */
 #define CUPS_TC_csASCII				3
@@ -311,8 +299,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);
-extern http_addrlist_t	*backendLookup(const char *hostname, int port, int *cancel);
+				            int make_model_size);
 extern int		backendNetworkSideCB(int print_fd, int device_fd,
 			                     int snmp_fd, http_addr_t *addr,
 					     int use_bc);
@@ -330,3 +317,8 @@ extern int		backendWaitLoop(int snmp_fd, http_addr_t *addr,
 }
 #  endif /* __cplusplus */
 #endif /* !_CUPS_BACKEND_PRIVATE_H_ */
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,16 +1,24 @@
 /*
- * IEEE-1284 support functions for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   IEEE-1284 support functions for CUPS.
 *
- * 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/".
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * Contents:
+ *
+ *   backendGetDeviceID()  - Get the IEEE-1284 device ID string and
+ *                           corresponding URI.
+ *   backendGetMakeModel() - Get the make and model string from the device ID.
 */

 /*
@@ -18,7 +26,7 @@
 */

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


 /*
@@ -88,7 +96,7 @@ backendGetDeviceID(
    *device_id = '\0';

 #  ifdef __linux
-    if (ioctl(fd, LPIOC_GET_DEVICE_ID((unsigned)device_id_size), device_id))
+    if (ioctl(fd, LPIOC_GET_DEVICE_ID(device_id_size), device_id))
    {
     /*
      * Linux has to implement things differently for every device it seems.
@@ -140,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;
@@ -169,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
@@ -178,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;
@@ -210,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';
      }
    }
@@ -276,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...
@@ -361,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 */
@@ -370,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...
@@ -471,3 +484,8 @@ backendGetMakeModel(

  return (0);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,16 +1,28 @@
 /*
- * Line Printer Daemon backend for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Line Printer Daemon backend for CUPS.
 *
- * 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/".
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * 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_timeout()     - Handle timeout alarms...
+ *   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.
 */

 /*
@@ -75,15 +87,18 @@ static int	abort_job = 0;		/* Non-zero if we get SIGTERM */
 * Local functions...
 */

-static int	cups_rresvport(int *port, int family);
-static int	lpd_command(int lpd_fd, char *format, ...);
+static int	lpd_command(int lpd_fd, int timeout, char *format, ...);
 static int	lpd_queue(const char *hostname, http_addrlist_t *addrlist,
 			  const char *printer, int print_fd, int snmp_fd,
 			  int mode, const char *user, const char *title,
 			  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);
+			  int contimeout);
+static void	lpd_timeout(int sig);
+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 */
 static void	sigterm_handler(int sig);


@@ -111,8 +126,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 		*filename,		/* File to print */
 		title[256];		/* Title string */
  int		port;			/* Port number */
+  char		portname[256];		/* Port name (string) */
  http_addrlist_t *addrlist;		/* List of addresses for printer */
-  int		snmp_enabled = 1;	/* Is SNMP enabled? */
  int		snmp_fd;		/* SNMP socket */
  int		fd;			/* Print file */
  int		status;			/* Status of LPD job */
@@ -131,8 +146,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-  int		num_jobopts;		/* Number of job options */
-  cups_option_t	*jobopts = NULL;	/* Job options */


 /*
@@ -180,8 +193,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    return (CUPS_BACKEND_FAILED);
  }

-  num_jobopts = cupsParseOptions(argv[5], 0, &jobopts);
-
 /*
  * Extract the hostname and printer name from the URI...
  */
@@ -343,8 +354,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	*/

        if (!value[0] || !_cups_strcasecmp(value, "on") ||
-	    !_cups_strcasecmp(value, "yes") ||
-	    !_cups_strcasecmp(value, "true") ||
+	    !_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true") ||
 	    !_cups_strcasecmp(value, "rfc1179"))
 	  reserve = RESERVE_RFC1179;
 	else if (!_cups_strcasecmp(value, "any"))
@@ -359,8 +369,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	*/

        manual_copies = !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, "sanitize_title"))
      {
@@ -369,18 +378,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	*/

        sanitize_title = !value[0] || !_cups_strcasecmp(value, "on") ||
-	 		 !_cups_strcasecmp(value, "yes") ||
-	 		 !_cups_strcasecmp(value, "true");
-      }
-      else if (!_cups_strcasecmp(name, "snmp"))
-      {
-        /*
-         * Enable/disable SNMP stuff...
-         */
-
-         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"))
      {
@@ -410,16 +408,25 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * Find the printer...
  */

-  addrlist = backendLookup(hostname, port, NULL);
+  snprintf(portname, sizeof(portname), "%d", port);

- /*
-  * See if the printer supports SNMP...
-  */
+  fputs("STATE: +connecting-to-device\n", stderr);
+  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);

-  if (snmp_enabled)
-    snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
-  else
-    snmp_fd = -1;
+  while ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
+  {
+    _cupsLangPrintFilter(stderr, "INFO",
+			 _("Unable to locate printer \"%s\"."), hostname);
+    sleep(10);
+
+    if (getenv("CLASS") != NULL)
+    {
+      fputs("STATE: -connecting-to-device\n", stderr);
+      exit(CUPS_BACKEND_FAILED);
+    }
+  }
+
+  snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);

 /*
  * Wait for data from the filter...
@@ -455,7 +462,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);
@@ -520,9 +527,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

    status = lpd_queue(hostname, addrlist, resource + 1, fd, snmp_fd, mode,
                       username, title, copies, banner, format, order, reserve,
-		       manual_copies, timeout, contimeout,
-		       cupsGetOption("job-originating-host-name", num_jobopts,
-		                     jobopts));
+		       manual_copies, timeout, contimeout);

    if (!status)
      fprintf(stderr, "PAGE: 1 %d\n", atoi(argv[4]));
@@ -530,9 +535,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  else
    status = lpd_queue(hostname, addrlist, resource + 1, fd, snmp_fd, mode,
                       username, title, 1, banner, format, order, reserve, 1,
-		       timeout, contimeout,
-		       cupsGetOption("job-originating-host-name", num_jobopts,
-		                     jobopts));
+		       timeout, contimeout);

 /*
  * Remove the temporary file if necessary...
@@ -555,96 +558,19 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 }


-/*
- * 'cups_rresvport()' - A simple implementation of rresvport_af().
- */
-
-static int				/* O  - Socket or -1 on error */
-cups_rresvport(int *port,		/* IO - Port number to bind to */
-               int family)		/* I  - Address family */
-{
-  http_addr_t	addr;			/* Socket address */
-  int		fd;			/* Socket file descriptor */
-
-
- /*
-  * Try to create an IPv4 socket...
-  */
-
-  if ((fd = socket(family, SOCK_STREAM, 0)) < 0)
-    return (-1);
-
- /*
-  * Initialize the address buffer...
-  */
-
-  memset(&addr, 0, sizeof(addr));
-  addr.addr.sa_family = (sa_family_t)family;
-
- /*
-  * Try to bind the socket to a reserved port...
-  */
-
-  while (*port > 511)
-  {
-   /*
-    * Set the port number...
-    */
-
-    _httpAddrSetPort(&addr, *port);
-
-   /*
-    * Try binding the port to the socket; return if all is OK...
-    */
-
-    if (!bind(fd, (struct sockaddr *)&addr, (socklen_t)httpAddrLength(&addr)))
-      return (fd);
-
-   /*
-    * Stop if we have any error other than "address already in use"...
-    */
-
-    if (errno != EADDRINUSE)
-    {
-      httpAddrClose(NULL, fd);
-
-      return (-1);
-    }
-
-   /*
-    * Try the next port...
-    */
-
-    (*port)--;
-  }
-
- /*
-  * Wasn't able to bind to a reserved port, so close the socket and return
-  * -1...
-  */
-
-#ifdef WIN32
-  closesocket(fd);
-#else
-  close(fd);
-#endif /* WIN32 */
-
-  return (-1);
-}
-
-
 /*
 * 'lpd_command()' - Send an LPR command sequence and wait for a reply.
 */

 static int			/* O - Status of command */
 lpd_command(int  fd,		/* I - Socket connection to LPD host */
+            int  timeout,	/* I - Seconds to wait for a response */
            char *format,	/* I - printf()-style format string */
            ...)		/* I - Additional args as necessary */
 {
  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 */


@@ -669,9 +595,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);
@@ -683,12 +609,18 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */

  fputs("DEBUG: Reading command status...\n", stderr);

+  alarm(timeout);
+
  if (recv(fd, &status, 1, 0) < 1)
  {
-    _cupsLangPrintFilter(stderr, "WARNING", _("The printer did not respond."));
-    status = (char)errno;
+    _cupsLangPrintFilter(stderr, "WARNING",
+		         _("Printer did not respond after %d seconds."),
+			 timeout);
+    status = errno;
  }

+  alarm(0);
+
  fprintf(stderr, "DEBUG: lpd_command returning %d\n", status);

  return (status);
@@ -715,8 +647,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	  int             reserve,	/* I - Reserve ports? */
 	  int             manual_copies,/* I - Do copies by hand... */
 	  int             timeout,	/* I - Timeout... */
-	  int             contimeout,	/* I - Connection timeout */
-	  const char      *orighost)	/* I - job-originating-host-name */
+	  int             contimeout)	/* I - Connection timeout */
 {
  char			localhost[255];	/* Local host name */
  int			error;		/* Error number */
@@ -732,16 +663,30 @@ 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
-  DWORD			tv;		/* Timeout in milliseconds */
-#else
-  struct timeval	tv;		/* Timeout in secs and usecs */
-#endif /* WIN32 */
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction	action;		/* Actions for POSIX signals */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */


+ /*
+  * Setup an alarm handler for timeouts...
+  */
+
+#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+  sigset(SIGALRM, lpd_timeout);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  action.sa_handler = lpd_timeout;
+  sigaction(SIGALRM, &action, NULL);
+#else
+  signal(SIGALRM, lpd_timeout);
+#endif /* HAVE_SIGSET */
+
 /*
  * Remember when we started trying to connect to the printer...
  */
@@ -759,7 +704,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,
@@ -814,7 +759,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	* priviledged lport between 721 and 731...
 	*/

-	if ((fd = cups_rresvport(&lport, addr->addr.addr.sa_family)) < 0)
+	if ((fd = rresvport_af(&lport, addr->addr.addr.sa_family)) < 0)
 	{
 	  perror("DEBUG: Unable to reserve port");
 	  sleep(1);
@@ -834,7 +779,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;
@@ -867,7 +812,8 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */

      fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(error));

-      if (errno == ECONNREFUSED || errno == EHOSTDOWN || errno == EHOSTUNREACH || errno == ETIMEDOUT || errno == ENOTCONN)
+      if (error == ECONNREFUSED || error == EHOSTDOWN ||
+          error == EHOSTUNREACH)
      {
        if (contimeout && (time(NULL) - start_time) > contimeout)
 	{
@@ -885,19 +831,19 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	      break;

 	  case EHOSTUNREACH :
-	  default :
 	      _cupsLangPrintFilter(stderr, "WARNING",
 			           _("The printer is unreachable at "
 				     "this time."));
 	      break;

 	  case ECONNREFUSED :
+	  default :
 	      _cupsLangPrintFilter(stderr, "WARNING",
-	                           _("The printer is in use."));
+	                           _("The printer is busy."));
 	      break;
        }

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

 	if (delay < 30)
 	  delay += 5;
@@ -918,29 +864,12 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      }
    }

-   /*
-    * Set the timeout...
-    */
-
-#ifdef WIN32
-    tv = (DWORD)(timeout * 1000);
-
-    setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
-    setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv));
-#else
-    tv.tv_sec  = timeout;
-    tv.tv_usec = 0;
-
-    setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
-    setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
-#endif /* WIN32 */
-
    fputs("STATE: -connecting-to-device\n", stderr);
    _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));

    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...
@@ -997,17 +926,14 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
    * literal output...
    */

-    if (lpd_command(fd, "\002%s\n",
+    if (lpd_command(fd, timeout, "\002%s\n",
                    printer))		/* Receive print job(s) */
    {
      close(fd);
      return (CUPS_BACKEND_FAILED);
    }

-    if (orighost && _cups_strcasecmp(orighost, "localhost"))
-      strlcpy(localhost, orighost, sizeof(localhost));
-    else
-      httpGetHostname(NULL, localhost, sizeof(localhost));
+    httpGetHostname(NULL, localhost, sizeof(localhost));

    snprintf(control, sizeof(control),
             "H%.31s\n"		/* RFC 1179, Section 7.2 - host name <= 31 chars */
@@ -1018,7 +944,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);
@@ -1027,13 +953,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);
@@ -1052,7 +978,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      * Send the control file...
      */

-      if (lpd_command(fd, "\002%d cfA%03.3d%.15s\n", strlen(control),
+      if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
                      (int)getpid() % 1000, localhost))
      {
 	close(fd);
@@ -1063,20 +989,25 @@ 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");

      }
      else
      {
+        alarm(timeout);
+
        if (read(fd, &status, 1) < 1)
 	{
 	  _cupsLangPrintFilter(stderr, "WARNING",
-	                       _("The printer did not respond."));
-	  status = (char)errno;
+			       _("Printer did not respond after %d seconds."),
+			       timeout);
+	  status = errno;
 	}
+
+        alarm(0);
      }

      if (status != 0)
@@ -1102,7 +1033,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      * Send the print file...
      */

-      if (lpd_command(fd, "\003" CUPS_LLFMT " dfA%03.3d%.15s\n",
+      if (lpd_command(fd, timeout, "\003" CUPS_LLFMT " dfA%03.3d%.15s\n",
                      CUPS_LLCAST filestats.st_size, (int)getpid() % 1000,
 		      localhost))
      {
@@ -1125,7 +1056,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;
@@ -1138,11 +1069,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
 	{
@@ -1153,12 +1084,17 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	  * want to requeue it over and over...
 	  */

+	  alarm(timeout);
+
          if (recv(fd, &status, 1, 0) < 1)
 	  {
 	    _cupsLangPrintFilter(stderr, "WARNING",
-			         _("The printer did not respond."));
+			         _("Printer did not respond after %d seconds."),
+			         timeout);
 	    status = 0;
          }
+
+	  alarm(0);
 	}
      }
      else
@@ -1185,7 +1121,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
      * Send control file...
      */

-      if (lpd_command(fd, "\002%d cfA%03.3d%.15s\n", strlen(control),
+      if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
                      (int)getpid() % 1000, localhost))
      {
 	close(fd);
@@ -1196,19 +1132,24 @@ 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
      {
+        alarm(timeout);
+
        if (read(fd, &status, 1) < 1)
 	{
 	  _cupsLangPrintFilter(stderr, "WARNING",
-			       _("The printer did not respond."));
-	  status = (char)errno;
+			       _("Printer did not respond after %d seconds."),
+			       timeout);
+	  status = errno;
 	}
+
+	alarm(0);
      }

      if (status != 0)
@@ -1220,8 +1161,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...
    */
@@ -1253,39 +1192,138 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 }


+/*
+ * 'lpd_timeout()' - Handle timeout alarms...
+ */
+
+static void
+lpd_timeout(int sig)			/* I - Signal number */
+{
+  (void)sig;
+
+#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
+  signal(SIGALRM, lpd_timeout);
+#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
+}
+
+
 /*
 * '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);
 }


+#ifndef HAVE_RRESVPORT_AF
+/*
+ * 'rresvport_af()' - A simple implementation of rresvport_af().
+ */
+
+static int				/* O  - Socket or -1 on error */
+rresvport_af(int *port,			/* IO - Port number to bind to */
+             int family)		/* I  - Address family */
+{
+  http_addr_t	addr;			/* Socket address */
+  int		fd;			/* Socket file descriptor */
+
+
+ /*
+  * Try to create an IPv4 socket...
+  */
+
+  if ((fd = socket(family, SOCK_STREAM, 0)) < 0)
+    return (-1);
+
+ /*
+  * Initialize the address buffer...
+  */
+
+  memset(&addr, 0, sizeof(addr));
+  addr.addr.sa_family = family;
+
+ /*
+  * Try to bind the socket to a reserved port...
+  */
+
+  while (*port > 511)
+  {
+   /*
+    * Set the port number...
+    */
+
+    _httpAddrSetPort(&addr, *port);
+
+   /*
+    * Try binding the port to the socket; return if all is OK...
+    */
+
+    if (!bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
+      return (fd);
+
+   /*
+    * Stop if we have any error other than "address already in use"...
+    */
+
+    if (errno != EADDRINUSE)
+    {
+#  ifdef WIN32
+      closesocket(fd);
+#  else
+      close(fd);
+#  endif /* WIN32 */
+
+      return (-1);
+    }
+
+   /*
+    * Try the next port...
+    */
+
+    (*port)--;
+  }
+
+ /*
+  * Wasn't able to bind to a reserved port, so close the socket and return
+  * -1...
+  */
+
+#  ifdef WIN32
+  closesocket(fd);
+#  else
+  close(fd);
+#  endif /* WIN32 */
+
+  return (-1);
+}
+#endif /* !HAVE_RRESVPORT_AF */
+
+
 /*
 * 'sigterm_handler()' - Handle 'terminate' signals that stop the backend.
 */
@@ -1297,3 +1335,8 @@ sigterm_handler(int sig)		/* I - Signal */

  abort_job = 1;
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,16 +1,23 @@
 /*
- * Common backend network APIs for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ *   Common backend network APIs for CUPS.
 *
- * 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/".
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * Contents:
+ *
+ *   backendCheckSideChannel() - Check the side-channel for pending requests.
+ *   backendNetworkSideCB()    - Handle common network side-channel commands.
 */

 /*
@@ -19,13 +26,18 @@

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


 /*
 * 'backendCheckSideChannel()' - Check the side-channel for pending requests.
 */

+
 void
 backendCheckSideChannel(
    int         snmp_fd,		/* I - SNMP socket */
@@ -45,65 +57,6 @@ backendCheckSideChannel(
 }


-/*
- * 'backendLookup()' - Lookup the given host and log addresses.
- */
-
-http_addrlist_t	*			/* O - List of addresses or NULL */
-backendLookup(const char *hostname,	/* I - Hostname */
-              int        port,		/* I - Port number */
-	      int        *cancel)	/* I - Variable to watch for job cancel */
-{
-  char			portname[32],	/* Port number as string */
-			addrname[256];	/* Address as string */
-  http_addrlist_t	*addrlist,	/* List of addresses */
-			*current;	/* Current address */
-
-
- /*
-  * Lookup the address for the named host...
-  */
-
-  snprintf(portname, sizeof(portname), "%d", port);
-
-  fputs("STATE: +connecting-to-device\n", stderr);
-  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
-
-  while ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
-  {
-    _cupsLangPrintFilter(stderr, "INFO", _("Unable to locate printer \"%s\"."), hostname);
-    sleep(10);
-
-    if (getenv("CLASS") != NULL)
-    {
-      fputs("STATE: -connecting-to-device\n", stderr);
-      exit(CUPS_BACKEND_STOP);
-    }
-
-    if (cancel && *cancel)
-    {
-      fputs("STATE: -connecting-to-device\n", stderr);
-      exit(CUPS_BACKEND_OK);
-    }
-  }
-
-  fputs("STATE: -connecting-to-device\n", stderr);
-
- /*
-  * Log the addresses we got...
-  */
-
-  for (current = addrlist; current; current = current->next)
-    fprintf(stderr, "DEBUG: %s=%s\n", hostname, httpAddrString(&current->addr, addrname, sizeof(addrname)));
-
- /*
-  * Return...
-  */
-
-  return (addrlist);
-}
-
-
 /*
 * 'backendNetworkSideCB()' - Handle common network side-channel commands.
 */
@@ -139,7 +92,7 @@ backendNetworkSideCB(
 	  status = CUPS_SC_STATUS_NOT_IMPLEMENTED;
 	else if (backendDrainOutput(print_fd, device_fd))
 	  status = CUPS_SC_STATUS_IO_ERROR;
-	else
+	else 
          status = CUPS_SC_STATUS_OK;

 	datalen = 0;
@@ -147,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;

@@ -166,35 +119,8 @@ backendNetworkSideCB(

        if (snmp_fd >= 0)
 	{
-	  char		*dataptr;	/* Pointer into data */
 	  cups_snmp_t	packet;		/* Packet from printer */
-          const char	*snmp_value;	/* CUPS_SNMP_VALUE env var */

-          if ((snmp_value = getenv("CUPS_SNMP_VALUE")) != NULL)
-          {
-            const char	*snmp_count;	/* CUPS_SNMP_COUNT env var */
-            int		count;		/* Repetition count */
-
-            if ((snmp_count = getenv("CUPS_SNMP_COUNT")) != NULL)
-            {
-              if ((count = atoi(snmp_count)) <= 0)
-                count = 1;
-            }
-            else
-              count = 1;
-
-	    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));
-
-	    fprintf(stderr, "DEBUG: Returning %s %s\n", data,
-	            data + strlen(data) + 1);
-
-	    status  = CUPS_SC_STATUS_OK;
-	    datalen = (int)(dataptr - data);
-	    break;
-          }

          if (!_cupsSNMPStringToOID(data, packet.object_name, CUPS_SNMP_MAX_OID))
 	  {
@@ -215,7 +141,8 @@ backendNetworkSideCB(
          {
 	    if (_cupsSNMPRead(snmp_fd, &packet, 1.0))
 	    {
-	      size_t	i;		/* Looping var */
+	      char	*dataptr;	/* Pointer into data */
+	      int	i;		/* Looping var */


              if (!_cupsSNMPOIDToString(packet.object_name, data, sizeof(data)))
@@ -230,31 +157,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;

@@ -263,27 +194,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';
@@ -306,12 +242,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)
 	{
@@ -349,6 +279,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;
@@ -357,3 +293,8 @@ backendNetworkSideCB(

  return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,267 +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 (Issue #4155)
-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. MP540 Printer, https://bugzilla.redhat.com/967873
-0x04a9 0x1730 unidir
-
-# Canon, Inc. MP550 Printer (Issue #4155)
-0x04a9 0x173d unidir
-
-# Canon, Inc. MP560 Printer (Issue #4155)
-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
-
-# Samsung ML-2160 Series (https://bugzilla.redhat.com/show_bug.cgi?id=873123)
-0x04e8 0x330f unidir
-
-# 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 (Issue #4448)
-0x043d 0x009a no-reattach
-
-# Canon MX310 (Issue #4482)
-0x04a9 0x1728 unidir
-
-# Canon MX320 (Issue #4482)
-0x04A9 0x1736 unidir
-
-# All Intermec devices (Issue #4553)
-0x067e no-reattach
-
-# HP LaserJet 1150 (Issue #4549)
-0x03f0 0x0f17 delay-close
-
-# HP LaserJet 1300 (Issue #4549)
-0x03f0 0x1017 delay-close
-0x03f0 0x1117 delay-close
-
-# HP LaserJet 1320 (Issue #4549)
-0x03f0 0x1d17 delay-close
-
-# Canon, Inc. MP530 Printer
-0x04a9 0x1712 unidir
-
-# Xerox WorkCentre 3220 (https://bugs.launchpad.net/bugs/1406203, Issue #4789)
-0x0924 0x4294 no-reattach
-
-# Lexmark C540n (Issue #4778)
-0x043d 0x0139 no-reattach
-
-# Kyocera Ecosys P6026cdn (Issue #4900)
-0x0482 0x063f no-reattach
-
-# Kyocera Ecosys P6130cdn (Issue #5102)
-0x0482 0x0677 no-reattach
-
-# Lexmark E260dn (Issue #4994)
-0x043d 0x0123 no-reattach
-
-# HP LaserJet 1160 (Issue #5121)
-0x03f0 0x1e17 delay-close
@@ -1,16 +1,18 @@
 #!/bin/sh
 #
-# Psuedo-backend for CUPS testing purposes.
+# "$Id$"
 #
-# Copyright 2011 by Apple Inc.
+#   Psuedo-backend for CUPS testing purposes.
 #
-# 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/".
+#   Copyright 2011 by Apple Inc.
 #
-# This file is subject to the Apple OS-Developed Software exception.
+#   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.
 #

 if test $# = 0; then
@@ -22,3 +24,7 @@ fi
 cat $6 >/dev/null
 sleep 5
 exit 0
+
+#
+# End of "$Id$".
+#
@@ -1,16 +1,25 @@
 /*
- * Common run loop APIs for CUPS backends.
+ * "$Id$"
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ *   Common run loop APIs for CUPS backends.
 *
- * 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/".
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * 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.
 */

 /*
@@ -19,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 */


 /*
@@ -77,10 +90,9 @@ backendDrainOutput(int print_fd,	/* I - Print file descriptor */
      * Read error - bail if we don't see EAGAIN or EINTR...
      */

-      if (errno != EAGAIN && errno != EINTR)
+      if (errno != EAGAIN || errno != EINTR)
      {
-	fprintf(stderr, "DEBUG: Read failed: %s\n", strerror(errno));
-	_cupsLangPrintFilter(stderr, "ERROR", _("Unable to read print data."));
+        _cupsLangPrintError("ERROR", _("Unable to read print data"));
 	return (-1);
      }

@@ -100,7 +112,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...
@@ -238,7 +250,7 @@ backendRunLoop(
 	{
 	  fputs("STATE: +offline-report\n", stderr);
 	  _cupsLangPrintFilter(stderr, "INFO",
-	                       _("The printer is not connected."));
+	                       _("Printer is not currently connected."));
 	  offline = 1;
 	}
 	else if (errno == EINTR && total_bytes == 0)
@@ -280,7 +292,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)
      {
@@ -305,11 +317,9 @@ backendRunLoop(
        * Read error - bail if we don't see EAGAIN or EINTR...
 	*/

-	if (errno != EAGAIN && errno != EINTR)
+	if (errno != EAGAIN || errno != EINTR)
 	{
-	  fprintf(stderr, "DEBUG: Read failed: %s\n", strerror(errno));
-	  _cupsLangPrintFilter(stderr, "ERROR",
-	                       _("Unable to read print data."));
+	  _cupsLangPrintError("ERROR", _("Unable to read print data"));
 	  return (-1);
 	}

@@ -337,7 +347,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...
@@ -358,7 +368,7 @@ backendRunLoop(
 	  {
 	    fputs("STATE: +offline-report\n", stderr);
 	    _cupsLangPrintFilter(stderr, "INFO",
-	                         _("The printer is not connected."));
+	                         _("Printer is not currently connected."));
 	    offline = 1;
 	  }
 	}
@@ -379,8 +389,7 @@ backendRunLoop(
 	if (offline && update_state)
 	{
 	  fputs("STATE: -offline-report\n", stderr);
-	  _cupsLangPrintFilter(stderr, "INFO",
-	                       _("The printer is now connected."));
+	  _cupsLangPrintFilter(stderr, "INFO", _("Printer is now connected."));
 	  offline = 0;
 	}

@@ -425,11 +434,9 @@ backendWaitLoop(
    int          use_bc,		/* I - Use back-channel? */
    _cups_sccb_t side_cb)		/* I - Side-channel callback */
 {
-  int			nfds;		/* Number of file descriptors */
-  fd_set		input;		/* Input set for reading */
-  time_t		curtime = 0,	/* Current time */
-			snmp_update = 0;/* Last SNMP status update */
-  struct timeval	timeout;	/* Timeout for select() */
+  fd_set	input;			/* Input set for reading */
+  time_t	curtime,		/* Current time */
+		snmp_update = 0;	/* Last SNMP status update */


  fprintf(stderr, "DEBUG: backendWaitLoop(snmp_fd=%d, addr=%p, side_cb=%p)\n",
@@ -439,9 +446,6 @@ backendWaitLoop(
  * Now loop until we receive data from stdin...
  */

-  if (snmp_fd >= 0)
-    snmp_update = time(NULL) + 5;
-
  for (;;)
  {
   /*
@@ -453,18 +457,7 @@ backendWaitLoop(
    if (side_cb)
      FD_SET(CUPS_SC_FD, &input);

-    if (snmp_fd >= 0)
-    {
-      curtime         = time(NULL);
-      timeout.tv_sec  = curtime >= snmp_update ? 0 : snmp_update - curtime;
-      timeout.tv_usec = 0;
-
-      nfds = select(CUPS_SC_FD + 1, &input, NULL, NULL, &timeout);
-    }
-    else
-      nfds = select(CUPS_SC_FD + 1, &input, NULL, NULL, NULL);
-
-    if (nfds < 0)
+    if (select(CUPS_SC_FD + 1, &input, NULL, NULL, NULL) < 0)
    {
     /*
      * Pause printing to clear any pending errors...
@@ -508,10 +501,10 @@ backendWaitLoop(
    * Do SNMP updates periodically...
    */

-    if (snmp_fd >= 0 && curtime >= snmp_update)
+    if (snmp_fd >= 0 && time(&curtime) >= snmp_update)
    {
      if (backendSNMPSupplies(snmp_fd, addr, NULL, NULL))
-        snmp_fd = -1;
+        snmp_update = INT_MAX;
      else
        snmp_update = curtime + 5;
    }
@@ -523,3 +516,8 @@ backendWaitLoop(

  return (1);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,15 +1,24 @@
 /*
- * SNMP supplies functions for CUPS.
+ * "$Id$"
 *
- * Copyright 2008-2015 by Apple Inc.
+ *   SNMP supplies functions for CUPS.
 *
- * 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/".
+ *   Copyright 2008-2011 by Apple Inc.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * 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.
 */

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

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


@@ -28,21 +36,14 @@
 #define CUPS_MAX_SUPPLIES	32	/* Maximum number of supplies for a printer */
 #define CUPS_SUPPLY_TIMEOUT	2.0	/* Timeout for SNMP lookups */

-#define CUPS_DEVELOPER_LOW	0x0001
-#define CUPS_DEVELOPER_EMPTY	0x0002
-#define CUPS_MARKER_SUPPLY_LOW	0x0004
-#define CUPS_MARKER_SUPPLY_EMPTY 0x0008
-#define CUPS_OPC_NEAR_EOL	0x0010
-#define CUPS_OPC_LIFE_OVER	0x0020
-#define CUPS_TONER_LOW		0x0040
-#define CUPS_TONER_EMPTY	0x0080
-#define CUPS_WASTE_ALMOST_FULL	0x0100
-#define CUPS_WASTE_FULL		0x0200
-#define CUPS_CLEANER_NEAR_EOL	0x0400	/* Proposed JPS3 */
-#define CUPS_CLEANER_LIFE_OVER	0x0800	/* Proposed JPS3 */
-
-#define CUPS_SNMP_NONE		0x0000
-#define CUPS_SNMP_CAPACITY	0x0001	/* Supply levels reported as percentages */
+#define CUPS_DEVELOPER_LOW		1
+#define CUPS_DEVELOPER_EMPTY		2
+#define CUPS_MARKER_SUPPLY_LOW		4
+#define CUPS_MARKER_SUPPLY_EMPTY	8
+#define CUPS_OPC_NEAR_EOL		16
+#define CUPS_OPC_LIFE_OVER		32
+#define CUPS_TONER_LOW			64
+#define CUPS_TONER_EMPTY		128


 /*
@@ -54,7 +55,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 */
@@ -75,8 +75,6 @@ static http_addr_t	current_addr;	/* Current address */
 static int		current_state = -1;
 					/* Current device state bits */
 static int		charset = -1;	/* Character set for supply names */
-static unsigned		quirks = CUPS_SNMP_NONE;
-					/* Quirks we have to work around */
 static int		num_supplies = 0;
 					/* Number of supplies found */
 static backend_supplies_t supplies[CUPS_MAX_SUPPLIES];
@@ -141,13 +139,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 */
@@ -155,17 +146,10 @@ static const int	prtMarkerSuppliesType[] =
 			(sizeof(prtMarkerSuppliesType) /
 			 sizeof(prtMarkerSuppliesType[0]));
 			 		/* Offset to supply index */
-static const int	prtMarkerSuppliesSupplyUnit[] =
-			{ CUPS_OID_prtMarkerSuppliesSupplyUnit, -1 },
-					/* Units OID */
-			prtMarkerSuppliesSupplyUnitOffset =
-			(sizeof(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_lowPaper, "media-low-report" },
 			  { CUPS_TC_noPaper | CUPS_TC_inputTrayEmpty, "media-empty-warning" },
 			  /* { CUPS_TC_lowToner, "toner-low-report" }, */ /* now use prtMarkerSupplies */
 			  /* { CUPS_TC_noToner, "toner-empty-warning" }, */ /* now use prtMarkerSupplies */
@@ -180,7 +164,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" },
@@ -189,11 +173,7 @@ static const backend_state_t supply_states[] =
 			  { CUPS_OPC_NEAR_EOL, "opc-near-eol-report" },
 			  { CUPS_OPC_LIFE_OVER, "opc-life-over-warning" },
 			  { CUPS_TONER_LOW, "toner-low-report" },
-			  { CUPS_TONER_EMPTY, "toner-empty-warning" },
-			  { CUPS_WASTE_ALMOST_FULL, "waste-receptacle-almost-full-report" },
-			  { CUPS_WASTE_FULL, "waste-receptacle-full-warning" },
-			  { CUPS_CLEANER_NEAR_EOL, "cleaner-life-almost-over-report" },
-			  { CUPS_CLEANER_LIFE_OVER, "cleaner-life-over-warning" },
+			  { CUPS_TONER_EMPTY, "toner-empty-warning" }
 			};


@@ -251,15 +231,9 @@ backendSNMPSupplies(
    {
      if (supplies[i].max_capacity > 0 && supplies[i].level >= 0)
 	percent = 100 * supplies[i].level / supplies[i].max_capacity;
-      else if (supplies[i].level >= 0 && supplies[i].level <= 100 &&
-               (quirks & CUPS_SNMP_CAPACITY))
-        percent = supplies[i].level;
      else
        percent = 50;

-      if (supplies[i].sclass == CUPS_TC_receptacleThatIsFilled)
-        percent = 100 - percent;
-
      if (percent <= 5)
      {
        switch (supplies[i].type)
@@ -271,6 +245,9 @@ backendSNMPSupplies(
              else
                new_supply_state |= CUPS_TONER_LOW;
              break;
+          case CUPS_TC_wasteToner :
+          case CUPS_TC_wasteInk :
+              break;
          case CUPS_TC_ink :
          case CUPS_TC_inkCartridge :
          case CUPS_TC_inkRibbon :
@@ -296,36 +273,16 @@ 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 :
-          case CUPS_TC_wasteWater :
-          case CUPS_TC_wasteWax :
-              if (percent <= 1)
-                new_supply_state |= CUPS_WASTE_FULL;
-              else
-                new_supply_state |= CUPS_WASTE_ALMOST_FULL;
-              break;
-#endif /* 0 */
-          case CUPS_TC_cleanerUnit :
-          case CUPS_TC_fuserCleaningPad :
-              if (percent <= 1)
-                new_supply_state |= CUPS_CLEANER_LIFE_OVER;
-              else
-                new_supply_state |= CUPS_CLEANER_NEAR_EOL;
-              break;
        }
      }

      if (i)
        *ptr++ = ',';

-      if ((supplies[i].max_capacity > 0 || (quirks & CUPS_SNMP_CAPACITY)) &&
-          supplies[i].level >= 0)
-        snprintf(ptr, sizeof(value) - (size_t)(ptr - value), "%d", percent);
+      if (supplies[i].max_capacity > 0 && supplies[i].level >= 0)
+        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);
@@ -451,7 +408,7 @@ backend_init_supplies(
 		cachefilename[1024],	/* Cache filename */
 		description[CUPS_SNMP_MAX_STRING],
 					/* Device description string */
-		value[CUPS_MAX_SUPPLIES * (CUPS_SNMP_MAX_STRING * 4 + 3)],
+		value[CUPS_MAX_SUPPLIES * (CUPS_SNMP_MAX_STRING * 2 + 3)],
 					/* Value string */
 		*ptr,			/* Pointer into value string */
 		*name_ptr;		/* Pointer into name string */
@@ -463,34 +420,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"
@@ -520,12 +477,6 @@ backend_init_supplies(
    return;
  }

-  if ((ppdattr = ppdFindAttr(ppd, "cupsSNMPQuirks", NULL)) != NULL)
-  {
-    if (!_cups_strcasecmp(ppdattr->value, "capacity"))
-      quirks |= CUPS_SNMP_CAPACITY;
-  }
-
  ppdClose(ppd);

 /*
@@ -566,20 +517,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;
@@ -669,12 +620,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);
  }
@@ -687,7 +638,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,
@@ -702,14 +653,13 @@ 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);

 /*
-  * Output the marker-names attribute (the double quoting is necessary to deal
-  * with embedded quotes and commas in the marker names...)
+  * Output the marker-names attribute...
  */

  for (i = 0, ptr = value; i < num_supplies; i ++)
@@ -717,21 +667,15 @@ backend_init_supplies(
    if (i)
      *ptr++ = ',';

-    *ptr++ = '\'';
    *ptr++ = '\"';
    for (name_ptr = supplies[i].name; *name_ptr;)
    {
-      if (*name_ptr == '\\' || *name_ptr == '\"' || *name_ptr == '\'')
-      {
+      if (*name_ptr == '\\' || *name_ptr == '\"')
        *ptr++ = '\\';
-        *ptr++ = '\\';
-        *ptr++ = '\\';
-      }

      *ptr++ = *name_ptr++;
    }
    *ptr++ = '\"';
-    *ptr++ = '\'';
  }

  *ptr = '\0';
@@ -750,9 +694,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);
@@ -768,33 +712,16 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
                void        *data)	/* I - User data (unused) */
 {
  int	i, j, k;			/* Looping vars */
-  static const char * const colors[][2] =
+  static const char * const colors[8][2] =
  {					/* Standard color names */
-    { "black",         "#000000" },
-    { "blue",          "#0000FF" },
-    { "brown",         "#A52A2A" },
-    { "cyan",          "#00FFFF" },
-    { "dark-gray",     "#404040" },
-    { "dark gray",     "#404040" },
-    { "dark-yellow",   "#FFCC00" },
-    { "dark yellow",   "#FFCC00" },
-    { "gold",          "#FFD700" },
-    { "gray",          "#808080" },
-    { "green",         "#00FF00" },
-    { "light-black",   "#606060" },
-    { "light black",   "#606060" },
-    { "light-cyan",    "#E0FFFF" },
-    { "light cyan",    "#E0FFFF" },
-    { "light-gray",    "#D3D3D3" },
-    { "light gray",    "#D3D3D3" },
-    { "light-magenta", "#FF77FF" },
-    { "light magenta", "#FF77FF" },
-    { "magenta",       "#FF00FF" },
-    { "orange",        "#FFA500" },
-    { "red",           "#FF0000" },
-    { "silver",        "#C0C0C0" },
-    { "white",         "#FFFFFF" },
-    { "yellow",        "#FFFF00" }
+    { "black",   "#000000" },
+    { "blue",    "#0000FF" },
+    { "cyan",    "#00FFFF" },
+    { "green",   "#00FF00" },
+    { "magenta", "#FF00FF" },
+    { "red",     "#FF0000" },
+    { "white",   "#FFFFFF" },
+    { "yellow",  "#FFFF00" }
  };


@@ -816,10 +743,9 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
      if (supplies[j].colorant == i)
      {
 	for (k = 0; k < (int)(sizeof(colors) / sizeof(colors[0])); k ++)
-	  if (!_cups_strcasecmp(colors[k][0],
-	                        (char *)packet->object_value.string.bytes))
+	  if (!strcmp(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;
 	  }
      }
@@ -908,6 +834,7 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
          {
 	    char	*src, *dst;	/* Pointers into strings */

+
           /*
 	    * Loop safe because both the object_value and supplies char arrays
 	    * are CUPS_SNMP_MAX_STRING elements long.
@@ -952,8 +879,7 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */

    supplies[i - 1].level = packet->object_value.integer;
  }
-  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesMaxCapacity) &&
-           !(quirks & CUPS_SNMP_CAPACITY))
+  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesMaxCapacity))
  {
   /*
    * Get max capacity...
@@ -970,28 +896,7 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
    if (i > num_supplies)
      num_supplies = i;

-    if (supplies[i - 1].max_capacity == 0 &&
-        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;
+    supplies[i - 1].max_capacity = packet->object_value.integer;
  }
  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesType))
  {
@@ -1012,26 +917,6 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */

    supplies[i - 1].type = packet->object_value.integer;
  }
-  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesSupplyUnit))
-  {
-   /*
-    * Get units for capacity...
-    */
-
-    i = packet->object_name[prtMarkerSuppliesSupplyUnitOffset];
-    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
-        packet->object_type != CUPS_ASN1_INTEGER)
-      return;
-
-    fprintf(stderr, "DEBUG2: prtMarkerSuppliesSupplyUnit.1.%d = %d\n", i,
-            packet->object_value.integer);
-
-    if (i > num_supplies)
-      num_supplies = i;
-
-    if (packet->object_value.integer == CUPS_TC_percent)
-      supplies[i - 1].max_capacity = 100;
-  }
 }


@@ -1056,9 +941,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;
@@ -1069,13 +954,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)
      {
@@ -1092,5 +977,10 @@ utf16_to_utf8(

  *ptr = '\0';

-  cupsUTF32ToUTF8(dst, temp, (int)dstsize);
+  cupsUTF32ToUTF8(dst, temp, dstsize);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,16 +1,44 @@
 /*
- * SNMP discovery backend for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ *   SNMP discovery backend for CUPS.
 *
- * 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/".
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * 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...
 */

 /*
@@ -223,7 +251,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

 #ifdef AF_INET6
  if ((ipv6 = _cupsSNMPOpen(AF_INET6)) < 0)
-    perror("DEBUG: Unable to create IPv6 socket");
+    return (1);
 #else
  ipv6 = -1;
 #endif /* AF_INET6 */
@@ -504,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)
  {
@@ -724,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;
 	  }
@@ -996,11 +1025,6 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	    * Description is the IEEE-1284 device ID...
 	    */

-            char *ptr;			/* Pointer into device ID */
-
-            for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++)
-              if (*ptr == '\n')
-                *ptr = ';';		/* A lot of bad printers put a newline */
 	    if (!device->id)
 	      device->id = strdup((char *)packet.object_value.string.bytes);

@@ -1042,11 +1066,8 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	  */

 	  char	make_model[256];	/* Make and model */
-          char *ptr;			/* Pointer into device ID */

-          for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++)
-            if (*ptr == '\n')
-              *ptr = ';';		/* A lot of bad printers put a newline */
+
 	  if (device->id)
 	    free(device->id);

@@ -1204,7 +1225,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 */
@@ -1306,7 +1327,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));
@@ -1317,7 +1338,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);
@@ -1359,3 +1380,8 @@ update_cache(snmp_cache_t *device,	/* I - Device */

  list_device(device);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,16 +1,23 @@
 /*
- * AppSocket backend for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   AppSocket backend for CUPS.
 *
- * 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/".
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * Contents:
+ *
+ *   main()    - Send a file to the printer or server.
+ *   wait_bc() - Wait for back-channel data...
 */

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

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


 /*
@@ -66,16 +73,20 @@ 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 */
+  char		portname[255];		/* Port name */
  int		delay;			/* Delay for retries... */
  int		device_fd;		/* AppSocket */
  int		error;			/* Error code (if any) */
  http_addrlist_t *addrlist,		/* Address list */
 		*addr;			/* Connected address */
  char		addrname[256];		/* Address name */
-  int		snmp_enabled = 1;	/* Is SNMP enabled? */
  int		snmp_fd,		/* SNMP socket */
 		start_count,		/* Page count via SNMP at start */
 		page_count,		/* Page count via SNMP */
@@ -235,16 +246,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
        waiteof = !value[0] || !_cups_strcasecmp(value, "on") ||
 		  !_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true");
      }
-      else if (!_cups_strcasecmp(name, "snmp"))
-      {
-        /*
-         * Enable/disable SNMP stuff...
-         */
-
-         snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
-                        !_cups_strcasecmp(value, "yes") ||
-                        !_cups_strcasecmp(value, "true");
-      }
      else if (!_cups_strcasecmp(name, "contimeout"))
      {
       /*
@@ -263,20 +264,33 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

  start_time = time(NULL);

-  addrlist = backendLookup(hostname, port, NULL);
+  sprintf(portname, "%d", port);
+
+  fputs("STATE: +connecting-to-device\n", stderr);
+  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
+
+  while ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
+  {
+    _cupsLangPrintFilter(stderr, "INFO",
+                         _("Unable to locate printer \"%s\"."), hostname);
+    sleep(10);
+
+    if (getenv("CLASS") != NULL)
+    {
+      fputs("STATE: -connecting-to-device\n", stderr);
+      return (CUPS_BACKEND_STOP);
+    }
+  }

 /*
  * See if the printer supports SNMP...
  */

-  if (snmp_enabled)
-    snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
-  else
-    snmp_fd = -1;
-
-  if (snmp_fd >= 0)
+  if ((snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family)) >= 0)
+  {
    have_supplies = !backendSNMPSupplies(snmp_fd, &(addrlist->addr),
                                         &start_count, NULL);
+  }
  else
    have_supplies = start_count = 0;

@@ -330,7 +344,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

      fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(error));

-      if (errno == ECONNREFUSED || errno == EHOSTDOWN || errno == EHOSTUNREACH || errno == ETIMEDOUT || errno == ENOTCONN)
+      if (error == ECONNREFUSED || error == EHOSTDOWN ||
+          error == EHOSTUNREACH)
      {
        if (contimeout && (time(NULL) - start_time) > contimeout)
 	{
@@ -348,19 +363,19 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	      break;

 	  case EHOSTUNREACH :
-	  default :
 	      _cupsLangPrintFilter(stderr, "WARNING",
 				   _("The printer is unreachable at this "
 				     "time."));
 	      break;

 	  case ECONNREFUSED :
+	  default :
 	      _cupsLangPrintFilter(stderr, "WARNING",
-	                           _("The printer is in use."));
+	                           _("The printer is busy."));
 	      break;
        }

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

 	if (delay < 30)
 	  delay += 5;
@@ -381,7 +396,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...
@@ -390,7 +405,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)
  {
@@ -409,7 +424,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)
  {
@@ -448,6 +472,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if (print_fd != 0)
    close(print_fd);

+  _cupsLangPrintFilter(stderr, "INFO", _("Ready to print."));
+
  return (CUPS_BACKEND_OK);
 }

@@ -456,7 +482,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 */
 {
@@ -486,7 +512,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);
@@ -494,3 +520,8 @@ wait_bc(int device_fd,			/* I - Socket */
  else
    return (-1);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,16 +1,22 @@
 /*
- * IEEE-1284 support functions test program for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2010 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   IEEE-1284 support functions test program for CUPS.
 *
- * 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/".
+ *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * Contents:
+ *
+ *   main() - Test the device-ID functions.
 */

 /*
@@ -71,3 +77,8 @@ main(int  argc,				/* I - Number of command-line args */

  return (0);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,16 +1,25 @@
 /*
- * Backend test program for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *   Backend test program for CUPS.
 *
- * 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/".
+ *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * Contents:
+ *
+ *   main()            - Run the named backend.
+ *   sigterm_handler() - Flag when we get SIGTERM.
+ *   usage()           - Show usage information.
+ *   walk_cb()         - Show results of cupsSideChannelSNMPWalk...
 */

 /*
@@ -88,19 +97,13 @@ 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));
-    if (!access(libpath, 0))
-    {
+    strlcpy(ptr, "/cups", sizeof(libpath) - (ptr - libpath));
+    if (access(libpath, 0))
 #ifdef __APPLE__
-      fprintf(stderr, "Setting DYLD_LIBRARY_PATH to \"%s\".\n", libpath);
      setenv("DYLD_LIBRARY_PATH", libpath, 1);
 #else
-      fprintf(stderr, "Setting LD_LIBRARY_PATH to \"%s\".\n", libpath);
      setenv("LD_LIBRARY_PATH", libpath, 1);
 #endif /* __APPLE__ */
-    }
-    else
-      perror(libpath);
  }

 /*
@@ -302,7 +305,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...
@@ -330,7 +333,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);
      }
@@ -405,7 +408,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);
@@ -564,13 +567,13 @@ main(int  argc,				/* I - Number of command-line args */

      length   = sizeof(buffer);
      scstatus = cupsSideChannelSNMPGet(oid, buffer, &length, 5.0);
-      printf("CUPS_SC_CMD_SNMP_GET %s returned %s, %d bytes (%s)\n", oid,
-	     statuses[scstatus], (int)length, buffer);
+      printf("CUPS_SC_CMD_SNMP_GET %s returned %s, %s\n", oid,
+	     statuses[scstatus], buffer);

      length   = sizeof(buffer);
      scstatus = cupsSideChannelSNMPGet(oid, buffer, &length, 5.0);
-      printf("CUPS_SC_CMD_SNMP_GET %s returned %s, %d bytes (%s)\n", oid,
-	     statuses[scstatus], (int)length, buffer);
+      printf("CUPS_SC_CMD_SNMP_GET %s returned %s, %s\n", oid,
+	     statuses[scstatus], buffer);
    }

    length   = 0;
@@ -629,13 +632,13 @@ sigterm_handler(int sig)		/* I - Signal */
 static void
 usage(void)
 {
-  puts("Usage: testbackend [-cancel] [-d] [-ps | -pcl] [-s [-get OID] "
+  puts("Usage: testbackend [-cancel] [-d] [-ps | -pcl] [-s [-oid OID] "
       "[-walk OID]] [-t] device-uri job-id user title copies options [file]");
  puts("");
  puts("Options:");
  puts("  -cancel     Simulate a canceled print job after 2 seconds.");
  puts("  -d          Show log messages from backend.");
-  puts("  -get OID    Lookup the specified SNMP OID.");
+  puts("  -oid OID    Lookup the specified SNMP OID.");
  puts("              (.1.3.6.1.2.1.43.10.2.1.4.1.1 is a good one for printers)");
  puts("  -pcl        Send PCL+PJL query and test page to backend.");
  puts("  -ps         Send PostScript query and test page to backend.");
@@ -658,20 +661,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=%s (%d bytes)\n", oid, data, datalen);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,15 +1,21 @@
 /*
- * SNMP supplies test program for CUPS.
+ * "$Id$"
 *
- * Copyright 2008-2011 by Apple Inc.
+ *   SNMP supplies test program for CUPS.
 *
- * 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/".
+ *   Copyright 2008-2011 by Apple Inc.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * Contents:
+ *
+ *   main() - Show the supplies state of a printer.
 */

 /*
@@ -70,3 +76,8 @@ main(int  argc,				/* I - Number of command-line args */
    sleep(5);
  }
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,18 +1,27 @@
 /*
- * USB port backend for CUPS.
+ * "$Id$"
 *
- * This file is included from "usb.c" when compiled on UNIX/Linux.
+ *   USB port backend for CUPS.
 *
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   This file is included from "usb.c" when compiled on UNIX/Linux.
 *
- * 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/".
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * 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...
 */

 /*
@@ -119,12 +128,16 @@ print_device(const char *uri,		/* I - Device URI */

      if (errno == EBUSY)
      {
-        _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
+        _cupsLangPrintFilter(stderr, "INFO",
+			     _("Printer busy, will retry in 10 seconds."));
 	sleep(10);
      }
      else if (errno == ENXIO || errno == EIO || errno == ENOENT ||
               errno == ENODEV)
      {
+        _cupsLangPrintFilter(stderr, "INFO",
+			     _("Printer not connected, will retry in 30 "
+			       "seconds."));
 	sleep(30);
      }
      else
@@ -144,7 +157,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 ****/

@@ -248,6 +261,7 @@ list_devices(void)

    close(fd);
  }
+#elif defined(__sgi)
 #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
  int	i;			/* Looping var */
  int	fd;			/* File descriptor */
@@ -276,6 +290,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 */
@@ -409,7 +425,8 @@ open_device(const char *uri,		/* I - Device URI */
      */

      if (busy)
-	_cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
+	_cupsLangPrintFilter(stderr, "INFO",
+			     _("Printer is busy, will retry in 5 seconds."));

      sleep(5);
    }
@@ -492,7 +509,8 @@ open_device(const char *uri,		/* I - Device URI */

      if (busy)
      {
-	_cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
+	_cupsLangPrintFilter(stderr, "INFO",
+			     _("Printer is busy, will retry in 5 seconds."));
 	sleep(5);
      }
    }
@@ -598,3 +616,8 @@ side_cb(int         print_fd,		/* I - Print file */

  return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,16 +1,24 @@
 /*
- * USB printer backend for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2012 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   USB port backend for CUPS.
 *
- * 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/".
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
- * This file is subject to the Apple OS-Developed Software exception.
+ *   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.
+ *
+ * Contents:
+ *
+ *   list_devices() - List all available USB devices to stdout.
+ *   print_device() - Print a file to a USB device.
+ *   main()         - Send a file to the specified USB port.
 */

 /*
@@ -47,7 +55,7 @@ int	print_device(const char *uri, const char *hostname,
 * Include the vendor-specific USB implementation...
 */

-#ifdef HAVE_LIBUSB
+#ifdef HAVE_USB_H
 #  include "usb-libusb.c"
 #elif defined(__APPLE__)
 #  include "usb-darwin.c"
@@ -110,7 +118,7 @@ print_device(const char *uri,		/* I - Device URI */

  return (CUPS_BACKEND_FAILED);
 }
-#endif /* HAVE_LIBUSB */
+#endif /* __APPLE__ */


 /*
@@ -249,3 +257,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

  return (status);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,25 +1,28 @@
-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/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/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/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 \
+lpc.o: lpc.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
+  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/thread-private.h
+lpq.o: lpq.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
+  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/thread-private.h
+lpr.o: lpr.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
+  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/thread-private.h
+lprm.o: lprm.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
+  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
  ../cups/thread-private.h
@@ -1,14 +1,16 @@
 #
-# Berkeley commands makefile for CUPS.
+# "$Id$"
 #
-# Copyright 2007-2017 by Apple Inc.
-# Copyright 1997-2006 by Easy Software Products, all rights reserved.
+#   Berkeley commands makefile for CUPS.
 #
-# 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
-# missing or damaged, see the license at "http://www.cups.org/".
+#   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/".
 #

 include ../Makedefs
@@ -86,7 +88,6 @@ install-exec:
 		$(INSTALL_DIR) $(SYMROOT); \
 		for file in $(TARGETS); do \
 			cp $$file $(SYMROOT); \
-			dsymutil $(SYMROOT)/$$file; \
 		done \
 	fi

@@ -124,7 +125,7 @@ uninstall:

 lpc:	lpc.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
+	$(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)


 #
@@ -133,7 +134,7 @@ lpc:	lpc.o ../cups/$(LIBCUPS)

 lpq:	lpq.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
+	$(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)


 #
@@ -142,7 +143,7 @@ lpq:	lpq.o ../cups/$(LIBCUPS)

 lpr:	lpr.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
+	$(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)


 #
@@ -151,7 +152,7 @@ lpr:	lpr.o ../cups/$(LIBCUPS)

 lprm:	lprm.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
+	$(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)


 #
@@ -159,3 +160,8 @@ lprm:	lprm.o ../cups/$(LIBCUPS)
 #

 include Dependencies
+
+
+#
+# End of "$Id$".
+#
@@ -1,14 +1,24 @@
 /*
- * "lpc" command for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   "lpc" command for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   Copyright 2007-2010 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/".
+ *
+ * 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.
 */

 /*
@@ -22,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 *);
@@ -148,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);
@@ -354,8 +364,7 @@ show_status(http_t     *http,		/* I - HTTP connection to server */

 	  for (ptr = printer;
 	       *ptr != '\0' && *dptr != '\0' && *ptr == *dptr;
-	       ptr ++, dptr ++)
-	    /* do nothing */;
+	       ptr ++, dptr ++);

          if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' ||
 	                       isspace(*dptr & 255)))
@@ -433,3 +442,8 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
    ippDelete(response);
  }
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,27 @@
 /*
- * "lpq" command for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   "lpq" command for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main()         - Parse options and commands.
+ *   show_jobs()    - Show jobs.
+ *   show_printer() - Show printer status.
+ *   usage()        - Show program usage.
+ */
+
+/*
+ * Include necessary headers...
 */

 /*
@@ -39,8 +52,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 {
  int		i;			/* Looping var */
  http_t	*http;			/* Connection to server */
-  const char	*opt,			/* Option pointer */
-		*dest,			/* Desired printer */
+  const char	*dest,			/* Desired printer */
 		*user,			/* Desired user */
 		*val;			/* Environment variable name */
  char		*instance;		/* Printer instance */
@@ -48,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);
@@ -64,156 +77,145 @@ 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] == '+')
-    {
      interval = atoi(argv[i] + 1);
-    }
    else if (argv[i][0] == '-')
    {
-      for (opt = argv[i] + 1; *opt; opt ++)
+      switch (argv[i][1])
      {
-	switch (*opt)
-	{
-	  case 'E' : /* Encrypt */
+        case 'E' : /* Encrypt */
 #ifdef HAVE_SSL
-	      cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
+	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);

-	      if (http)
-		httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
+	    if (http)
+	      httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
 #else
-	      _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), argv[0]);
+            _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."),
+	                    argv[0]);
 #endif /* HAVE_SSL */
-	      break;
+	    break;

-	  case 'U' : /* Username */
-	      if (opt[1] != '\0')
+        case 'U' : /* Username */
+	    if (argv[i][2] != '\0')
+	      cupsSetUser(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
 	      {
-		cupsSetUser(opt + 1);
-		opt += strlen(opt) - 1;
-	      }
-	      else
-	      {
-		i ++;
-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr, _("%s: Error - expected username after \"-U\" option."), argv[0]);
-		  return (1);
-		}
-
-		cupsSetUser(argv[i]);
-	      }
-	      break;
-
-	  case 'P' : /* Printer */
-	      if (opt[1] != '\0')
-	      {
-		dest = opt + 1;
-		opt += strlen(opt) - 1;
-	      }
-	      else
-	      {
-		i ++;
-
-		if (i >= argc)
-		{
-		  httpClose(http);
-
-		  usage();
-		}
-
-		dest = argv[i];
+	        _cupsLangPrintf(stderr,
+		                _("%s: Error - expected username after "
+				  "\"-U\" option."), argv[0]);
+	        return (1);
 	      }

-	      if ((instance = strchr(dest, '/')) != NULL)
-		*instance++ = '\0';
+              cupsSetUser(argv[i]);
+	    }
+	    break;

-	      http = connect_server(argv[0], http);
+        case 'P' : /* Printer */
+	    if (argv[i][2])
+	      dest = argv[i] + 2;
+	    else
+	    {
+	      i ++;

-	      if ((named_dest = cupsGetNamedDest(http, dest, instance)) == 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)
-		  _cupsLangPrintf(stderr, _("%s: Error - unknown destination \"%s/%s\"."), argv[0], dest, instance);
-		else
-		  _cupsLangPrintf(stderr, _("%s: Unknown destination \"%s\"."), argv[0], dest);
-
-		return (1);
-	      }
-
-	      cupsFreeDests(1, named_dest);
-	      break;
-
-	  case 'a' : /* All printers */
-	      all = 1;
-	      break;
-
-	  case 'h' : /* Connect to host */
-	      if (http)
+	      if (i >= argc)
 	      {
 		httpClose(http);
-		http = NULL;
+		cupsFreeDests(num_dests, dests);
+
+	        usage();
 	      }

-	      if (opt[1] != '\0')
-	      {
-		cupsSetServer(opt + 1);
-		opt += strlen(opt) - 1;
-	      }
-	      else
-	      {
-		i ++;
+	      dest = argv[i];
+	    }

-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr, _("%s: Error - expected hostname after \"-h\" option."), argv[0]);
-		  return (1);
-		}
-		else
-		  cupsSetServer(argv[i]);
-	      }
-	      break;
+	    if ((instance = strchr(dest, '/')) != NULL)
+	      *instance++ = '\0';

-	  case 'l' : /* Long status */
-	      longstatus = 1;
-	      break;
+            http = connect_server(argv[0], http);

-	  default :
+            if (num_dests == 0)
+              num_dests = cupsGetDests2(http, &dests);
+
+            if (cupsGetDest(dest, instance, num_dests, dests) == NULL)
+	    {
+	      if (instance)
+		_cupsLangPrintf(stderr,
+		                _("%s: Error - unknown destination \"%s/%s\"."),
+		        	argv[0], dest, instance);
+              else
+		_cupsLangPrintf(stderr, _("%s: Unknown destination \"%s\"."),
+				argv[0], dest);
+
+	      return (1);
+	    }
+	    break;
+
+	case 'a' : /* All printers */
+	    all = 1;
+	    break;
+
+        case 'h' : /* Connect to host */
+	    if (http)
+	    {
 	      httpClose(http);
+	      http = NULL;
+	    }

-	      usage();
-	}
+	    if (argv[i][2] != '\0')
+              cupsSetServer(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+
+	      if (i >= argc)
+	      {
+	        _cupsLangPrintf(stderr,
+		        	_("%s: Error - expected hostname after "
+			          "\"-h\" option."), argv[0]);
+		return (1);
+              }
+	      else
+                cupsSetServer(argv[i]);
+	    }
+	    break;
+
+	case 'l' : /* Long status */
+	    longstatus = 1;
+	    break;
+
+	default :
+	    httpClose(http);
+	    cupsFreeDests(num_dests, dests);
+
+	    usage();
+	    break;
      }
    }
    else if (isdigit(argv[i][0] & 255))
-    {
      id = atoi(argv[i]);
-    }
    else
-    {
      user = argv[i];
-    }
-  }

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

  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)
@@ -229,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,
@@ -239,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;
  }

 /*
@@ -259,7 +260,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    if (i && interval)
    {
      fflush(stdout);
-      sleep((unsigned)interval);
+      sleep(interval);
    }
    else
      break;
@@ -269,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);
@@ -320,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 */
@@ -366,7 +371,6 @@ show_jobs(const char *command,		/* I - Command name */
  *    attributes-natural-language
  *    job-uri or printer-uri
  *    requested-attributes
-  *    requesting-user-name
  */

  request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);
@@ -395,9 +399,6 @@ show_jobs(const char *command,		/* I - Command name */
                 "requesting-user-name", NULL, user);
    ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
  }
-  else
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                 "requesting-user-name", NULL, cupsUser());

  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                "requested-attributes",
@@ -442,9 +443,12 @@ 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";
+      jobname     = "untitled";
+      jobuser     = NULL;
      jobdest     = NULL;
      jobcopies   = 1;

@@ -458,6 +462,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;
@@ -495,9 +505,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 ++;

@@ -506,7 +523,7 @@ show_jobs(const char *command,		/* I - Command name */
      */

      if (jobstate == IPP_JOB_PROCESSING)
-	strlcpy(rankstr, "active", sizeof(rankstr));
+	strcpy(rankstr, "active");
      else
      {
       /*
@@ -538,9 +555,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;
@@ -647,3 +671,8 @@ usage(void)
 		  "[-l] [+interval]"));
  exit(1);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,20 @@
 /*
- * "lpr" command for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   "lpr" command for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main() - Parse options and send files for printing.
 */

 /*
@@ -30,8 +36,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  int		job_id;			/* Job ID */
  char		ch;			/* Option character */
  char		*printer,		/* Destination printer or class */
-		*instance,		/* Instance */
-		*opt;			/* Option pointer */
+		*instance;		/* Instance */
  const char	*title,			/* Job title */
 		*val;			/* Environment variable name */
  int		num_copies;		/* Number of copies per file */
@@ -55,237 +60,221 @@ main(int  argc,				/* I - Number of command-line arguments */
  title       = NULL;

  for (i = 1; i < argc; i ++)
-  {
    if (argv[i][0] == '-')
-    {
-      for (opt = argv[i] + 1; *opt; opt ++)
+      switch (ch = argv[i][1])
      {
-	switch (ch = *opt)
-	{
-	  case 'E' : /* Encrypt */
+        case 'E' : /* Encrypt */
 #ifdef HAVE_SSL
-	      cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
+	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
 #else
-	      _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), argv[0]);
+            _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."),
+	                    argv[0]);
 #endif /* HAVE_SSL */
-	      break;
+	    break;

-	  case 'U' : /* Username */
-	      if (opt[1] != '\0')
+        case 'U' : /* Username */
+	    if (argv[i][2] != '\0')
+	      cupsSetUser(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
 	      {
-		cupsSetUser(opt + 1);
-		opt += strlen(opt) - 1;
+	        _cupsLangPrintf(stderr,
+		                _("%s: Error - expected username after "
+				  "\"-U\" option."), argv[0]);
+	        return (1);
 	      }
+
+              cupsSetUser(argv[i]);
+	    }
+	    break;
+	    
+        case 'H' : /* Connect to host */
+	    if (argv[i][2] != '\0')
+              cupsSetServer(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+
+	      if (i >= argc)
+	      {
+	        _cupsLangPrintf(stderr,
+		        	_("%s: Error - expected hostname after "
+			          "\"-H\" option."), argv[0]);
+		return (1);
+              }
 	      else
+                cupsSetServer(argv[i]);
+	    }
+	    break;
+
+	case '1' : /* TROFF font set 1 */
+	case '2' : /* TROFF font set 2 */
+	case '3' : /* TROFF font set 3 */
+	case '4' : /* TROFF font set 4 */
+	case 'i' : /* indent */
+	case 'w' : /* width */
+	    if (argv[i][2] == '\0')
+	    {
+	      i ++;
+
+	      if (i >= argc)
 	      {
-		i ++;
-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr, _("%s: Error - expected username after \"-U\" option."), argv[0]);
-		  return (1);
-		}
-
-		cupsSetUser(argv[i]);
-	      }
-	      break;
-
-	  case 'H' : /* Connect to host */
-	      if (opt[1] != '\0')
-	      {
-		cupsSetServer(opt + 1);
-		opt += strlen(opt) - 1;
-	      }
-	      else
-	      {
-		i ++;
-
-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr, _("%s: Error - expected hostname after \"-H\" option."), argv[0]);
-		  return (1);
-		}
-		else
-		  cupsSetServer(argv[i]);
-	      }
-	      break;
-
-	  case '1' : /* TROFF font set 1 */
-	  case '2' : /* TROFF font set 2 */
-	  case '3' : /* TROFF font set 3 */
-	  case '4' : /* TROFF font set 4 */
-	  case 'i' : /* indent */
-	  case 'w' : /* width */
-	      if (opt[1] != '\0')
-	      {
-		opt += strlen(opt) - 1;
-	      }
-	      else
-	      {
-		i ++;
-
-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr,
-				  _("%s: Error - expected value after \"-%c\" "
-				    "option."), argv[0], ch);
-		  return (1);
-		}
-	      }
-
-	  case 'c' : /* CIFPLOT */
-	  case 'd' : /* DVI */
-	  case 'f' : /* FORTRAN */
-	  case 'g' : /* plot */
-	  case 'n' : /* Ditroff */
-	  case 't' : /* Troff */
-	  case 'v' : /* Raster image */
-	      _cupsLangPrintf(stderr, _("%s: Warning - \"%c\" format modifier not supported - output may not be correct."), argv[0], ch);
-	      break;
-
-	  case 'o' : /* Option */
-	      if (opt[1] != '\0')
-	      {
-		num_options = cupsParseOptions(opt + 1, num_options, &options);
-		opt += strlen(opt) - 1;
-	      }
-	      else
-	      {
-		i ++;
-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr, _("%s: Error - expected option=value after \"-o\" option."), argv[0]);
-		  return (1);
-		}
-
-		num_options = cupsParseOptions(argv[i], num_options, &options);
-	      }
-	      break;
-
-	  case 'l' : /* Literal/raw */
-	      num_options = cupsAddOption("raw", "true", num_options, &options);
-	      break;
-
-	  case 'p' : /* Prettyprint */
-	      num_options = cupsAddOption("prettyprint", "true", num_options, &options);
-	      break;
-
-	  case 'h' : /* Suppress burst page */
-	      num_options = cupsAddOption("job-sheets", "none", num_options, &options);
-	      break;
-
-	  case 's' : /* Don't use symlinks */
-	      break;
-
-	  case 'm' : /* Mail on completion */
-	      {
-		char	email[1024];	/* EMail address */
-
-		snprintf(email, sizeof(email), "mailto:%s@%s", cupsUser(), httpGetHostname(NULL, buffer, sizeof(buffer)));
-		num_options = cupsAddOption("notify-recipient-uri", email, num_options, &options);
-	      }
-	      break;
-
-	  case 'q' : /* Queue file but don't print */
-	      num_options = cupsAddOption("job-hold-until", "indefinite", num_options, &options);
-	      break;
-
-	  case 'r' : /* Remove file after printing */
-	      deletefile = 1;
-	      break;
-
-	  case 'P' : /* Destination printer or class */
-	      if (opt[1] != '\0')
-	      {
-		printer = opt + 1;
-		opt += strlen(opt) - 1;
-	      }
-	      else
-	      {
-		i ++;
-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr, _("%s: Error - expected destination after \"-P\" option."), argv[0]);
-		  return (1);
-		}
-
-		printer = argv[i];
-	      }
-
-	      if ((instance = strrchr(printer, '/')) != NULL)
-		*instance++ = '\0';
-
-	      if ((dest = cupsGetNamedDest(NULL, printer, instance)) != NULL)
-	      {
-		for (j = 0; j < dest->num_options; j ++)
-		  if (cupsGetOption(dest->options[j].name, num_options,
-				    options) == NULL)
-		    num_options = cupsAddOption(dest->options[j].name,
-						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]);
+		_cupsLangPrintf(stderr,
+		                _("%s: Error - expected value after \"-%c\" "
+				  "option."), argv[0], ch);
 		return (1);
 	      }
-	      break;
+	    }

-	  case '#' : /* Number of copies */
-	      if (opt[1] != '\0')
-	      {
-		num_copies = atoi(opt + 1);
-		opt += strlen(opt) - 1;
-	      }
-	      else
-	      {
-		i ++;
-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr, _("%s: Error - expected copies after \"-#\" option."), argv[0]);
-		  return (1);
-		}
+        case 'c' : /* CIFPLOT */
+	case 'd' : /* DVI */
+	case 'f' : /* FORTRAN */
+	case 'g' : /* plot */
+	case 'n' : /* Ditroff */
+	case 't' : /* Troff */
+	case 'v' : /* Raster image */
+	    _cupsLangPrintf(stderr,
+	                    _("%s: Warning - \"%c\" format modifier not "
+			      "supported - output may not be correct."),
+			    argv[0], ch);
+	    break;

-		num_copies = atoi(argv[i]);
-	      }
-
-	      if (num_copies < 1)
+	case 'o' : /* Option */
+	    if (argv[i][2] != '\0')
+	      num_options = cupsParseOptions(argv[i] + 2, num_options, &options);
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
 	      {
-		_cupsLangPrintf(stderr, _("%s: Error - copies must be 1 or more."), argv[0]);
+	        _cupsLangPrintf(stderr,
+		                _("%s: Error - expected option=value after "
+			          "\"-o\" option."), argv[0]);
 		return (1);
 	      }

-	      sprintf(buffer, "%d", num_copies);
-	      num_options = cupsAddOption("copies", buffer, num_options, &options);
-	      break;
+	      num_options = cupsParseOptions(argv[i], num_options, &options);
+	    }
+	    break;

-	  case 'C' : /* Class */
-	  case 'J' : /* Job name */
-	  case 'T' : /* Title */
-	      if (opt[1] != '\0')
+	case 'l' : /* Literal/raw */
+            num_options = cupsAddOption("raw", "true", num_options, &options);
+	    break;
+
+	case 'p' : /* Prettyprint */
+            num_options = cupsAddOption("prettyprint", "true", num_options,
+	                                &options);
+	    break;
+
+	case 'h' : /* Suppress burst page */
+            num_options = cupsAddOption("job-sheets", "none", num_options,
+	                                &options);
+	    break;
+
+	case 's' : /* Don't use symlinks */
+	    break;
+
+	case 'm' : /* Mail on completion */
+	    {
+	      char	email[1024];	/* EMail address */
+
+
+	      snprintf(email, sizeof(email), "mailto:%s@%s", cupsUser(),
+	               httpGetHostname(NULL, buffer, sizeof(buffer)));
+	      num_options = cupsAddOption("notify-recipient-uri", email,
+	                                  num_options, &options);
+	    }
+	    break;
+
+	case 'q' : /* Queue file but don't print */
+            num_options = cupsAddOption("job-hold-until", "indefinite",
+	                                num_options, &options);
+	    break;
+
+	case 'r' : /* Remove file after printing */
+	    deletefile = 1;
+	    break;
+
+        case 'P' : /* Destination printer or class */
+	    if (argv[i][2] != '\0')
+	      printer = argv[i] + 2;
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
 	      {
-		title = opt + 1;
-		opt += strlen(opt) - 1;
+	        _cupsLangPrintf(stderr,
+		        	_("%s: Error - expected destination after "
+			          "\"-P\" option."), argv[0]);
+		return (1);
 	      }
-	      else
+
+	      printer = argv[i];
+	    }
+
+            if ((instance = strrchr(printer, '/')) != NULL)
+	      *instance++ = '\0';
+
+            if ((dest = cupsGetNamedDest(NULL, printer, instance)) != NULL)
+	    {
+	      for (j = 0; j < dest->num_options; j ++)
+	        if (cupsGetOption(dest->options[j].name, num_options,
+		                  options) == NULL)
+	          num_options = cupsAddOption(dest->options[j].name,
+		                              dest->options[j].value,
+					      num_options, &options);
+	    }
+	    break;
+
+	case '#' : /* Number of copies */
+	    if (argv[i][2] != '\0')
+	      num_copies = atoi(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
 	      {
-		i ++;
-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr, _("%s: Error - expected name after \"-%c\" option."), argv[0], ch);
-		  return (1);
-		}
-
-		title = argv[i];
+	        _cupsLangPrintf(stderr,
+		        	_("%s: Error - expected copies after "
+			          "\"-#\" option."), argv[0]);
+		return (1);
 	      }
-	      break;

-	  default :
-	      _cupsLangPrintf(stderr, _("%s: Error - unknown option \"%c\"."), argv[0], *opt);
-	      return (1);
-	}
+	      num_copies = atoi(argv[i]);
+	    }
+
+            sprintf(buffer, "%d", num_copies);
+            num_options = cupsAddOption("copies", buffer, num_options, &options);
+	    break;
+
+	case 'C' : /* Class */
+	case 'J' : /* Job name */
+	case 'T' : /* Title */
+	    if (argv[i][2] != '\0')
+	      title = argv[i] + 2;
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
+	      {
+		_cupsLangPrintf(stderr,
+		                _("%s: Error - expected name after \"-%c\" "
+				  "option."), argv[0], ch);
+		return (1);
+	      }
+
+	      title = argv[i];
+	    }
+	    break;
+
+	default :
+	    _cupsLangPrintf(stderr,
+	                    _("%s: Error - unknown option \"%c\"."), argv[0],
+			    argv[i][1]);
+	    return (1);
      }
-    }
    else if (num_files < 1000)
    {
     /*
@@ -312,11 +301,9 @@ main(int  argc,				/* I - Number of command-line arguments */
      }
    }
    else
-    {
-      _cupsLangPrintf(stderr, _("%s: Error - too many files - \"%s\"."), argv[0], argv[i]);
-    }
-  }
-
+      _cupsLangPrintf(stderr,
+                      _("%s: Error - too many files - \"%s\"."), argv[0],
+		      argv[i]);
 /*
  * See if we have any files to print; if not, print from stdin...
  */
@@ -333,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)
@@ -398,6 +377,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    const char		*format;	/* Document format */
    ssize_t		bytes;		/* Bytes read */

+
    if (cupsGetOption("raw", num_options, options))
      format = CUPS_FORMAT_RAW;
    else if ((format = cupsGetOption("document-format", num_options,
@@ -409,23 +389,17 @@ 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)
    {
      _cupsLangPrintf(stderr, _("%s: Error - unable to queue from stdin - %s."),
 		      argv[0], httpStatus(status));
-      cupsFinishDocument(CUPS_HTTP_DEFAULT, printer);
-      cupsCancelJob2(CUPS_HTTP_DEFAULT, printer, job_id, 0);
      return (1);
    }

    if (cupsFinishDocument(CUPS_HTTP_DEFAULT, printer) != IPP_OK)
-    {
-      _cupsLangPrintf(stderr, "%s: %s", argv[0], cupsLastErrorString());
-      cupsCancelJob2(CUPS_HTTP_DEFAULT, printer, job_id, 0);
-      return (1);
-    }
+      job_id = 0;
  }

  if (job_id < 1)
@@ -436,3 +410,8 @@ main(int  argc,				/* I - Number of command-line arguments */

  return (0);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,20 @@
 /*
- * "lprm" command for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   "lprm" command for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   Copyright 2007-2010 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/".
+ *
+ * Contents:
+ *
+ *   main() - Parse options and cancel jobs.
 */

 /*
@@ -29,8 +35,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  int		i;		/* Looping var */
  int		job_id;		/* Job ID */
  const char	*name;		/* Destination printer */
-  char		*instance,	/* Pointer to instance name */
-		*opt;		/* Option pointer */
+  char		*instance;	/* Pointer to instance name */
  cups_dest_t	*dest,		/* Destination */
 		*defdest;	/* Default destination */
  int		did_cancel;	/* Did we cancel something? */
@@ -51,96 +56,90 @@ main(int  argc,			/* I - Number of command-line arguments */
  */

  for (i = 1; i < argc; i ++)
-  {
    if (argv[i][0] == '-' && argv[i][1] != '\0')
-    {
-      for (opt = argv[i] + 1; *opt; opt ++)
+      switch (argv[i][1])
      {
-	switch (*opt)
-	{
-	  case 'E' : /* Encrypt */
+        case 'E' : /* Encrypt */
 #ifdef HAVE_SSL
-	      cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
+	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
 #else
-	      _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), argv[0]);
+            _cupsLangPrintf(stderr,
+	                    _("%s: Sorry, no encryption support."), argv[0]);
 #endif /* HAVE_SSL */
-	      break;
+	    break;

-	  case 'P' : /* Cancel jobs on a printer */
-	      if (opt[1] != '\0')
+        case 'P' : /* Cancel jobs on a printer */
+	    if (argv[i][2])
+	      name = argv[i] + 2;
+	    else
+	    {
+	      i ++;
+	      name = argv[i];
+	    }
+
+	    if ((instance = strchr(name, '/')) != NULL)
+	      *instance = '\0';
+
+	    if ((dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, name,
+	                                 NULL)) == NULL)
+	    {
+	      _cupsLangPrintf(stderr,
+	                      _("%s: Error - unknown destination \"%s\"."),
+			      argv[0], name);
+              goto error;
+	    }
+
+	    cupsFreeDests(1, dest);
+	    break;
+
+        case 'U' : /* Username */
+	    if (argv[i][2] != '\0')
+	      cupsSetUser(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
 	      {
-		name = opt + 1;
-		opt += strlen(opt) - 1;
-	      }
-	      else
-	      {
-		i ++;
-		name = argv[i];
+	        _cupsLangPrintf(stderr,
+		                _("%s: Error - expected username after "
+				  "\"-U\" option."), argv[0]);
+	        goto error;
 	      }

-	      if ((instance = strchr(name, '/')) != NULL)
-		*instance = '\0';
+              cupsSetUser(argv[i]);
+	    }
+	    break;
+	    
+        case 'h' : /* Connect to host */
+	    if (argv[i][2] != '\0')
+              cupsSetServer(argv[i] + 2);
+	    else
+	    {
+	      i ++;

-	      if ((dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, name, NULL)) == NULL)
+	      if (i >= argc)
 	      {
-		_cupsLangPrintf(stderr, _("%s: Error - unknown destination \"%s\"."), argv[0], name);
+	        _cupsLangPrintf(stderr,
+		        	_("%s: Error - expected hostname after "
+			          "\"-h\" option."), argv[0]);
 		goto error;
-	      }
-
-	      cupsFreeDests(1, dest);
-	      break;
-
-	  case 'U' : /* Username */
-	      if (opt[1] != '\0')
-	      {
-		cupsSetUser(opt + 1);
-		opt += strlen(opt) - 1;
-	      }
+              }
 	      else
-	      {
-		i ++;
-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr, _("%s: Error - expected username after \"-U\" option."), argv[0]);
-		  goto error;
-		}
+                cupsSetServer(argv[i]);
+	    }

-		cupsSetUser(argv[i]);
-	      }
-	      break;
+            if (defdest)
+	      cupsFreeDests(1, defdest);

-	  case 'h' : /* Connect to host */
-	      if (opt[1] != '\0')
-	      {
-		cupsSetServer(opt + 1);
-		opt += strlen(opt) - 1;
-	      }
-	      else
-	      {
-		i ++;
+	    defdest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL);
+	    name    = defdest ? defdest->name : NULL;
+	    break;

-		if (i >= argc)
-		{
-		  _cupsLangPrintf(stderr, _("%s: Error - expected hostname after \"-h\" option."), argv[0]);
-		  goto error;
-		}
-		else
-		  cupsSetServer(argv[i]);
-	      }
-
-	      if (defdest)
-		cupsFreeDests(1, defdest);
-
-	      defdest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL);
-	      name    = defdest ? defdest->name : NULL;
-	      break;
-
-	  default :
-	      _cupsLangPrintf(stderr, _("%s: Error - unknown option \"%c\"."), argv[0], *opt);
-	      goto error;
-	}
+	default :
+	    _cupsLangPrintf(stderr, _("%s: Error - unknown option \"%c\"."),
+			    argv[0], argv[i][1]);
+            goto error;
      }
-    }
    else
    {
     /*
@@ -183,7 +182,6 @@ main(int  argc,			/* I - Number of command-line arguments */

      did_cancel = 1;
    }
-  }

 /*
  * If nothing has been canceled yet, cancel the current job on the specified
@@ -212,3 +210,8 @@ main(int  argc,			/* I - Number of command-line arguments */

  return (1);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,74 +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/http-private.h ../cups/md5-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/raster.h ../cups/pwg-private.h \
-  ../cups/adminutil.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,14 +1,16 @@
 #
-# CGI makefile for CUPS.
+# "$Id$"
 #
-# Copyright 2007-2017 by Apple Inc.
-# Copyright 1997-2006 by Easy Software Products.
+#   CGI makefile for CUPS.
 #
-# 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
-# missing or damaged, see the license at "http://www.cups.org/".
+#   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/".
 #

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

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

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


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

@@ -126,13 +129,10 @@ install-exec:
 #

 install-headers:
-	if test "x$(privateinclude)" != x; then \
-		echo Installing private header files into $(PRIVATEINCLUDE)...; \
-		$(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
-		for file in cgi.h help-index.h; do \
-			$(INSTALL_DATA) $$file $(PRIVATEINCLUDE); \
-		done; \
-	fi
+	echo Installing header files in $(INCLUDEDIR)/cups...
+	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
+	$(INSTALL_DATA) cgi.h $(INCLUDEDIR)/cups
+	$(INSTALL_DATA) help-index.h $(INCLUDEDIR)/cups


 #
@@ -143,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
@@ -154,7 +154,6 @@ install-libs: $(INSTALLSTATIC)
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
 		cp $(LIBCUPSCGI) $(SYMROOT); \
-		dsymutil $(SYMROOT)/$(LIBCUPSCGI); \
 	fi

 installstatic:
@@ -176,21 +175,44 @@ 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)
-	-if test "x$(privateinclude)" != x; then \
-		$(RM) $(PRIVATEINCLUDE)/cgi.h; \
-		$(RM) $(PRIVATEINCLUDE)/help-index.h; \
-		$(RMDIR) $(PRIVATEINCLUDE); \
-	fi
+	$(RM) $(INCLUDEDIR)/cups/cgi.h
+	$(RM) $(INCLUDEDIR)/cups/help-index.h
+	-$(RMDIR) $(INCLUDEDIR)/cups


 #
-# libcupscgi.so.1
+# Automatic API help files...
 #

-libcupscgi.so.1:	$(LIBOBJS)
+apihelp:
+	mxmldoc --section "Programming" \
+		--title "CGI API" \
+		--css ../doc/cups-printable.css \
+		--header api-cgi.header --intro api-cgi.shtml \
+		cgi.h help-index.h $(LIBOBJS:.o=.c) >../doc/help/api-cgi.html
+	mxmldoc --tokens help/api-cgi.html api-cgi.xml >../doc/help/api-cgi.tokens
+	$(RM) api-cgi.xml
+
+framedhelp:
+	mxmldoc --framed api-cgi \
+		--section "Programming" \
+		--title "CGI API" \
+		--css ../doc/cups-printable.css \
+		--header api-cgi.header --intro api-cgi.shtml \
+		cgi.h help-index.h $(LIBOBJS:.o=.c)
+
+
+#
+# libcupscgi.so.1, libcupscgi.sl.1
+#
+
+libcupscgi.so.1 libcupscgi.sl.1:	$(LIBOBJS)
 	echo Linking $@...
 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
 	$(RM) `basename $@ .1`
@@ -213,13 +235,24 @@ 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
 #

 libcupscgi.la:    $(LIBOBJS)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
 		-version-info 1:0 $(LIBS)


@@ -240,7 +273,7 @@ libcupscgi.a:	$(LIBOBJS)

 admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS)


 #
@@ -249,7 +282,7 @@ admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)

 classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS)


 #
@@ -258,7 +291,7 @@ classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)

 help.cgi:	help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS)


 #
@@ -267,7 +300,7 @@ help.cgi:	help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)

 jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)


 #
@@ -276,7 +309,7 @@ jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)

 makedocset:	makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
 		$(LIBZ) $(LIBGSSAPI)

@@ -287,7 +320,7 @@ makedocset:	makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)

 printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS)


 #
@@ -296,7 +329,7 @@ printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)

 testcgi:	testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
 		$(LIBZ) $(LIBGSSAPI)
 	echo Testing CGI API...
@@ -309,7 +342,7 @@ testcgi:	testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)

 testhi:	testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
 		$(LIBZ) $(LIBGSSAPI)
 	echo Testing help index API...
@@ -322,12 +355,28 @@ testhi:	testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)

 testtemplate:	testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \
+	$(CC) $(LDFLAGS) -o $@ testtemplate.o 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...
 #

 include Dependencies
+
+
+#
+# End of "$Id$".
+#
@@ -1,14 +1,37 @@
 /*
- * Administration CGI for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Administration CGI for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * 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.
 */

 /*
@@ -16,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>
@@ -38,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);
@@ -56,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);


 /*
@@ -64,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 */
@@ -497,7 +523,7 @@ do_add_rss_subscription(http_t *http)	/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(_("Add RSS Subscription"));
-    cgiShowIPPError(_("Unable to add RSS subscription"));
+    cgiShowIPPError(_("Unable to add RSS subscription:"));
  }
  else
  {
@@ -784,8 +810,8 @@ do_am_class(http_t *http,		/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(title);
-    cgiShowIPPError(modify ? _("Unable to modify class") :
-                             _("Unable to add class"));
+    cgiShowIPPError(modify ? _("Unable to modify class:") :
+                             _("Unable to add class:"));
  }
  else
  {
@@ -828,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 */
@@ -937,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);
@@ -1030,8 +1055,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
      else
      {
 	cgiStartHTML(title);
-	cgiShowIPPError(modify ? _("Unable to modify printer") :
-				 _("Unable to add printer"));
+	cgiShowIPPError(modify ? _("Unable to modify printer:") :
+				 _("Unable to add printer:"));
 	cgiEndHTML();
        return;
      }
@@ -1147,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 */


@@ -1169,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);

@@ -1186,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
@@ -1294,7 +1317,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
    else
    {
      cgiStartHTML(title);
-      cgiShowIPPError(_("Unable to get list of printer drivers"));
+      cgiShowIPPError(_("Unable to get list of printer drivers:"));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
    }
@@ -1325,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));

   /*
@@ -1359,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"));
@@ -1383,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/"));

@@ -1399,8 +1415,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
    else if (cupsLastError() > IPP_OK_CONFLICT)
    {
      cgiStartHTML(title);
-      cgiShowIPPError(modify ? _("Unable to modify printer") :
-                               _("Unable to add printer"));
+      cgiShowIPPError(modify ? _("Unable to modify printer:") :
+                               _("Unable to add printer:"));
    }
    else if (modify)
    {
@@ -1506,7 +1522,7 @@ do_cancel_subscription(http_t *http)/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(_("Cancel RSS Subscription"));
-    cgiShowIPPError(_("Unable to cancel RSS subscription"));
+    cgiShowIPPError(_("Unable to cancel RSS subscription:"));
  }
  else
  {
@@ -1541,8 +1557,6 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    int			advanced,	/* Advanced settings shown? */
 			changed;	/* Have settings changed? */
    const char		*debug_logging,	/* DEBUG_LOGGING value */
-			*preserve_jobs = NULL,
-					/* PRESERVE_JOBS value */
 			*remote_admin,	/* REMOTE_ADMIN value */
 			*remote_any,	/* REMOTE_ANY value */
 			*share_printers,/* SHARE_PRINTERS value */
@@ -1597,36 +1611,19 @@ do_config_server(http_t *http)		/* I - HTTP connection */
      */

      browse_web_if        = cgiGetVariable("BROWSE_WEB_IF") ? "Yes" : "No";
+      preserve_job_history = cgiGetVariable("PRESERVE_JOB_HISTORY") ? "Yes" : "No";
+      preserve_job_files   = cgiGetVariable("PRESERVE_JOB_FILES") ? "Yes" : "No";
      max_clients          = cgiGetVariable("MAX_CLIENTS");
+      max_jobs             = cgiGetVariable("MAX_JOBS");
      max_log_size         = cgiGetVariable("MAX_LOG_SIZE");
-      preserve_jobs        = cgiGetVariable("PRESERVE_JOBS");
-
-      if (preserve_jobs)
-      {
-        max_jobs             = cgiGetVariable("MAX_JOBS");
-	preserve_job_history = cgiGetVariable("PRESERVE_JOB_HISTORY");
-	preserve_job_files   = cgiGetVariable("PRESERVE_JOB_FILES");
-
-	if (!max_jobs || atoi(max_jobs) < 0)
-	  max_jobs = "500";
-
-	if (!preserve_job_history)
-	  preserve_job_history = "On";
-
-	if (!preserve_job_files)
-	  preserve_job_files = "1d";
-      }
-      else
-      {
-        max_jobs             = "0";
-        preserve_job_history = "No";
-        preserve_job_files   = "No";
-      }

      if (!max_clients || atoi(max_clients) <= 0)
 	max_clients = "100";

-      if (!max_log_size || atoi(max_log_size) <= 0.0)
+      if (!max_jobs || atoi(max_jobs) <= 0)
+	max_jobs = "500";
+
+      if (!max_log_size || atof(max_log_size) <= 0.0)
 	max_log_size = "1m";
    }

@@ -1638,7 +1635,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    {
      cgiStartHTML(cgiText(_("Change Settings")));
      cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to change server settings")));
+                     cgiText(_("Unable to change server settings:")));
      cgiSetVariable("ERROR", cupsLastErrorString());
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -1677,7 +1674,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    if ((current_preserve_job_files = cupsGetOption("PreserveJobFiles",
                                                    num_settings,
 						    settings)) == NULL)
-      current_preserve_job_files = "1d";
+      current_preserve_job_files = "No";

    if ((current_max_clients = cupsGetOption("MaxClients", num_settings,
                                             settings)) == NULL)
@@ -1780,7 +1777,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */

 	cgiStartHTML(cgiText(_("Change Settings")));
 	cgiSetVariable("MESSAGE",
-                       cgiText(_("Unable to change server settings")));
+                       cgiText(_("Unable to change server settings:")));
 	cgiSetVariable("ERROR", cupsLastErrorString());
 	cgiCopyTemplateLang("error.tmpl");
      }
@@ -1831,7 +1828,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    if ((tempfd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
    {
      cgiStartHTML(cgiText(_("Edit Configuration File")));
-      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file")));
+      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file:")));
      cgiSetVariable("ERROR", strerror(errno));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -1843,7 +1840,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    if ((temp = cupsFileOpenFd(tempfd, "w")) == NULL)
    {
      cgiStartHTML(cgiText(_("Edit Configuration File")));
-      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file")));
+      cgiSetVariable("MESSAGE", cgiText(_("Unable to create temporary file:")));
      cgiSetVariable("ERROR", strerror(errno));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -1865,7 +1862,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')
@@ -1893,7 +1890,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    else if (status != HTTP_CREATED)
    {
      cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to upload cupsd.conf file")));
+                     cgiText(_("Unable to upload cupsd.conf file:")));
      cgiSetVariable("ERROR", httpStatus(status));

      cgiStartHTML(cgiText(_("Edit Configuration File")));
@@ -1901,7 +1898,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");
@@ -1940,7 +1937,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    {
      cgiStartHTML(cgiText(_("Edit Configuration File")));
      cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to access cupsd.conf file")));
+                     cgiText(_("Unable to access cupsd.conf file:")));
      cgiSetVariable("ERROR", strerror(errno));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -1953,7 +1950,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
    {
      cgiStartHTML(cgiText(_("Edit Configuration File")));
      cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to access cupsd.conf file")));
+                     cgiText(_("Unable to access cupsd.conf file:")));
      cgiSetVariable("ERROR",
                     cgiText(_("Unable to edit cupsd.conf files larger than "
 		               "1MB")));
@@ -1977,7 +1974,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */

      cgiStartHTML(cgiText(_("Edit Configuration File")));
      cgiSetVariable("MESSAGE",
-                     cgiText(_("Unable to access cupsd.conf file")));
+                     cgiText(_("Unable to access cupsd.conf file:")));
      cgiSetVariable("ERROR", strerror(errno));
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -1990,9 +1987,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);
    }
@@ -2009,7 +2006,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;

@@ -2019,7 +2016,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 	  if (ch == '\\' || ch == '\"')
 	  {
 	    *bufptr++ = '\\';
-	    *bufptr++ = (char)ch;
+	    *bufptr++ = ch;
 	  }
 	  else if (ch == '\n')
 	  {
@@ -2032,7 +2029,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 	    *bufptr++ = 't';
 	  }
 	  else if (ch >= ' ')
-	    *bufptr++ = (char)ch;
+	    *bufptr++ = ch;
 	}

 	*bufptr = '\0';
@@ -2134,7 +2131,7 @@ do_delete_class(http_t *http)		/* I - HTTP connection */
  cgiStartHTML(cgiText(_("Delete Class")));

  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to delete class"));
+    cgiShowIPPError(_("Unable to delete class:"));
  else
    cgiCopyTemplateLang("class-deleted.tmpl");

@@ -2219,7 +2216,7 @@ do_delete_printer(http_t *http)		/* I - HTTP connection */
  cgiStartHTML(cgiText(_("Delete Printer")));

  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to delete printer"));
+    cgiShowIPPError(_("Unable to delete printer:"));
  else
    cgiCopyTemplateLang("printer-deleted.tmpl");

@@ -2623,6 +2620,10 @@ do_menu(http_t *http)			/* I - HTTP connection */
 #endif /* HAVE_GSSAPI */
  cgiSetVariable("KERBEROS", "");

+#ifdef HAVE_DNSSD
+  cgiSetVariable("HAVE_DNSSD", "1");
+#endif /* HAVE_DNSSD */
+
  if ((val = cupsGetOption("BrowseWebIF", num_settings,
                           settings)) == NULL)
    val = "No";
@@ -2635,25 +2636,18 @@ do_menu(http_t *http)			/* I - HTTP connection */
                           settings)) == NULL)
    val = "Yes";

-  if (val &&
-      (!_cups_strcasecmp(val, "0") || !_cups_strcasecmp(val, "no") ||
-       !_cups_strcasecmp(val, "off") || !_cups_strcasecmp(val, "false") ||
-       !_cups_strcasecmp(val, "disabled")))
+  if (!_cups_strcasecmp(val, "yes") || !_cups_strcasecmp(val, "on") ||
+      !_cups_strcasecmp(val, "true"))
  {
-    cgiSetVariable("PRESERVE_JOB_HISTORY", "0");
-    cgiSetVariable("PRESERVE_JOB_FILES", "0");
-  }
-  else
-  {
-    cgiSetVariable("PRESERVE_JOBS", "CHECKED");
-    cgiSetVariable("PRESERVE_JOB_HISTORY", val);
+    cgiSetVariable("PRESERVE_JOB_HISTORY", "CHECKED");

    if ((val = cupsGetOption("PreserveJobFiles", num_settings,
 			     settings)) == NULL)
-      val = "1d";
-
-    cgiSetVariable("PRESERVE_JOB_FILES", val);
+      val = "No";

+    if (!_cups_strcasecmp(val, "yes") || !_cups_strcasecmp(val, "on") ||
+	!_cups_strcasecmp(val, "true"))
+      cgiSetVariable("PRESERVE_JOB_FILES", "CHECKED");
  }

  if ((val = cupsGetOption("MaxClients", num_settings, settings)) == NULL)
@@ -2821,7 +2815,7 @@ do_set_allowed_users(http_t *http)	/* I - HTTP connection */
      exit(0);
    }
    else if (cupsLastError() > IPP_OK_CONFLICT)
-      cgiShowIPPError(_("Unable to get printer attributes"));
+      cgiShowIPPError(_("Unable to get printer attributes:"));
    else
      cgiCopyTemplateLang("users.tmpl");

@@ -2971,7 +2965,7 @@ do_set_allowed_users(http_t *http)	/* I - HTTP connection */
    else if (cupsLastError() > IPP_OK_CONFLICT)
    {
      cgiStartHTML(cgiText(_("Set Allowed Users")));
-      cgiShowIPPError(_("Unable to change printer"));
+      cgiShowIPPError(_("Unable to change printer:"));
    }
    else
    {
@@ -3058,7 +3052,7 @@ do_set_default(http_t *http)		/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to set server default"));
+    cgiShowIPPError(_("Unable to set server default:"));
  }
  else
  {
@@ -3167,7 +3161,7 @@ do_set_options(http_t *http,		/* I - HTTP connection */
    if ((ppd = ppdOpenFile(filename)) == NULL)
    {
      cgiSetVariable("ERROR", ppdErrorString(ppdLastError(&i)));
-      cgiSetVariable("MESSAGE", cgiText(_("Unable to open PPD file")));
+      cgiSetVariable("MESSAGE", cgiText(_("Unable to open PPD file:")));
      cgiStartHTML(title);
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();
@@ -3788,7 +3782,7 @@ do_set_options(http_t *http,		/* I - HTTP connection */
    else if (cupsLastError() > IPP_OK_CONFLICT)
    {
      cgiStartHTML(title);
-      cgiShowIPPError(_("Unable to set options"));
+      cgiShowIPPError(_("Unable to set options:"));
    }
    else
    {
@@ -3866,7 +3860,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...
@@ -3887,7 +3881,7 @@ do_set_sharing(http_t *http)		/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(cgiText(_("Set Publishing")));
-    cgiShowIPPError(_("Unable to change printer-is-shared attribute"));
+    cgiShowIPPError(_("Unable to change printer-is-shared attribute:"));
  }
  else
  {
@@ -4080,7 +4074,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 = " ";

@@ -4094,7 +4088,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 :
@@ -4104,7 +4098,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 :
@@ -4122,7 +4116,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 :
@@ -4171,7 +4165,7 @@ get_option_value(
    if (bufptr == buffer || (bufend - bufptr) < 2)
      return (NULL);

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

  return (buffer);
@@ -4202,73 +4196,5 @@ get_points(double     number,		/* I - Original number */


 /*
- * 'get_printer_ppd()' - Get an IPP Everywhere PPD file for the given URI.
+ * End of "$Id$".
 */
-
-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);
-}
@@ -0,0 +1,34 @@
+<!--
+  "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $"
+
+  CGI API header for CUPS.
+
+  Copyright 2009 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/".
+-->
+
+<h1 class='title'>CGI API</h1>
+
+<div class='summary'><table summary='General Information'>
+<thead>
+<tr>
+	<th>Header</th>
+	<th>cups/cgi.h</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<th>Library</th>
+	<td>-lcupscgi</td>
+</tr>
+<tr>
+	<th>See Also</th>
+	<td>Programming: <a href='api-overview.html' target='_top'>Introduction to CUPS Programming</a></td>
+</tr>
+</tbody>
+</table></div>
@@ -0,0 +1,17 @@
+<!--
+  "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $"
+
+  CGI API introduction for CUPS.
+
+  Copyright 2009 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/".
+-->
+
+<h2 class='title'><a name='OVERVIEW'>Overview</a></h2>
+
+<p>The CGI API provides Common Gateway Interface functions for CUPS.</p>
@@ -1,14 +1,16 @@
 /*
- * Private CGI definitions for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2011 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Private CGI definitions for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
 */

 /*
@@ -27,3 +29,8 @@
 */

 #define CUPS_PAGE_MAX	100		/* Maximum items per page */
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,16 @@
 /*
- * CGI support library definitions for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2010 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   CGI support library definitions for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   Copyright 2007-2010 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/".
 */

 #ifndef _CUPS_CGI_H_
@@ -111,3 +113,7 @@ extern const char	*cgiText(const char *message);
 #  endif /* __cplusplus */

 #endif /* !_CUPS_CGI_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,23 @@
 /*
- * Class status CGI for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Class status CGI for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * 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.
 */

 /*
@@ -33,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 */
@@ -159,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"))
@@ -247,7 +257,7 @@ do_class_op(http_t      *http,		/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to do maintenance command"));
+    cgiShowIPPError(_("Unable to do maintenance command:"));
  }
  else
  {
@@ -276,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();
@@ -297,7 +307,8 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
 			*response;	/* IPP response */
  cups_array_t		*classes;	/* Array of class objects */
  ipp_attribute_t	*pclass;	/* Class object */
-  int			first,		/* First class to show */
+  int			ascending,	/* Order of classes (0 = descending) */
+			first,		/* First class to show */
 			count;		/* Number of classes */
  const char		*var;		/* Form variable */
  void			*search;	/* Search data */
@@ -369,10 +380,25 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
    sprintf(val, "%d", count);
    cgiSetVariable("TOTAL", val);

-    for (i = 0, pclass = (ipp_attribute_t *)cupsArrayIndex(classes, first);
-	 i < CUPS_PAGE_MAX && pclass;
-	 i ++, pclass = (ipp_attribute_t *)cupsArrayNext(classes))
-      cgiSetIPPObjectVars(pclass, NULL, i);
+    if ((var = cgiGetVariable("ORDER")) != NULL)
+      ascending = !_cups_strcasecmp(var, "asc");
+    else
+      ascending = 1;
+
+    if (ascending)
+    {
+      for (i = 0, pclass = (ipp_attribute_t *)cupsArrayIndex(classes, first);
+	   i < CUPS_PAGE_MAX && pclass;
+	   i ++, pclass = (ipp_attribute_t *)cupsArrayNext(classes))
+        cgiSetIPPObjectVars(pclass, NULL, i);
+    }
+    else
+    {
+      for (i = 0, pclass = (ipp_attribute_t *)cupsArrayIndex(classes, count - first - 1);
+	   i < CUPS_PAGE_MAX && pclass;
+	   i ++, pclass = (ipp_attribute_t *)cupsArrayPrev(classes))
+        cgiSetIPPObjectVars(pclass, NULL, i);
+    }

   /*
    * Save navigation URLs...
@@ -392,12 +418,6 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
      cgiSetVariable("NEXT", val);
    }

-    if (count > CUPS_PAGE_MAX)
-    {
-      snprintf(val, sizeof(val), "%d", CUPS_PAGE_MAX * (count / CUPS_PAGE_MAX));
-      cgiSetVariable("LAST", val);
-    }
-
   /*
    * Then show everything...
    */
@@ -427,7 +447,7 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
    * Show the error...
    */

-    cgiShowIPPError(_("Unable to get class list"));
+    cgiShowIPPError(_("Unable to get class list:"));
  }

   cgiEndHTML();
@@ -526,8 +546,13 @@ show_class(http_t     *http,		/* I - Connection to server */
    */

    cgiStartHTML(pclass);
-    cgiShowIPPError(_("Unable to get class status"));
+    cgiShowIPPError(_("Unable to get class status:"));
  }

   cgiEndHTML();
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,34 @@
 /*
- * Online help index routines for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Online help index routines for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * 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.
 */

 /*
@@ -326,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 ++;
@@ -882,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);
@@ -890,7 +910,7 @@ help_load_file(
  node   = NULL;
  offset = 0;

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

  while (cupsFileGets(fp, line, sizeof(line)))
  {
@@ -999,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)
      {
@@ -1159,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 --;
@@ -1186,7 +1206,7 @@ help_load_file(
  cupsFileClose(fp);

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

  return (0);
 }
@@ -1218,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;
@@ -1301,3 +1321,8 @@ help_sort_words(help_word_t *w1,	/* I - Second word */

  return (_cups_strcasecmp(w1->text, w2->text));
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,16 @@
 /*
- * Online help index definitions for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2011 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Online help index definitions for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
 */

 #ifndef _CUPS_HELP_INDEX_H_
@@ -79,3 +81,7 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 #  endif /* __cplusplus */

 #endif /* !_CUPS_HELP_INDEX_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,20 @@
 /*
- * Online help CGI for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2011 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Online help CGI for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main() - Main entry for CGI.
 */

 /*
@@ -33,8 +39,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  const char	*query;			/* Search query */
  const char	*cache_dir;		/* CUPS_CACHEDIR environment variable */
  const char	*docroot;		/* CUPS_DOCROOT environment variable */
-  const char	*helpfile,		/* Current help file */
-		*helptitle = NULL;	/* Current help title */
+  const char	*helpfile;		/* Current help file */
  const char	*topic;			/* Current topic */
  char		topic_data[1024];	/* Topic form data */
  const char	*section;		/* Current section */
@@ -83,7 +88,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    perror(filename);

    cgiStartHTML(cgiText(_("Online Help")));
-    cgiSetVariable("ERROR", cgiText(_("Unable to load help index.")));
+    cgiSetVariable("ERROR", "Unable to load help index!");
    cgiCopyTemplateLang("error.tmpl");
    cgiEndHTML();

@@ -124,7 +129,7 @@ main(int  argc,				/* I - Number of command-line arguments */
      perror(filename);

      cgiStartHTML(cgiText(_("Online Help")));
-      cgiSetVariable("ERROR", cgiText(_("Unable to access help file.")));
+      cgiSetVariable("ERROR", "Unable to access help file!");
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();

@@ -134,7 +139,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    if ((n = helpFindNode(hi, helpfile, NULL)) == NULL)
    {
      cgiStartHTML(cgiText(_("Online Help")));
-      cgiSetVariable("ERROR", cgiText(_("Help file not in index.")));
+      cgiSetVariable("ERROR", "Help file not in index!");
      cgiCopyTemplateLang("error.tmpl");
      cgiEndHTML();

@@ -142,11 +147,12 @@ main(int  argc,				/* I - Number of command-line arguments */
    }

   /*
-    * Save the page title and help file...
+    * Set the page title and save the help file...
    */

-    helptitle = n->text;
-    topic     = n->section;
+    cgiSetVariable("HELPFILE", helpfile);
+    cgiSetVariable("HELPTITLE", n->text);
+    cgiSetVariable("TOPIC", n->section);

   /*
    * Send a standard page header...
@@ -164,8 +170,6 @@ main(int  argc,				/* I - Number of command-line arguments */
    */

    cgiStartHTML(cgiText(_("Online Help")));
-
-    topic = cgiGetVariable("TOPIC");
  }

 /*
@@ -176,6 +180,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    cgiSetVariable("QUERY", "");

  query = cgiGetVariable("QUERY");
+  topic = cgiGetVariable("TOPIC");
  si    = helpSearchIndex(hi, query, topic, helpfile);

  cgiClearVariables();
@@ -183,10 +188,6 @@ main(int  argc,				/* I - Number of command-line arguments */
    cgiSetVariable("QUERY", query);
  if (topic)
    cgiSetVariable("TOPIC", topic);
-  if (helpfile)
-    cgiSetVariable("HELPFILE", helpfile);
-  if (helptitle)
-    cgiSetVariable("HELPTITLE", helptitle);

  fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n",
          query ? query : "(null)", topic ? topic : "(null)");
@@ -271,7 +272,7 @@ main(int  argc,				/* I - Number of command-line arguments */
      section = n->section;
    }

-    if (!topic || !n->section || strcmp(n->section, topic))
+    if (!topic || strcmp(n->section, topic))
      continue;

   /*
@@ -355,7 +356,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    else
    {
      perror(filename);
-      cgiSetVariable("ERROR", cgiText(_("Unable to open help file.")));
+      cgiSetVariable("ERROR", "Unable to open help file.");
      cgiCopyTemplateLang("error.tmpl");
    }
  }
@@ -384,3 +385,8 @@ main(int  argc,				/* I - Number of command-line arguments */

  return (0);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,26 @@
 /*
- * HTML support functions for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2011 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   HTML support functions for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   cgiEndHTML()           - End a HTML page.
+ *   cgiEndMultipart()      - End the delivery of a multipart web page.
+ *   cgiFormEncode()        - Encode a string as a form variable.
+ *   cgiStartHTML()         - Start a HTML page.
+ *   cgiStartMultipart()    - Start a multipart delivery of a web page.
+ *   cgiSupportsMultipart() - Does the browser support multi-part documents?
+ *   cgi_null_passwd()      - Return a NULL password for authentication.
 */

 /*
@@ -91,7 +103,7 @@ cgiFormEncode(char       *dst,		/* I - Destination string */
  for (dstptr = dst; *src && dstptr < dstend;)
  {
    switch (*src)
-    {
+    { 
      case ' ' :
         /*
 	  * Encode spaces with a "+"...
@@ -220,3 +232,8 @@ cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */

  return (NULL);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,31 @@
 /*
- * CGI <-> IPP variable routines for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   CGI <-> IPP variable routines for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * 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.
 */

 /*
@@ -48,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] = '_';

@@ -90,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...
@@ -106,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...
@@ -220,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 */
@@ -540,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"
@@ -778,7 +792,7 @@ cgiPrintTestPage(http_t     *http,	/* I - Connection to server */
  cgiStartHTML(cgiText(_("Print Test Page")));

  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to print test page"));
+    cgiShowIPPError(_("Unable to print test page:"));
  else
  {
    cgiSetVariable("PRINTER_NAME", dest);
@@ -903,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
    {
@@ -912,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);
 }
@@ -940,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\", "
@@ -1020,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);
@@ -1158,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);

@@ -1167,32 +1186,40 @@ 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 ?
-			 "dpi" : "dpcm");
+			 "dpi" : "dpc");
 	    break;

 	case IPP_TAG_URI :
@@ -1203,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;
            }

@@ -1215,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 :
@@ -1323,7 +1364,7 @@ cgiSetIPPVars(ipp_t      *response,	/* I - Response data to be copied... */
    attr = cgiSetIPPObjectVars(attr, prefix, element);
  }

-  fprintf(stderr, "DEBUG2: Returning %d from cgiSetIPPVars()...\n", element);
+  fprintf(stderr, "DEBUG2: Returing %d from cgiSetIPPVars()...\n", element);

  return (element);
 }
@@ -1358,7 +1399,8 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
 			*response;	/* IPP response */
  cups_array_t		*jobs;		/* Array of job objects */
  ipp_attribute_t	*job;		/* Job object */
-  int			first,		/* First job to show */
+  int			ascending,	/* Order of jobs (0 = descending) */
+			first,		/* First job to show */
 			count;		/* Number of jobs */
  const char		*var,		/* Form variable */
 			*query,		/* Query string */
@@ -1390,21 +1432,10 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
        	 "ipp://localhost/");

-  if ((which_jobs = cgiGetVariable("which_jobs")) != NULL && *which_jobs)
+  if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
                 NULL, which_jobs);

-  if ((var = cgiGetVariable("FIRST")) != NULL)
-  {
-    if ((first = atoi(var)) < 0)
-      first = 0;
-  }
-  else
-    first = 0;
-
-  if (first > 0)
-    ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "first-index", first + 1);
-
  cgiGetAttributes(request, "jobs.tmpl");

 /*
@@ -1427,7 +1458,7 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    }

    jobs  = cgiGetIPPObjects(response, search);
-    count = cupsArrayCount(jobs) + first;
+    count = cupsArrayCount(jobs);

    if (search)
      cgiFreeSearch(search);
@@ -1436,6 +1467,24 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    * Figure out which jobs to display...
    */

+    if ((var = cgiGetVariable("FIRST")) != NULL)
+      first = atoi(var);
+    else
+      first = 0;
+
+    if (first >= count)
+      first = count - CUPS_PAGE_MAX;
+
+    first = (first / CUPS_PAGE_MAX) * CUPS_PAGE_MAX;
+
+    if (first < 0)
+      first = 0;
+
+    if ((var = cgiGetVariable("ORDER")) != NULL)
+      ascending = !_cups_strcasecmp(var, "asc");
+    else
+      ascending = !which_jobs || !_cups_strcasecmp(which_jobs, "not-completed");
+
    section = cgiGetVariable("SECTION");

    cgiClearVariables();
@@ -1443,6 +1492,8 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    if (query)
      cgiSetVariable("QUERY", query);

+    cgiSetVariable("ORDER", ascending ? "asc" : "dec");
+
    cgiSetVariable("SECTION", section);

    sprintf(val, "%d", count);
@@ -1451,10 +1502,20 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
    if (which_jobs)
      cgiSetVariable("WHICH_JOBS", which_jobs);

-    for (i = 0, job = (ipp_attribute_t *)cupsArrayFirst(jobs);
-	 i < CUPS_PAGE_MAX && job;
-	 i ++, job = (ipp_attribute_t *)cupsArrayNext(jobs))
-      cgiSetIPPObjectVars(job, NULL, i);
+    if (ascending)
+    {
+      for (i = 0, job = (ipp_attribute_t *)cupsArrayIndex(jobs, first);
+	   i < CUPS_PAGE_MAX && job;
+	   i ++, job = (ipp_attribute_t *)cupsArrayNext(jobs))
+        cgiSetIPPObjectVars(job, NULL, i);
+    }
+    else
+    {
+      for (i = 0, job = (ipp_attribute_t *)cupsArrayIndex(jobs, count - first - 1);
+	   i < CUPS_PAGE_MAX && job;
+	   i ++, job = (ipp_attribute_t *)cupsArrayPrev(jobs))
+        cgiSetIPPObjectVars(job, NULL, i);
+    }

   /*
    * Save navigation URLs...
@@ -1483,12 +1544,6 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
      cgiSetVariable("NEXT", val);
    }

-    if (count > CUPS_PAGE_MAX)
-    {
-      snprintf(val, sizeof(val), "%d", CUPS_PAGE_MAX * (count / CUPS_PAGE_MAX));
-      cgiSetVariable("LAST", val);
-    }
-
   /*
    * Then show everything...
    */
@@ -1530,3 +1585,8 @@ cgiText(const char *message)		/* I - Message */

  return (_cupsLangString(language, message));
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,21 @@
 /*
- * Job status CGI for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Job status CGI for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main()      - Main entry for CGI.
+ *   do_job_op() - Do a job operation.
 */

 /*
@@ -30,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 */
@@ -174,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);
  }
@@ -187,7 +195,7 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
  cgiStartHTML(cgiText(_("Jobs")));

  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Job operation failed"));
+    cgiShowIPPError(_("Job operation failed:"));
  else if (op == IPP_CANCEL_JOB)
    cgiCopyTemplateLang("job-cancel.tmpl");
  else if (op == IPP_HOLD_JOB)
@@ -199,3 +207,8 @@ do_job_op(http_t      *http,		/* I - HTTP connection */

  cgiEndHTML();
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,25 +1,37 @@
 /*
- * Xcode documentation set generator.
+ * "$Id$"
 *
- * Copyright 2007-2012 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Xcode documentation set generator.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
 *
 * Usage:
 *
 *   makedocset directory *.tokens
+ *
+ * Contents:
+ *
+ *   main()                   - Test the help index code.
+ *   compare_html()           - Compare the titles of two HTML files.
+ *   compare_sections()       - Compare the names of two help sections.
+ *   compare_sections_files() - Compare the number of files and section names.
+ *   write_index()            - Write an index file for the CUPS help.
+ *   write_info()             - Write the Info.plist file.
+ *   write_nodes()            - Write the Nodes.xml file.
 */

 /*
 * Include necessary headers...
 */

-#include "cgi-private.h"
+#include "cgi.h"
 #include <errno.h>


@@ -467,3 +479,8 @@ write_nodes(const char   *path,		/* I - File to write */

  cupsFileClose(fp);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,23 @@
 /*
- * Printer status CGI for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Printer status CGI for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * 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.
 */

 /*
@@ -34,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 */
@@ -162,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")));
@@ -256,7 +266,7 @@ do_printer_op(http_t      *http,	/* I - HTTP connection */
  else if (cupsLastError() > IPP_OK_CONFLICT)
  {
    cgiStartHTML(title);
-    cgiShowIPPError(_("Unable to do maintenance command"));
+    cgiShowIPPError(_("Unable to do maintenance command:"));
  }
  else
  {
@@ -283,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();
@@ -304,7 +314,8 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
 			*response;	/* IPP response */
  cups_array_t		*printers;	/* Array of printer objects */
  ipp_attribute_t	*printer;	/* Printer object */
-  int			first,		/* First printer to show */
+  int			ascending,	/* Order of printers (0 = descending) */
+			first,		/* First printer to show */
 			count;		/* Number of printers */
  const char		*var;		/* Form variable */
  void			*search;	/* Search data */
@@ -386,10 +397,25 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
    sprintf(val, "%d", count);
    cgiSetVariable("TOTAL", val);

-    for (i = 0, printer = (ipp_attribute_t *)cupsArrayIndex(printers, first);
-	 i < CUPS_PAGE_MAX && printer;
-	 i ++, printer = (ipp_attribute_t *)cupsArrayNext(printers))
-      cgiSetIPPObjectVars(printer, NULL, i);
+    if ((var = cgiGetVariable("ORDER")) != NULL)
+      ascending = !_cups_strcasecmp(var, "asc");
+    else
+      ascending = 1;
+
+    if (ascending)
+    {
+      for (i = 0, printer = (ipp_attribute_t *)cupsArrayIndex(printers, first);
+	   i < CUPS_PAGE_MAX && printer;
+	   i ++, printer = (ipp_attribute_t *)cupsArrayNext(printers))
+        cgiSetIPPObjectVars(printer, NULL, i);
+    }
+    else
+    {
+      for (i = 0, printer = (ipp_attribute_t *)cupsArrayIndex(printers, count - first - 1);
+	   i < CUPS_PAGE_MAX && printer;
+	   i ++, printer = (ipp_attribute_t *)cupsArrayPrev(printers))
+        cgiSetIPPObjectVars(printer, NULL, i);
+    }

   /*
    * Save navigation URLs...
@@ -409,12 +435,6 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
      cgiSetVariable("NEXT", val);
    }

-    if (count > CUPS_PAGE_MAX)
-    {
-      snprintf(val, sizeof(val), "%d", CUPS_PAGE_MAX * (count / CUPS_PAGE_MAX));
-      cgiSetVariable("LAST", val);
-    }
-
   /*
    * Then show everything...
    */
@@ -444,7 +464,7 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
    * Show the error...
    */

-    cgiShowIPPError(_("Unable to get printer list"));
+    cgiShowIPPError(_("Unable to get printer list:"));
  }

   cgiEndHTML();
@@ -546,8 +566,13 @@ show_printer(http_t     *http,		/* I - Connection to server */
    */

    cgiStartHTML(printer);
-    cgiShowIPPError(_("Unable to get printer status"));
+    cgiShowIPPError(_("Unable to get printer status:"));
  }

   cgiEndHTML();
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,22 @@
 /*
- * Search routines for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   Search routines for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   cgiCompileSearch() - Compile a search string.
+ *   cgiDoSearch()      - Do a search of some text.
+ *   cgiFreeSearch()    - Free a compiled search context.
 */

 /*
@@ -30,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 */


@@ -131,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
@@ -166,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);

@@ -200,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);

     /*
@@ -241,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);
@@ -279,7 +287,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
    free(lword);

  if (sptr > s)
-    memcpy(sptr, ".*", 3);
+    strcpy(sptr, ".*");
  else
  {
   /*
@@ -366,3 +374,8 @@ cgiFreeSearch(void *search)		/* I - Search context */
 {
  regfree((regex_t *)search);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,27 @@
 /*
- * CGI template function.
+ * "$Id$"
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ *   CGI template function.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * 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"
@@ -253,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';

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

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

      if (ch == '?')
      {
@@ -473,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] == '#')
@@ -485,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';

@@ -540,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;
 	      }
@@ -646,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 == '\"')
@@ -681,3 +726,8 @@ cgi_puturi(const char *s,		/* I - String to output */
    s ++;
  }
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,21 @@
 /*
- * CGI test program for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2014 by Apple Inc.
- * Copyright 1997-2005 by Easy Software Products.
+ *   CGI test program for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main()       - Test the help index code.
+ *   list_nodes() - List nodes in an array...
 */

 /*
@@ -23,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...
@@ -60,3 +68,8 @@ main(void)

  return (0);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,21 @@
 /*
- * Help index test program for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2011 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Help index test program for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
+ *
+ * Contents:
+ *
+ *   main()       - Test the help index code.
+ *   list_nodes() - List nodes in an array...
 */

 /*
@@ -99,3 +106,8 @@ list_nodes(const char   *title,		/* I - Title string */
    printf(" (%d words)\n", cupsArrayCount(node->words));
  }
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,14 +1,20 @@
 /*
- * CGI template test program for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2011 by Apple Inc.
- * Copyright 2006 by Easy Software Products.
+ *   CGI template test program for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 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/".
+ *
+ * Contents:
+ *
+ *   main() - Test the template code.
 */

 /*
@@ -90,3 +96,8 @@ main(int  argc,				/* I - Number of command-line arguments */

  return (0);
 }
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,18 +1,49 @@
 /*
- * CGI form variable and array functions for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2005 by Easy Software Products.
+ *   CGI form variable and array functions for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
- */
-
-/*
- * Include necessary headers...
+ *   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/".
+ *
+ * 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*/
@@ -136,8 +167,6 @@ cgiClearVariables(void)
  _cgi_var_t	*v;			/* Current variable */


-  fputs("DEBUG: cgiClearVariables called.\n", stderr);
-
  for (v = form_vars, i = form_count; i > 0; v ++, i --)
  {
    _cupsStrFree(v->name);
@@ -372,8 +401,6 @@ cgiSetArray(const char *name,		/* I - Name of variable */
  if (name == NULL || value == NULL || element < 0 || element > 100000)
    return;

-  fprintf(stderr, "DEBUG: cgiSetArray: %s[%d]=\"%s\"\n", name, element, value);
-
  if ((var = cgi_find_variable(name)) == NULL)
  {
    cgi_add_variable(name, element, value);
@@ -386,7 +413,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;

@@ -435,9 +462,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');
 }


@@ -464,7 +491,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;

@@ -505,8 +532,6 @@ cgiSetVariable(const char *name,	/* I - Name of variable */
  if (name == NULL || value == NULL)
    return;

-  fprintf(stderr, "cgiSetVariable: %s=\"%s\"\n", name, value);
-
  if ((var = cgi_find_variable(name)) == NULL)
  {
    cgi_add_variable(name, 0, value);
@@ -550,7 +575,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;
@@ -561,7 +586,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);
@@ -601,7 +626,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));
 }

@@ -624,8 +649,6 @@ cgi_initialize_cookies(void)

  while (*cookie)
  {
-    int	skip = 0;			/* Skip this cookie? */
-
   /*
    * Skip leading whitespace...
    */
@@ -641,14 +664,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;
@@ -664,38 +682,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';

@@ -704,7 +710,7 @@ cgi_initialize_cookies(void)
    * "$"...
    */

-    if (name[0] != '$' && !skip)
+    if (name[0] != '$')
      num_cookies = cupsAddOption(name, value, num_cookies, &cookies);
  }
 }
@@ -757,8 +763,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));
@@ -823,22 +829,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;
 	  }
 	}
@@ -848,7 +854,7 @@ cgi_initialize_multipart(
 	*/

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

 	close(fd);
      }
@@ -865,9 +871,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;
@@ -967,12 +973,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...");
@@ -989,7 +995,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)
@@ -999,8 +1005,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)
      {
@@ -1114,7 +1120,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';
@@ -1252,7 +1258,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
@@ -1292,3 +1298,8 @@ cgi_unlink_file(void)
    form_file = NULL;
  }
 }
+
+
+/*
+ * 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,14 +1,16 @@
 #
-# Configuration file makefile for CUPS.
+# "$Id$"
 #
-# Copyright 2007-2015 by Apple Inc.
-# Copyright 1993-2006 by Easy Software Products.
+#   Configuration file makefile for CUPS.
 #
-# 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
-# missing or damaged, see the license at "http://www.cups.org/".
+#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 1993-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/".
 #

 include ../Makedefs
@@ -17,7 +19,7 @@ include ../Makedefs
 # Config files...
 #

-KEEP	=	cups-files.conf cupsd.conf snmp.conf
+KEEP	=	cupsd.conf snmp.conf
 REPLACE	=	mime.convs mime.types


@@ -74,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 \
@@ -134,3 +136,8 @@ uninstall:
 		$(RM) $(BUILDROOT)$(PAMDIR)/cups; \
 		$(RMDIR) $(BUILDROOT)$(PAMDIR); \
 	fi
+
+
+#
+# End of "$Id$".
+#
@@ -1,93 +0,0 @@
-#
-# 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@
-
-# User that is substituted for unauthenticated (remote) root accesses...
-#RemoteRoot remroot
-
-# Do we allow file: device URIs other than to /dev/null?
-#FileDevice No
-
-# Permissions for configuration and log files...
-#ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
-#LogFilePerm 0@CUPS_LOG_FILE_PERM@
-
-# Location of the file logging all access to the scheduler; may be the name
-# "syslog". If not an absolute path, the value of ServerRoot is used as the
-# root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
-AccessLog @CUPS_LOGDIR@/access_log
-
-# Location of cache files used by the scheduler...
-#CacheDir @CUPS_CACHEDIR@
-
-# Location of data files used by the scheduler...
-#DataDir @CUPS_DATADIR@
-
-# Location of the static web content served by the scheduler...
-#DocumentRoot @CUPS_DOCROOT@
-
-# Location of the file logging all messages produced by the scheduler and any
-# helper programs; may be the name "syslog". If not an absolute path, the value
-# of ServerRoot is used as the root directory.  Also see the "LogLevel"
-# directive in cupsd.conf.
-ErrorLog @CUPS_LOGDIR@/error_log
-
-# Location of fonts used by older print filters...
-#FontPath @CUPS_FONTPATH@
-
-# Location of LPD configuration
-#LPDConfigFile @CUPS_DEFAULT_LPD_CONFIG_FILE@
-
-# Location of the file logging all pages printed by the scheduler and any
-# helper programs; may be the name "syslog". If not an absolute path, the value
-# of ServerRoot is used as the root directory.  Also see the "PageLogFormat"
-# directive in cupsd.conf.
-PageLog @CUPS_LOGDIR@/page_log
-
-# Location of the file listing all of the local printers...
-#Printcap @CUPS_DEFAULT_PRINTCAP@
-
-# Format of the Printcap file...
-#PrintcapFormat bsd
-#PrintcapFormat plist
-#PrintcapFormat solaris
-
-# Location of all spool files...
-#RequestRoot @CUPS_REQUESTS@
-
-# Location of helper programs...
-#ServerBin @CUPS_SERVERBIN@
-
-# SSL/TLS keychain for the scheduler...
-#ServerKeychain @CUPS_SERVERKEYCHAIN@
-
-# Location of other configuration files...
-#ServerRoot @CUPS_SERVERROOT@
-
-# Location of Samba configuration file...
-#SMBConfigFile @CUPS_DEFAULT_SMB_CONFIG_FILE@
-
-# Location of scheduler state files...
-#StateDir @CUPS_STATEDIR@
-
-# Location of scheduler/helper temporary files. This directory is emptied on
-# scheduler startup and cannot be one of the standard (public) temporary
-# directory locations for security reasons...
-#TempDir @CUPS_REQUESTS@/tmp
@@ -1,12 +1,17 @@
 #
-# 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@
+
+# Administrator user group...
+SystemGroup @CUPS_SYSTEM_GROUPS@
+@CUPS_SYSTEM_AUTHKEY@

 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
@@ -14,6 +19,8 @@ Listen localhost:@DEFAULT_IPP_PORT@

 # Show shared printers on the local network.
 Browsing On
+BrowseOrder allow,deny
+BrowseAllow all
 BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@

 # Default authentication type, when authentication is required...
@@ -39,13 +46,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...
@@ -135,48 +135,6 @@ WebInterface @CUPS_WEBIF@
  </Limit>
 </Policy>

-# Set the kerberized printer/job policies...
-<Policy kerberos>
-  # Job/subscription privacy...
-  JobPrivateAccess default
-  JobPrivateValues default
-  SubscriptionPrivateAccess default
-  SubscriptionPrivateValues default
-
-  # Job-related operations must be done by the owner or an administrator...
-  <Limit Create-Job Print-Job Print-URI Validate-Job>
-    AuthType Negotiate
-    Order deny,allow
-  </Limit>
-
-  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
-    AuthType Negotiate
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All administration operations require an administrator to authenticate...
-  <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
-    AuthType Default
-    Require user @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All printer operations require a printer operator to authenticate...
-  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
-    AuthType Default
-    Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
-    Order deny,allow
-  </Limit>
-
-  # Only the owner or an administrator can cancel or authenticate a job...
-  <Limit Cancel-Job CUPS-Authenticate-Job>
-    AuthType Negotiate
-    Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
-    Order deny,allow
-  </Limit>
-
-  <Limit All>
-    Order deny,allow
-  </Limit>
-</Policy>
+#
+# End of "$Id$".
+#
@@ -1,18 +1,20 @@
 #
-# DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
-# VERSIONS OF CUPS.  Instead, create a "local.convs" file that
-# reflects your local configuration changes.
+# "$Id$"
 #
-# Base MIME conversions file for CUPS.
+#   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
+#   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
+#   reflects your local configuration changes.
 #
-# Copyright 2007-2016 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products.
+#   Base MIME conversions file for CUPS.
 #
-# 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/".
+#   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/".
 #

 ########################################################################
@@ -45,7 +47,6 @@ application/postscript		application/vnd.cups-postscript	66	pstops

 # PWG Raster filter for IPP Everywhere...
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
-application/vnd.cups-raster	image/urf			100	rastertopwg

 ########################################################################
 #
@@ -56,3 +57,7 @@ application/vnd.cups-raster	image/urf			100	rastertopwg
 #

@DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
+
+#
+# End of "$Id$".
+#
@@ -1,18 +1,20 @@
 #
-# Base MIME types file for CUPS.
+# "$Id: mime.types 9871 2011-08-06 06:34:46Z mike $"
 #
-# 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.
+#   Base MIME types file for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products.
+#   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.
 #
-# 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/".
+#   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/".
 #

 ########################################################################
@@ -35,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
@@ -69,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") \
@@ -79,7 +80,6 @@ application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
 				 (contains(0,4096,<0a>%!) + \
 				  !contains(0,4096,"ENTER LANGUAGE")))

-
 ########################################################################
 #
 # Image files...
@@ -92,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
@@ -106,7 +106,6 @@ image/x-xpixmap			xpm ascii(0,1024) + string(3,"XPM")
 image/x-sun-raster		ras string(0,<59a66a95>)

 #image/fpx			fpx
-image/urf			urf string(0,UNIRAST<00>)
 image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
@@ -124,8 +123,8 @@ 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 + \
-				(string(0,/*) string(0,//) \
+				printable(0,1024) + \
+				(string(0,/*) string(0,//)
 				 string(0,#include) contains(0,1024,<0a>#include) \
 				 string(0,#define) contains(0,1024,<0a>#define))
 text/html			html htm printable(0,1024) +\
@@ -153,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>@) \
@@ -169,3 +168,7 @@ application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 #

 application/octet-stream
+
+#
+# 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,22 +1,30 @@
 dnl
-dnl Common configuration stuff for CUPS.
+dnl "$Id: cups-common.m4 10192 2012-01-20 21:49:02Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Common configuration stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+dnl   Copyright 2007-2011 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
+
+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="AC_PACKAGE_VERSION"
+CUPS_VERSION="1.6svn"
 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 ],
@@ -25,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:=}"
@@ -36,16 +44,15 @@ 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)
-AC_PATH_PROG(GZIP,gzip)
+AC_PATH_PROG(HTMLDOC,htmldoc)
 AC_PATH_PROG(LD,ld)
 AC_PATH_PROG(LN,ln)
-AC_PATH_PROG(MKDIR,mkdir)
 AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(RM,rm)
 AC_PATH_PROG(RMDIR,rmdir)
@@ -82,12 +89,11 @@ 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))
-AC_SEARCH_LIBS(crypt, crypt)
 AC_SEARCH_LIBS(fmod, m)
+AC_SEARCH_LIBS(crypt, crypt)
 AC_SEARCH_LIBS(getspent, sec gen)

 LIBMALLOC=""
@@ -123,13 +129,14 @@ AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
 AC_CHECK_HEADER(langinfo.h,AC_DEFINE(HAVE_LANGINFO_H))
 AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
 AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
-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(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H))

 dnl Checks for iconv.h and iconv_open
 AC_CHECK_HEADER(iconv.h,
@@ -138,9 +145,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)...
@@ -162,7 +166,7 @@ AC_CHECK_FUNCS(statfs statvfs)

 dnl Checks for string functions.
 AC_CHECK_FUNCS(strdup strlcat strlcpy)
-if test "$host_os_name" = "hp-ux" -a "$host_os_version" = "1020"; then
+if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then
 	echo Forcing snprintf emulation for HP-UX.
 else
 	AC_CHECK_FUNCS(snprintf vsnprintf)
@@ -181,8 +185,8 @@ dnl Check for vsyslog function.
 AC_CHECK_FUNCS(vsyslog)

 dnl Checks for signal functions.
-case "$host_os_name" in
-	linux* | gnu*)
+case "$uname" in
+	Linux | GNU)
 		# Do not use sigset on Linux or GNU HURD
 		;;
 	*)
@@ -196,12 +200,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 Check for getgrouplist
-AC_CHECK_FUNCS(getgrouplist)
-
 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;
@@ -225,28 +223,21 @@ 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 $host_os_name != 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
-	AC_MSG_ERROR(Need pkg-config to enable libusb support.)
+if test x$enable_libusb = xyes; then
+	check_libusb=yes
+elif test x$enable_libusb != xno -a $uname != Darwin; then
+	check_libusb=yes
+else
+	check_libusb=no
+fi
+
+if test $check_libusb = yes; then
+	AC_CHECK_LIB(usb, usb_get_string_simple,[
+		AC_CHECK_HEADER(usb.h,
+			AC_DEFINE(HAVE_USB_H)
+			LIBUSB="-lusb")])
 fi

 dnl See if we have libwrap for TCP wrappers support...
@@ -263,23 +254,17 @@ if test x$enable_tcp_wrappers = xyes; then
 fi

 dnl ZLIB
-INSTALL_GZIP=""
 LIBZ=""
 AC_CHECK_HEADER(zlib.h,
    AC_CHECK_LIB(z, gzgets,
 	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))
-AC_SUBST(INSTALL_GZIP)
+	LIBS="$LIBS -lz"))
 AC_SUBST(LIBZ)

 dnl Flags for "ar" command...
-case $host_os_name in
-        darwin* | *bsd*)
+case $uname in
+        Darwin* | *BSD*)
                ARFLAGS="-rcv"
                ;;
        *)
@@ -306,15 +291,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$host_os_name" != 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)
@@ -327,12 +317,7 @@ if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdar
 		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
@@ -344,12 +329,11 @@ AC_SUBST(DBUS_NOTIFIERLIBS)

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

-case $host_os_name in
-        darwin*)
+case $uname in
+        Darwin*)
                BACKLIBS="$BACKLIBS -framework IOKit"
                SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices"
                LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS"
@@ -359,15 +343,25 @@ case $host_os_name 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)

+		dnl Check for new ColorSync APIs...
+		SAVELIBS="$LIBS"
+		LIBS="$LIBS -framework ApplicationServices"
+		AC_CHECK_FUNCS(ColorSyncRegisterDevice)
+		LIBS="$SAVELIBS"
+
 		dnl Check for the new membership functions in MacOSX 10.4...
 		AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
 		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))

@@ -388,25 +382,27 @@ case $host_os_name in

 			if test "x$default_adminkey" != xdefault; then
 				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
-				CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey"
-			else
+			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"
 			fi

 			if test "x$default_operkey" != xdefault; then
 				CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin"
-			else
+			elif grep -q system.print.operator /etc/authorization; then
 				CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
+			else
+				CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
 			fi])
 		AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))

 		dnl Check for sandbox/Seatbelt support
-		if test $host_os_version -ge 100; then
+		if test $uversion -ge 100; then
 			AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
 		fi
-		if test $host_os_version -ge 110 -a $host_os_version -lt 120; then
-			# Broken public headers in 10.7.x...
+		if test $uversion -ge 110; then
+			# Broken public headers in 10.7...
 			AC_MSG_CHECKING(for sandbox/private.h presence)
 			if test -f /usr/local/include/sandbox/private.h; then
 				AC_MSG_RESULT(yes)
@@ -420,14 +416,11 @@ case $host_os_name in
 		AC_CHECK_HEADER(xpc/xpc.h,
 			AC_DEFINE(HAVE_XPC)
 			INSTALLXPC="install-xpc")
-		AC_CHECK_HEADER(xpc/private.h,
-			AC_DEFINE(HAVE_XPC_PRIVATE_H))
                ;;
 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)

@@ -454,3 +447,7 @@ case "$COMPONENTS" in
 esac

 AC_SUBST(BUILDDIRS)
+
+dnl
+dnl End of "$Id: cups-common.m4 10192 2012-01-20 21:49:02Z mike $".
+dnl
@@ -1,14 +1,16 @@
 dnl
-dnl Compiler stuff for CUPS.
+dnl "$Id: cups-compiler.m4 10190 2012-01-20 16:22:58Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Compiler stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+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

 dnl Clear the debugging and non-shared library options unless the user asks
@@ -46,10 +48,6 @@ fi

 dnl Unit tests take up time during a compile...
 if test x$enable_unit_tests = xyes; then
-        if test "$build" != "$host"; then
-                AC_MSG_ERROR([Sorry, cannot build unit tests when cross-compiling.])
-        fi
-
 	UNITTESTS="unittests"
 else
 	UNITTESTS=""
@@ -67,7 +65,7 @@ else
 fi

 if test -z "$with_ldarchflags"; then
-	if test "$host_os_name" = darwin; then
+	if test "$uname" = Darwin; then
 		# Only create Intel programs by default
 		LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch ppc64//'`"
 	else
@@ -105,103 +103,62 @@ 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 "$host_os_name" 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"
-
-		AC_MSG_CHECKING(whether compiler supports -Wno-format-truncation)
-		OLDCFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS -Werror -Wno-format-truncation"
-		AC_TRY_COMPILE(,,
-			[OPTIM="$OPTIM -Wno-format-truncation"
-			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

-	case "$host_os_name" in
-		darwin*)
+	case "$uname" in
+		Darwin*)
 			# -D_FORTIFY_SOURCE=2 adds additional object size
 			# checking, basically wrapping all string functions
 			# with buffer-limited ones.  Not strictly needed for
@@ -210,18 +167,65 @@ if test -n "$GCC"; then
 			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
 			;;

-		linux*)
+		Linux*)
 			# 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 $host_os_name in
-		sunos*)
+	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
 				if test "x$with_optim" = x; then
@@ -231,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
@@ -240,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."
 			;;
@@ -248,10 +266,34 @@ else
 fi

 # Add general compiler options per platform...
-case $host_os_name in
-	linux*)
+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 10190 2012-01-20 16:22:58Z mike $".
+dnl
@@ -1,18 +1,20 @@
 dnl
-dnl Default cupsd configuration settings for CUPS.
+dnl "$Id: cups-defaults.m4 10104 2011-11-04 06:37:03Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 2006-2007 by Easy Software Products, all rights reserved.
+dnl   Default cupsd configuration settings for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+dnl   Copyright 2007-2011 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
+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 Default languages...
-LANGUAGES="`ls -1 locale/cups_*.po 2>/dev/null | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '`"
+LANGUAGES="`ls -1 locale/cups_*.po | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '`"

 AC_ARG_WITH(languages, [  --with-languages        set installed languages, default=all ],[
 	case "$withval" in
@@ -22,10 +24,10 @@ AC_ARG_WITH(languages, [  --with-languages        set installed languages, defau
 	esac])
 AC_SUBST(LANGUAGES)

-dnl macOS bundle-based localization support
-AC_ARG_WITH(bundledir, [  --with-bundledir        set macOS localization bundle directory ],
+dnl Mac OS X bundle-based localization support
+AC_ARG_WITH(bundledir, [  --with-bundledir     set Mac OS X localization bundle directory ],
 	CUPS_BUNDLEDIR="$withval",
-	if test "x$host_os_name" = xdarwin -a $host_os_version -ge 100; then
+	if test "x$uname" = xDarwin -a $uversion -ge 100; then
 		CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A"
 		LANGUAGES=""
 	else
@@ -37,43 +39,17 @@ if test "x$CUPS_BUNDLEDIR" != x; then
 	AC_DEFINE_UNQUOTED(CUPS_BUNDLEDIR, "$CUPS_BUNDLEDIR")
 fi

-dnl Default executable file permissions
-AC_ARG_WITH(exe_file_perm, [  --with-exe-file-perm    set default executable permissions value, default=0555],
-	CUPS_EXE_FILE_PERM="$withval",
-	[case "$host_os_name" in
-		linux* | gnu*)
-			CUPS_EXE_FILE_PERM="755"
-			;;
-		*)
-			CUPS_EXE_FILE_PERM="555"
-			;;
-	esac])
-AC_SUBST(CUPS_EXE_FILE_PERM)
-
 dnl Default ConfigFilePerm
 AC_ARG_WITH(config_file_perm, [  --with-config-file-perm set default ConfigFilePerm value, default=0640],
 	CUPS_CONFIG_FILE_PERM="$withval",
-	[if test "x$host_os_name" = xdarwin; then
+	if test "x$uname" = xDarwin; then
 		CUPS_CONFIG_FILE_PERM="644"
 	else
 		CUPS_CONFIG_FILE_PERM="640"
-	fi])
+	fi)
 AC_SUBST(CUPS_CONFIG_FILE_PERM)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_CONFIG_FILE_PERM, 0$CUPS_CONFIG_FILE_PERM)

-dnl Default permissions for cupsd
-AC_ARG_WITH(cupsd_file_perm, [  --with-cupsd-file-perm  set default cupsd permissions, default=0500],
-	CUPS_CUPSD_FILE_PERM="$withval",
-	[case "$host_os_name" in
-		linux* | gnu*)
-			CUPS_CUPSD_FILE_PERM="700"
-			;;
-		*)
-			CUPS_CUPSD_FILE_PERM="500"
-			;;
-	esac])
-AC_SUBST(CUPS_CUPSD_FILE_PERM)
-
 dnl Default LogFilePerm
 AC_ARG_WITH(log_file_perm, [  --with-log-file-perm    set default LogFilePerm value, default=0644],
 	CUPS_LOG_FILE_PERM="$withval",
@@ -96,21 +72,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
@@ -129,7 +96,7 @@ AC_ARG_WITH(local_protocols, [  --with-local-protocols  set default BrowseLocalP

 if test x$with_local_protocols != xno; then
 	if test "x$default_local_protocols" = "xdefault"; then
-		if test "x$DNSSD_BACKEND" != "x"; then
+		if test "x$DNSSDLIBS" != "x"; then
 			CUPS_BROWSE_LOCAL_PROTOCOLS="dnssd"
 		else
 			CUPS_BROWSE_LOCAL_PROTOCOLS=""
@@ -161,7 +128,7 @@ dnl Determine the correct username and group for this OS...
 AC_ARG_WITH(cups_user, [  --with-cups-user        set default user for CUPS],
 	CUPS_USER="$withval",
 	AC_MSG_CHECKING(for default print user)
-	if test x$host_os_name = xdarwin; then
+	if test x$uname = xDarwin; then
 		if test x`id -u _lp 2>/dev/null` = x; then
 			CUPS_USER="lp";
 		else
@@ -194,7 +161,7 @@ fi
 AC_ARG_WITH(cups_group, [  --with-cups-group       set default group for CUPS],
 	CUPS_GROUP="$withval",
 	AC_MSG_CHECKING(for default print group)
-	if test x$host_os_name = xdarwin; then
+	if test x$uname = xDarwin; then
 		if test x`id -g _lp 2>/dev/null` = x; then
 			CUPS_GROUP="lp";
 		else
@@ -227,7 +194,7 @@ fi

 AC_ARG_WITH(system_groups, [  --with-system-groups    set default system groups for CUPS],
 	CUPS_SYSTEM_GROUPS="$withval",
-	if test x$host_os_name = xdarwin; then
+	if test x$uname = xDarwin; then
 		CUPS_SYSTEM_GROUPS="admin"
 	else
 		AC_MSG_CHECKING(for default system groups)
@@ -280,15 +247,15 @@ AC_ARG_WITH(printcap, [  --with-printcap         set default printcap file],

 if test x$default_printcap != xno; then
 	if test "x$default_printcap" = "xdefault"; then
-		case $host_os_name in
-			darwin*)
-				if test $host_os_version -ge 90; then
+		case $uname in
+			Darwin*)
+				if test $uversion -ge 90; then
 					CUPS_DEFAULT_PRINTCAP="/Library/Preferences/org.cups.printers.plist"
 				else
 					CUPS_DEFAULT_PRINTCAP="/etc/printcap"
 				fi
 				;;
-			sunos*)
+			SunOS*)
 				CUPS_DEFAULT_PRINTCAP="/etc/printers.conf"
 				;;
 			*)
@@ -312,8 +279,8 @@ AC_ARG_WITH(lpdconfigfile, [  --with-lpdconfigfile    set default LPDConfigFile

 if test x$default_lpdconfigfile != xno; then
 	if test "x$default_lpdconfigfile" = "xdefault"; then
-		case $host_os_name in
-			darwin*)
+		case $uname in
+			Darwin*)
 				CUPS_DEFAULT_LPD_CONFIG_FILE="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist"
 				;;
 			*)
@@ -332,7 +299,6 @@ else
 fi

 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG_FILE, "$CUPS_DEFAULT_LPD_CONFIG_FILE")
-AC_SUBST(CUPS_DEFAULT_LPD_CONFIG_FILE)

 dnl Default SMB config file...
 AC_ARG_WITH(smbconfigfile, [  --with-smbconfigfile    set default SMBConfigFile URI],
@@ -354,7 +320,6 @@ else
 fi

 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG_FILE, "$CUPS_DEFAULT_SMB_CONFIG_FILE")
-AC_SUBST(CUPS_DEFAULT_SMB_CONFIG_FILE)

 dnl Default MaxCopies value...
 AC_ARG_WITH(max-copies, [  --with-max-copies       set default max copies value, default=9999 ],
@@ -380,7 +345,7 @@ AC_ARG_WITH(snmp-address, [  --with-snmp-address     set SNMP query address, def
 	else
 		CUPS_SNMP_ADDRESS="Address $withval"
 	fi,
-	if test "x$host_os_name" = xdarwin; then
+	if test "x$uname" = xDarwin; then
 		CUPS_SNMP_ADDRESS=""
 	else
 		CUPS_SNMP_ADDRESS="Address @LOCAL"
@@ -402,7 +367,7 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)

 dnl Web interface...
-AC_ARG_ENABLE(webif, [  --enable-webif          enable the web interface by default, default=no for macOS])
+AC_ARG_ENABLE(webif, [  --enable-webif          enable the web interface by default, default=no for Mac OS X])
 case "x$enable_webif" in
 	xno)
 		CUPS_WEBIF=No
@@ -413,7 +378,7 @@ case "x$enable_webif" in
 		CUPS_DEFAULT_WEBIF=1
 		;;
 	*)
-		if test $host_os_name = darwin; then
+		if test $uname = Darwin; then
 			CUPS_WEBIF=No
 			CUPS_DEFAULT_WEBIF=0
 		else
@@ -425,3 +390,7 @@ esac

 AC_SUBST(CUPS_WEBIF)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)
+
+dnl
+dnl End of "$Id: cups-defaults.m4 10104 2011-11-04 06:37:03Z mike $".
+dnl
@@ -1,14 +1,16 @@
 dnl
-dnl Directory stuff for CUPS.
+dnl "$Id: cups-directories.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Directory stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+dnl   Copyright 2007-2011 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

 AC_PREFIX_DEFAULT(/)
@@ -74,7 +76,7 @@ fi
 dnl Fix "localstatedir" variable if it hasn't been specified...
 if test "$localstatedir" = "\${prefix}/var"; then
 	if test "$prefix" = "/"; then
-		if test "$host_os_name" = darwin; then
+		if test "$uname" = Darwin; then
 			localstatedir="/private/var"
 		else
 			localstatedir="/var"
@@ -87,7 +89,7 @@ fi
 dnl Fix "sysconfdir" variable if it hasn't been specified...
 if test "$sysconfdir" = "\${prefix}/etc"; then
 	if test "$prefix" = "/"; then
-		if test "$host_os_name" = darwin; then
+		if test "$uname" = Darwin; then
 			sysconfdir="/private/etc"
 		else
 			sysconfdir="/etc"
@@ -99,12 +101,20 @@ fi

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

@@ -119,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="")
@@ -165,7 +295,7 @@ dnl Setup default locations...
 AC_ARG_WITH(cachedir, [  --with-cachedir         set path for cache files],cachedir="$withval",cachedir="")

 if test x$cachedir = x; then
-	if test "x$host_os_name" = xdarwin; then
+	if test "x$uname" = xDarwin; then
 		CUPS_CACHEDIR="$localstatedir/spool/cups/cache"
 	else
 		CUPS_CACHEDIR="$localstatedir/cache/cups"
@@ -230,11 +360,15 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")

 # Locale data
 if test "$localedir" = "\${datarootdir}/locale"; then
-	case "$host_os_name" in
-		linux* | gnu* | *bsd* | darwin*)
+	case "$uname" in
+		Linux | GNU | *BSD* | Darwin*)
 			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"
@@ -265,9 +399,9 @@ AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
 AC_SUBST(CUPS_REQUESTS)

 # Server executables...
-case "$host_os_name" in
-	*bsd* | darwin*)
-		# *BSD and Darwin (macOS)
+case "$uname" in
+	*BSD* | Darwin*)
+		# *BSD and Darwin (MacOS X)
 		INSTALL_SYSV=""
 		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
 		;;
@@ -288,16 +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 "$host_os_name" in
-		darwin*)
-			# Darwin (macOS)
-			CUPS_STATEDIR="$CUPS_SERVERROOT"
-			;;
-		*)
-			# All others
-			CUPS_STATEDIR="$localstatedir/run/cups"
-			;;
-	esac])
+case "$uname" in
+	Darwin*)
+		# Darwin (Mac 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 9771 2011-05-12 05:21:56Z mike $".
+dnl
@@ -1,17 +1,18 @@
 dnl
-dnl DNS Service Discovery (aka Bonjour) stuff for CUPS.
+dnl "$Id: cups-dnssd.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
+dnl   DNS Service Discovery (aka Bonjour) stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+dnl   Copyright 2007-2011 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
+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(avahi, [  --disable-avahi         disable DNS Service Discovery support using Avahi])
-AC_ARG_ENABLE(dnssd, [  --disable-dnssd         disable DNS Service Discovery support using mDNSResponder])
+AC_ARG_ENABLE(dnssd, [  --disable-dnssd         disable DNS Service Discovery support])
 AC_ARG_WITH(dnssd-libs, [  --with-dnssd-libs       set directory for DNS Service Discovery library],
 	LDFLAGS="-L$withval $LDFLAGS"
 	DSOFLAGS="-L$withval $DSOFLAGS",)
@@ -21,34 +22,17 @@ 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$host_os_name != xdarwin; 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)
-	fi
-fi
-
-if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then
+if test x$enable_dnssd != xno; then
 	AC_CHECK_HEADER(dns_sd.h, [
-		case "$host_os_name" in
-			darwin*)
-				# Darwin and macOS...
+		case "$uname" in
+			Darwin*)
+				# Darwin and MacOS X...
 				AC_DEFINE(HAVE_DNSSD)
+				AC_DEFINE(HAVE_COREFOUNDATION)
+				AC_DEFINE(HAVE_SYSTEMCONFIGURATION)
 				DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration"
 				DNSSD_BACKEND="dnssd"
-				IPPFIND_BIN="ippfind"
-				IPPFIND_MAN="ippfind.\$(MAN1EXT)"
 				;;
 			*)
 				# All others...
@@ -65,8 +49,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"
 				;;
@@ -76,5 +58,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 9771 2011-05-12 05:21:56Z mike $".
+dnl
@@ -1,17 +1,19 @@
 dnl
-dnl GSSAPI/Kerberos library detection for CUPS.
+dnl   "$Id: cups-gssapi.m4 10137 2011-12-02 04:04:49Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 2006-2007 by Easy Software Products.
+dnl   GSSAPI/Kerberos library detection for CUPS.
 dnl
-dnl This file contains Kerberos support code, copyright 2006 by
-dnl Jelmer Vernooij.
+dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2006-2007 by Easy Software Products.
 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 missing or damaged, see the license at "http://www.cups.org/".
+dnl   This file contains Kerberos support code, copyright 2006 by
+dnl   Jelmer Vernooij.
+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(gssapi, [  --disable-gssapi        disable GSSAPI support])
@@ -20,11 +22,11 @@ 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 "$host_os_name" in
-			darwin)
-				# macOS weak-links to the Kerberos framework...
+		case "$uname" in
+			Darwin)
+				# Mac OS X weak-links to the Kerberos framework...
 				LIBGSSAPI="-weak_framework Kerberos"
 				AC_MSG_CHECKING(for GSS framework)
 				if test -d /System/Library/Frameworks/GSS.framework; then
@@ -34,7 +36,7 @@ if test x$enable_gssapi != xno; then
 					AC_MSG_RESULT(no)
 				fi
 				;;
-			sunos*)
+			SunOS*)
 				# Solaris has a non-standard krb5-config, don't use it!
 				AC_CHECK_LIB(gss, gss_display_status,
 					AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
@@ -52,13 +54,13 @@ if test x$enable_gssapi != xno; then
 		AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
 	else
 		# Check for vendor-specific implementations...
-		case "$host_os_name" in
-			hp-ux*)
+		case "$uname" in
+			HP-UX*)
 				AC_CHECK_LIB(gss, gss_display_status,
 					AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
 					LIBGSSAPI="-lgss -lgssapi_krb5")
 				;;
-			sunos*)
+			SunOS*)
 				AC_CHECK_LIB(gss, gss_display_status,
 					AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
 					LIBGSSAPI="-lgss")
@@ -69,12 +71,50 @@ 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_krb5.h presence)
+			if test -f $gssdir/Headers/gssapi_krb5.h; then
+				AC_DEFINE(HAVE_GSSAPI_KRB5_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; then
+					# Broken public headers in 10.7...
+					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))
+			AC_CHECK_HEADER(gssapi/gssapi_generic.h, AC_DEFINE(HAVE_GSSAPI_GENERIC_H))
+			AC_CHECK_HEADER(gssapi/gssapi_krb5.h, AC_DEFINE(HAVE_GSSAPI_KRB5_H))
 		fi

 		SAVELIBS="$LIBS"
@@ -125,3 +165,7 @@ fi

 AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")
+
+dnl
+dnl End of "$Id: cups-gssapi.m4 10137 2011-12-02 04:04:49Z mike $".
+dnl
@@ -1,14 +1,16 @@
 dnl
-dnl Large file support stuff for CUPS.
+dnl "$Id: cups-largefile.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Copyright 2007-2011 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Large file support stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+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

 dnl Check for largefile support...
@@ -44,3 +46,7 @@ if test $ac_cv_c_long_long = yes; then
 fi

 AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
+
+dnl
+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,22 +1,21 @@
 dnl
-dnl Libtool stuff for CUPS.
+dnl "$Id: cups-libtool.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Libtool stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+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

-AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=/path/to/libtool
+AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported
                          build with libtool (UNSUPPORTED!)],
 	[if test x$enable_libtool_unsupported != xno; then
-		if test x$enable_libtool_unsupported == xyes; then
-			AC_MSG_ERROR([Use --enable-libtool-unsupported=/path/to/libtool.])
-		fi
 		LIBTOOL="$enable_libtool_unsupported"
 		enable_shared=no
 		echo "WARNING: libtool is not supported or endorsed by Apple Inc."
@@ -25,40 +24,16 @@ AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=/path/to/libt
 		LIBTOOL=""
 	fi])

+AC_SUBST(LIBTOOL)
+
 if test x$LIBTOOL != x; then
-	DSO="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
-	DSOXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
-
-	LD_CC="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
-	LD_CXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
-
 	LIBCUPS="libcups.la"
-	LIBCUPSSTATIC="libcups.la"
-	LIBCUPSCGI="libcupscgi.la"
 	LIBCUPSIMAGE="libcupsimage.la"
-	LIBCUPSMIME="libcupsmime.la"
-	LIBCUPSPPDC="libcupsppdc.la"
-
-	LIBTOOL_CC="\$(LIBTOOL) --mode=compile --tag=CC"
-	LIBTOOL_CXX="\$(LIBTOOL) --mode=compile --tag=CXX"
-	LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
-
 	LINKCUPS="../cups/\$(LIBCUPS)"
 	LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
-
-else
-	LD_CC="\$(CC)"
-	LD_CXX="\$(CXX)"
-
-	LIBTOOL_CC=""
-	LIBTOOL_CXX=""
-	LIBTOOL_INSTALL=""
+	DSO="\$(CC)"
 fi

-AC_SUBST(LD_CC)
-AC_SUBST(LD_CXX)
-
-AC_SUBST(LIBTOOL)
-AC_SUBST(LIBTOOL_CC)
-AC_SUBST(LIBTOOL_CXX)
-AC_SUBST(LIBTOOL_INSTALL)
+dnl
+dnl End of "$Id: cups-libtool.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl
@@ -1,14 +1,16 @@
 dnl
-dnl Manpage stuff for CUPS.
+dnl "$Id: cups-manpages.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Manpage stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+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
+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...
@@ -19,13 +21,19 @@ if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
 fi

 if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
-	case "$host_os_name" in
-        	darwin* | linux* | gnu* | *bsd*)
-        		# Darwin, macOS, Linux, GNU HURD, and *BSD
+	case "$uname" in
+        	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"
@@ -42,17 +50,25 @@ AC_SUBST(AMANDIR)
 AC_SUBST(PMANDIR)

 dnl Setup manpage extensions...
-case "$host_os_name" in
-	sunos*)
-		# Solaris
+case "$uname" in
+	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
 		MAN8EXT=1m
 		MAN8DIR=1m
 		;;
-	linux* | gnu* | darwin*)
-		# Linux, GNU Hurd, and macOS
+	Linux* | GNU* | Darwin*)
+		# Linux, GNU Hurd, and Mac OS X
 		MAN1EXT=1.gz
 		MAN5EXT=5.gz
 		MAN7EXT=7.gz
@@ -74,3 +90,7 @@ AC_SUBST(MAN5EXT)
 AC_SUBST(MAN7EXT)
 AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)
+
+dnl
+dnl End of "$Id: cups-manpages.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl
@@ -1,22 +1,19 @@
 dnl
-dnl Networking stuff for CUPS.
+dnl "$Id: cups-network.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Copyright 2007-2016 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Networking stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+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

-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))
@@ -28,7 +25,7 @@ AC_SEARCH_LIBS(__res_init, resolv bind, AC_DEFINE(HAVE_RES_INIT),

 # Tru64 5.1b leaks file descriptors with these functions; disable until
 # we can come up with a test for this...
-if test "$host_os_name" != "osf1"; then
+if test "$uname" != "OSF1"; then
 	AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
 	AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
 fi
@@ -45,9 +42,9 @@ AC_ARG_WITH(domainsocket, [  --with-domainsocket     set unix domain socket name

 if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then
 	if test "x$default_domainsocket" = x; then
-		case "$host_os_name" in
-			darwin*)
-				# Darwin and macOS do their own thing...
+		case "$uname" in
+			Darwin*)
+				# Darwin and MaxOS X do their own thing...
 				CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd"
 				;;
 			*)
@@ -68,3 +65,10 @@ 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 9771 2011-05-12 05:21:56Z mike $".
+dnl
@@ -1,37 +1,35 @@
 dnl
-dnl Operating system stuff for CUPS.
+dnl "$Id: cups-opsys.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Operating system stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+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
+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 Get the build and host platforms and split the host_os value
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
+dnl Get the operating system, version number, and architecture...
+uname=`uname`
+uversion=`uname -r | sed -e '1,$s/^[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\).*/\1\2/'`
+uarch=`uname -m`

-[host_os_name=`echo $host_os | sed -e '1,$s/[0-9.]*$//g'`]
-[host_os_version=`echo $host_os | sed -e '1,$s/^[^0-9.]*//g' | awk -F. '{print $1 $2}'`]
-# Linux often does not yield an OS version we can use...
-if test "x$host_os_version" = x; then
-        host_os_version="0"
-fi
+case "$uname" in
+	GNU* | GNU/*)
+		uname="GNU"
+		;;
+	IRIX*)
+		uname="IRIX"
+		;;
+	Linux*)
+		uname="Linux"
+		;;
+esac

-if test "$host_os_name" = darwin -a $host_os_version -lt 120; then
-        AC_MSG_ERROR([Sorry, this version of CUPS requires macOS 10.8 or higher.])
-fi
-
-dnl Determine whether we are cross-compiling...
-if test "$build" = "$host"; then
-        # No, build local targets
-	LOCALTARGET="local"
-else
-        # Yes, don't build local targets
-	LOCALTARGET=""
-fi
-AC_SUBST(LOCALTARGET)
+dnl
+dnl "$Id: cups-opsys.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl
@@ -1,18 +1,25 @@
 dnl
-dnl PAM stuff for CUPS.
+dnl "$Id: cups-pam.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   PAM stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+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

 AC_ARG_ENABLE(pam, [  --disable-pam           disable PAM support])
-AC_ARG_WITH(pam_module, [  --with-pam-module       set the PAM module to use])
+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"
@@ -52,9 +59,9 @@ if test x$enable_pam != xno; then

 	LIBS="$SAVELIBS"

-	case "$host_os_name" in
-		darwin*)
-			# Darwin/macOS
+	case "$uname" in
+		Darwin*)
+			# Darwin/Mac OS X
 			if test "x$with_pam_module" != x; then
 				PAMFILE="pam.$with_pam_module"
 			elif test -f /usr/lib/pam/pam_opendirectory.so.2; then
@@ -89,3 +96,7 @@ AC_SUBST(PAMFILE)
 AC_SUBST(PAMLIBS)
 AC_SUBST(PAMMOD)
 AC_SUBST(PAMMODAUTH)
+
+dnl
+dnl End of "$Id: cups-pam.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl
@@ -1,16 +1,22 @@
 dnl
-dnl Select/poll stuff for CUPS.
+dnl "$Id: cups-poll.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Copyright 2007-2011 by Apple Inc.
-dnl Copyright 2006 by Easy Software Products, all rights reserved.
+dnl   Select/poll stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 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

 AC_CHECK_FUNC(poll, AC_DEFINE(HAVE_POLL))
 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 9771 2011-05-12 05:21:56Z mike $".
+dnl
@@ -1,26 +1,26 @@
 dnl
-dnl Scripting configuration stuff for CUPS.
+dnl "$Id: cups-scripting.m4 9927 2011-08-27 09:28:30Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Scripting configuration stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+dnl   Copyright 2007-2010 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

 dnl Do we have Java?
 AC_ARG_WITH(java, [  --with-java             set Java interpreter for web interfaces ],
 	CUPS_JAVA="$withval",
-	CUPS_JAVA="auto")
+	CUPS_JAVA="")

-if test "x$CUPS_JAVA" = xauto; then
+if test "x$CUPS_JAVA" = x; then
 	AC_PATH_PROG(JAVA,java)
 	CUPS_JAVA="$JAVA"
-elif test "x$CUPS_JAVA" = xno; then
-        CUPS_JAVA=""
 fi

 AC_DEFINE_UNQUOTED(CUPS_JAVA, "$CUPS_JAVA")
@@ -32,13 +32,11 @@ fi
 dnl Do we have Perl?
 AC_ARG_WITH(perl, [  --with-perl             set Perl interpreter for web interfaces ],
 	CUPS_PERL="$withval",
-	CUPS_PERL="auto")
+	CUPS_PERL="")

-if test "x$CUPS_PERL" = xauto; then
+if test "x$CUPS_PERL" = x; then
 	AC_PATH_PROG(PERL,perl)
 	CUPS_PERL="$PERL"
-elif test "x$CUPS_PERL" = xno; then
-        CUPS_PERL=""
 fi

 AC_DEFINE_UNQUOTED(CUPS_PERL, "$CUPS_PERL")
@@ -50,9 +48,9 @@ fi
 dnl Do we have PHP?
 AC_ARG_WITH(php, [  --with-php              set PHP interpreter for web interfaces ],
 	CUPS_PHP="$withval",
-	CUPS_PHP="auto")
+	CUPS_PHP="")

-if test "x$CUPS_PHP" = xauto; then
+if test "x$CUPS_PHP" = x; then
 	AC_PATH_PROG(PHPCGI,php-cgi)
 	if test "x$PHPCGI" = x; then
 		AC_PATH_PROG(PHP,php)
@@ -60,8 +58,6 @@ if test "x$CUPS_PHP" = xauto; then
 	else
 		CUPS_PHP="$PHPCGI"
 	fi
-elif test "x$CUPS_PHP" = xno; then
-        CUPS_PHP=""
 fi

 AC_DEFINE_UNQUOTED(CUPS_PHP, "$CUPS_PHP")
@@ -75,13 +71,11 @@ fi
 dnl Do we have Python?
 AC_ARG_WITH(python, [  --with-python           set Python interpreter for web interfaces ],
 	CUPS_PYTHON="$withval",
-	CUPS_PYTHON="auto")
+	CUPS_PYTHON="")

-if test "x$CUPS_PYTHON" = xauto; then
+if test "x$CUPS_PYTHON" = x; then
 	AC_PATH_PROG(PYTHON,python)
 	CUPS_PYTHON="$PYTHON"
-elif test "x$CUPS_PYTHON" = xno; then
-        CUPS_PYTHON=""
 fi

 AC_DEFINE_UNQUOTED(CUPS_PYTHON, "$CUPS_PYTHON")
@@ -89,3 +83,7 @@ AC_DEFINE_UNQUOTED(CUPS_PYTHON, "$CUPS_PYTHON")
 if test "x$CUPS_PYTHON" != x; then
 	AC_DEFINE(HAVE_PYTHON)
 fi
+
+dnl
+dnl End of "$Id: cups-scripting.m4 9927 2011-08-27 09:28:30Z mike $".
+dnl
@@ -1,14 +1,16 @@
 dnl
-dnl Shared library support for CUPS.
+dnl "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Shared library support for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+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

 PICFLAG=1
@@ -21,8 +23,8 @@ LIBCUPSBASE="lib$cupsbase"
 LIBCUPSSTATIC="lib$cupsbase.a"

 if test x$enable_shared != xno; then
-	case "$host_os_name" in
-		sunos*)
+	case "$uname" in
+		SunOS*)
 			LIBCUPS="lib$cupsbase.so.2"
 			LIBCUPSCGI="libcupscgi.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
@@ -32,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"
@@ -42,7 +88,7 @@ if test x$enable_shared != xno; then
 			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
 			;;
-		darwin*)
+		Darwin*)
 			LIBCUPS="lib$cupsbase.2.dylib"
 			LIBCUPSCGI="libcupscgi.1.dylib"
 			LIBCUPSIMAGE="libcupsimage.2.dylib"
@@ -52,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."
@@ -94,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)
@@ -120,8 +185,21 @@ if test "$DSO" != ":"; then
 	# Tell the run-time linkers where to find a DSO.  Some platforms
 	# need this option, even when the library is installed in a
 	# standard location...
-	case $host_os_name in
-                sunos*)
+	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
 				DSOFLAGS="-R$libdir $DSOFLAGS"
@@ -129,7 +207,7 @@ if test "$DSO" != ":"; then
 				EXPORT_LDFLAGS="-R$libdir"
 			fi
 			;;
-                *bsd*)
+                *BSD*)
                        # *BSD...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
@@ -137,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"
@@ -154,3 +232,7 @@ fi
 AC_SUBST(DSOLIBS)
 AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
+
+dnl
+dnl End of "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $".
+dnl
@@ -1,34 +1,41 @@
 dnl
-dnl TLS stuff for CUPS.
+dnl "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   OpenSSL/GNUTLS stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+dnl   Copyright 2007-2011 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

 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=""

 if test x$enable_ssl != xno; then
    dnl Look for CDSA...
    if test $have_ssl = 0 -a "x$enable_cdsassl" != "xno"; then
-	if test $host_os_name = darwin; then
+	if test $uname = Darwin; then
 	    AC_CHECK_HEADER(Security/SecureTransport.h, [
 	    	have_ssl=1
 		AC_DEFINE(HAVE_SSL)
 		AC_DEFINE(HAVE_CDSASSL)
-		CUPS_SERVERKEYCHAIN="/Library/Keychains/System.keychain"

 		dnl Check for the various security headers...
 		AC_CHECK_HEADER(Security/SecureTransportPriv.h,
@@ -49,18 +56,47 @@ 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)])
+		dnl Check for SSLSetProtocolVersionMax...
+		SAVELIBS="$LIBS"
+		LIBS="$LIBS -framework Security"
+		AC_CHECK_FUNC(SSLSetProtocolVersionMax)
+		LIBS="$SAVELIBS"

-		if test $host_os_version -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_PROG(LIBGNUTLSCONFIG,libgnutls-config)
+    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
 	if $PKGCONFIG --exists gnutls; then
 	    have_ssl=1
 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
@@ -76,15 +112,49 @@ if test x$enable_ssl != xno; then
 	fi

 	if test $have_ssl = 1; then
-	    CUPS_SERVERKEYCHAIN="ssl"
-
-	    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
+
+	    LIBS="$SAVELIBS")
+    fi
 fi

 IPPALIASES="http"
@@ -92,14 +162,18 @@ 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(IPPALIASES)
 AC_SUBST(SSLFLAGS)
 AC_SUBST(SSLLIBS)

 EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)
+
+
+dnl
+dnl End of "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $".
+dnl
@@ -1,187 +0,0 @@
-dnl
-dnl Launch-on-demand/startup stuff for CUPS.
-dnl
-dnl Copyright 2007-2017 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 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 macOS/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_activate_socket, [
-		AC_DEFINE(HAVE_LAUNCHD)
-		AC_DEFINE(HAVE_ONDEMAND)])
-	AC_CHECK_HEADER(launch.h, AC_DEFINE(HAVE_LAUNCH_H))
-
-	if test "$host_os_name" = darwin; then
-	        LAUNCHD_DIR="/System/Library/LaunchDaemons"
-		# liblaunch is already part of libSystem
-	fi
-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_DEFINE(HAVE_ONDEMAND)
-			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 Upstart is also used on Linux (e.g., Chrome OS)
-AC_ARG_ENABLE(upstart, [  --enable-upstart        enable upstart support])
-if test "x$enable_upstart" = "xyes"; then
-	if test "x$have_systemd" = "xyes"; then
-		AC_MSG_ERROR(Cannot support both systemd and upstart.)
-	fi
-	AC_DEFINE(HAVE_UPSTART)
-	AC_DEFINE(HAVE_ONDEMAND)
-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 "$host_os_name" in
-        	linux* | gnu*)
-                	# Linux
-                        rcstart="81"
-                      	;;
-
-		sunos*)
-			# Solaris
-                        rcstart="81"
-			;;
-
-                *)
-                        # Others
-                        rcstart="99"
-                        ;;
-	esac
-fi
-
-if test "x$rcstop" = x; then
-	case "$host_os_name" in
-        	linux* | gnu*)
-                	# 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
@@ -1,14 +1,16 @@
 dnl
-dnl Threading stuff for CUPS.
+dnl "$Id: cups-threads.m4 9771 2011-05-12 05:21:56Z mike $"
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Threading stuff for CUPS.
 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 missing or damaged, see the license at "http://www.cups.org/".
+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

 AC_ARG_ENABLE(threads, [  --disable-threads       disable multi-threading support])
@@ -36,7 +38,7 @@ if test "x$enable_threads" != xno; then

 				# Solaris requires -D_POSIX_PTHREAD_SEMANTICS to
 				# be POSIX-compliant... :(
-				if test $host_os_name = sunos; then
+				if test $uname = SunOS; then
 					PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
 				fi
 				break
@@ -46,3 +48,7 @@ if test "x$enable_threads" != xno; then
 fi

 AC_SUBST(PTHREAD_FLAGS)
+
+dnl
+dnl End of "$Id: cups-threads.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl
@@ -1,14 +1,16 @@
 /*
- * Configuration file for CUPS.
+ * "$Id$"
 *
- * Copyright 2007-2017 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ *   Configuration file for CUPS.
 *
- * 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
- * missing or damaged, see the license at "http://www.cups.org/".
+ *   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/".
 */

 #ifndef _CUPS_CONFIG_H_
@@ -30,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"


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

-#define CUPS_DEFAULT_MAX_COPIES	9999
+#define CUPS_DEFAULT_MAX_COPIES	100


 /*
@@ -130,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
@@ -169,10 +168,10 @@


 /*
- * Use <stdint.h>?
+ * Do we have <scsi/sg.h>?
 */

-#undef HAVE_STDINT_H
+#undef HAVE_SCSI_SG_H


 /*
@@ -240,13 +239,6 @@
 #undef HAVE_VSYSLOG


-/*
- * Do we have the systemd journal functions?
- */
-
-#undef HAVE_SYSTEMD_SD_JOURNAL_H
-
-
 /*
 * Do we have the (v)snprintf() functions?
 */
@@ -299,24 +291,10 @@

 #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?
- */
-
-#undef HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION
-
-
-/*
- * Do we have the gnutls_priority_set_direct function?
- */
-
-#undef HAVE_GNUTLS_PRIORITY_SET_DIRECT
-
-
 /*
 * What Security framework headers do we have?
 */
@@ -332,6 +310,41 @@
 #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 SSLSetProtocolVersionMax function?
+ */
+
+#undef HAVE_SSLSETPROTOCOLVERSIONMAX
+
+
 /*
 * Do we have the cssmErrorString function?
 */
@@ -340,24 +353,22 @@


 /*
- * Do we have the SecGenerateSelfSignedCertificate function?
+ * Do we have the SLP library?
 */

-#undef HAVE_SECGENERATESELFSIGNEDCERTIFICATE
+#undef HAVE_LIBSLP


 /*
- * Do we have the SecKeychainOpen function?
+ * Do we have an LDAP library?
 */

-#undef HAVE_SECKEYCHAINOPEN
-
-
-/*
- * Do we have (a working) SSLSetEnabledCiphers function?
- */
-
-#undef HAVE_SSLSETENABLEDCIPHERS
+#undef HAVE_LDAP
+#undef HAVE_OPENLDAP
+#undef HAVE_MOZILLA_LDAP
+#undef HAVE_LDAP_SSL_H
+#undef HAVE_LDAP_SSL
+#undef HAVE_LDAP_REBIND_PROC


 /*
@@ -368,19 +379,12 @@


 /*
- * Do we have mDNSResponder for DNS Service Discovery (aka Bonjour)?
+ * Do we have DNS Service Discovery (aka Bonjour)?
 */

 #undef HAVE_DNSSD


-/*
- * Do we have Avahi for DNS Service Discovery (aka Bonjour)?
- */
-
-#undef HAVE_AVAHI
-
-
 /*
 * Do we have <sys/ioctl.h>?
 */
@@ -465,6 +469,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?
 */
@@ -472,13 +483,6 @@
 #undef HAVE_PTHREAD_H


-/*
- * Do we have on-demand support (launchd/systemd/upstart)?
- */
-
-#undef HAVE_ONDEMAND
-
-
 /*
 * Do we have launchd support?
 */
@@ -487,20 +491,6 @@
 #undef HAVE_LAUNCHD


-/*
- * Do we have systemd support?
- */
-
-#undef HAVE_SYSTEMD
-
-
-/*
- * Do we have upstart support?
- */
-
-#undef HAVE_UPSTART
-
-
 /*
 * Various scripting languages...
 */
@@ -515,6 +505,32 @@
 #define CUPS_PYTHON	"/usr/bin/python"


+/*
+ * Location of the poppler/Xpdf pdftops program...
+ */
+
+#undef HAVE_PDFTOPS
+#undef HAVE_PDFTOPS_WITH_ORIGPAGESIZES
+#define CUPS_PDFTOPS	"/usr/bin/pdftops"
+
+
+/*
+ * Location of the Ghostscript gs program...
+ */
+
+#undef HAVE_GHOSTSCRIPT
+#undef HAVE_GHOSTSCRIPT_PS2WRITE
+#define CUPS_GHOSTSCRIPT "/usr/bin/gs"
+
+
+/*
+ * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
+ */
+
+#undef HAVE_COREFOUNDATION
+#undef HAVE_SYSTEMCONFIGURATION
+
+
 /*
 * Do we have CoreFoundation public and private headers?
 */
@@ -539,14 +555,7 @@


 /*
- * Do we have the getgrouplist() function?
- */
-
-#undef HAVE_GETGROUPLIST
-
-
-/*
- * Do we have macOS 10.4's mbr_XXX functions?
+ * Do we have Mac OS X 10.4's mbr_XXX functions?
 */

 #undef HAVE_MEMBERSHIP_H
@@ -562,13 +571,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


 /*
@@ -580,8 +595,11 @@
 #undef HAVE_GSS_GSSAPI_H
 #undef HAVE_GSS_GSSAPI_SPI_H
 #undef HAVE_GSSAPI
+#undef HAVE_GSSAPI_GENERIC_H
 #undef HAVE_GSSAPI_GSSAPI_H
 #undef HAVE_GSSAPI_H
+#undef HAVE_GSSAPI_KRB5_H
+#undef HAVE_KRB5_H


 /*
@@ -645,7 +663,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)
@@ -658,11 +676,18 @@
 #endif /* HAVE_ARC4RANDOM */


+/*
+ * Do we have vproc_transaction_begin/end?
+ */
+
+#undef HAVE_VPROC_TRANSACTION_BEGIN
+
+
 /*
 * Do we have libusb?
 */

-#undef HAVE_LIBUSB
+#undef HAVE_USB_H


 /*
@@ -692,18 +717,24 @@


 /*
- * Location of macOS localization bundle, if any.
+ * Location of Mac OS X localization bundle, if any.
 */

 #undef CUPS_BUNDLEDIR


+/*
+ * Do we have the ColorSyncRegisterDevice function?
+ */
+
+#undef HAVE_COLORSYNCREGISTERDEVICE
+
+
 /*
 * Do we have XPC?
 */

 #undef HAVE_XPC
-#undef HAVE_XPC_PRIVATE_H


 /*
@@ -713,21 +744,8 @@
 #undef HAVE_MXML_H


-/*
- * Do we have the C99 abs() function?
- */
-
-#undef HAVE_ABS
-#if !defined(HAVE_ABS) && !defined(abs)
-#  if defined(__GNUC__) || __STDC_VERSION__ >= 199901L
-#    define abs(x) _cups_abs(x)
-static inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
-#  elif defined(_MSC_VER)
-#    define abs(x) _cups_abs(x)
-static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
-#  else
-#    define abs(x) ((x) < 0 ? -(x) : (x))
-#  endif /* __GNUC__ || __STDC_VERSION__ */
-#endif /* !HAVE_ABS && !abs */
-
 #endif /* !_CUPS_CONFIG_H_ */
+
+/*
+ * End of "$Id$".
+ */
--- a/Mostrar Mais
+++ b/Mostrar Mais