Bump version numbers.

- Lots of usage of localtime and gmtime (use _r/_s versions instead -
  Issue #5685)
- Some unnecessary comparisons
- Suppress checks that are not useful (header guards, short global names, and
  the integer overflow checks which don't reflect the actual range of values)

.gitattributes

@@ -0,0 +1,3 @@
+.git* export-ignore
+.mailmap export-ignore
+tools export-ignore

.gitignore

@@ -0,0 +1,167 @@
+*.a
+*.bck
+*.gz
+*.o
+.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/admin.cgi
+cgi-bin/classes.cgi
+cgi-bin/help.cgi
+cgi-bin/jobs.cgi
+cgi-bin/printers.cgi
+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/libcups.2.dylib
+cups/libcups.dylib
+cups/libcups.so
+cups/libcups.so.2
+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/libcupsimage.2.dylib
+filter/libcupsimage.dylib
+filter/libcupsimage.so
+filter/libcupsimage.so.2
+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
+vcnet/.vs
+vcnet/packages
+vcnet/x64
+xcode/CUPS.xcodeproj/project.xcworkspace/
+xcode/CUPS.xcodeproj/xcuserdata/

.mailmap

@@ -0,0 +1,11 @@
+# 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>

CHANGES-1.6.txt

@@ -3,6 +3,8 @@ 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

CHANGES-1.7.txt

@@ -0,0 +1,250 @@
+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)

CHANGES-2.0.txt

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

CHANGES-2.1.txt

@@ -0,0 +1,150 @@
+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)
+

CHANGES-IPPTOOL.txt

@@ -1,162 +0,0 @@
-CHANGES-IPPTOOL.txt - 2013-07-15
---------------------------------
-
-This file provides a list of changes to the ipptool binary distribution posted
-on cups.org.
-
-2013-07-15
-
-	- New ippfind tool now included with ipptool.
-	- Added support for automatically extending the timeout when all of the
-	  request data has not yet been written (all platforms but Windows
-	  which does not support it...)
-	- Fixed several ipptool test files that used old STATUS names.
-
-
-2013-04-18
-
-	- Fixed some HTTP issues with authentication and compression.
-	- The IPP/1.1 test file did not allow for sufficient retries when
-	  printing.
-	- The IPP/1.1 test file did not allow for empty printer-name values.
-	- The IPP Everywhere test file contained numerous errors.
-	- The color.jpg test file used a progressive mode instead of the
-	  baseline JPEG mode.
-	- The IPP/1.1 test file referenced "color.jpeg" instead of "color.jpg".
-
-
-2013-01-31
-
-	- Added support for DEFINE-MATCH and DEFINE-NO-MATCH as STATUS
-	  predicates.
-	- Added support for WITH-VALUE and resolution values.
-	- Added support for SKIP-IF-MISSING (skip test if file is missing)
-	- Added support for octetString values.
-	- Added support for document compression in Print-Job and Send-Document
-	  requests.
-	- Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
-	  out.
-	- Fixed a bug where bad IPP responses would cause ipptool to crash.
-
-
-2012-02-28
-
-	- Changed behavior of WITH-VALUES "/regex/" to not require all values to
-	  match.
-	- Added WITH-ALL-VALUES directive for EXPECT predicates that require all
-	  values to match.
-	- Updated test files to use WITH-ALL-VALUES where necessary.
-	- Updated test files to use new ABNF for media names from PWG Media
-	  Names 2.0.
-
-
-2012-02-06
-
-	- Fixed the packaging of ipptool on Windows (removed unnecessary DLLs)
-	- Fixed an crash in ipptool when mixing DISPLAY with -I and a failed
-	  request.
-	- Added a Print-Job test file.
-	- Added a "setdebug" batch file for Windows
-	- Added support for a CUPS_DISABLE_ASYNC_CONNECT environment variable.
-
-
-2012-01-10
-
-	- Fixed an issue with the IPP/1.1 test file where the "waiting for job
-	  completion" test did not work.
-	- The attribute groups out of order error was not shown for the
-	  operation-attributes-tag group.
-
-
-2011-12-02
-
-	- Fixed a truncated XML output bug that would happen for certain errors.
-	- Fixed the order-of-groups tests.
-	- Fixed "WITH-VALUE >N" for rangeOfInteger attributes.
-	- The Windows installer was missing the get-printer-attributes.test
-	  file.
-	- The Linux binaries are now compiled for all LSB 4.x-compliant Linux
-	  distributions.
-	- The Linux binaries no longer support SSL or TLS.
-
-
-2011-10-05
-
-	- Fixed a crasher bug that showed up on Windows.
-	- The IPP/1.1 test would hang if the initial Print-Job test failed.
-	- Fixed a typo in the IPP/2.0 test.
-
-
-2011-10-03
-
-	- Using OF-TYPE with the "no-value" or "unknown" out-of-band value tags
-	  now works without special WITH-VALUE strings.
-	- ipptool now shows an error when an attribute appears more than once
-	  within the same attribute group.
-	- ipptool did not display attributes as specified by the DISPLAY
-	  directive when a test error failed.
-	- Fixed one spot where DEFINE-VALUE was still treated as an error when
-	  the EXPECT test failed.
-	- uriScheme values were not displayed properly.
-	- Updated the IPP/1.1 tests to properly validate support for
-	  job-hold-until-default and job-hold-until-supported when the Hold-Job
-	  operation is supported.
-	- Updated the IPP/1.1 tests to properly check for the various standard
-	  media sizes for the printing tests.
-	- Updated the IPP/1.1 tests to accept "no-value" for media-default an
-	  orientation-requested-default.
-	- Updated the IPP/1.1 tests to accept "unknown" for job-state.
-	- Updated the IPP/1.1 tests to not perform the bogus URI printing tests
-	  unless the "document-uri" variable is defined.
-	- Updated the IPP/2.0 tests to properly validate media-col
-	  "media-xxx-supported" attributes.
-	- Updated the IPP/2.2 tests to properly validate media-ready and
-	  media-col-ready.
-
-
-2011-09-28
-
-	- Test output now includes a summary and overall score at the end.
-	- The MATCH-VALUE predicate now correctly deals with a failed EXPECT
-	  condition.
-	- The IPP/1.1 test suite now looks for legacy media names and uses them
-	  if the corresponding PWG standard names are not present.
-	- The IPP/1.1 test suite now tests the Print-Job+Release-Job when the
-	  printer supports the job-hold-until attribute, Hold-Job operation, and
-	  Release-Job operation.
-
-
-2011-09-21
-
-	- Fixes for HTTP chunking, timeout, and encryption issues reported by
-	  various users.
-	- Greatly improved IPP tests with added IPP/2.2 tests.
-	- New test documents - 1-page and 4-page mixed A4/Letter PDF/PS and a
-	  couple JPEGs.
-	- New REPEAT directives to programmatically repeat tests as needed.
-
-
-2011-08-16
-
-	- The Windows version no longer requires Visual Studio to be installed.
-	- The Windows version now supports SSL.
-	- Added "ipps" URI support.
-	- Added a new "-T" option.
-	- Added support for fractional seconds for the -i option and DELAY
-	  directive.
-	- Added support for authentication.
-	- Added DEFINE-MATCH, DEFINE-NO-MATCH, DEFINE-VALUE, IF-NOT-DEFINED,
-	  IGNORE-ERRORS, SKIP-IF-DEFINED, SKIP-IF-NOT-DEFINED,
-	  SKIP-PREVIOUS-ERROR directives.
-	- WITH-VALUE now supports variable expansion.
-	- Updated the IPP/1.1 conformance test to skip the "my-jobs different
-	  user" test if the printer URI contains a username.
-	- Updated the IPP conformance tests to validate media, media-default,
-	  and media-supported values.
-	- No longer error out if a Printer returns a different version number in
-	  the response when the request contains the version 0.0.
-
-
-2010-10-16
-
-	- Initial release of standalone binary.

CHANGES.md

@@ -0,0 +1,517 @@
+CHANGES - 2.2.13 - 2019-12-13
+=============================
+
+
+Changes in CUPS v2.2.13
+-----------------------
+
+- CVE-2019-2228: The `ippSetValuetag` function did not validate the default
+  language value.
+- Added a workaround for the scheduler's systemd support (Issue #5640)
+- Fixed spelling of "fold-accordion".
+- Fixed the default common name for TLS certificates used by `ippserver`.
+- The libusb-based USB backend now reports an error when the distribution
+  permissions are wrong (Issue #5658)
+- Default printers set with `lpoptions` did not work in all cases (Issue #5681,
+  Issue #5683, Issue #5684)
+- Fixed an off-by-one error in `ippEnumString` (Issue #5695)
+- Fixed some new compiler warnings (Issue #5700)
+- Fixed a few issues with the Apple Raster support (rdar://55301114)
+- The IPP backend did not detect all cases where a job should be retried using
+  a raster format (rdar://56021091)
+
+
+Changes in CUPS v2.2.12
+-----------------------
+
+- CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows (rdar://51685251)
+- The `cupsctl` command now prevents setting "cups-files.conf" directives
+  (Issue #5530)
+- Updated the systemd service file for cupsd (Issue #5551)
+- The `cupsCheckDestSupported` function did not check octetString values
+  correctly (Issue #5557)
+- The scheduler did not encode octetString values like "job-password" correctly
+  for the print filters (Issue #5558)
+- Restored minimal support for the `Emulators` keyword in PPD files to allow
+  old Samsung printer drivers to continue to work (Issue #5562)
+- Timed out job submission now yields an error (Issue #5570)
+- The footer in the web interface covered some content on small displays
+  (Issue #5574)
+- The libusb-based USB backend now enforces read limits, improving print speed
+  in many cases (Issue #5583)
+- Fixed some compatibility issues with old releases of CUPS (Issue #5587)
+- Fixed a bug in the scheduler job cleanup code (Issue #5588)
+- "make" failed with GZIP options (Issue #5595)
+- Added FIPS-140 workarounds for GNU TLS (Issue #5601, Issue #5622)
+- The scheduler no longer provides a default value for the description
+  (Issue #5603)
+- The `lpadmin` command did not always update the PPD file for changes to the
+  `cupsIPPSupplies` and `cupsSNMPSupplies` keywords (Issue #5610)
+- The scheduler now uses both the group's membership list as well as the
+  various OS-specific membership functions to determine whether a user belongs
+  to a named group (Issue #5613)
+- Added USB quirks rule for HP LaserJet 1015 (Issue #5617)
+- Fixed some PPD parser issues (Issue #5623, Issue #5624)
+- The IPP parser no longer allows invalid member attributes in collections
+  (Issue #5630)
+- Fixed IPP buffer overflow (rdar://50035411)
+- Fixed memory disclosure issue in the scheduler (rdar://51373853)
+- Fixed DoS issues in the scheduler (rdar://51373929)
+- The scheduler would restart continuously when idle and printers were not
+  shared (rdar://52561199)
+- Fixed a command ordering issue in the Zebra ZPL driver.
+- Fixed a memory leak in `ppdOpen`.
+
+
+Changes in CUPS v2.2.11
+-----------------------
+
+- Running ppdmerge with the same input and output filenames did not work as
+  advertised (Issue #5455)
+- Fixed a potential memory leak when reading at the end of a file (Issue #5473)
+- Fixed potential unaligned accesses in the string pool (Issue #5474)
+- Fixed a potential memory leak when loading a PPD file (Issue #5475)
+- Added a USB quirks rule for the Lexmark E120n (Issue #5478)
+- Updated the USB quirks rule for Zebra label printers (Issue #5395)
+- Fixed a compile error on Linux (Issue #5483)
+- The lpadmin command, web interface, and scheduler all queried an IPP
+  Everywhere printer differently, resulting in different PPDs for the same
+  printer (Issue #5484)
+- Fixed an issue with the self-signed certificates generated by GNU TLS
+  (Issue #5506)
+- The `ippValidateAttribute` function did not catch all instances of invalid
+  UTF-8 strings (Issue #5509)
+- Non-Kerberized printing to Windows via IPP was broken (Issue #5515)
+- The scheduler no longer stops a printer if an error occurs when a job is
+  canceled or aborted (Issue #5517)
+- Added a USB quirks rule for the DYMO 450 Turbo (Issue #5521)
+- Added a USB quirks rule for Xerox printers (Issue #5523)
+- The scheduler's self-signed certificate did not include all of the alternate
+  names for the server when using GNU TLS (Issue #5525)
+- Fixed compiler warnings with newer versions of GCC (Issue #5532, Issue #5533)
+- Fixed some PPD caching and IPP Everywhere PPD accounting/password bugs
+  (Issue #5535)
+- Fixed `PreserveJobHistory` bug with time values (Issue #5538)
+- Media size matching now uses a tolerance of 0.5mm (rdar://33822024)
+- The lpadmin command would hang with a bad PPD file (rdar://41495016)
+- Fixed a potential crash bug in cups-driverd (rdar://46625579)
+- Fixed a performance regression with large PPDs (rdar://47040759)
+- The scheduler did not always idle exit as quickly as it could.
+
+
+Changes in CUPS v2.2.10
+-----------------------
+
+- CVE-2018-4300: Linux session cookies used a predictable random number seed.
+- The `lpoptions` command now works with IPP Everywhere printers that have not
+  yet been added as local queues (Issue #5045)
+- Added USB quirk rules (Issue #5395, Issue #5443)
+- The generated PPD files for IPP Everywhere printers did not contain the
+  cupsManualCopies keyword (Issue #5433)
+- Kerberos credentials might be truncated (Issue #5435)
+- The handling of `MaxJobTime 0` did not match the documentation (Issue #5438)
+- Incorporated the page accounting changes from CUPS 2.3 (Issue #5439)
+- Fixed a bug adding a queue with the `-E` option (Issue #5440)
+- Fixed a crash bug when mapping PPD duplex options to IPP attributes
+  (rdar://46183976)
+
+
+Changes in CUPS v2.2.9
+----------------------
+
+- Localization changes (Issue #5348, Issue #5362, Issue #5408)
+- Documentation updates (Issue #5369)
+- The lpadmin command would create a non-working printer in some error cases
+  (Issue #5305)
+- The scheduler would crash if an empty `AccessLog` directive was specified
+  (Issue #5309)
+- Fixed a regression in the changes to ippValidateAttribute (Issue #5322,
+  Issue #5330)
+- Fixed a crash bug in the Epson dot matrix driver (Issue #5323)
+- Automatic debug logging of job errors did not work with systemd (Issue #5337)
+- The web interface did not list the IPP Everywhere "driver" (Issue #5338)
+- The IPP Everywhere "driver" now properly supports face-up printers
+  (Issue #5345)
+- Fixed some typos in the label printer drivers (Issue #5350)
+- Multi-file jobs could get stuck if the backend failed (Issue #5359,
+  Issue #5413)
+- The IPP Everywhere "driver" no longer does local filtering when printing to
+  a shared CUPS printer (Issue #5361)
+- The lpadmin command now correctly reports IPP errors when configuring an
+  IPP Everywhere printer (Issue #5370)
+- Fixed some memory leaks discovered by Coverity (Issue #5375)
+- The PPD compiler incorrectly terminated JCL options (Issue #5379)
+- The cupstestppd utility did not generate errors for missing/mismatched
+  CloseUI/JCLCloseUI keywords (Issue #5381)
+- The scheduler now reports the actual location of the log file (Issue #5398)
+- Added a USB quirk rule (Issue #5420)
+- The scheduler was being backgrounded on macOS, causing applications to spin
+  (rdar://40436080)
+- The scheduler did not validate that required initial request attributes were
+  in the operation group (rdar://41098178)
+- Authentication in the web interface did not work on macOS (rdar://41444473)
+- Fixed an issue with HTTP Digest authentication (rdar://41709086)
+- The scheduler could crash when job history was purged (rdar://42198057)
+- Dropped non-working RSS subscriptions UI from web interface templates.
+- Fixed a memory leak for some IPP (extension) syntaxes.
+
+
+Changes in CUPS v2.2.8
+----------------------
+
+- Additional changes for the scheduler to substitute default values for invalid
+  job attributes when running in "relaxed conformance" mode (Issue #5229)
+- The `ipptool` program no longer checks for duplicate attributes when running
+  in list or CSV mode (Issue #5278)
+- Fixed builds without PAM (Issue #5283)
+- Fixed `lpoptions` man page (Issue #5286)
+- The `cupsCreateJob`, `cupsPrintFile2`, and `cupsPrintFiles2` APIs did not use
+  the supplied HTTP connection (Issue #5288)
+- Fixed another crash in the scheduler when adding an IPP Everywhere printer
+  (Issue #5290)
+- Added a workaround for certain web browsers that do not support multiple
+  authentication schemes in a single response header (Issue #5289)
+- Fixed policy limits containing the `All` operation (Issue #5296)
+- The scheduler was always restarted after idle-exit with systemd (Issue #5297)
+- Added a USB quirks rule for the HP LaserJet P1102 (Issue #5310)
+- The mailto notifier did not wait for the welcome message (Issue #5312)
+- Fixed a parsing bug in the pstops filter (Issue #5321)
+- Documentation updates (Issue #5299, Issue #5301, Issue #5306)
+- Localization updates (Issue #5317)
+- The scheduler allowed environment variables to be specified in the
+  `cupsd.conf` file (rdar://37836779, rdar://37836995, rdar://37837252,
+  rdar://37837581)
+- Fax queues did not support pause (p) or wait-for-dialtone (w) characters
+  (rdar://39212256)
+- The scheduler did not validate notify-recipient-uri values properly
+  (rdar://40068936)
+- The IPP parser allowed invalid group tags (rdar://40442124)
+- Fixed a parsing bug in the new authentication code.
+
+
+Changes in CUPS v2.2.7
+----------------------
+
+- NOTICE: Raw print queues are now deprecated (Issue #5269)
+- Fixed an Avahi crash bug in the scheduler (Issue #5268)
+- The IPP Everywhere PPD generator did not include the `cupsJobPassword`
+  keyword, when supported (Issue #5265)
+- Systemd did not restart cupsd when configuration changes were made that
+  required a restart (Issue #5263)
+- The Lexmark Optra E310 printer needs the "no-reattach" USB quirk rule
+  (Issue #5259)
+- The scheduler could crash while adding an IPP Everywhere printer (Issue #5258)
+- Label printers supported by the rastertolabel driver don't support SNMP, so
+  don't delay printing to test it (Issue #5256)
+- Fixed a compile issue when PAM is not available (Issue #5253)
+- Documentation fixes (Issue #5252)
+- Star Micronics printers need the "unidir" USB quirk rule (Issue #5251)
+- The scheduler now supports using temporary print queues for older IPP/1.1
+  print queues like those shared by CUPS 1.3 and earlier (Issue #5241)
+- Fixed printing to some IPP Everywhere printers (Issue #5238)
+- Kerberized printing to another CUPS server did not work correctly
+  (Issue #5233)
+- The `cupsRasterWritePixels` function did not correctly swap bytes for some
+  formats (Issue #5225)
+- Added a USB quirk rule for Canon MP280 series printers (Issue #5221)
+- The `ppdInstallableConflict` tested too many constraints (Issue #5213)
+- More fixes for printing to old CUPS servers (Issue #5211)
+- The `cupsCopyDest` function now correctly copies the `is_default` value
+  (Issue #5208)
+- The scheduler did not work with older versions of uClibc (Issue #5188)
+- The scheduler now substitutes default values for invalid job attributes when
+  running in "relaxed conformance" mode (Issue #5186)
+- Fixed PAM module detection and added support for the common PAM definitions
+  (Issue #5185)
+- Fixed a journald support bug in the scheduler (Issue #5181)
+- The cups-driverd program incorrectly stopped scanning PPDs as soon as a loop
+  was seen (Issue #5170)
+- Fixed group validation on OpenBSD (Issue #5166)
+- Fixed the `ippserver` sample code when threading is disabled or unavailable
+  (Issue #5154)
+- The `cupsEnumDests` function did not include options from the lpoptions files
+  (Issue #5144)
+- The `SSLOptions` directive now supports `MinTLS` and `MaxTLS` options to
+  control the minimum and maximum TLS versions that will be allowed,
+  respectively (Issue #5119)
+- The scheduler did not write out dirty configuration and state files if there
+  were open client connections (Issue #5118)
+- The `lpadmin` command now provides a better error message when an unsupported
+  System V interface script is used (Issue #5111)
+- The `lp` and `lpr` commands now provide better error messages when the default
+  printer cannot be found (Issue #5096)
+- No longer support backslash, question mark, or quotes in printer names
+  (Issue #4966)
+- The CUPS library now supports the latest HTTP Digest authentication
+  specification including support for SHA-256 (Issue #4862)
+- The `lpstat` command now reports when new jobs are being held (Issue #4761)
+- The `lpoptions` command incorrectly saved default options (Issue #4717)
+- The `ppdLocalizeIPPReason` function incorrectly returned a localized version
+  of "none" (rdar://36566269)
+- TLS connections now properly timeout (rdar://34938533)
+- The IPP backend did not properly detect failed PDF prints (rdar://34055474)
+- Temporary files are now placed in the correct directory for sandboxed
+  applications on macOS (rdar://problem/37789645)
+
+
+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)

CHANGES.txt

@@ -1,91 +0,0 @@
-CHANGES.txt - 1.7.0 - 2013-08-01
---------------------------------
-
-CHANGES IN CUPS V1.7.0
-
-	- 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)

CONTRIBUTING.md

@@ -0,0 +1,635 @@
+# 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.
+

CREDITS.md

@@ -1,9 +1,10 @@
-CREDITS.txt - 2013-07-23
-------------------------
+CREDITS - 2017-05-01
+====================
 
-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.
@@ -17,20 +18,20 @@ like 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.
-    Niklas 'Nille' Åkerström       - Swedish localization.
     Naruiko Ogasawara              - Japanese localization.
     Giulio Orsero                  - Bug fixes and testing.
     Michal Osowiecki               - Polish localization.
@@ -40,6 +41,7 @@ like to thank the following individuals for their contributions:
     Petter Reinholdtsen            - HP-UX compiler stuff.
     Juan Pablo González Riopedre   - Spanish localization.
     Giovanni Scafora               - Italian localization.
+    Joachim Schwender              - German localization.
     Opher Shachar                  - Hebrew localization.
     Stuart Stevens                 - HP JetDirect IPP information.
     Andrea Suatoni                 - IRIX desktop integration and testing.

INSTALL.md

@@ -0,0 +1,227 @@
+INSTALL - CUPS v2.2.13 - 2019-12-13
+===================================
+
+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 compiler 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.

INSTALL.txt

@@ -1,210 +0,0 @@
-INSTALL - CUPS v1.7.0 - 2013-07-16
-----------------------------------
-
-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".
-
-*******************************************************************************
-*******************************************************************************
-****                                                                       ****
-****  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.                                           ****
-****                                                                       ****
-*******************************************************************************
-*******************************************************************************
-
-
-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
-    CDSA, GNU TLS, or OpenSSL libraries for encryption support, and either MIT
-    (1.6.3 or higher) or Heimdal Kerberos for Kerberos support.  CUPS will
-    compile and run without these, however you'll miss out on many of the
-    features provided by CUPS.
-
-    Also, please note that CUPS does not include print filters to support PDF
-    or raster printing.  You *must* download GPL Ghostscript and/or the Open
-    Printing CUPS filters package separately to print on operating systems
-    other than OS X.
-
-
-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.msweet.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 users forum at:
-
-        http://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.

IPPTOOL.txt

@@ -1,232 +0,0 @@
-IPPTOOL.txt - 2013-07-15
-------------------------
-
-See the file CHANGES-IPPTOOL.txt for a list of changes to this software.
-
-
-INTRODUCTION
-
-    CUPS includes two user programs for IPP printers.  The first is called
-    ipptool and can be used to send arbitrary IPP requests to a CUPS server or
-    IPP printer.  This tool started life as part of the CUPS automated test
-    suite and has grown to support complex conformance tests and a simple way
-    to query printer, job, and subscription attributes.
-
-    The second program called ippfind that can be used to find IPP printers
-    that have registered themselves using Bonjour (DNS-SD, mDNS, and Zeroconf)
-    and run commands such as ipptool.
-
-
-READING THE DOCUMENTATION
-
-    Full documentation on the ipptool command can be found in the
-    "man-ipptool.html" and "man-ipptoolfile.html" files; the latter describes
-    the test file format supported by ipptool.
-
-    Full documentation on the ippfind command can be found in the
-    "man-ippfind.html" file.
-
-
-IPPFIND BASIC USAGE
-
-    The ippfind command can be used to discover IPP printers on your network.
-    For example, the following command prints the printer URI of registered IPP
-    printers:
-
-        ippfind
-
-    To find all color IPP printers, run:
-
-        ippfind --txt-color T
-
-    And to run the IPP Everywhere conformance test file on every registered IPP
-    printer, run the following command:
-
-        ippfind _ipp._tcp,_print --exec ipptool -t '{}' ipp-everywhere.test \;
-
-
-IPPTOOL BASIC USAGE
-
-    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
-
-
-STANDARD TEST FILES
-
-    The following standard test files are included with ipptool:
-
-        create-printer-subscription.test    Creates a printer subscription for
-                                            state change notifications
-        get-completed-jobs.test             Shows a list of completed jobs
-        get-jobs.test                       Shows a list of pending jobs
-        get-notifications.test              Shows events for an ippget
-	                                    subscription.
-        get-printer-attributes.test         Shows printer attributes
-        get-subscriptions.test              Shows a list of subscriptions
-        ipp-1.1.test                        IPP/1.1 conformance test suite
-        ipp-2.0.test                        IPP/2.0 conformance test suite
-        ipp-2.1.test                        IPP/2.1 conformance test suite
-        ipp-2.2.test                        IPP/2.2 conformance test suite
-        ipp-everywhere.test                 IPP Everywhere conformance test
-                                            suite
-        print-job.test                      Prints a file
-        print-job-deflate.test              Prints a file, compressing with
-                                            deflate.
-        print-job-gzip.test                 Prints a file, compressing with gzip
-        validate-job.test                   Validates attributes for a job
-                                            submission.
-
-
-CONFORMANCE TESTS
-
-    We provide basic IPP conformance tests for IPP/1.1, IPP/2.0, IPP/2.1,
-    IPP/2.2, and IPP Everywhere.  For a given printer URI, the following
-    commands perform tests at each level:
-
-        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
-	testfile.jpg
-	testfile.pcl
-	testfile.pdf
-	testfile.ps
-	testfile.txt
-
-    Useful options include the following:
-
-        -4           Connect using IPv4
-        -6           Connect using IPv6
-        -C           Send chunked requests (default)
-        -d name=val  Define a variable
-        -E           Test IPP with HTTP Upgrade to TLS
-        -L           Send requests using the Content-Length header (HTTP/1.0)
-        -S           Test IPP over HTTPS (default for ipps: URIs)
-        -T seconds   Set a timeout for responses in seconds
-        -v           Be verbose, showing all attributes sent and received
-        -X           Produce XML (Apple plist) output
-
-    The printer-uri must be a URI supported by the printer using the "ipp" or
-    "ipps" scheme, for example:
-
-        ipp://192.168.0.1/ipp
-        ipps://192.168.0.1/ipp/print
-
-    Print-by-reference (URL) printing can be tested by defining the document-uri
-    variable as a URL, for example:
-
-        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:
-
-        ipptool -tf document-a4.pdf \
-            -d document-uri=http://www.cups.org/test/document-a4.pdf \
-            ipp://192.168.0.1/ipp -I -V 2.0 ipp-2.0.test
-
-    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.
-
-
-IPP EVERYWHERE TESTING
-
-    The IPP Everywhere tests use sample PWG raster files available from:
-
-        ftp://ftp.pwg.org/pub/pwg/ipp/examples
-
-    Extract the corresponding ZIP archives into the current directory before
-    running the ipp-everywhere.test file.  The test file will attempt to print
-    each PWG Raster file that is supported by the printer being tested - up to
-    372 pages including the 90 pages produced by the regular IPP test suite.
-
-
-GETTING SUPPORT AND OTHER RESOURCES
-
-    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide
-    discussion forums which are available at:
-
-	http://www.cups.org/
-
-
-REPORTING BUGS
-
-    If you believe you have discovered a bug in ippfind or ipptool, please fill
-    out the bug form at:
-
-	http://www.cups.org/str.php
-
-    Be sure to identify the version of CUPS and ippfind/ipptool (if you
-    downloaded the standalone version) you are using, the printer (if any) and
-    firmware version, and include any files that apply.
-
-    If you downloaded the standalone version of ippfind/ipptool, please also
-    re-run the command with debug logging enabled.  Run the following commands
-    on Windows to enable debug logging:
-
-        setdebug.bat
-
-    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 ippfind or ipptool command a new "ipptool.log" file
-    will be created with detailed information - attach this file to the bug you
-    file as well.
-
-
-LEGAL STUFF
-
-    CUPS is Copyright 2007-2013 by Apple Inc.  CUPS and the CUPS logo are
-    trademarks of Apple Inc.
-
-    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
-
-    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.

LICENSE.txt

@@ -1,6 +1,6 @@
                           CUPS License Agreement
 
-		      Copyright 2007-2012 by Apple Inc.
+		      Copyright 2007-2016 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
-exceptions for Apple operating systems and the OpenSSL toolkit. A
-copy of the exceptions and licenses follow this introduction.
+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.
 
 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 exceptions:
+the following special exception:
 
      1. Apple Operating System Development License Exception;
 
@@ -70,8 +70,8 @@ the following special exceptions:
 	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, OS X, and OS X Server
-	   products and all follow-on releases and future
+	   versions of Apple's Darwin, iOS, macOS, macOS Server, and
+	   tvOS products and all follow-on releases and future
 	   versions thereof.
 
 	c. This exception is only available for Apple
@@ -86,14 +86,8 @@ the following special exceptions:
 	     This file is subject to the Apple OS-Developed
 	     Software exception.
 
-     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.
+No developer is required to provide this exception in a derived
+work.
 
 
 KERBEROS SUPPORT CODE

Makedefs.in

@@ -1,17 +1,22 @@
 #
-# "$Id$"
+# Common makefile definitions for CUPS.
 #
-#   Common makefile definitions for CUPS.
+# Copyright 2007-2019 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2013 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# missing or damaged, see the license at "http://www.cups.org/".
 #
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+
 #
+# CUPS version...
+#
+
+CUPS_VERSION    =       @CUPS_VERSION@
+
 
 #
 # Programs...
@@ -19,16 +24,19 @@
 
 AR		=	@AR@
 AWK		=	@AWK@
-CC		=	@LIBTOOL@ @CC@
+CC		=	@LIBTOOL_CC@ @CC@
 CHMOD		=	@CHMOD@
-CXX		=	@LIBTOOL@ @CXX@
+CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
 DSOXX		=	@DSOXX@
-GZIP		=	@GZIP@
+GZIPPROG	=	@GZIPPROG@
 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
@@ -40,14 +48,14 @@ SHELL		=	/bin/sh
 # Installation programs...
 #
 
-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
 INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA	=	$(INSTALL) -c -m 444
 INSTALL_DIR	=	$(INSTALL) -d
-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+INSTALL_LIB	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 INSTALL_MAN	=	$(INSTALL) -c -m 444
-INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
+INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
 
 #
 # Default user, group, and system groups for the scheduler...
@@ -74,15 +82,20 @@ 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...
 #
 
 LIBCUPS		=	@LIBCUPS@
-LIBCUPSCGI	=	@LIBCUPSCGI@
 LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
-LIBCUPSMIME	=	@LIBCUPSMIME@
-LIBCUPSPPDC	=	@LIBCUPSPPDC@
 LIBCUPSSTATIC	=	@LIBCUPSSTATIC@
 LIBGSSAPI	=	@LIBGSSAPI@
 LIBMALLOC	=	@LIBMALLOC@
@@ -110,6 +123,13 @@ IPPALIASES	=	@IPPALIASES@
 
 INSTALLXPC	=	@INSTALLXPC@
 
+#
+# Code signing...
+#
+
+CODE_SIGN	=	@CODE_SIGN@
+CODE_SIGN_IDENTITY = -
+
 #
 # Program options...
 #
@@ -121,9 +141,9 @@ INSTALLXPC	=	@INSTALLXPC@
 #
 
 ALL_CFLAGS	=	-I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(ONDEMANDFLAGS) $(OPTIONS)
 ALL_CXXFLAGS	=	-I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(ONDEMANDFLAGS) $(OPTIONS)
 ARCHFLAGS	=	@ARCHFLAGS@
 ARFLAGS		=	@ARFLAGS@
 BACKLIBS	=	@BACKLIBS@
@@ -140,13 +160,14 @@ 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) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ)
+LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
 LIBS		=	$(LINKCUPS) $(COMMONLIBS)
+ONDEMANDFLAGS	=	@ONDEMANDFLAGS@
+ONDEMANDLIBS	=	@ONDEMANDLIBS@
 OPTIM		=	@OPTIM@
 OPTIONS		=
 PAMLIBS		=	@PAMLIBS@
@@ -200,8 +221,6 @@ 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@
@@ -216,10 +235,7 @@ REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR		=	$(BUILDROOT)@sbindir@
 SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
-SMFMANIFESTDIR	= 	@SMFMANIFESTDIR@
 STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
-USBQUIRKS	=	@USBQUIRKS@
-XINETD		=	@XINETD@
 
 MAN1EXT		=	@MAN1EXT@
 MAN5EXT		=	@MAN5EXT@
@@ -230,8 +246,15 @@ 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@
 
 
 #
@@ -258,8 +281,3 @@ DBUSDIR		=	@DBUSDIR@
 	echo -n Compressing $<...
 	$(RM) $@
 	gzip -v9 <$< >$@
-
-
-#
-# End of "$Id$"
-#

Makefile

@@ -1,16 +1,14 @@
 #
-# "$Id$"
+# Top-level Makefile for CUPS.
 #
-#   Top-level Makefile for CUPS.
+# Copyright 2007-2018 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2013 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include Makedefs
@@ -98,22 +96,18 @@ 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) 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) packaging/cups-desc.plist packaging/cups-info.plist
-	$(RM) templates/header.tmpl
+	$(RM) data/testprint
 	$(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) 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) 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) templates/header.tmpl
 	-$(RM) doc/*/index.html
 	-$(RM) templates/*/header.tmpl
-	-$(RM) -r autom4te*.cache clang cups/charmaps cups/locale driver/test
+	-$(RM) -r autom4te*.cache clang cups/charmaps cups/locale
 
 
 #
@@ -128,8 +122,14 @@ depend:
 
 
 #
-# 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)
+# 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...)
 #
 
 .PHONY: clang clang-changes
@@ -140,6 +140,26 @@ 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...
 #
@@ -246,43 +266,11 @@ debugcheck:	all unittests
 #
 
 apihelp:
-	for dir in cgi-bin cups filter ppdc scheduler; do\
+	for dir in cups filter; 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/)...
-#
-
-docset:	apihelp
-	echo Generating docset directory tree...
-	$(RM) -r org.cups.docset
-	mkdir -p org.cups.docset/Contents/Resources/Documentation/help
-	mkdir -p org.cups.docset/Contents/Resources/Documentation/images
-	cd man; $(MAKE) $(MFLAGS) html
-	cd doc; $(MAKE) $(MFLAGS) docset
-	cd cgi-bin; $(MAKE) $(MFLAGS) makedocset
-	cgi-bin/makedocset org.cups.docset \
-		`svnversion . | sed -e '1,$$s/[a-zA-Z]//g'` \
-		doc/help/api-*.tokens
-	$(RM) doc/help/api-*.tokens
-	echo Indexing docset...
-	/Applications/Xcode.app/Contents/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 \
-		--atom org.cups.docset.atom \
-		--download-url http://www.cups.org/org.cups.docset.xar \
-		org.cups.docset
-
 
 #
 # Lines of code computation...
@@ -300,22 +288,15 @@ sloc:
 
 EPMFLAGS	=	-v --output-dir dist $(EPMARCH)
 
-aix bsd deb depot inst pkg setld slackware swinstall tardist:
+bsd deb epm pkg rpm slackware:
 	epm $(EPMFLAGS) -f $@ cups packaging/cups.list
 
-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
+.PHONY:	dist
 dist:	all
 	$(RM) -r dist
 	$(MAKE) $(MFLAGS) epm
 	case `uname` in \
 		*BSD*) $(MAKE) $(MFLAGS) bsd;; \
-		Darwin*) $(MAKE) $(MFLAGS) osx;; \
 		Linux*) test ! -x /usr/bin/rpm || $(MAKE) $(MFLAGS) rpm;; \
 		SunOS*) $(MAKE) $(MFLAGS) pkg;; \
 	esac
@@ -326,8 +307,3 @@ dist:	all
 #
 
 .NOTPARALLEL:
-
-
-#
-# End of "$Id$".
-#

README.md

@@ -0,0 +1,161 @@
+README - CUPS v2.2.13 - 2019-12-13
+==================================
+
+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 2.2.x 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-2019 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.

README.txt

@@ -1,163 +0,0 @@
-README - CUPS v1.7.0 - 2013-07-16
----------------------------------
-
-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 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-2013 by Apple Inc.  CUPS and the CUPS logo are
-    trademarks of Apple Inc.
-
-    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
-
-    This software is based in part on the work of the Independent JPEG Group.
-
-    CUPS is provided under the terms of version 2 of the GNU General Public
-    License and GNU Library General Public License. This program is distributed
-    in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the "doc/help/license.html" or "LICENSE.txt" files for more information.

backend/Dependencies

@@ -1,70 +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/ipp-private.h ../cups/ipp.h \
-  ../cups/http.h ../cups/array.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/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/array-private.h
-lpd.o: lpd.c ../cups/http-private.h ../config.h ../cups/http.h \
-  ../cups/versioning.h ../cups/array.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
-  ../cups/cups-private.h ../cups/string-private.h \
-  ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/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/ipp-private.h ../cups/ipp.h \
-  ../cups/http.h ../cups/array.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/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/ipp-private.h ../cups/ipp.h \
-  ../cups/http.h ../cups/array.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/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/http.h \
-  ../cups/versioning.h ../cups/array.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
-  ../cups/cups-private.h ../cups/string-private.h \
-  ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+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
 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/ipp-private.h ../cups/ipp.h \
-  ../cups/http.h ../cups/array.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
-  ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
+  ../cups/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
 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/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
   ../cups/sidechannel.h
 testsupplies.o: testsupplies.c backend-private.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/ipp-private.h ../cups/ipp.h \
-  ../cups/http.h ../cups/array.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/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/ipp-private.h ../cups/ipp.h \
-  ../cups/http.h ../cups/array.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h \
+  ../cups/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
+  usb-darwin.c ../cups/file-private.h ../cups/ppd-private.h \
+  ../cups/ppd.h ../cups/raster.h

backend/Makefile

@@ -1,18 +1,16 @@
 #
-# "$Id$"
+# Backend makefile for CUPS.
 #
-#   Backend makefile for CUPS.
+# Copyright 2007-2017 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2013 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# missing or damaged, see the license at "http://www.cups.org/".
 #
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-#   This file is subject to the Apple OS-Developed Software exception.
+# This file is subject to the Apple OS-Developed Software exception.
 #
 
 include ../Makedefs
@@ -23,17 +21,18 @@ include ../Makedefs
 
 # RBACKENDS are installed mode 0700 so cupsd will run them as root...
 #
-# UBACKENDS are installed mode 0755 so cupsd will run them as an unprivileged
-# user...
+# UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+# an unprivileged user...
 #
-# See http://www.cups.org/documentation.php/api-filter.html for more info...
+# See http://www.cups.org/doc/api-filter.html for more info...
 RBACKENDS =	\
 		ipp \
 		lpd \
 		$(DNSSD_BACKEND)
 UBACKENDS =	\
 		snmp \
-		socket \
+		socket
+ULBACKENDS =	\
 		usb
 UNITTESTS =	\
 		test1284 \
@@ -42,7 +41,8 @@ UNITTESTS =	\
 TARGETS =	\
 		libbackend.a \
 		$(RBACKENDS) \
-		$(UBACKENDS)
+		$(UBACKENDS) \
+		$(ULBACKENDS)
 LIBOBJS	=	\
 		ieee1284.o \
 		network.o \
@@ -71,7 +71,7 @@ all:	$(TARGETS)
 # Make library targets...
 #
 
-libs:
+libs:	$(ULBACKENDS)
 
 
 #
@@ -86,7 +86,7 @@ unittests:	$(UNITTESTS)
 #
 
 clean:
-	$(RM) $(OBJS) $(TARGETS) $(UNITTESTS) $(LIBOBJS) http https ipps mdns
+	$(RM) $(OBJS) $(TARGETS) $(UNITTESTS) $(LIBOBJS) http https ipps mdns socket-static
 
 
 #
@@ -167,6 +167,18 @@ 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
 
 
 #
@@ -179,7 +191,7 @@ uninstall:
 		$(RM) $(SERVERBIN)/apple/$$file; \
 	done
 	-$(RMDIR) $(SERVERBIN)/apple
-	for file in $(RBACKENDS) $(UBACKENDS); do \
+	for file in $(RBACKENDS) $(UBACKENDS) $(ULBACKENDS); do \
 		$(RM) $(SERVERBIN)/backend/$$file; \
 	done
 	for file in $(IPPALIASES); do \
@@ -195,7 +207,7 @@ uninstall:
 
 test1284:	test1284.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
+	$(LD_CC) $(LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -205,7 +217,7 @@ test1284:	test1284.o ../cups/$(LIBCUPSSTATIC)
 
 testbackend:	testbackend.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
+	$(LD_CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -215,7 +227,7 @@ testbackend:	testbackend.o ../cups/$(LIBCUPSSTATIC)
 
 testsupplies:	testsupplies.o libbackend.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
+	$(LD_CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
 		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
 		$(COMMONLIBS) $(LIBZ)
 
@@ -237,7 +249,8 @@ libbackend.a:	$(LIBOBJS)
 
 dnssd:	dnssd.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	if test `uname` = Darwin; then \
 		$(RM) mdns; \
 		$(LN) dnssd mdns; \
@@ -250,7 +263,8 @@ dnssd:	dnssd.o ../cups/$(LIBCUPS) libbackend.a
 
 ipp:	ipp.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	$(RM) http
 	$(LN) ipp http
 
@@ -261,7 +275,8 @@ ipp:	ipp.o ../cups/$(LIBCUPS) libbackend.a
 
 lpd:	lpd.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -270,7 +285,8 @@ lpd:	lpd.o ../cups/$(LIBCUPS) libbackend.a
 
 snmp:	snmp.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -279,7 +295,15 @@ snmp:	snmp.o ../cups/$(LIBCUPS) libbackend.a
 
 socket:	socket.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+
+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)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -288,8 +312,9 @@ socket:	socket.o ../cups/$(LIBCUPS) libbackend.a
 
 usb:	usb.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
 		$(BACKLIBS) $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 usb.o:	usb.c usb-darwin.c usb-libusb.c usb-unix.c
 
 
@@ -298,8 +323,3 @@ usb.o:	usb.c usb-darwin.c usb-libusb.c usb-unix.c
 #
 
 include Dependencies
-
-
-#
-# End of "$Id$".
-#

backend/backend-private.h

@@ -1,18 +1,16 @@
 /*
- * "$Id$"
+ * Backend support definitions for CUPS.
  *
- *   Backend support definitions for CUPS.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_BACKEND_PRIVATE_H_
@@ -313,7 +311,8 @@ extern int		backendGetDeviceID(int fd, char *device_id,
 					   int uri_size);
 extern int		backendGetMakeModel(const char *device_id,
 			                    char *make_model,
-				            int make_model_size);
+				            size_t make_model_size);
+extern http_addrlist_t	*backendLookup(const char *hostname, int port, int *cancel);
 extern int		backendNetworkSideCB(int print_fd, int device_fd,
 			                     int snmp_fd, http_addr_t *addr,
 					     int use_bc);
@@ -331,8 +330,3 @@ extern int		backendWaitLoop(int snmp_fd, http_addr_t *addr,
 }
 #  endif /* __cplusplus */
 #endif /* !_CUPS_BACKEND_PRIVATE_H_ */
-
-
-/*
- * End of "$Id$".
- */

backend/dnssd.c

@@ -1,33 +1,15 @@
 /*
- * "$Id$"
+ * DNS-SD discovery backend for CUPS.
  *
- *   DNS-SD discovery backend for CUPS.
+ * Copyright 2008-2018 by Apple Inc.
  *
- *   Copyright 2008-2012 by Apple Inc.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()		     - Browse for printers.
- *   browse_callback()	     - Browse devices.
- *   browse_local_callback() - Browse local devices.
- *   client_callback()       - Avahi client callback function.
- *   compare_devices()	     - Compare two devices.
- *   exec_backend()	     - Execute the backend that corresponds to the
- *			       resolved service name.
- *   device_type()	     - Get DNS-SD type enumeration from string.
- *   get_device()	     - Create or update a device.
- *   query_callback()	     - Process query data.
- *   find_device()	     - Find a device from its name and domain.
- *   sigterm_handler()	     - Handle termination signals.
- *   unquote()		     - Unquote a name string.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -77,7 +59,8 @@ typedef struct
 		*domain,		/* Domain name */
 		*fullName,		/* Full name */
 		*make_and_model,	/* Make and model from TXT record */
-		*device_id;		/* 1284 device ID from TXT record */
+		*device_id,		/* 1284 device ID from TXT record */
+		*uuid;			/* UUID from TXT record */
   cups_devtype_t type;			/* Device registration type */
   int		priority,		/* Priority associated with type */
 		cups_shared,		/* CUPS shared printer? */
@@ -95,6 +78,7 @@ static int		job_canceled = 0;
 static AvahiSimplePoll	*simple_poll = NULL;
 					/* Poll information */
 static int		got_data = 0;	/* Got data from poll? */
+static int		browsers = 0;	/* Number of running browsers */
 #endif /* HAVE_AVAHI */
 
 
@@ -110,7 +94,7 @@ static void		browse_callback(DNSServiceRef sdRef,
 				        const char *serviceName,
 				        const char *regtype,
 				        const char *replyDomain, void *context)
-					__attribute__((nonnull(1,5,6,7,8)));
+					_CUPS_NONNULL((1,5,6,7,8));
 static void		browse_local_callback(DNSServiceRef sdRef,
 					      DNSServiceFlags flags,
 					      uint32_t interfaceIndex,
@@ -119,7 +103,7 @@ static void		browse_local_callback(DNSServiceRef sdRef,
 					      const char *regtype,
 					      const char *replyDomain,
 					      void *context)
-					      __attribute__((nonnull(1,5,6,7,8)));
+					      _CUPS_NONNULL((1,5,6,7,8));
 #endif /* HAVE_DNSSD */
 #ifdef HAVE_AVAHI
 static void		browse_callback(AvahiServiceBrowser *browser,
@@ -137,12 +121,12 @@ static void		client_callback(AvahiClient *client,
 #endif /* HAVE_AVAHI */
 
 static int		compare_devices(cups_device_t *a, cups_device_t *b);
-static void		exec_backend(char **argv);
+static void		exec_backend(char **argv) _CUPS_NORETURN;
 static cups_device_t	*get_device(cups_array_t *devices,
 			            const char *serviceName,
 			            const char *regtype,
 				    const char *replyDomain)
-				    __attribute__((nonnull(1,2,3,4)));
+				    _CUPS_NONNULL((1,2,3,4));
 #ifdef HAVE_DNSSD
 static void		query_callback(DNSServiceRef sdRef,
 			               DNSServiceFlags flags,
@@ -152,7 +136,7 @@ static void		query_callback(DNSServiceRef sdRef,
 				       uint16_t rrclass, uint16_t rdlen,
 				       const void *rdata, uint32_t ttl,
 				       void *context)
-				       __attribute__((nonnull(1,5,9,11)));
+				       _CUPS_NONNULL((1,5,9,11));
 #elif defined(HAVE_AVAHI)
 static int		poll_callback(struct pollfd *pollfds,
 			              unsigned int num_pollfds, int timeout,
@@ -169,7 +153,7 @@ static void		query_callback(AvahiRecordBrowser *browser,
 #endif /* HAVE_DNSSD */
 static void		sigterm_handler(int sig);
 static void		unquote(char *dst, const char *src, size_t dstsize)
-			    __attribute__((nonnull(1,2)));
+			    _CUPS_NONNULL((1,2));
 
 
 /*
@@ -332,7 +316,7 @@ main(int  argc,				/* I - Number of command-line args */
   if ((simple_poll = avahi_simple_poll_new()) == NULL)
   {
     fputs("DEBUG: Unable to create Avahi simple poll object.\n", stderr);
-    return (1);
+    return (0);
   }
 
   avahi_simple_poll_set_func(simple_poll, poll_callback, NULL);
@@ -342,9 +326,10 @@ main(int  argc,				/* I - Number of command-line args */
   if (!client)
   {
     fputs("DEBUG: Unable to create Avahi client.\n", stderr);
-    return (1);
+    return (0);
   }
 
+  browsers = 6;
   avahi_service_browser_new(client, AVAHI_IF_UNSPEC,
 			    AVAHI_PROTO_UNSPEC,
 			    "_fax-ipp._tcp", NULL, 0,
@@ -513,9 +498,15 @@ main(int  argc,				/* I - Number of command-line args */
           {
 	    unquote(uriName, best->fullName, sizeof(uriName));
 
-	    httpAssembleURI(HTTP_URI_CODING_ALL, device_uri, sizeof(device_uri),
-			    "dnssd", NULL, uriName, 0,
-			    best->cups_shared ? "/cups" : "/");
+            if (best->uuid)
+	      httpAssembleURIf(HTTP_URI_CODING_ALL, device_uri,
+	                       sizeof(device_uri), "dnssd", NULL, uriName, 0,
+			       best->cups_shared ? "/cups?uuid=%s" : "/?uuid=%s",
+			       best->uuid);
+	    else
+	      httpAssembleURI(HTTP_URI_CODING_ALL, device_uri,
+	                      sizeof(device_uri), "dnssd", NULL, uriName, 0,
+			      best->cups_shared ? "/cups" : "/");
 
 	    cupsBackendReport("network", device_uri, best->make_and_model,
 	                      best->name, best->device_id, NULL);
@@ -546,9 +537,15 @@ main(int  argc,				/* I - Number of command-line args */
       {
 	unquote(uriName, best->fullName, sizeof(uriName));
 
-	httpAssembleURI(HTTP_URI_CODING_ALL, device_uri, sizeof(device_uri),
-			"dnssd", NULL, uriName, 0,
-			best->cups_shared ? "/cups" : "/");
+	if (best->uuid)
+	  httpAssembleURIf(HTTP_URI_CODING_ALL, device_uri,
+			   sizeof(device_uri), "dnssd", NULL, uriName, 0,
+			   best->cups_shared ? "/cups?uuid=%s" : "/?uuid=%s",
+			   best->uuid);
+	else
+	  httpAssembleURI(HTTP_URI_CODING_ALL, device_uri,
+			  sizeof(device_uri), "dnssd", NULL, uriName, 0,
+			  best->cups_shared ? "/cups" : "/");
 
 	cupsBackendReport("network", device_uri, best->make_and_model,
 			  best->name, best->device_id, NULL);
@@ -558,7 +555,11 @@ main(int  argc,				/* I - Number of command-line args */
 
       fprintf(stderr, "DEBUG: sent=%d, count=%d\n", sent, count);
 
+#ifdef HAVE_AVAHI
+      if (sent == cupsArrayCount(devices) && browsers == 0)
+#else
       if (sent == cupsArrayCount(devices))
+#endif /* HAVE_AVAHI */
 	break;
     }
   }
@@ -710,9 +711,12 @@ browse_callback(
 	break;
 
     case AVAHI_BROWSER_REMOVE:
-    case AVAHI_BROWSER_ALL_FOR_NOW:
     case AVAHI_BROWSER_CACHE_EXHAUSTED:
         break;
+
+    case AVAHI_BROWSER_ALL_FOR_NOW:
+	browsers--;
+	break;
   }
 }
 
@@ -824,8 +828,8 @@ exec_backend(char **argv)		/* I - Command-line arguments */
  * 'device_type()' - Get DNS-SD type enumeration from string.
  */
 
-static int
-device_type(const char *regtype)
+static cups_devtype_t			/* O - Device type */
+device_type(const char *regtype)	/* I - Service registration type */
 {
 #ifdef HAVE_AVAHI
   if (!strcmp(regtype, "_ipp._tcp"))
@@ -915,9 +919,6 @@ get_device(cups_array_t *devices,	/* I - Device array */
   * Yes, add the device...
   */
 
-  fprintf(stderr, "DEBUG: Found \"%s.%s%s\"...\n", serviceName, regtype,
-	  replyDomain);
-
   device           = calloc(sizeof(cups_device_t), 1);
   device->name     = strdup(serviceName);
   device->domain   = strdup(replyDomain);
@@ -933,8 +934,7 @@ get_device(cups_array_t *devices,	/* I - Device array */
 #ifdef HAVE_DNSSD
   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
 #else /* HAVE_AVAHI */
-  avahi_service_name_join(fullName, kDNSServiceMaxDomainName,
-			   serviceName, regtype, replyDomain);
+  avahi_service_name_join(fullName, kDNSServiceMaxDomainName, serviceName, regtype, replyDomain);
 #endif /* HAVE_DNSSD */
 
   device->fullName = strdup(fullName);
@@ -949,7 +949,7 @@ get_device(cups_array_t *devices,	/* I - Device array */
  *
  * Note: This function is needed because avahi_simple_poll_iterate is broken
  *       and always uses a timeout of 0 (!) milliseconds.
- *       (Avahi Ticket #364)
+ *       (https://github.com/lathiat/avahi/issues/127)
  */
 
 static int				/* O - Number of file descriptors matching */
@@ -1040,9 +1040,7 @@ query_callback(
                   "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
 		  "rrtype=%u, rrclass=%u, rdlen=%u, rdata=%p, ttl=%u, "
 		  "context=%p)\n",
-          sdRef, flags, interfaceIndex, errorCode,
-	  fullName ? fullName : "(null)", rrtype, rrclass, rdlen, rdata, ttl,
-	  context);
+          sdRef, flags, interfaceIndex, errorCode, fullName, rrtype, rrclass, rdlen, rdata, ttl, context);
 
  /*
   * Only process "add" data...
@@ -1055,9 +1053,7 @@ query_callback(
   fprintf(stderr, "DEBUG2: query_callback(browser=%p, interfaceIndex=%d, "
                   "protocol=%d, event=%d, fullName=\"%s\", rrclass=%u, "
 		  "rrtype=%u, rdata=%p, rdlen=%u, flags=%x, context=%p)\n",
-          browser, interfaceIndex, protocol, event,
-	  fullName ? fullName : "(null)", rrclass, rrtype, rdata,
-	  (unsigned)rdlen, flags, context);
+          browser, interfaceIndex, protocol, event, fullName, rrclass, rrtype, rdata, (unsigned)rdlen, flags, context);
 
  /*
   * Only process "add" data...
@@ -1102,7 +1098,7 @@ query_callback(
     datanext = data + datalen;
 
     for (ptr = key; data < datanext && *data != '='; data ++)
-      *ptr++ = *data;
+      *ptr++ = (char)*data;
     *ptr = '\0';
 
     if (data < datanext && *data == '=')
@@ -1110,7 +1106,7 @@ query_callback(
       data ++;
 
       if (data < datanext)
-	memcpy(value, data, datanext - data);
+	memcpy(value, data, (size_t)(datanext - data));
       value[datanext - data] = '\0';
 
       fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
@@ -1130,8 +1126,7 @@ query_callback(
       */
 
       ptr = device_id + strlen(device_id);
-      snprintf(ptr, sizeof(device_id) - (ptr - device_id), "%s:%s;",
-	       key + 4, value);
+      snprintf(ptr, sizeof(device_id) - (size_t)(ptr - device_id), "%s:%s;", key + 4, value);
     }
 
     if (!_cups_strcasecmp(key, "usb_MFG") || !_cups_strcasecmp(key, "usb_MANU") ||
@@ -1180,6 +1175,8 @@ query_callback(
       if (device->type == CUPS_DEVICE_PRINTER)
 	device->sent = 1;
     }
+    else if (!_cups_strcasecmp(key, "UUID"))
+      device->uuid = strdup(value);
   }
 
   if (device->device_id)
@@ -1191,19 +1188,19 @@ query_callback(
       snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
 	       make_and_model, model);
     else if (!_cups_strncasecmp(model, "designjet ", 10))
-      snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10);
+      snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;", model + 10);
     else if (!_cups_strncasecmp(model, "stylus ", 7))
-      snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7);
+      snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;", model + 7);
     else if ((ptr = strchr(model, ' ')) != NULL)
     {
      /*
       * Assume the first word is the make...
       */
 
-      memcpy(make_and_model, model, ptr - model);
+      memcpy(make_and_model, model, (size_t)(ptr - model));
       make_and_model[ptr - model] = '\0';
 
-      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s",
+      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
 	       make_and_model, ptr + 1);
     }
   }
@@ -1235,7 +1232,7 @@ query_callback(
       while (isalnum(*ptr & 255) || *ptr == '-' || *ptr == '.')
       {
         if (isalnum(*ptr & 255) && valptr < (value + sizeof(value) - 1))
-          *valptr++ = toupper(*ptr++ & 255);
+          *valptr++ = (char)toupper(*ptr++ & 255);
         else
           break;
       }
@@ -1244,8 +1241,7 @@ query_callback(
     }
 
     ptr = device_id + strlen(device_id);
-    snprintf(ptr, sizeof(device_id) - (ptr - device_id), "CMD:%s;",
-	     value + 1);
+    snprintf(ptr, sizeof(device_id) - (size_t)(ptr - device_id), "CMD:%s;", value + 1);
   }
 
   if (device_id[0])
@@ -1261,6 +1257,13 @@ query_callback(
     strlcat(make_and_model, " ", sizeof(make_and_model));
     strlcat(make_and_model, model, sizeof(make_and_model));
 
+    if (!_cups_strncasecmp(make_and_model, "EPSON EPSON ", 12))
+      _cups_strcpy(make_and_model, make_and_model + 6);
+    else if (!_cups_strncasecmp(make_and_model, "HP HP ", 6))
+      _cups_strcpy(make_and_model, make_and_model + 3);
+    else if (!_cups_strncasecmp(make_and_model, "Lexmark International Lexmark ", 30))
+      _cups_strcpy(make_and_model, make_and_model + 22);
+
     device->make_and_model = strdup(make_and_model);
   }
   else
@@ -1279,7 +1282,7 @@ sigterm_handler(int sig)		/* I - Signal number (unused) */
   (void)sig;
 
   if (job_canceled)
-    exit(CUPS_BACKEND_OK);
+    _exit(CUPS_BACKEND_OK);
   else
     job_canceled = 1;
 }
@@ -1317,8 +1320,3 @@ unquote(char       *dst,		/* I - Destination buffer */
 
   *dst = '\0';
 }
-
-
-/*
- * End of "$Id$".
- */

backend/ieee1284.c

@@ -1,24 +1,16 @@
 /*
- * "$Id$"
+ * IEEE-1284 support functions for CUPS.
  *
- *   IEEE-1284 support functions for CUPS.
+ * Copyright 2007-2015 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   backendGetDeviceID()  - Get the IEEE-1284 device ID string and
- *                           corresponding URI.
- *   backendGetMakeModel() - Get the make and model string from the device ID.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -26,7 +18,7 @@
  */
 
 #include "backend-private.h"
-#include <cups/cups-private.h>
+#include <cups/ppd-private.h>
 
 
 /*
@@ -96,7 +88,7 @@ backendGetDeviceID(
     *device_id = '\0';
 
 #  ifdef __linux
-    if (ioctl(fd, LPIOC_GET_DEVICE_ID(device_id_size), device_id))
+    if (ioctl(fd, LPIOC_GET_DEVICE_ID((unsigned)device_id_size), device_id))
     {
      /*
       * Linux has to implement things differently for every device it seems.
@@ -148,8 +140,7 @@ backendGetDeviceID(
 		* Read the 1284 device ID...
 		*/
 
-		if ((length = read(devparportfd, device_id,
-				   device_id_size - 1)) >= 2)
+		if ((length = read(devparportfd, device_id, (size_t)device_id_size - 1)) >= 2)
 		{
 		  device_id[length] = '\0';
 		  got_id = 1;
@@ -178,8 +169,7 @@ backendGetDeviceID(
       * bytes.  The 1284 spec says the length is stored MSB first...
       */
 
-      length = (((unsigned)device_id[0] & 255) << 8) +
-	       ((unsigned)device_id[1] & 255);
+      length = (int)((((unsigned)device_id[0] & 255) << 8) + ((unsigned)device_id[1] & 255));
 
      /*
       * Check to see if the length is larger than our buffer; first
@@ -188,8 +178,7 @@ backendGetDeviceID(
       */
 
       if (length > device_id_size || length < 14)
-	length = (((unsigned)device_id[1] & 255) << 8) +
-		 ((unsigned)device_id[0] & 255);
+	length = (int)((((unsigned)device_id[1] & 255) << 8) + ((unsigned)device_id[0] & 255));
 
       if (length > device_id_size)
 	length = device_id_size;
@@ -221,7 +210,7 @@ backendGetDeviceID(
 
 	length -= 2;
 
-	memmove(device_id, device_id + 2, length);
+	memmove(device_id, device_id + 2, (size_t)length);
 	device_id[length] = '\0';
       }
     }
@@ -287,7 +276,7 @@ backendGetDeviceID(
   */
 
   if (make_model)
-    backendGetMakeModel(device_id, make_model, make_model_size);
+    backendGetMakeModel(device_id, make_model, (size_t)make_model_size);
 
  /*
   * Then generate a device URI...
@@ -372,7 +361,7 @@ int					/* O - 0 on success, -1 on failure */
 backendGetMakeModel(
     const char *device_id,		/* O - 1284 device ID */
     char       *make_model,		/* O - Make/model */
-    int        make_model_size)		/* I - Size of buffer */
+    size_t     make_model_size)		/* I - Size of buffer */
 {
   int		num_values;		/* Number of keys and values */
   cups_option_t	*values;		/* Keys and values */
@@ -381,9 +370,7 @@ backendGetMakeModel(
 		*des;			/* Description string */
 
 
-  DEBUG_printf(("backendGetMakeModel(device_id=\"%s\", "
-                "make_model=%p, make_model_size=%d)\n", device_id,
-		make_model, make_model_size));
+  DEBUG_printf(("backendGetMakeModel(device_id=\"%s\", make_model=%p, make_model_size=" CUPS_LLFMT ")\n", device_id, make_model, CUPS_LLCAST make_model_size));
 
  /*
   * Range check input...
@@ -484,8 +471,3 @@ backendGetMakeModel(
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/lpd.c

@@ -1,27 +1,16 @@
 /*
- * "$Id$"
+ * Line Printer Daemon backend for CUPS.
  *
- *   Line Printer Daemon backend for CUPS.
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()            - Send a file to the printer or server.
- *   lpd_command()     - Send an LPR command sequence and wait for a reply.
- *   lpd_queue()       - Queue a file using the Line Printer Daemon protocol.
- *   lpd_write()       - Write a buffer of data to an LPD server.
- *   rresvport_af()    - A simple implementation of rresvport_af().
- *   sigterm_handler() - Handle 'terminate' signals that stop the backend.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -35,14 +24,14 @@
 #include <sys/stat.h>
 #include <stdio.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include <winsock.h>
 #else
 #  include <sys/socket.h>
 #  include <netinet/in.h>
 #  include <arpa/inet.h>
 #  include <netdb.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 #ifdef __APPLE__
 #  include <CoreFoundation/CFNumber.h>
 #  include <CoreFoundation/CFPreferences.h>
@@ -86,17 +75,19 @@ static int	abort_job = 0;		/* Non-zero if we get SIGTERM */
  * Local functions...
  */
 
-static int	lpd_command(int lpd_fd, char *format, ...);
+static int	cups_rresvport(int *port, int family);
+static int	lpd_command(int lpd_fd, char *format, ...)
+#    ifdef __GNUC__
+__attribute__ ((__format__ (__printf__, 2, 3)))
+#    endif /* __GNUC__ */
+;
 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 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 ssize_t	lpd_write(int lpd_fd, char *buffer, size_t length);
 static void	sigterm_handler(int sig);
 
 
@@ -124,7 +115,6 @@ 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 */
@@ -393,8 +383,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
          */
 
          snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
-                        _cups_strcasecmp(value, "yes") ||
-                        _cups_strcasecmp(value, "true");
+                        !_cups_strcasecmp(value, "yes") ||
+                        !_cups_strcasecmp(value, "true");
       }
       else if (!_cups_strcasecmp(name, "timeout"))
       {
@@ -424,23 +414,11 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
   * Find the printer...
   */
 
-  snprintf(portname, sizeof(portname), "%d", port);
+  addrlist = backendLookup(hostname, port, NULL);
 
-  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_FAILED);
-    }
-  }
+ /*
+  * See if the printer supports SNMP...
+  */
 
   if (snmp_enabled)
     snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
@@ -481,7 +459,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, bytes);
+      write(fd, buffer, (size_t)bytes);
 
     backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
 		   backendNetworkSideCB);
@@ -581,6 +559,84 @@ 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.
  */
@@ -592,7 +648,7 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
 {
   va_list	ap;		/* Argument pointer */
   char		buf[1024];	/* Output buffer */
-  int		bytes;		/* Number of bytes to output */
+  ssize_t	bytes;		/* Number of bytes to output */
   char		status;		/* Status from command */
 
 
@@ -617,9 +673,9 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
   * Send the command...
   */
 
-  fprintf(stderr, "DEBUG: Sending command string (%d bytes)...\n", bytes);
+  fprintf(stderr, "DEBUG: Sending command string (" CUPS_LLFMT " bytes)...\n", CUPS_LLCAST bytes);
 
-  if (lpd_write(fd, buf, bytes) < bytes)
+  if (lpd_write(fd, buf, (size_t)bytes) < bytes)
   {
     perror("DEBUG: Unable to send LPD command");
     return (-1);
@@ -634,7 +690,7 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
   if (recv(fd, &status, 1, 0) < 1)
   {
     _cupsLangPrintFilter(stderr, "WARNING", _("The printer did not respond."));
-    status = errno;
+    status = (char)errno;
   }
 
   fprintf(stderr, "DEBUG: lpd_command returning %d\n", status);
@@ -680,14 +736,14 @@ 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 */
-  size_t		nbytes;		/* Number of bytes written */
+  ssize_t		nbytes;		/* Number of bytes written */
   off_t			tbytes;		/* Total bytes written */
   char			buffer[32768];	/* Output buffer */
-#ifdef WIN32
+#ifdef _WIN32
   DWORD			tv;		/* Timeout in milliseconds */
 #else
   struct timeval	tv;		/* Timeout in secs and usecs */
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 
  /*
@@ -762,7 +818,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	* priviledged lport between 721 and 731...
 	*/
 
-	if ((fd = rresvport_af(&lport, addr->addr.addr.sa_family)) < 0)
+	if ((fd = cups_rresvport(&lport, addr->addr.addr.sa_family)) < 0)
 	{
 	  perror("DEBUG: Unable to reserve port");
 	  sleep(1);
@@ -782,7 +838,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	return (CUPS_BACKEND_FAILED);
       }
 
-      if (!connect(fd, &(addr->addr.addr), httpAddrLength(&(addr->addr))))
+      if (!connect(fd, &(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr))))
 	break;
 
       error = errno;
@@ -815,8 +871,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 
       fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(error));
 
-      if (error == ECONNREFUSED || error == EHOSTDOWN ||
-          error == EHOSTUNREACH)
+      if (errno == ECONNREFUSED || errno == EHOSTDOWN || errno == EHOSTUNREACH || errno == ETIMEDOUT || errno == ENOTCONN)
       {
         if (contimeout && (time(NULL) - start_time) > contimeout)
 	{
@@ -834,19 +889,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."));
 	      break;
         }
 
-	sleep(delay);
+	sleep((unsigned)delay);
 
 	if (delay < 30)
 	  delay += 5;
@@ -871,7 +926,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
     * Set the timeout...
     */
 
-#ifdef WIN32
+#ifdef _WIN32
     tv = (DWORD)(timeout * 1000);
 
     setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
@@ -882,7 +937,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 
     setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
     setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
     fputs("STATE: -connecting-to-device\n", stderr);
     _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));
@@ -967,7 +1022,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 
     if (banner)
     {
-      snprintf(cptr, sizeof(control) - (cptr - control),
+      snprintf(cptr, sizeof(control) - (size_t)(cptr - control),
                "C%.31s\n"	/* RFC 1179, Section 7.2 - class name <= 31 chars */
 	       "L%s\n",
                localhost, user);
@@ -976,13 +1031,13 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 
     while (copies > 0)
     {
-      snprintf(cptr, sizeof(control) - (cptr - control), "%cdfA%03d%.15s\n",
+      snprintf(cptr, sizeof(control) - (size_t)(cptr - control), "%cdfA%03d%.15s\n",
                format, (int)getpid() % 1000, localhost);
       cptr   += strlen(cptr);
       copies --;
     }
 
-    snprintf(cptr, sizeof(control) - (cptr - control),
+    snprintf(cptr, sizeof(control) - (size_t)(cptr - control),
              "UdfA%03d%.15s\n"
 	     "N%.131s\n",	/* RFC 1179, Section 7.2 - sourcefile name <= 131 chars */
              (int)getpid() % 1000, localhost, title);
@@ -1001,7 +1056,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, "\002%d cfA%03d%.15s\n", (int)strlen(control),
                       (int)getpid() % 1000, localhost))
       {
 	close(fd);
@@ -1012,9 +1067,9 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
       fprintf(stderr, "DEBUG: Sending control file (%u bytes)\n",
 	      (unsigned)strlen(control));
 
-      if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
+      if ((size_t)lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
       {
-	status = errno;
+	status = (char)errno;
 	perror("DEBUG: Unable to write control file");
 
       }
@@ -1024,7 +1079,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	{
 	  _cupsLangPrintFilter(stderr, "WARNING",
 	                       _("The printer did not respond."));
-	  status = errno;
+	  status = (char)errno;
 	}
       }
 
@@ -1051,7 +1106,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, "\003" CUPS_LLFMT " dfA%03d%.15s\n",
                       CUPS_LLCAST filestats.st_size, (int)getpid() % 1000,
 		      localhost))
       {
@@ -1074,7 +1129,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, nbytes) < nbytes)
+	  if (lpd_write(fd, buffer, (size_t)nbytes) < nbytes)
 	  {
 	    perror("DEBUG: Unable to send print file to printer");
             break;
@@ -1087,11 +1142,11 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
       if (mode == MODE_STANDARD)
       {
 	if (tbytes < filestats.st_size)
-	  status = errno;
+	  status = (char)errno;
 	else if (lpd_write(fd, "", 1) < 1)
 	{
 	  perror("DEBUG: Unable to send trailing nul to printer");
-	  status = errno;
+	  status = (char)errno;
 	}
 	else
 	{
@@ -1134,7 +1189,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, "\002%d cfA%03d%.15s\n", (int)strlen(control),
                       (int)getpid() % 1000, localhost))
       {
 	close(fd);
@@ -1145,9 +1200,9 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
       fprintf(stderr, "DEBUG: Sending control file (%lu bytes)\n",
 	      (unsigned long)strlen(control));
 
-      if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
+      if ((size_t)lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
       {
-	status = errno;
+	status = (char)errno;
 	perror("DEBUG: Unable to write control file");
       }
       else
@@ -1156,7 +1211,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	{
 	  _cupsLangPrintFilter(stderr, "WARNING",
 			       _("The printer did not respond."));
-	  status = errno;
+	  status = (char)errno;
 	}
       }
 
@@ -1169,6 +1224,8 @@ 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...
     */
@@ -1204,119 +1261,35 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
  * 'lpd_write()' - Write a buffer of data to an LPD server.
  */
 
-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 */
+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 */
 {
-  int	bytes,				/* Number of bytes written */
-	total;				/* Total number of bytes written */
+  ssize_t	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 - total, 0)) >= 0)
+  while ((bytes = send(lpd_fd, buffer, length - (size_t)total, 0)) >= 0)
   {
     total  += bytes;
     buffer += bytes;
 
-    if (total == length)
+    if ((size_t)total == length)
       break;
   }
 
   if (bytes < 0)
     return (-1);
   else
-    return (length);
+    return (total);
 }
 
 
-#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.
  */
@@ -1328,8 +1301,3 @@ sigterm_handler(int sig)		/* I - Signal */
 
   abort_job = 1;
 }
-
-
-/*
- * End of "$Id$".
- */

backend/network.c

@@ -1,23 +1,16 @@
 /*
- * "$Id$"
+ * Common backend network APIs for CUPS.
  *
- *   Common backend network APIs for CUPS.
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   backendCheckSideChannel() - Check the side-channel for pending requests.
- *   backendNetworkSideCB()    - Handle common network side-channel commands.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -26,18 +19,13 @@
 
 #include "backend-private.h"
 #include <limits.h>
-#ifdef __hpux
-#  include <sys/time.h>
-#else
-#  include <sys/select.h>
-#endif /* __hpux */
+#include <sys/select.h>
 
 
 /*
  * 'backendCheckSideChannel()' - Check the side-channel for pending requests.
  */
 
-
 void
 backendCheckSideChannel(
     int         snmp_fd,		/* I - SNMP socket */
@@ -57,6 +45,65 @@ 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.
  */
@@ -100,7 +147,7 @@ backendNetworkSideCB(
 
     case CUPS_SC_CMD_GET_BIDI :
 	status  = CUPS_SC_STATUS_OK;
-        data[0] = use_bc;
+        data[0] = (char)use_bc;
         datalen = 1;
         break;
 
@@ -139,13 +186,13 @@ backendNetworkSideCB(
 	    for (dataptr = data + strlen(data) + 1;
 	         count > 0 && dataptr < (data + sizeof(data) - 1);
 	         count --, dataptr += strlen(dataptr))
-	      strlcpy(dataptr, snmp_value, sizeof(data) - (dataptr - data));
+	      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 = dataptr - data;
+	    datalen = (int)(dataptr - data);
 	    break;
           }
 
@@ -168,7 +215,7 @@ backendNetworkSideCB(
           {
 	    if (_cupsSNMPRead(snmp_fd, &packet, 1.0))
 	    {
-	      int	i;		/* Looping var */
+	      size_t	i;		/* Looping var */
 
 
               if (!_cupsSNMPOIDToString(packet.object_name, data, sizeof(data)))
@@ -183,35 +230,31 @@ backendNetworkSideCB(
 	      switch (packet.object_type)
 	      {
 	        case CUPS_ASN1_BOOLEAN :
-		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
-		             packet.object_value.boolean);
+		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%d", packet.object_value.boolean);
 	            datalen += (int)strlen(dataptr);
 		    break;
 
 	        case CUPS_ASN1_INTEGER :
-		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
+		    snprintf(dataptr, sizeof(data) - (size_t)(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 < 0)
-		      i = 0;
-		    else if (packet.object_value.string.num_bytes <
-			     (sizeof(data) - (dataptr - data)))
+		    if (packet.object_value.string.num_bytes < (sizeof(data) - (size_t)(dataptr - data)))
 		      i = packet.object_value.string.num_bytes;
 		    else
-		      i = (int)(sizeof(data) - (dataptr - data));
+		      i = sizeof(data) - (size_t)(dataptr - data);
 
 		    memcpy(dataptr, packet.object_value.string.bytes, i);
 
-                    datalen += i;
+                    datalen += (int)i;
 		    break;
 
 	        case CUPS_ASN1_OID :
 		    _cupsSNMPOIDToString(packet.object_value.oid, dataptr,
-		                         sizeof(data) - (dataptr - data));
+		                         sizeof(data) - (size_t)(dataptr - data));
 	            datalen += (int)strlen(dataptr);
 		    break;
 
@@ -220,32 +263,27 @@ 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) - (dataptr - data), "%d",
-		             packet.object_value.counter);
+		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%u", packet.object_value.counter);
 	            datalen += (int)strlen(dataptr);
 		    break;
 
                 case CUPS_ASN1_GAUGE :
-		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%u",
-		             packet.object_value.gauge);
+		    snprintf(dataptr, sizeof(data) - (size_t)(dataptr - data), "%u", packet.object_value.gauge);
 	            datalen += (int)strlen(dataptr);
 		    break;
 
                 case CUPS_ASN1_TIMETICKS :
-		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%u",
-		             packet.object_value.timeticks);
+		    snprintf(dataptr, sizeof(data) - (size_t)(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';
@@ -268,6 +306,12 @@ 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)
 	{
@@ -305,12 +349,6 @@ 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;
@@ -319,8 +357,3 @@ backendNetworkSideCB(
 
   return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
 }
-
-
-/*
- * End of "$Id$".
- */

backend/org.cups.usb-quirks

@@ -5,12 +5,20 @@
 # 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
+#   unidir        Only supports 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.
+#
+# To get the USB vendor and product IDs for a given printer, run the "lsusb"
+# command, which will show something like the following:
+#
+#   Bus 002 Device 003: ID ab21:34dc Acme Example Printer
+#
+# The "ab21:34dc" is the vendor and product ID, separated by a colon.
 
 # HP DeskJet 895C
 0x03f0 0x0004 unidir
@@ -51,64 +59,70 @@
 # NEC Picty800 (HP OEM)
 0x0409 0xf1be unidir
 
-# Lexmark International, Inc. (e250d), https://bugs.launchpad.net/bugs/1084164
+# 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
+# Canon, Inc. PIXMA iP6000D Printer (https://bugs.launchpad.net/bugs/1160638)
 0x04a9 0x1095 unidir
 
-# Canon, Inc. PIXMA iP4200 Printer, http://www.cups.org/str.php?L4155
+# Canon, Inc. PIXMA iP4200 Printer (Issue #4155)
 0x04a9 0x10a2 unidir
 
-# Canon, Inc. PIXMA iP4300 Printer, https://bugs.launchpad.net/bugs/1032385
+# 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
+# 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
+# Canon, Inc. MP500 Printer (https://bugs.launchpad.net/bugs/1032456)
 0x04a9 0x170c unidir
 
-# Canon, Inc. MP510 Printer, https://bugs.launchpad.net/bugs/1050009
+# Canon, Inc. MP510 Printer (https://bugs.launchpad.net/bugs/1050009)
 0x04a9 0x1717 unidir
 
-# Canon, Inc. MP550 Printer, http://www.cups.org/str.php?L4155
+# 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, http://www.cups.org/str.php?L4155
+# Canon, Inc. MP560 Printer (Issue #4155)
 0x04a9 0x173e unidir
 
-# Canon, Inc. MF4150 Printer, https://bugs.launchpad.net/bugs/1160638
+# Canon, Inc. MF4150 Printer (https://bugs.launchpad.net/bugs/1160638)
 0x04a9 0x26a3 no-reattach
 
-# Brother Industries, Ltd HL-1430 Laser Printer, https://bugs.launchpad.net/bugs/1038695
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
+# 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
@@ -117,14 +131,17 @@
 # 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
+# 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
+# All Samsung devices (https://bugs.launchpad.net/bugs/1032456)
 0x04e8 soft-reset
 
-# All Zebra devices, https://bugs.launchpad.net/bugs/1001028
-0x0a5f unidir
+# 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) (Issue #5395)
+0x0a5f unidir no-reattach
 
 # Canon CP-10
 0x04a9 0x304a blacklist
@@ -212,3 +229,76 @@
 
 # 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 1015 (Issue #5617)
+0x03f0 0x0e17 delay-close
+
+# 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
+
+# Canon, Inc. MP280 series (Issue #5221)
+0x04a9 0x1746 unidir
+
+# Star Micronics printers (Issue #5251)
+0x0519 unidir
+
+# Lexmark Optra E310 (Issue #5259)
+0x043d 0x000c no-reattach
+
+# HP LaserJet P1102 (Issue #5310)
+0x03F0 0x002A no-reattach
+
+# Lexmark MS317dn
+0x043d 0x0226 no-reattach
+
+# Star TSP743 (Issue #5443)
+0x0519 0x0001 delay-close
+
+# Lexmark E120n (Issue #5478)
+0x043d 0x00cc no-reattach
+
+# All Xerox printers (Issue #5523)
+0x0924 no-reattach
+
+# Dymo 450 Turbo (Issue #5521)
+0x0922 0x0021 unidir

backend/pseudo

@@ -1,18 +1,16 @@
 #!/bin/sh
 #
-# "$Id$"
+# Psuedo-backend for CUPS testing purposes.
 #
-#   Psuedo-backend for CUPS testing purposes.
+# Copyright 2011 by Apple Inc.
 #
-#   Copyright 2011 by Apple Inc.
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-#   This file is subject to the Apple OS-Developed Software exception.
+# This file is subject to the Apple OS-Developed Software exception.
 #
 
 if test $# = 0; then
@@ -24,7 +22,3 @@ fi
 cat $6 >/dev/null
 sleep 5
 exit 0
-
-#
-# End of "$Id$".
-#

backend/runloop.c

@@ -1,25 +1,16 @@
 /*
- * "$Id$"
+ * Common run loop APIs for CUPS backends.
  *
- *   Common run loop APIs for CUPS backends.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * 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.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -28,11 +19,7 @@
 
 #include "backend-private.h"
 #include <limits.h>
-#ifdef __hpux
-#  include <sys/time.h>
-#else
-#  include <sys/select.h>
-#endif /* __hpux */
+#include <sys/select.h>
 
 
 /*
@@ -90,7 +77,7 @@ 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."));
@@ -113,7 +100,7 @@ backendDrainOutput(int print_fd,	/* I - Print file descriptor */
 
     for (print_ptr = print_buffer; print_bytes > 0;)
     {
-      if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
+      if ((bytes = write(device_fd, print_ptr, (size_t)print_bytes)) < 0)
       {
        /*
         * Write error - bail if we don't see an error we can retry...
@@ -293,7 +280,7 @@ backendRunLoop(
 	fprintf(stderr,
 	        "DEBUG: Received " CUPS_LLFMT " bytes of back-channel data\n",
 	        CUPS_LLCAST bc_bytes);
-        cupsBackChannelWrite(bc_buffer, bc_bytes, 1.0);
+        cupsBackChannelWrite(bc_buffer, (size_t)bc_bytes, 1.0);
       }
       else if (bc_bytes < 0 && errno != EAGAIN && errno != EINTR)
       {
@@ -318,7 +305,7 @@ 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",
@@ -350,7 +337,7 @@ backendRunLoop(
 
     if (print_bytes && FD_ISSET(device_fd, &output))
     {
-      if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
+      if ((bytes = write(device_fd, print_ptr, (size_t)print_bytes)) < 0)
       {
        /*
         * Write error - bail if we don't see an error we can retry...
@@ -536,8 +523,3 @@ backendWaitLoop(
 
   return (1);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/snmp-supplies.c

@@ -1,24 +1,15 @@
 /*
- * "$Id$"
+ * SNMP supplies functions for CUPS.
  *
- *   SNMP supplies functions for CUPS.
+ * Copyright 2008-2015 by Apple Inc.
  *
- *   Copyright 2008-2012 by Apple Inc.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * 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.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -26,6 +17,7 @@
  */
 
 #include "backend-private.h"
+#include <cups/ppd-private.h>
 #include <cups/array.h>
 
 
@@ -62,6 +54,7 @@ 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 */
@@ -148,6 +141,13 @@ 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 */
@@ -257,6 +257,9 @@ backendSNMPSupplies(
       else
         percent = 50;
 
+      if (supplies[i].sclass == CUPS_TC_receptacleThatIsFilled)
+        percent = 100 - percent;
+
       if (percent <= 5)
       {
         switch (supplies[i].type)
@@ -293,6 +296,7 @@ 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 :
@@ -303,6 +307,7 @@ backendSNMPSupplies(
               else
                 new_supply_state |= CUPS_WASTE_ALMOST_FULL;
               break;
+#endif /* 0 */
           case CUPS_TC_cleanerUnit :
           case CUPS_TC_fuserCleaningPad :
               if (percent <= 1)
@@ -318,9 +323,9 @@ backendSNMPSupplies(
 
       if ((supplies[i].max_capacity > 0 || (quirks & CUPS_SNMP_CAPACITY)) &&
           supplies[i].level >= 0)
-        snprintf(ptr, sizeof(value) - (ptr - value), "%d", percent);
+        snprintf(ptr, sizeof(value) - (size_t)(ptr - value), "%d", percent);
       else
-        strlcpy(ptr, "-1", sizeof(value) - (ptr - value));
+        strlcpy(ptr, "-1", sizeof(value) - (size_t)(ptr - value));
     }
 
     fprintf(stderr, "ATTR: marker-levels=%s\n", value);
@@ -561,20 +566,20 @@ backend_init_supplies(
    /*
     * Yes, read the cache file:
     *
-    *     2 num_supplies charset
+    *     3 num_supplies charset
     *     device description
     *     supply structures...
     */
 
     if (cupsFileGets(cachefile, value, sizeof(value)))
     {
-      if (sscanf(value, "2 %d%d", &num_supplies, &charset) == 2 &&
+      if (sscanf(value, "3 %d%d", &num_supplies, &charset) == 2 &&
           num_supplies <= CUPS_MAX_SUPPLIES &&
           cupsFileGets(cachefile, value, sizeof(value)))
       {
         if (!strcmp(description, value))
 	  cupsFileRead(cachefile, (char *)supplies,
-	               num_supplies * sizeof(backend_supplies_t));
+	               (size_t)num_supplies * sizeof(backend_supplies_t));
         else
 	{
 	  num_supplies = -1;
@@ -664,12 +669,12 @@ backend_init_supplies(
 
   if ((cachefile = cupsFileOpen(cachefilename, "w")) != NULL)
   {
-    cupsFilePrintf(cachefile, "2 %d %d\n", num_supplies, charset);
+    cupsFilePrintf(cachefile, "3 %d %d\n", num_supplies, charset);
     cupsFilePrintf(cachefile, "%s\n", description);
 
     if (num_supplies > 0)
       cupsFileWrite(cachefile, (char *)supplies,
-                    num_supplies * sizeof(backend_supplies_t));
+                    (size_t)num_supplies * sizeof(backend_supplies_t));
 
     cupsFileClose(cachefile);
   }
@@ -697,7 +702,7 @@ backend_init_supplies(
     if (i)
       *ptr++ = ',';
 
-    strlcpy(ptr, supplies[i].color, sizeof(value) - (ptr - value));
+    strlcpy(ptr, supplies[i].color, sizeof(value) - (size_t)(ptr - value));
   }
 
   fprintf(stderr, "ATTR: marker-colors=%s\n", value);
@@ -745,9 +750,9 @@ backend_init_supplies(
     type = supplies[i].type;
 
     if (type < CUPS_TC_other || type > CUPS_TC_covers)
-      strlcpy(ptr, "unknown", sizeof(value) - (ptr - value));
+      strlcpy(ptr, "unknown", sizeof(value) - (size_t)(ptr - value));
     else
-      strlcpy(ptr, types[type - CUPS_TC_other], sizeof(value) - (ptr - value));
+      strlcpy(ptr, types[type - CUPS_TC_other], sizeof(value) - (size_t)(ptr - value));
   }
 
   fprintf(stderr, "ATTR: marker-types=%s\n", value);
@@ -969,6 +974,25 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
         packet->object_value.integer > 0)
       supplies[i - 1].max_capacity = packet->object_value.integer;
   }
+  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesClass))
+  {
+   /*
+    * Get marker class...
+    */
+
+    i = packet->object_name[prtMarkerSuppliesClassOffset];
+    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
+        packet->object_type != CUPS_ASN1_INTEGER)
+      return;
+
+    fprintf(stderr, "DEBUG2: prtMarkerSuppliesClass.1.%d = %d\n", i,
+            packet->object_value.integer);
+
+    if (i > num_supplies)
+      num_supplies = i;
+
+    supplies[i - 1].sclass = packet->object_value.integer;
+  }
   else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesType))
   {
    /*
@@ -1032,9 +1056,9 @@ utf16_to_utf8(
   for (ptr = temp; srcsize >= 2;)
   {
     if (le)
-      ch = src[0] | (src[1] << 8);
+      ch = (cups_utf32_t)(src[0] | (src[1] << 8));
     else
-      ch = (src[0] << 8) | src[1];
+      ch = (cups_utf32_t)((src[0] << 8) | src[1]);
 
     src += 2;
     srcsize -= 2;
@@ -1045,13 +1069,13 @@ utf16_to_utf8(
       * Multi-word UTF-16 char...
       */
 
-      int lch;			/* Lower word */
+      cups_utf32_t lch;			/* Lower word */
 
 
       if (le)
-	lch = src[0] | (src[1] << 8);
+	lch = (cups_utf32_t)(src[0] | (src[1] << 8));
       else
-	lch = (src[0] << 8) | src[1];
+	lch = (cups_utf32_t)((src[0] << 8) | src[1]);
 
       if (lch >= 0xdc00 && lch <= 0xdfff)
       {
@@ -1068,10 +1092,5 @@ utf16_to_utf8(
 
   *ptr = '\0';
 
-  cupsUTF32ToUTF8(dst, temp, dstsize);
+  cupsUTF32ToUTF8(dst, temp, (int)dstsize);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/snmp.c

@@ -1,44 +1,16 @@
 /*
- * "$Id$"
+ * SNMP discovery backend for CUPS.
  *
- *   SNMP discovery backend for CUPS.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * 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...
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -532,17 +504,16 @@ fix_make_model(
     make_model[0] = 'H';
     make_model[1] = 'P';
     make_model[2] = ' ';
-    strlcpy(make_model + 3, mmptr, make_model_size - 3);
+    strlcpy(make_model + 3, mmptr, (size_t)make_model_size - 3);
   }
   else if (!_cups_strncasecmp(old_make_model, "deskjet", 7))
-    snprintf(make_model, make_model_size, "HP DeskJet%s", old_make_model + 7);
+    snprintf(make_model, (size_t)make_model_size, "HP DeskJet%s", old_make_model + 7);
   else if (!_cups_strncasecmp(old_make_model, "officejet", 9))
-    snprintf(make_model, make_model_size, "HP OfficeJet%s", old_make_model + 9);
+    snprintf(make_model, (size_t)make_model_size, "HP OfficeJet%s", old_make_model + 9);
   else if (!_cups_strncasecmp(old_make_model, "stylus_pro_", 11))
-    snprintf(make_model, make_model_size, "EPSON Stylus Pro %s",
-             old_make_model + 11);
+    snprintf(make_model, (size_t)make_model_size, "EPSON Stylus Pro %s", old_make_model + 11);
   else
-    strlcpy(make_model, old_make_model, make_model_size);
+    strlcpy(make_model, old_make_model, (size_t)make_model_size);
 
   if ((mmptr = strstr(make_model, ", Inc.,")) != NULL)
   {
@@ -753,7 +724,7 @@ probe_device(snmp_cache_t *device)	/* I - Device */
 	    * Insert hostname/address...
 	    */
 
-	    strlcpy(uriptr, device->addrname, sizeof(uri) - (uriptr - uri));
+	    strlcpy(uriptr, device->addrname, sizeof(uri) - (size_t)(uriptr - uri));
 	    uriptr += strlen(uriptr);
 	    format += 2;
 	  }
@@ -1233,7 +1204,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 */
@@ -1335,7 +1306,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));
@@ -1346,7 +1317,7 @@ try_connect(http_addr_t *addr,		/* I - Socket address */
 
   alarm(1);
 
-  status = connect(fd, (void *)addr, httpAddrLength(addr));
+  status = connect(fd, (void *)addr, (socklen_t)httpAddrLength(addr));
 
   close(fd);
   alarm(0);
@@ -1388,8 +1359,3 @@ update_cache(snmp_cache_t *device,	/* I - Device */
 
   list_device(device);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/socket.c

@@ -1,23 +1,16 @@
 /*
- * "$Id$"
+ * AppSocket backend for CUPS.
  *
- *   AppSocket backend for CUPS.
+ * Copyright 2007-2018 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()    - Send a file to the printer or server.
- *   wait_bc() - Wait for back-channel data...
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -30,7 +23,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include <winsock.h>
 #else
 #  include <unistd.h>
@@ -39,14 +32,14 @@
 #  include <netinet/in.h>
 #  include <arpa/inet.h>
 #  include <netdb.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 
 /*
  * Local functions...
  */
 
-static int	wait_bc(int device_fd, int secs);
+static ssize_t	wait_bc(int device_fd, int secs);
 
 
 /*
@@ -76,7 +69,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
   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) */
@@ -250,8 +242,8 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
          */
 
          snmp_enabled = !value[0] || !_cups_strcasecmp(value, "on") ||
-                        _cups_strcasecmp(value, "yes") ||
-                        _cups_strcasecmp(value, "true");
+                        !_cups_strcasecmp(value, "yes") ||
+                        !_cups_strcasecmp(value, "true");
       }
       else if (!_cups_strcasecmp(name, "contimeout"))
       {
@@ -271,23 +263,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
   start_time = time(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);
-    }
-  }
+  addrlist = backendLookup(hostname, port, NULL);
 
  /*
   * See if the printer supports SNMP...
@@ -354,8 +330,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
       fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(error));
 
-      if (error == ECONNREFUSED || error == EHOSTDOWN ||
-          error == EHOSTUNREACH)
+      if (errno == ECONNREFUSED || errno == EHOSTDOWN || errno == EHOSTUNREACH || errno == ETIMEDOUT || errno == ENOTCONN)
       {
         if (contimeout && (time(NULL) - start_time) > contimeout)
 	{
@@ -373,19 +348,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."));
 	      break;
         }
 
-	sleep(delay);
+	sleep((unsigned)delay);
 
 	if (delay < 30)
 	  delay += 5;
@@ -415,7 +390,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
   tbytes = 0;
 
   if (bytes > 0)
-    tbytes += write(device_fd, buffer, bytes);
+    tbytes += write(device_fd, buffer, (size_t)bytes);
 
   while (copies > 0 && tbytes >= 0)
   {
@@ -427,14 +402,18 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
       lseek(print_fd, 0, SEEK_SET);
     }
 
-    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addrlist->addr), 1,
-                            0, backendNetworkSideCB);
+    if ((bytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addrlist->addr), 1, 0, backendNetworkSideCB)) < 0)
+      tbytes = -1;
+    else
+      tbytes = bytes;
 
     if (print_fd != 0 && tbytes >= 0)
       _cupsLangPrintFilter(stderr, "INFO", _("Print file sent."));
   }
 
-  if (waiteof)
+  fputs("STATE: +cups-waiting-for-job-completed\n", stderr);
+
+  if (waiteof && tbytes >= 0)
   {
    /*
     * Shutdown the socket and wait for the other end to finish...
@@ -471,7 +450,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
   if (print_fd != 0)
     close(print_fd);
 
-  return (CUPS_BACKEND_OK);
+  return (tbytes >= 0 ? CUPS_BACKEND_OK : CUPS_BACKEND_FAILED);
 }
 
 
@@ -479,7 +458,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * 'wait_bc()' - Wait for back-channel data...
  */
 
-static int				/* O - # bytes read or -1 on error */
+static ssize_t				/* O - # bytes read or -1 on error */
 wait_bc(int device_fd,			/* I - Socket */
         int secs)			/* I - Seconds to wait */
 {
@@ -509,7 +488,7 @@ wait_bc(int device_fd,			/* I - Socket */
     {
       fprintf(stderr, "DEBUG: Received %d bytes of back-channel data\n",
 	      (int)bytes);
-      cupsBackChannelWrite(buffer, bytes, 1.0);
+      cupsBackChannelWrite(buffer, (size_t)bytes, 1.0);
     }
 
     return (bytes);
@@ -517,8 +496,3 @@ wait_bc(int device_fd,			/* I - Socket */
   else
     return (-1);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/test1284.c

@@ -1,22 +1,16 @@
 /*
- * "$Id$"
+ * IEEE-1284 support functions test program for CUPS.
  *
- *   IEEE-1284 support functions test program for CUPS.
+ * Copyright 2007-2010 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2010 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"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main() - Test the device-ID functions.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -24,12 +18,12 @@
  */
 
 #include <cups/string-private.h>
-#ifdef WIN32
+#ifdef _WIN32
 #  include <io.h>
 #else
 #  include <unistd.h>
 #  include <fcntl.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 #include "ieee1284.c"
 
@@ -77,8 +71,3 @@ main(int  argc,				/* I - Number of command-line args */
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/testbackend.c

@@ -1,25 +1,16 @@
 /*
- * "$Id$"
+ * Backend test program for CUPS.
  *
- *   Backend test program for CUPS.
+ * Copyright 2007-2018 by Apple Inc.
+ * Copyright 1997-2005 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()            - Run the named backend.
- *   sigterm_handler() - Flag when we get SIGTERM.
- *   usage()           - Show usage information.
- *   walk_cb()         - Show results of cupsSideChannelSNMPWalk...
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -47,7 +38,7 @@ static int	job_canceled = 0;
  */
 
 static void	sigterm_handler(int sig);
-static void	usage(void) __attribute__((noreturn));
+static void	usage(void) _CUPS_NORETURN;
 static void	walk_cb(const char *oid, const char *data, int datalen,
 		        void *context);
 
@@ -97,7 +88,7 @@ main(int  argc,				/* I - Number of command-line args */
   if (getcwd(libpath, sizeof(libpath)) &&
       (ptr = strrchr(libpath, '/')) != NULL && !strcmp(ptr, "/backend"))
   {
-    strlcpy(ptr, "/cups", sizeof(libpath) - (ptr - libpath));
+    strlcpy(ptr, "/cups", sizeof(libpath) - (size_t)(ptr - libpath));
     if (!access(libpath, 0))
     {
 #ifdef __APPLE__
@@ -311,7 +302,7 @@ main(int  argc,				/* I - Number of command-line args */
 	  */
 
 	  if ((bytes = cupsBackChannelRead(buffer, sizeof(buffer), 0)) > 0)
-	    write(2, buffer, bytes);
+	    write(2, buffer, (size_t)bytes);
 
 	 /*
 	  * Throttle output to ~100hz...
@@ -339,7 +330,7 @@ main(int  argc,				/* I - Number of command-line args */
 	*/
 
         while ((bytes = cupsBackChannelRead(buffer, sizeof(buffer), 5.0)) > 0)
-	  write(2, buffer, bytes);
+	  write(2, buffer, (size_t)bytes);
 
 	exit(0);
       }
@@ -414,7 +405,7 @@ main(int  argc,				/* I - Number of command-line args */
         while ((bytes = cupsBackChannelRead(buffer, sizeof(buffer),
 	                                    timeout)) > 0)
 	{
-	  write(2, buffer, bytes);
+	  write(2, buffer, (size_t)bytes);
 	  timeout = 5.0;
 	}
 	write(2, "\nDEBUG: END\n", 12);
@@ -668,21 +659,19 @@ walk_cb(const char *oid,		/* I - OID */
 	void       *context)		/* I - Context (unused) */
 {
   char temp[80];
-  if (datalen > (sizeof(temp) - 1))
+
+  (void)context;
+
+  if ((size_t)datalen > (sizeof(temp) - 1))
   {
     memcpy(temp, data, sizeof(temp) - 1);
     temp[sizeof(temp) - 1] = '\0';
   }
   else
   {
-    memcpy(temp, data, datalen);
+    memcpy(temp, data, (size_t)datalen);
     temp[datalen] = '\0';
   }
 
   printf("CUPS_SC_CMD_SNMP_WALK %s, %d bytes (%s)\n", oid, datalen, temp);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/testsupplies.c

@@ -1,21 +1,15 @@
 /*
- * "$Id$"
+ * SNMP supplies test program for CUPS.
  *
- *   SNMP supplies test program for CUPS.
+ * Copyright 2008-2011 by Apple Inc.
  *
- *   Copyright 2008-2011 by Apple Inc.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main() - Show the supplies state of a printer.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -76,8 +70,3 @@ main(int  argc,				/* I - Number of command-line args */
     sleep(5);
   }
 }
-
-
-/*
- * End of "$Id$".
- */

backend/usb-libusb.c

@@ -1,35 +1,13 @@
 /*
- * "$Id$"
+ * LIBUSB interface code for CUPS.
  *
- *   LIBUSB interface code for CUPS.
+ * Copyright 2007-2019 by Apple Inc.
  *
- *   Copyright 2007-2013 by Apple Inc.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   list_devices()	  - List the available printers.
- *   print_device()	  - Print a file to a USB device.
- *   close_device()	  - Close the connection to the USB printer.
- *   compare_quirks()	  - Compare two quirks entries.
- *   find_device()	  - Find or enumerate USB printers.
- *   find_quirks()	  - Find the quirks for the given printer, if any.
- *   get_device_id()	  - Get the IEEE-1284 device ID for the printer.
- *   list_cb()		  - List USB printers for discovery.
- *   load_quirks()	  - Load all quirks files in the /usr/share/cups/usb
- *			    directory.
- *   make_device_uri()	  - Create a device URI for a USB printer.
- *   open_device()	  - Open a connection to the USB printer.
- *   print_cb() 	  - Find a USB printer for printing.
- *   read_thread()	  - Thread to read the backchannel data on.
- *   sidechannel_thread() - Handle side-channel requests.
- *   soft_reset()	  - Send a soft reset to the device.
- *   soft_reset_printer() - Do the soft reset request specific to printers
+ * 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/".
  */
 
 /*
@@ -38,6 +16,7 @@
 
 #include <libusb.h>
 #include <cups/cups-private.h>
+#include <cups/ppd-private.h>
 #include <cups/dir.h>
 #include <pthread.h>
 #include <sys/select.h>
@@ -123,6 +102,7 @@ typedef struct usb_globals_s		/* Global USB printer information */
 #define USB_QUIRK_USB_INIT	0x0010	/* Needs vendor USB init string */
 #define USB_QUIRK_VENDOR_CLASS	0x0020	/* Descriptor uses vendor-specific
 					   Class or SubClass */
+#define USB_QUIRK_DELAY_CLOSE	0x0040	/* Delay close */
 #define USB_QUIRK_WHITELIST	0x0000	/* no quirks */
 
 
@@ -496,7 +476,7 @@ print_device(const char *uri,		/* I - Device URI */
 	iostatus = libusb_bulk_transfer(g.printer->handle,
 					g.printer->write_endp,
 					print_buffer, g.print_bytes,
-					&bytes, 60000);
+					&bytes, 0);
        /*
 	* Ignore timeout errors, but retain the number of bytes written to
 	* avoid sending duplicate data...
@@ -519,7 +499,7 @@ print_device(const char *uri,		/* I - Device URI */
 	  iostatus = libusb_bulk_transfer(g.printer->handle,
 					  g.printer->write_endp,
 					  print_buffer, g.print_bytes,
-					  &bytes, 60000);
+					  &bytes, 0);
 	}
 
        /*
@@ -534,7 +514,7 @@ print_device(const char *uri,		/* I - Device URI */
 	  iostatus = libusb_bulk_transfer(g.printer->handle,
 					  g.printer->write_endp,
 					  print_buffer, g.print_bytes,
-					  &bytes, 60000);
+					  &bytes, 0);
         }
 
 	if (iostatus)
@@ -661,6 +641,9 @@ print_device(const char *uri,		/* I - Device URI */
   * Close the connection and input file and general clean up...
   */
 
+  if (g.printer->quirks & USB_QUIRK_DELAY_CLOSE)
+    sleep(1);
+
   close_device(g.printer);
 
  /*
@@ -846,8 +829,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
   err = libusb_init(NULL);
   if (err)
   {
-    fprintf(stderr, "DEBUG: Unable to initialize USB access via libusb, "
-                    "libusb error %i\n", (int)err);
+    fprintf(stderr, "ERROR: Unable to initialize USB access via libusb, libusb error %i (%s)\n", (int)err, libusb_strerror((int)err));
     return (NULL);
   }
 
@@ -899,7 +881,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
           protocol   = 0;
 
 	  for (altset = 0, altptr = ifaceptr->altsetting;
-	       altset < ifaceptr->num_altsetting;
+	       altset < (uint8_t)ifaceptr->num_altsetting;
 	       altset ++, altptr ++)
           {
 	   /*
@@ -920,8 +902,8 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 	      fprintf(stderr, "DEBUG: Printer does not report class 7 and/or "
 		      "subclass 1 but works as a printer anyway\n");
 
-	    read_endp  = -1;
-	    write_endp = -1;
+	    read_endp  = 0xff;
+	    write_endp = 0xff;
 
 	    for (endp = 0, endpptr = altptr->endpoint;
 	         endp < altptr->bNumEndpoints;
@@ -935,7 +917,7 @@ find_device(usb_cb_t   cb,		/* I - Callback function */
 		  write_endp = endp;
 	      }
 
-            if (write_endp >= 0)
+            if (write_endp != 0xff)
 	    {
 	     /*
 	      * Save the best match so far...
@@ -1085,8 +1067,7 @@ get_device_id(usb_printer_t *printer,	/* I - Printer */
   * bytes.  The 1284 spec says the length is stored MSB first...
   */
 
-  length = (((unsigned)buffer[0] & 255) << 8) |
-	   ((unsigned)buffer[1] & 255);
+  length = (int)((((unsigned)buffer[0] & 255) << 8) | ((unsigned)buffer[1] & 255));
 
  /*
   * Check to see if the length is larger than our buffer or less than 14 bytes
@@ -1097,8 +1078,7 @@ get_device_id(usb_printer_t *printer,	/* I - Printer */
   */
 
   if (length > bufsize || length < 14)
-    length = (((unsigned)buffer[1] & 255) << 8) |
-	     ((unsigned)buffer[0] & 255);
+    length = (int)((((unsigned)buffer[1] & 255) << 8) | ((unsigned)buffer[0] & 255));
 
   if (length > bufsize)
     length = bufsize;
@@ -1120,7 +1100,7 @@ get_device_id(usb_printer_t *printer,	/* I - Printer */
   * nul-terminate.
   */
 
-  memmove(buffer, buffer + 2, length);
+  memmove(buffer, buffer + 2, (size_t)length);
   buffer[length] = '\0';
 
   return (0);
@@ -1233,6 +1213,9 @@ load_quirks(void)
       if (strstr(line, " blacklist"))
         quirk->quirks |= USB_QUIRK_BLACKLIST;
 
+      if (strstr(line, " delay-close"))
+        quirk->quirks |= USB_QUIRK_DELAY_CLOSE;
+
       if (strstr(line, " no-reattach"))
         quirk->quirks |= USB_QUIRK_NO_REATTACH;
 
@@ -1473,9 +1456,14 @@ open_device(usb_printer_t *printer,	/* I - Printer */
   else
   {
     printer->usblp_attached = 0;
-    fprintf(stderr, "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" kernel module attached\n",
-	      devdesc.idVendor, devdesc.idProduct);
-    goto error;
+
+    if (errcode != LIBUSB_ERROR_NOT_SUPPORTED)
+    {
+      fprintf(stderr,
+              "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" "
+              "kernel module attached\n", devdesc.idVendor, devdesc.idProduct);
+      goto error;
+    }
   }
 
  /*
@@ -1539,6 +1527,16 @@ open_device(usb_printer_t *printer,	/* I - Printer */
 
       goto error;
     }
+    else if ((errcode = libusb_detach_kernel_driver(printer->handle, printer->iface)) < 0)
+    {
+      fprintf(stderr,
+              "DEBUG: Failed to detach \"usblp\" module from %04x:%04x\n",
+              devdesc.idVendor, devdesc.idProduct);
+
+      goto error;
+    }
+
+    sleep (1);
   }
 
  /*
@@ -1734,7 +1732,7 @@ static void *read_thread(void *reference)
     {
       fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n",
               (int)rbytes);
-      cupsBackChannelWrite((const char *)readbuffer, rbytes, 1.0);
+      cupsBackChannelWrite((const char *)readbuffer, (size_t)rbytes, 1.0);
     }
     else if (readstatus == LIBUSB_ERROR_TIMEOUT)
       fputs("DEBUG: Got USB transaction timeout during read.\n", stderr);
@@ -1747,8 +1745,7 @@ static void *read_thread(void *reference)
     * Make sure this loop executes no more than once every 250 miliseconds...
     */
 
-    if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) &&
-        (g.wait_eof || !g.read_thread_stop))
+    if ((g.wait_eof || !g.read_thread_stop))
     {
       gettimeofday(&now, NULL);
       if (timercmp(&now, &end, <))
@@ -2018,9 +2015,3 @@ soft_reset_printer(
 
   return (errcode);
 }
-
-
-/*
- * End of "$Id$".
- */
-

backend/usb-unix.c

@@ -1,27 +1,18 @@
 /*
- * "$Id$"
+ * USB port backend for CUPS.
  *
- *   USB port backend for CUPS.
+ * This file is included from "usb.c" when compiled on UNIX/Linux.
  *
- *   This file is included from "usb.c" when compiled on UNIX/Linux.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * 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...
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -153,7 +144,7 @@ print_device(const char *uri,		/* I - Device URI */
 
   tcgetattr(device_fd, &opts);
 
-  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
+  opts.c_lflag &= ~(unsigned)(ICANON | ECHO | ISIG);	/* Raw mode */
 
   /**** No options supported yet ****/
 
@@ -285,8 +276,6 @@ 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 */
@@ -609,8 +598,3 @@ side_cb(int         print_fd,		/* I - Print file */
 
   return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
 }
-
-
-/*
- * End of "$Id$".
- */

backend/usb.c

@@ -1,24 +1,16 @@
 /*
- * "$Id$"
+ * USB printer backend for CUPS.
  *
- *   USB port backend for CUPS.
+ * Copyright 2007-2012 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * 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.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -32,13 +24,13 @@
 
 #include "backend-private.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include <io.h>
 #else
 #  include <unistd.h>
 #  include <fcntl.h>
 #  include <termios.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 
 /*
@@ -257,8 +249,3 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
   return (status);
 }
-
-
-/*
- * End of "$Id$".
- */

berkeley/Dependencies

@@ -1,25 +1,25 @@
 lpc.o: lpc.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/versioning.h ../cups/ipp-private.h \
-  ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+  ../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/ipp-private.h \
-  ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+  ../cups/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/ipp-private.h \
-  ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/language.h ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+  ../cups/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/ipp-private.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/http-private.h ../cups/md5-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/language.h \
-  ../cups/pwg-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/thread-private.h
+  ../cups/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

berkeley/Makefile

@@ -1,16 +1,14 @@
 #
-# "$Id$"
+# Berkeley commands makefile for CUPS.
 #
-#   Berkeley commands makefile for CUPS.
+# Copyright 2007-2017 by Apple Inc.
+# Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2012 by Apple Inc.
-#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs
@@ -126,7 +124,8 @@ uninstall:
 
 lpc:	lpc.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -135,7 +134,8 @@ lpc:	lpc.o ../cups/$(LIBCUPS)
 
 lpq:	lpq.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -144,7 +144,8 @@ lpq:	lpq.o ../cups/$(LIBCUPS)
 
 lpr:	lpr.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -153,7 +154,8 @@ lpr:	lpr.o ../cups/$(LIBCUPS)
 
 lprm:	lprm.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -161,8 +163,3 @@ lprm:	lprm.o ../cups/$(LIBCUPS)
 #
 
 include Dependencies
-
-
-#
-# End of "$Id$".
-#

berkeley/lpc.c

@@ -1,24 +1,14 @@
 /*
- * "$Id$"
+ * "lpc" command for CUPS.
  *
- *   "lpc" command for CUPS.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * 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.
+ * 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/".
  */
 
 /*
@@ -32,7 +22,7 @@
  * Local functions...
  */
 
-static int	compare_strings(const char *, const char *, int);
+static int	compare_strings(const char *, const char *, size_t);
 static void	do_command(http_t *, const char *, const char *);
 static void	show_help(const char *);
 static void	show_status(http_t *, const char *);
@@ -158,9 +148,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 */
-                int        tmin)	/* I - Minimum number of unique chars in option */
+                size_t     tmin)	/* I - Minimum number of unique chars in option */
 {
-  int	slen;				/* Length of command-line string */
+  size_t	slen;			/* Length of command-line string */
 
 
   slen = strlen(s);
@@ -443,8 +433,3 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
     ippDelete(response);
   }
 }
-
-
-/*
- * End of "$Id$".
- */

berkeley/lpq.c

@@ -1,27 +1,14 @@
 /*
- * "$Id$"
+ * "lpq" command for CUPS.
  *
- *   "lpq" command for CUPS.
+ * Copyright 2007-2018 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2013 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...
+ * 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/".
  */
 
 /*
@@ -39,7 +26,7 @@ static http_t	*connect_server(const char *, http_t *);
 static int	show_jobs(const char *, http_t *, const char *,
 		          const char *, const int, const int);
 static void	show_printer(const char *, http_t *, const char *);
-static void	usage(void) __attribute__((noreturn));
+static void	usage(void) _CUPS_NORETURN;
 
 
 /*
@@ -52,7 +39,8 @@ main(int  argc,				/* I - Number of command-line arguments */
 {
   int		i;			/* Looping var */
   http_t	*http;			/* Connection to server */
-  const char	*dest,			/* Desired printer */
+  const char	*opt,			/* Option pointer */
+		*dest,			/* Desired printer */
 		*user,			/* Desired user */
 		*val;			/* Environment variable name */
   char		*instance;		/* Printer instance */
@@ -78,129 +66,138 @@ main(int  argc,				/* I - Number of command-line arguments */
   all        = 0;
 
   for (i = 1; i < argc; i ++)
+  {
     if (argv[i][0] == '+')
+    {
       interval = atoi(argv[i] + 1);
+    }
     else if (argv[i][0] == '-')
     {
-      switch (argv[i][1])
+      for (opt = argv[i] + 1; *opt; opt ++)
       {
-        case 'E' : /* Encrypt */
+	switch (*opt)
+	{
+	  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 (argv[i][2] != '\0')
-	      cupsSetUser(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
+	  case 'U' : /* Username */
+	      if (opt[1] != '\0')
 	      {
-	        _cupsLangPrintf(stderr,
-		                _("%s: Error - expected username after "
-				  "\"-U\" option."), argv[0]);
-	        return (1);
+		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];
 	      }
 
-              cupsSetUser(argv[i]);
-	    }
-	    break;
+	      if ((instance = strchr(dest, '/')) != NULL)
+		*instance++ = '\0';
 
-        case 'P' : /* Printer */
-	    if (argv[i][2])
-	      dest = argv[i] + 2;
-	    else
-	    {
-	      i ++;
+	      http = connect_server(argv[0], http);
 
-	      if (i >= argc)
+	      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)
 	      {
 		httpClose(http);
-
-	        usage();
+		http = NULL;
 	      }
 
-	      dest = argv[i];
-	    }
-
-	    if ((instance = strchr(dest, '/')) != NULL)
-	      *instance++ = '\0';
-
-            http = connect_server(argv[0], http);
-
-            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)
-	    {
-	      httpClose(http);
-	      http = NULL;
-	    }
-
-	    if (argv[i][2] != '\0')
-              cupsSetServer(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-
-	      if (i >= argc)
+	      if (opt[1] != '\0')
 	      {
-	        _cupsLangPrintf(stderr,
-		        	_("%s: Error - expected hostname after "
-			          "\"-h\" option."), argv[0]);
-		return (1);
-              }
+		cupsSetServer(opt + 1);
+		opt += strlen(opt) - 1;
+	      }
 	      else
-                cupsSetServer(argv[i]);
-	    }
-	    break;
+	      {
+		i ++;
 
-	case 'l' : /* Long status */
-	    longstatus = 1;
-	    break;
+		if (i >= argc)
+		{
+		  _cupsLangPrintf(stderr, _("%s: Error - expected hostname after \"-h\" option."), argv[0]);
+		  return (1);
+		}
+		else
+		  cupsSetServer(argv[i]);
+	      }
+	      break;
 
-	default :
-	    httpClose(http);
+	  case 'l' : /* Long status */
+	      longstatus = 1;
+	      break;
 
-	    usage();
-	    break;
+	  default :
+	      httpClose(http);
+
+	      usage();
+	}
       }
     }
     else if (isdigit(argv[i][0] & 255))
+    {
       id = atoi(argv[i]);
+    }
     else
+    {
       user = argv[i];
+    }
+  }
 
   http = connect_server(argv[0], http);
 
@@ -262,7 +259,7 @@ main(int  argc,				/* I - Number of command-line arguments */
     if (i && interval)
     {
       fflush(stdout);
-      sleep(interval);
+      sleep((unsigned)interval);
     }
     else
       break;
@@ -323,9 +320,6 @@ 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 */
@@ -448,9 +442,6 @@ 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";
@@ -467,12 +458,6 @@ 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;
@@ -510,16 +495,9 @@ 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 ++;
 
@@ -560,16 +538,9 @@ 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;
@@ -676,8 +647,3 @@ usage(void)
 		  "[-l] [+interval]"));
   exit(1);
 }
-
-
-/*
- * End of "$Id$".
- */

berkeley/lpr.c

@@ -1,20 +1,14 @@
 /*
- * "$Id$"
+ * "lpr" command for CUPS.
  *
- *   "lpr" command for CUPS.
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2013 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main() - Parse options and send files for printing.
+ * 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/".
  */
 
 /*
@@ -36,9 +30,9 @@ 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 */
-  const char	*title,			/* Job title */
-		*val;			/* Environment variable name */
+		*instance,		/* Instance */
+		*opt;			/* Option pointer */
+  const char	*title;			/* Job title */
   int		num_copies;		/* Number of copies per file */
   int		num_files;		/* Number of files to print */
   const char	*files[1000];		/* Files to print */
@@ -60,229 +54,235 @@ main(int  argc,				/* I - Number of command-line arguments */
   title       = NULL;
 
   for (i = 1; i < argc; i ++)
+  {
     if (argv[i][0] == '-')
     {
-      switch (ch = argv[i][1])
+      for (opt = argv[i] + 1; *opt; opt ++)
       {
-        case 'E' : /* Encrypt */
+	switch (ch = *opt)
+	{
+	  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 (argv[i][2] != '\0')
-	      cupsSetUser(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
+	  case 'U' : /* Username */
+	      if (opt[1] != '\0')
 	      {
-	        _cupsLangPrintf(stderr,
-		                _("%s: Error - expected username after "
-				  "\"-U\" option."), argv[0]);
-	        return (1);
+		cupsSetUser(opt + 1);
+		opt += strlen(opt) - 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)
 	      {
-		_cupsLangPrintf(stderr,
-		                _("%s: Error - expected value after \"-%c\" "
-				  "option."), argv[0], ch);
+		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]);
 		return (1);
 	      }
-	    }
+	      break;
 
-        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 (argv[i][2] != '\0')
-	      num_options = cupsParseOptions(argv[i] + 2, num_options, &options);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
+	  case '#' : /* Number of copies */
+	      if (opt[1] != '\0')
 	      {
-	        _cupsLangPrintf(stderr,
-		                _("%s: Error - expected option=value after "
-			          "\"-o\" option."), argv[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);
+		}
+
+		num_copies = atoi(argv[i]);
+	      }
+
+	      if (num_copies < 1)
+	      {
+		_cupsLangPrintf(stderr, _("%s: Error - copies must be 1 or more."), argv[0]);
 		return (1);
 	      }
 
-	      num_options = cupsParseOptions(argv[i], num_options, &options);
-	    }
-	    break;
+	      sprintf(buffer, "%d", num_copies);
+	      num_options = cupsAddOption("copies", buffer, 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 (argv[i][2] != '\0')
-	      printer = argv[i] + 2;
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
+	  case 'C' : /* Class */
+	  case 'J' : /* Job name */
+	  case 'T' : /* Title */
+	      if (opt[1] != '\0')
 	      {
-	        _cupsLangPrintf(stderr,
-		        	_("%s: Error - expected destination after "
-			          "\"-P\" option."), argv[0]);
-		return (1);
+		title = opt + 1;
+		opt += strlen(opt) - 1;
 	      }
+	      else
+	      {
+		i ++;
+		if (i >= argc)
+		{
+		  _cupsLangPrintf(stderr, _("%s: Error - expected name after \"-%c\" option."), argv[0], ch);
+		  return (1);
+		}
 
-	      printer = argv[i];
-	    }
+		title = argv[i];
+	      }
+	      break;
 
-            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]);
+	  default :
+	      _cupsLangPrintf(stderr, _("%s: Error - unknown option \"%c\"."), argv[0], *opt);
 	      return (1);
-	    }
-	    break;
-
-	case '#' : /* Number of copies */
-	    if (argv[i][2] != '\0')
-	      num_copies = atoi(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		        	_("%s: Error - expected copies after "
-			          "\"-#\" option."), argv[0]);
-		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)
@@ -311,9 +311,11 @@ 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...
   */
@@ -342,33 +344,10 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   if (printer == NULL)
   {
-    val = NULL;
-
-    if ((printer = getenv("LPDEST")) == NULL)
-    {
-      if ((printer = getenv("PRINTER")) != NULL)
-      {
-        if (!strcmp(printer, "lp"))
-          printer = NULL;
-	else
-	  val = "PRINTER";
-      }
-    }
+    if (!cupsGetNamedDest(NULL, NULL, NULL) && cupsLastError() == IPP_STATUS_ERROR_NOT_FOUND)
+      _cupsLangPrintf(stderr, _("%s: Error - %s"), argv[0], cupsLastErrorString());
     else
-      val = "LPDEST";
-
-    if (printer && !cupsGetNamedDest(NULL, printer, NULL))
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - %s environment variable names "
-		        "non-existent destination \"%s\"."), argv[0], val,
-		      printer);
-    else if (cupsLastError() == IPP_NOT_FOUND)
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - no default destination available."),
-		      argv[0]);
-    else
-      _cupsLangPrintf(stderr, _("%s: Error - scheduler not responding."),
-		      argv[0]);
+      _cupsLangPrintf(stderr, _("%s: Error - scheduler not responding."), argv[0]);
 
     return (1);
   }
@@ -406,7 +385,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 
     while (status == HTTP_CONTINUE &&
            (bytes = read(0, buffer, sizeof(buffer))) > 0)
-      status = cupsWriteRequestData(CUPS_HTTP_DEFAULT, buffer, bytes);
+      status = cupsWriteRequestData(CUPS_HTTP_DEFAULT, buffer, (size_t)bytes);
 
     if (status != HTTP_CONTINUE)
     {
@@ -433,8 +412,3 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */

berkeley/lprm.c

@@ -1,20 +1,14 @@
 /*
- * "$Id$"
+ * "lprm" command for CUPS.
  *
- *   "lprm" command for CUPS.
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   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.
+ * 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/".
  */
 
 /*
@@ -35,7 +29,8 @@ 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 */
+  char		*instance,	/* Pointer to instance name */
+		*opt;		/* Option pointer */
   cups_dest_t	*dest,		/* Destination */
 		*defdest;	/* Default destination */
   int		did_cancel;	/* Did we cancel something? */
@@ -56,90 +51,96 @@ main(int  argc,			/* I - Number of command-line arguments */
   */
 
   for (i = 1; i < argc; i ++)
+  {
     if (argv[i][0] == '-' && argv[i][1] != '\0')
-      switch (argv[i][1])
+    {
+      for (opt = argv[i] + 1; *opt; opt ++)
       {
-        case 'E' : /* Encrypt */
+	switch (*opt)
+	{
+	  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 (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)
+	  case 'P' : /* Cancel jobs on a printer */
+	      if (opt[1] != '\0')
 	      {
-	        _cupsLangPrintf(stderr,
-		                _("%s: Error - expected username after "
-				  "\"-U\" option."), argv[0]);
-	        goto error;
+		name = opt + 1;
+		opt += strlen(opt) - 1;
+	      }
+	      else
+	      {
+		i ++;
+		name = argv[i];
 	      }
 
-              cupsSetUser(argv[i]);
-	    }
-	    break;
-	    
-        case 'h' : /* Connect to host */
-	    if (argv[i][2] != '\0')
-              cupsSetServer(argv[i] + 2);
-	    else
-	    {
-	      i ++;
+	      if ((instance = strchr(name, '/')) != NULL)
+		*instance = '\0';
 
-	      if (i >= argc)
+	      if ((dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, name, NULL)) == NULL)
 	      {
-	        _cupsLangPrintf(stderr,
-		        	_("%s: Error - expected hostname after "
-			          "\"-h\" option."), argv[0]);
+		_cupsLangPrintf(stderr, _("%s: Error - unknown destination \"%s\"."), argv[0], name);
 		goto error;
-              }
+	      }
+
+	      cupsFreeDests(1, dest);
+	      break;
+
+	  case 'U' : /* Username */
+	      if (opt[1] != '\0')
+	      {
+		cupsSetUser(opt + 1);
+		opt += strlen(opt) - 1;
+	      }
 	      else
-                cupsSetServer(argv[i]);
-	    }
+	      {
+		i ++;
+		if (i >= argc)
+		{
+		  _cupsLangPrintf(stderr, _("%s: Error - expected username after \"-U\" option."), argv[0]);
+		  goto error;
+		}
 
-            if (defdest)
-	      cupsFreeDests(1, defdest);
+		cupsSetUser(argv[i]);
+	      }
+	      break;
 
-	    defdest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL);
-	    name    = defdest ? defdest->name : NULL;
-	    break;
+	  case 'h' : /* Connect to host */
+	      if (opt[1] != '\0')
+	      {
+		cupsSetServer(opt + 1);
+		opt += strlen(opt) - 1;
+	      }
+	      else
+	      {
+		i ++;
 
-	default :
-	    _cupsLangPrintf(stderr, _("%s: Error - unknown option \"%c\"."),
-			    argv[0], argv[i][1]);
-            goto error;
+		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;
+	}
       }
+    }
     else
     {
      /*
@@ -182,6 +183,7 @@ 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
@@ -210,8 +212,3 @@ main(int  argc,			/* I - Number of command-line arguments */
 
   return (1);
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/Dependencies

@@ -1,73 +1,74 @@
 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 help-index.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 \
   ../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 help-index.h ../cups/debug-private.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
 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 help-index.h ../cups/debug-private.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
 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 help-index.h ../cups/debug-private.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
 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 help-index.h ../cups/debug-private.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
 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 help-index.h ../cups/debug-private.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 \
   ../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 help-index.h ../cups/debug-private.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 \
-  ../cups/adminutil.h ../cups/ppd.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
 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 help-index.h ../cups/debug-private.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
 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 help-index.h ../cups/debug-private.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
 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 help-index.h ../cups/debug-private.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
+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
 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 help-index.h ../cups/debug-private.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
 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 help-index.h
+  ../cups/language.h ../cups/pwg.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 help-index.h
+  ../cups/language.h ../cups/pwg.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 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
+  ../cups/language.h ../cups/pwg.h help-index.h

cgi-bin/Makefile

@@ -1,16 +1,14 @@
 #
-# "$Id$"
+# CGI makefile for CUPS.
 #
-#   CGI makefile for CUPS.
+# Copyright 2007-2018 by Apple Inc.
+# Copyright 1997-2006 by Easy Software Products.
 #
-#   Copyright 2007-2012 by Apple Inc.
-#   Copyright 1997-2006 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs
@@ -28,12 +26,10 @@ OBJS	=	\
 		classes.o \
 		help.o \
 		jobs.o \
-		makedocset.o \
 		printers.o \
 		testcgi.o \
 		testhi.o \
-		testtemplate.o \
-		websearch.o
+		testtemplate.o
 CGIS	=	\
 		admin.cgi \
 		classes.cgi \
@@ -41,9 +37,7 @@ CGIS	=	\
 		jobs.cgi \
 		printers.cgi
 LIBTARGETS =	\
-		libcupscgi.a \
-		$(LIBCUPSCGI) \
-		websearch
+		libcupscgi.a
 
 UNITTARGETS =	\
 		testcgi \
@@ -81,8 +75,7 @@ unittests:	$(UNITTARGETS)
 #
 
 clean:
-	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
-	$(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib
+	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
 
 
 #
@@ -130,39 +123,13 @@ install-exec:
 #
 
 install-headers:
-	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
 
 
 #
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC)
-	echo Installing libraries in $(LIBDIR)...
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR)
-	if test $(LIBCUPSCGI) = "libcupscgi.so.1" -o $(LIBCUPSCGI) = "libcupscgi.sl.1"; then \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
-		$(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
-	fi
-	if test $(LIBCUPSCGI) = "libcupscgi.1.dylib"; then \
-		$(RM) $(LIBDIR)/libcupscgi.dylib; \
-		$(LN) $(LIBCUPSCGI) $(LIBDIR)/libcupscgi.dylib; \
-	fi
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		cp $(LIBCUPSCGI) $(SYMROOT); \
-		dsymutil $(SYMROOT)/$(LIBCUPSCGI); \
-	fi
-
-installstatic:
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) -m 755 libcupscgi.a $(LIBDIR)
-	$(RANLIB) $(LIBDIR)/libcupscgi.a
-	$(CHMOD) 555 $(LIBDIR)/libcupscgi.a
+install-libs:
 
 
 #
@@ -174,88 +141,6 @@ uninstall:
 		$(RM) $(SERVERBIN)/cgi-bin/$$file; \
 	done
 	-$(RMDIR) $(SERVERBIN)/cgi-bin
-	$(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)
-	$(RM) $(INCLUDEDIR)/cups/cgi.h
-	$(RM) $(INCLUDEDIR)/cups/help-index.h
-	-$(RMDIR) $(INCLUDEDIR)/cups
-
-
-#
-# Automatic API help files...
-#
-
-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`
-	$(LN) $@ `basename $@ .1`
-
-
-#
-# libcupscgi.1.dylib
-#
-
-libcupscgi.1.dylib:	$(LIBOBJS) libcupscgi.exp
-	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
-		-install_name $(libdir)/$@ \
-		-current_version 1.0.0 \
-		-compatibility_version 1.0.0 \
-		-exported_symbols_list libcupscgi.exp \
-		$(LIBOBJS) $(LIBS)
-	$(RM) libcupscgi.dylib
-	$(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 $@...
-	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-		-version-info 1:0 $(LIBS)
 
 
 #
@@ -273,56 +158,50 @@ libcupscgi.a:	$(LIBOBJS)
 # admin.cgi
 #
 
-admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o $@ admin.o libcupscgi.a $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
 # classes.cgi
 #
 
-classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o $@ classes.o libcupscgi.a $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
 # help.cgi
 #
 
-help.cgi:	help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+help.cgi:	help.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o $@ help.o libcupscgi.a $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
 # jobs.cgi
 #
 
-jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)
-
-
-#
-# makedocset
-#
-
-makedocset:	makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
-	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
-		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
-		$(LIBZ) $(LIBGSSAPI)
+	$(LD_CC) $(LDFLAGS) -o $@ jobs.o libcupscgi.a $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
 # printers.cgi
 #
 
-printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS)
+	$(LD_CC) $(LDFLAGS) -o $@ printers.o -L. libcupscgi.a $(LIBS)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -331,9 +210,10 @@ printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 testcgi:	testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
 		$(LIBZ) $(LIBGSSAPI)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Testing CGI API...
 	./testcgi
 
@@ -344,9 +224,10 @@ testcgi:	testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 
 testhi:	testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
 		$(LIBZ) $(LIBGSSAPI)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Testing help index API...
 	./testhi
 
@@ -357,19 +238,9 @@ testhi:	testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 
 testtemplate:	testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \
+	$(LD_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)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -377,8 +248,3 @@ websearch:	websearch.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 #
 
 include Dependencies
-
-
-#
-# End of "$Id$".
-#

cgi-bin/admin.c

@@ -1,37 +1,14 @@
 /*
- * "$Id$"
+ * Administration CGI for CUPS.
  *
- *   Administration CGI for CUPS.
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * 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.
+ * 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/".
  */
 
 /*
@@ -39,6 +16,8 @@
  */
 
 #include "cgi-private.h"
+#include <cups/http-private.h>
+#include <cups/ppd-private.h>
 #include <cups/adminutil.h>
 #include <cups/ppd.h>
 #include <errno.h>
@@ -59,12 +38,7 @@ static int	current_device = 0;	/* Current device shown */
  * Local functions...
  */
 
-static void	choose_device_cb(const char *device_class,
-                                 const char *device_id, const char *device_info,
-                                 const char *device_make_and_model,
-                                 const char *device_uri,
-                                 const char *device_location,
-				 const char *title);
+static void	choose_device_cb(const char *device_class, const char *device_id, const char *device_info, const char *device_make_and_model, const char *device_uri, const char *device_location, const char *title);
 static void	do_add_rss_subscription(http_t *http);
 static void	do_am_class(http_t *http, int modify);
 static void	do_am_printer(http_t *http, int modify);
@@ -82,6 +56,7 @@ static void	do_set_sharing(http_t *http);
 static char	*get_option_value(ppd_file_t *ppd, const char *name,
 		                  char *buffer, size_t bufsize);
 static double	get_points(double number, const char *uval);
+static char	*get_printer_ppd(const char *uri, char *buffer, size_t bufsize);
 
 
 /*
@@ -89,8 +64,7 @@ static double	get_points(double number, const char *uval);
  */
 
 int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+main(void)
 {
   http_t	*http;			/* Connection to the server */
   const char	*op;			/* Operation name */
@@ -793,7 +767,7 @@ do_am_class(http_t *http,		/* I - HTTP connection */
     attr = ippAddStrings(request, IPP_TAG_PRINTER, IPP_TAG_URI, "member-uris",
                          num_printers, NULL, NULL);
     for (i = 0; i < num_printers; i ++)
-      attr->values[i].string.text = _cupsStrAlloc(cgiGetArray("MEMBER_URIS", i));
+      ippSetString(request, &attr, i, cgiGetArray("MEMBER_URIS", i));
   }
 
  /*
@@ -854,7 +828,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
   const cgi_file_t *file;		/* Uploaded file, if any */
   const char	*var;			/* CGI variable */
   char		uri[HTTP_MAX_URI],	/* Device or printer URI */
-		*uriptr;		/* Pointer into URI */
+		*uriptr,		/* Pointer into URI */
+		evefile[1024] = "";	/* IPP Everywhere PPD file */
   int		maxrate;		/* Maximum baud rate */
   char		baudrate[255];		/* Baud rate string */
   const char	*name,			/* Pointer to class name */
@@ -1162,6 +1137,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
   else if (!file &&
            (!cgiGetVariable("PPD_NAME") || cgiGetVariable("SELECT_MAKE")))
   {
+    int ipp_everywhere = !strncmp(var, "ipp://", 6) || !strncmp(var, "ipps://", 7) || (!strncmp(var, "dnssd://", 8) && (strstr(var, "_ipp._tcp") || strstr(var, "_ipps._tcp")));
+
     if (modify && !cgiGetVariable("SELECT_MAKE"))
     {
      /*
@@ -1172,7 +1149,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 */
-      int		bytes;		/* Number of bytes */
+      ssize_t		bytes;		/* Number of bytes */
       http_status_t	get_status;	/* Status of GET */
 
 
@@ -1194,7 +1171,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, bytes);
+          write(fd, buffer, (size_t)bytes);
 
 	close(fd);
 
@@ -1211,8 +1188,10 @@ 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(&bytes)));
+	          filename, ppdErrorString(ppdLastError(&linenum)));
 	}
       }
       else
@@ -1305,9 +1284,8 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
         cgiStartHTML(title);
 	if (!cgiGetVariable("PPD_MAKE"))
 	  cgiSetVariable("PPD_MAKE", cgiGetVariable("CURRENT_MAKE"));
-	if (!modify)
-	  cgiSetVariable("CURRENT_MAKE_AND_MODEL",
-	                 cgiGetArray("PPD_MAKE_AND_MODEL", 0));
+        if (ipp_everywhere)
+	  cgiSetVariable("SHOW_IPP_EVERYWHERE", "1");
 	cgiCopyTemplateLang("choose-model.tmpl");
         cgiEndHTML();
       }
@@ -1348,20 +1326,22 @@ 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));
 
    /*
@@ -1380,7 +1360,7 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
       if ((uriptr = strchr(uri, '?')) == NULL)
         uriptr = uri + strlen(uri);
 
-      snprintf(uriptr, sizeof(uri) - (uriptr - uri),
+      snprintf(uriptr, sizeof(uri) - (size_t)(uriptr - uri),
                "?baud=%s+bits=%s+parity=%s+flow=%s",
                cgiGetVariable("BAUDRATE"), cgiGetVariable("BITS"),
 	       cgiGetVariable("PARITY"), cgiGetVariable("FLOW"));
@@ -1404,6 +1384,11 @@ do_am_printer(http_t *http,		/* I - HTTP connection */
 
     if (file)
       ippDelete(cupsDoFileRequest(http, request, "/admin/", file->tempfile));
+    else if (evefile[0])
+    {
+      ippDelete(cupsDoFileRequest(http, request, "/admin/", evefile));
+      unlink(evefile);
+    }
     else
       ippDelete(cupsDoRequest(http, request, "/admin/"));
 
@@ -1881,7 +1866,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
         if ((end = strstr(start, "\n")) == NULL)
 	  end = start + strlen(start);
 
-      cupsFileWrite(temp, start, end - start);
+      cupsFileWrite(temp, start, (size_t)(end - start));
       cupsFilePutChar(temp, '\n');
 
       if (*end == '\r')
@@ -1917,7 +1902,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     }
     else
     {
-      cgiSetVariable("refresh_page", "5;URL=/admin/?OP=redirect");
+      cgiSetVariable("refresh_page", "5;URL=/admin/");
 
       cgiStartHTML(cgiText(_("Edit Configuration File")));
       cgiCopyTemplateLang("restart.tmpl");
@@ -2006,9 +1991,9 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * Allocate memory and load the file into a string buffer...
     */
 
-    if ((buffer = calloc(1, info.st_size + 1)) != NULL)
+    if ((buffer = calloc(1, (size_t)info.st_size + 1)) != NULL)
     {
-      cupsFileRead(cupsd, buffer, info.st_size);
+      cupsFileRead(cupsd, buffer, (size_t)info.st_size);
       cgiSetVariable("CUPSDCONF", buffer);
       free(buffer);
     }
@@ -2025,7 +2010,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 * info.st_size + 1)) != NULL)
+      if ((buffer = calloc(1, 2 * (size_t)info.st_size + 1)) != NULL)
       {
 	bufend = buffer + 2 * info.st_size - 1;
 
@@ -2035,7 +2020,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 	  if (ch == '\\' || ch == '\"')
 	  {
 	    *bufptr++ = '\\';
-	    *bufptr++ = ch;
+	    *bufptr++ = (char)ch;
 	  }
 	  else if (ch == '\n')
 	  {
@@ -2048,7 +2033,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 	    *bufptr++ = 't';
 	  }
 	  else if (ch >= ' ')
-	    *bufptr++ = ch;
+	    *bufptr++ = (char)ch;
 	}
 
 	*bufptr = '\0';
@@ -2428,7 +2413,7 @@ do_list_printers(http_t *http)		/* I - HTTP connection */
          attr;
 	 attr = ippFindNextAttribute(response, "device-uri", IPP_TAG_URI))
     {
-      cupsArrayAdd(printer_devices, _cupsStrAlloc(attr->values[0].string.text));
+      cupsArrayAdd(printer_devices, strdup(attr->values[0].string.text));
     }
 
    /*
@@ -2566,7 +2551,7 @@ do_list_printers(http_t *http)		/* I - HTTP connection */
       for (printer_device = (char *)cupsArrayFirst(printer_devices);
            printer_device;
 	   printer_device = (char *)cupsArrayNext(printer_devices))
-        _cupsStrFree(printer_device);
+        free(printer_device);
 
       cupsArrayDelete(printer_devices);
     }
@@ -2963,7 +2948,7 @@ do_set_allowed_users(http_t *http)	/* I - HTTP connection */
         * Add the name...
 	*/
 
-        attr->values[i].string.text = _cupsStrAlloc(ptr);
+        ippSetString(request, &attr, i, ptr);
 
        /*
         * Advance to the next name...
@@ -3425,6 +3410,9 @@ do_set_options(http_t *http,		/* I - HTTP connection */
 
 	      switch (cparam->type)
 	      {
+	        case PPD_CUSTOM_UNKNOWN :
+	            break;
+
 		case PPD_CUSTOM_POINTS :
 		    if (!_cups_strncasecmp(option->defchoice, "Custom.", 7))
 		    {
@@ -3772,8 +3760,8 @@ do_set_options(http_t *http,		/* I - HTTP connection */
 
     attr = ippAddStrings(request, IPP_TAG_PRINTER, IPP_TAG_NAME,
                          "job-sheets-default", 2, NULL, NULL);
-    attr->values[0].string.text = _cupsStrAlloc(cgiGetVariable("job_sheets_start"));
-    attr->values[1].string.text = _cupsStrAlloc(cgiGetVariable("job_sheets_end"));
+    ippSetString(request, &attr, 0, cgiGetVariable("job_sheets_start"));
+    ippSetString(request, &attr, 1, cgiGetVariable("job_sheets_end"));
 
     if ((var = cgiGetVariable("printer_error_policy")) != NULL)
       ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME,
@@ -3882,7 +3870,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", atoi(shared));
+  ippAddBoolean(request, IPP_TAG_OPERATION, "printer-is-shared", (char)atoi(shared));
 
  /*
   * Do the request and get back a response...
@@ -4024,6 +4012,9 @@ get_option_value(
 
     switch (cparam->type)
     {
+      case PPD_CUSTOM_UNKNOWN :
+          break;
+
       case PPD_CUSTOM_CURVE :
       case PPD_CUSTOM_INVCURVE :
       case PPD_CUSTOM_REAL :
@@ -4096,12 +4087,15 @@ get_option_value(
       if ((val = cgiGetVariable(keyword)) == NULL)
 	return (NULL);
 
-      snprintf(bufptr, bufend - bufptr, "%s%s=", prefix, cparam->name);
+      snprintf(bufptr, (size_t)(bufend - bufptr), "%s%s=", prefix, cparam->name);
       bufptr += strlen(bufptr);
       prefix = " ";
 
       switch (cparam->type)
       {
+        case PPD_CUSTOM_UNKNOWN :
+            break;
+
 	case PPD_CUSTOM_CURVE :
 	case PPD_CUSTOM_INVCURVE :
 	case PPD_CUSTOM_REAL :
@@ -4110,7 +4104,7 @@ get_option_value(
 		number > cparam->maximum.custom_real)
 	      return (NULL);
 
-	    snprintf(bufptr, bufend - bufptr, "%g", number);
+	    snprintf(bufptr, (size_t)(bufend - bufptr), "%g", number);
 	    break;
 
 	case PPD_CUSTOM_INT :
@@ -4120,7 +4114,7 @@ get_option_value(
 		integer > cparam->maximum.custom_int)
 	      return (NULL);
 
-	    snprintf(bufptr, bufend - bufptr, "%ld", integer);
+	    snprintf(bufptr, (size_t)(bufend - bufptr), "%ld", integer);
 	    break;
 
 	case PPD_CUSTOM_POINTS :
@@ -4138,7 +4132,7 @@ get_option_value(
 		number_points > cparam->maximum.custom_points)
 	      return (NULL);
 
-	    snprintf(bufptr, bufend - bufptr, "%g%s", number, uval);
+	    snprintf(bufptr, (size_t)(bufend - bufptr), "%g%s", number, uval);
 	    break;
 
 	case PPD_CUSTOM_PASSCODE :
@@ -4218,5 +4212,79 @@ get_points(double     number,		/* I - Original number */
 
 
 /*
- * End of "$Id$".
+ * 'get_printer_ppd()' - Get an IPP Everywhere PPD file for the given URI.
  */
+
+static char *				/* O - Filename or NULL */
+get_printer_ppd(const char *uri,	/* I - Printer URI */
+                char       *buffer,	/* I - Filename buffer */
+		size_t     bufsize)	/* I - Size of filename buffer */
+{
+  http_t	*http;			/* Connection to printer */
+  ipp_t		*request,		/* Get-Printer-Attributes request */
+		*response;		/* Get-Printer-Attributes response */
+  char		resolved[1024],		/* Resolved URI */
+		scheme[32],		/* URI scheme */
+		userpass[256],		/* Username:password */
+		host[256],		/* Hostname */
+		resource[256];		/* Resource path */
+  int		port;			/* Port number */
+  static const char * const pattrs[] =	/* Printer attributes we need */
+  {
+    "all",
+    "media-col-database"
+  };
+
+
+ /*
+  * 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);
+  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes",  (int)(sizeof(pattrs) / sizeof(pattrs[0])), NULL, pattrs);
+  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);
+}

cgi-bin/api-cgi.header

@@ -1,34 +0,0 @@
-<!--
-  "$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>

cgi-bin/api-cgi.shtml

@@ -1,17 +0,0 @@
-<!--
-  "$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>

cgi-bin/cgi-private.h

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
+ * Private CGI definitions for CUPS.
  *
- *   Private CGI definitions for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -29,8 +27,3 @@
  */
 
 #define CUPS_PAGE_MAX	100		/* Maximum items per page */
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/cgi.h

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
+ * CGI support library definitions for CUPS.
  *
- *   CGI support library definitions for CUPS.
+ * Copyright 2007-2010 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   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/".
+ * 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/".
  */
 
 #ifndef _CUPS_CGI_H_
@@ -21,12 +19,12 @@
 #  include <time.h>
 #  include <sys/stat.h>
 
-#  ifdef WIN32
+#  ifdef _WIN32
 #    include <direct.h>
 #    include <io.h>
 #  else
 #    include <unistd.h>
-#  endif /* WIN32 */
+#  endif /* _WIN32 */
 
 #  include <cups/cups.h>
 #  include <cups/array.h>
@@ -113,7 +111,3 @@ extern const char	*cgiText(const char *message);
 #  endif /* __cplusplus */
 
 #endif /* !_CUPS_CGI_H_ */
-
-/*
- * End of "$Id$".
- */

cgi-bin/classes.c

@@ -1,23 +1,14 @@
 /*
- * "$Id$"
+ * Class status CGI for CUPS.
  *
- *   Class status CGI for CUPS.
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * 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.
+ * 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/".
  */
 
 /*
@@ -42,8 +33,7 @@ static void	show_class(http_t *http, const char *printer);
  */
 
 int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+main(void)
 {
   const char	*pclass;		/* Class name */
   const char	*user;			/* Username */
@@ -169,8 +159,8 @@ main(int  argc,				/* I - Number of command-line arguments */
       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, "purge-jobs"))
-      do_class_op(http, pclass, IPP_PURGE_JOBS, cgiText(_("Purge Jobs")));
+    else if (!strcmp(op, "cancel-jobs"))
+      do_class_op(http, pclass, IPP_OP_CANCEL_JOBS, cgiText(_("Cancel Jobs")));
     else if (!_cups_strcasecmp(op, "print-test-page"))
       cgiPrintTestPage(http, pclass);
     else if (!_cups_strcasecmp(op, "move-jobs"))
@@ -286,8 +276,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_PURGE_JOBS)
-      cgiCopyTemplateLang("printer-purge.tmpl");
+    else if (op == IPP_OP_CANCEL_JOBS)
+      cgiCopyTemplateLang("printer-cancel-jobs.tmpl");
   }
 
   cgiEndHTML();
@@ -307,8 +297,7 @@ 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			ascending,	/* Order of classes (0 = descending) */
-			first,		/* First class to show */
+  int			first,		/* First class to show */
 			count;		/* Number of classes */
   const char		*var;		/* Form variable */
   void			*search;	/* Search data */
@@ -380,25 +369,10 @@ show_all_classes(http_t     *http,	/* I - Connection to server */
     sprintf(val, "%d", count);
     cgiSetVariable("TOTAL", val);
 
-    if ((var = cgiGetVariable("ORDER")) != NULL && *var)
-      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);
-    }
+    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);
 
    /*
     * Save navigation URLs...
@@ -418,6 +392,12 @@ 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...
     */
@@ -551,8 +531,3 @@ show_class(http_t     *http,		/* I - Connection to server */
 
    cgiEndHTML();
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/help-index.c

@@ -1,34 +1,14 @@
 /*
- * "$Id$"
+ * Online help index routines for CUPS.
  *
- *   Online help index routines for CUPS.
+ * Copyright 2007-2018 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * 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.
+ * 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/".
  */
 
 /*
@@ -158,11 +138,7 @@ static int		help_load_file(help_index_t *hi,
 			               const char *filename,
 				       const char *relative,
 				       time_t     mtime);
-static help_node_t	*help_new_node(const char *filename, const char *anchor,
-			               const char *section, const char *text,
-				       time_t mtime, off_t offset,
-				       size_t length)
-				       __attribute__((nonnull(1,3,4)));
+static help_node_t	*help_new_node(const char *filename, const char *anchor, const char *section, const char *text, time_t mtime, off_t offset, size_t length) _CUPS_NONNULL((1, 3, 4));
 static int		help_sort_by_name(help_node_t *p1, help_node_t *p2);
 static int		help_sort_by_score(help_node_t *p1, help_node_t *p2);
 static int		help_sort_words(help_word_t *w1, help_word_t *w2);
@@ -346,7 +322,7 @@ helpLoadIndex(const char *hifile,	/* I - Index filename */
 	    mtime = strtol(ptr, &ptr, 10);
 
 	  offset = strtoll(ptr, &ptr, 10);
-	  length = strtoll(ptr, &ptr, 10);
+	  length = (size_t)strtoll(ptr, &ptr, 10);
 
 	  while (isspace(*ptr & 255))
             ptr ++;
@@ -902,7 +878,7 @@ help_load_file(
 
 
   DEBUG_printf(("2help_load_file(hi=%p, filename=\"%s\", relative=\"%s\", "
-                "mtime=%ld)", hi, filename, relative, mtime));
+                "mtime=%ld)", hi, filename, relative, (long)mtime));
 
   if ((fp = cupsFileOpen(filename, "r")) == NULL)
     return (-1);
@@ -1019,14 +995,14 @@ help_load_file(
 
         *ptr++ = ' ';
 
-        if (!cupsFileGets(fp, ptr, sizeof(line) - (ptr - line) - 1))
+        if (!cupsFileGets(fp, ptr, sizeof(line) - (size_t)(ptr - line) - 1))
 	  break;
       }
 
       *ptr = '\0';
 
       if (node)
-	node->length = offset - node->offset;
+	node->length = (size_t)(offset - node->offset);
 
       if (!*text)
       {
@@ -1179,9 +1155,9 @@ help_load_file(
 
 	for (text = ptr, ptr ++; *ptr && isalnum(*ptr & 255); ptr ++);
 
-	wordlen = ptr - text;
+	wordlen = (int)(ptr - text);
 
-        memcpy(temp, text, wordlen);
+        memcpy(temp, text, (size_t)wordlen);
 	temp[wordlen] = '\0';
 
         ptr --;
@@ -1206,7 +1182,7 @@ help_load_file(
   cupsFileClose(fp);
 
   if (node)
-    node->length = offset - node->offset;
+    node->length = (size_t)(offset - node->offset);
 
   return (0);
 }
@@ -1238,7 +1214,7 @@ help_new_node(const char   *filename,	/* I - Filename */
 
   n->filename = strdup(filename);
   n->anchor   = anchor ? strdup(anchor) : NULL;
-  n->section  = (section && *section) ? strdup(section) : NULL;
+  n->section  = *section ? strdup(section) : NULL;
   n->text     = strdup(text);
   n->mtime    = mtime;
   n->offset   = offset;
@@ -1321,8 +1297,3 @@ help_sort_words(help_word_t *w1,	/* I - Second word */
 
   return (_cups_strcasecmp(w1->text, w2->text));
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/help-index.h

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
+ * Online help index definitions for CUPS.
  *
- *   Online help index definitions for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_HELP_INDEX_H_
@@ -81,7 +79,3 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 #  endif /* __cplusplus */
 
 #endif /* !_CUPS_HELP_INDEX_H_ */
-
-/*
- * End of "$Id$".
- */

cgi-bin/help.c

@@ -1,20 +1,14 @@
 /*
- * "$Id$"
+ * Online help CGI for CUPS.
  *
- *   Online help CGI for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main() - Main entry for CGI.
+ * 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/".
  */
 
 /*
@@ -277,7 +271,7 @@ main(int  argc,				/* I - Number of command-line arguments */
       section = n->section;
     }
 
-    if (!topic || strcmp(n->section, topic))
+    if (!topic || !n->section || strcmp(n->section, topic))
       continue;
 
    /*
@@ -390,8 +384,3 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/html.c

@@ -1,26 +1,14 @@
 /*
- * "$Id$"
+ * HTML support functions for CUPS.
  *
- *   HTML support functions for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * 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.
+ * 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/".
  */
 
 /*
@@ -103,7 +91,7 @@ cgiFormEncode(char       *dst,		/* I - Destination string */
   for (dstptr = dst; *src && dstptr < dstend;)
   {
     switch (*src)
-    { 
+    {
       case ' ' :
          /*
 	  * Encode spaces with a "+"...
@@ -232,8 +220,3 @@ cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
 
   return (NULL);
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/ipp-var.c

@@ -1,31 +1,14 @@
 /*
- * "$Id$"
+ * CGI <-> IPP variable routines for CUPS.
  *
- *   CGI <-> IPP variable routines for CUPS.
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * 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.
+ * 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/".
  */
 
 /*
@@ -65,7 +48,7 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
   {
     for (i = 0; lang[i] && i < 15; i ++)
       if (isalnum(lang[i] & 255))
-        locale[i] = tolower(lang[i]);
+        locale[i] = (char)tolower(lang[i]);
       else
         locale[i] = '_';
 
@@ -107,7 +90,7 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
   while ((ch = getc(in)) != EOF)
     if (ch == '\\')
       getc(in);
-    else if (ch == '{' && num_attrs < (sizeof(attrs) / sizeof(attrs[0])))
+    else if (ch == '{' && num_attrs < (int)(sizeof(attrs) / sizeof(attrs[0])))
     {
      /*
       * Grab the name...
@@ -123,7 +106,7 @@ cgiGetAttributes(ipp_t      *request,	/* I - IPP request */
 	  if (ch == '_')
 	    *nameptr++ = '-';
 	  else
-            *nameptr++ = ch;
+            *nameptr++ = (char)ch;
 	}
 
       *nameptr = '\0';
@@ -237,6 +220,9 @@ cgiGetIPPObjects(ipp_t *response,	/* I - IPP response */
 	      break;
 
           case IPP_TAG_INTEGER :
+	      if (!strncmp(ippGetName(attr), "time-at-", 8))
+	        break;			/* Ignore time-at-xxx */
+
 	      for (i = 0; !add && i < attr->num_values; i ++)
 	      {
 	        char	buf[255];	/* Number buffer */
@@ -917,7 +903,7 @@ cgiRewriteURL(const char *uri,		/* I - Current URI */
       * Make URI relative to the current server...
       */
 
-      strlcpy(url, resource, urlsize);
+      strlcpy(url, resource, (size_t)urlsize);
     }
     else
     {
@@ -926,17 +912,13 @@ cgiRewriteURL(const char *uri,		/* I - Current URI */
       */
 
       if (userpass[0])
-	snprintf(url, urlsize, "%s://%s@%s:%d%s",
-		 ishttps ? "https" : "http",
-		 userpass, hostname, port, resource);
+	snprintf(url, (size_t)urlsize, "%s://%s@%s:%d%s", ishttps ? "https" : "http", userpass, hostname, port, resource);
       else
-	snprintf(url, urlsize, "%s://%s:%d%s",
-		 ishttps ? "https" : "http",
-		 hostname, port, resource);
+	snprintf(url, (size_t)urlsize, "%s://%s:%d%s", ishttps ? "https" : "http", hostname, port, resource);
     }
   }
   else
-    strlcpy(url, uri, urlsize);
+    strlcpy(url, uri, (size_t)urlsize);
 
   return (url);
 }
@@ -958,7 +940,6 @@ 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\", "
@@ -1039,7 +1020,7 @@ cgiSetIPPObjectVars(
 	  *valptr++ = ' ';
         }
 
-        remaining = sizeof(value) - (valptr - value);
+        remaining = sizeof(value) - (size_t)(valptr - value);
 
         if (!strcmp(attr->values[i].string.text, "printer-stopped"))
 	  strlcpy(valptr, _("Printer Paused"), remaining);
@@ -1177,7 +1158,7 @@ cgiSetIPPObjectVars(
     for (i = 0; i < attr->num_values; i ++)
     {
       if (i)
-	strlcat(valptr, ", ", sizeof(value) - (valptr - value));
+	strlcat(valptr, ", ", sizeof(value) - (size_t)(valptr - value));
 
       valptr += strlen(valptr);
 
@@ -1186,36 +1167,28 @@ cgiSetIPPObjectVars(
 	case IPP_TAG_INTEGER :
 	case IPP_TAG_ENUM :
 	    if (strncmp(name, "time_at_", 8) == 0)
-	    {
-	      time_t	t;		/* Temporary time value */
-
-              t    = (time_t)attr->values[i].integer;
-	      date = localtime(&t);
-
-	      strftime(valptr, sizeof(value) - (valptr - value), "%c", date);
-	    }
+	      _cupsStrDate(valptr, sizeof(value) - (size_t)(valptr - value), (time_t)ippGetInteger(attr, i));
 	    else
-	      snprintf(valptr, sizeof(value) - (valptr - value),
-		       "%d", attr->values[i].integer);
+	      snprintf(valptr, sizeof(value) - (size_t)(valptr - value), "%d", ippGetInteger(attr, i));
 	    break;
 
 	case IPP_TAG_BOOLEAN :
-	    snprintf(valptr, sizeof(value) - (valptr - value),
+	    snprintf(valptr, sizeof(value) - (size_t)(valptr - value),
 	             "%d", attr->values[i].boolean);
 	    break;
 
 	case IPP_TAG_NOVALUE :
-	    strlcat(valptr, "novalue", sizeof(value) - (valptr - value));
+	    strlcat(valptr, "novalue", sizeof(value) - (size_t)(valptr - value));
 	    break;
 
 	case IPP_TAG_RANGE :
-	    snprintf(valptr, sizeof(value) - (valptr - value),
+	    snprintf(valptr, sizeof(value) - (size_t)(valptr - value),
 	             "%d-%d", attr->values[i].range.lower,
 		     attr->values[i].range.upper);
 	    break;
 
 	case IPP_TAG_RESOLUTION :
-	    snprintf(valptr, sizeof(value) - (valptr - value),
+	    snprintf(valptr, sizeof(value) - (size_t)(valptr - value),
 	             "%dx%d%s", attr->values[i].resolution.xres,
 		     attr->values[i].resolution.yres,
 		     attr->values[i].resolution.units == IPP_RES_PER_INCH ?
@@ -1230,21 +1203,7 @@ cgiSetIPPObjectVars(
 	      * Rewrite URIs...
 	      */
 
-              if (!strcmp(name, "member_uris"))
-	      {
-		char	url[1024];	/* URL for class member... */
-
-
-		cgiRewriteURL(attr->values[i].string.text, url,
-		              sizeof(url), NULL);
-
-                snprintf(valptr, sizeof(value) - (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);
+	      cgiRewriteURL(attr->values[i].string.text, valptr, (int)(sizeof(value) - (size_t)(valptr - value)), NULL);
               break;
             }
 
@@ -1256,7 +1215,7 @@ cgiSetIPPObjectVars(
 	case IPP_TAG_LANGUAGE :
 	case IPP_TAG_MIMETYPE :
 	    strlcat(valptr, attr->values[i].string.text,
-	            sizeof(value) - (valptr - value));
+	            sizeof(value) - (size_t)(valptr - value));
 	    break;
 
         case IPP_TAG_BEGIN_COLLECTION :
@@ -1364,7 +1323,7 @@ cgiSetIPPVars(ipp_t      *response,	/* I - Response data to be copied... */
     attr = cgiSetIPPObjectVars(attr, prefix, element);
   }
 
-  fprintf(stderr, "DEBUG2: Returing %d from cgiSetIPPVars()...\n", element);
+  fprintf(stderr, "DEBUG2: Returning %d from cgiSetIPPVars()...\n", element);
 
   return (element);
 }
@@ -1399,8 +1358,7 @@ 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			ascending,	/* Order of jobs (0 = descending) */
-			first,		/* First job to show */
+  int			first,		/* First job to show */
 			count;		/* Number of jobs */
   const char		*var,		/* Form variable */
 			*query,		/* Query string */
@@ -1436,6 +1394,17 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
     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");
 
  /*
@@ -1458,7 +1427,7 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
     }
 
     jobs  = cgiGetIPPObjects(response, search);
-    count = cupsArrayCount(jobs);
+    count = cupsArrayCount(jobs) + first;
 
     if (search)
       cgiFreeSearch(search);
@@ -1467,25 +1436,6 @@ 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 && *var)
-      ascending = !_cups_strcasecmp(var, "asc");
-    else
-      ascending = !which_jobs || !*which_jobs ||
-                  !_cups_strcasecmp(which_jobs, "not-completed");
-
     section = cgiGetVariable("SECTION");
 
     cgiClearVariables();
@@ -1493,8 +1443,6 @@ 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);
@@ -1503,20 +1451,10 @@ cgiShowJobs(http_t     *http,		/* I - Connection to server */
     if (which_jobs)
       cgiSetVariable("WHICH_JOBS", which_jobs);
 
-    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);
-    }
+    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);
 
    /*
     * Save navigation URLs...
@@ -1545,6 +1483,12 @@ 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...
     */
@@ -1586,8 +1530,3 @@ cgiText(const char *message)		/* I - Message */
 
   return (_cupsLangString(language, message));
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/jobs.c

@@ -1,21 +1,14 @@
 /*
- * "$Id$"
+ * Job status CGI for CUPS.
  *
- *   Job status CGI for CUPS.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()      - Main entry for CGI.
- *   do_job_op() - Do a job operation.
+ * 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/".
  */
 
 /*
@@ -37,8 +30,7 @@ static void	do_job_op(http_t *http, int job_id, ipp_op_t op);
  */
 
 int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+main(void)
 {
   http_t	*http;			/* Connection to the server */
   const char	*op;			/* Operation name */
@@ -207,8 +199,3 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
 
   cgiEndHTML();
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/makedocset.c

@@ -1,486 +0,0 @@
-/*
- * "$Id$"
- *
- *   Xcode documentation set generator.
- *
- *   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/".
- *
- * 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 <errno.h>
-
-
-/*
- * Local structures...
- */
-
-typedef struct _cups_html_s		/**** Help file ****/
-{
-  char		*path;			/* Path to help file */
-  char		*title;			/* Title of help file */
-} _cups_html_t;
-
-typedef struct _cups_section_s		/**** Help section ****/
-{
-  char		*name;			/* Section name */
-  cups_array_t	*files;			/* Files in this section */
-} _cups_section_t;
-
-
-/*
- * Local functions...
- */
-
-static int	compare_html(_cups_html_t *a, _cups_html_t *b);
-static int	compare_sections(_cups_section_t *a, _cups_section_t *b);
-static int	compare_sections_files(_cups_section_t *a, _cups_section_t *b);
-static void	write_index(const char *path, help_index_t *hi);
-static void	write_info(const char *path, const char *revision);
-static void	write_nodes(const char *path, help_index_t *hi);
-
-
-/*
- * '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 */
-{
-  int		i;			/* Looping var */
-  char		path[1024],		/* Path to documentation */
-		line[1024];		/* Line from file */
-  help_index_t	*hi;			/* Help index */
-  cups_file_t	*tokens,		/* Tokens.xml file */
-		*fp;			/* Current file */
-
-
-  if (argc < 4)
-  {
-    puts("Usage: makedocset directory revision *.tokens");
-    return (1);
-  }
-
- /*
-  * Index the help documents...
-  */
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Documentation", argv[1]);
-  if ((hi = helpLoadIndex(NULL, path)) == NULL)
-  {
-    fputs("makedocset: Unable to index help files!\n", stderr);
-    return (1);
-  }
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Documentation/index.html",
-           argv[1]);
-  write_index(path, hi);
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Nodes.xml", argv[1]);
-  write_nodes(path, hi);
-
- /*
-  * Write the Info.plist file...
-  */
-
-  snprintf(path, sizeof(path), "%s/Contents/Info.plist", argv[1]);
-  write_info(path, argv[2]);
-
- /*
-  * Merge the Tokens.xml files...
-  */
-
-  snprintf(path, sizeof(path), "%s/Contents/Resources/Tokens.xml", argv[1]);
-  if ((tokens = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create \"%s\": %s\n", path,
-	    strerror(errno));
-    return (1);
-  }
-
-  cupsFilePuts(tokens, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-  cupsFilePuts(tokens, "<Tokens version=\"1.0\">\n");
-
-  for (i = 3; i < argc; i ++)
-  {
-    if ((fp = cupsFileOpen(argv[i], "r")) == NULL)
-    {
-      fprintf(stderr, "makedocset: Unable to open \"%s\": %s\n", argv[i],
-	      strerror(errno));
-      return (1);
-    }
-
-    if (!cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "<?xml ", 6) ||
-        !cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "<Tokens ", 8))
-    {
-      fprintf(stderr, "makedocset: Bad Tokens.xml file \"%s\"!\n", argv[i]);
-      return (1);
-    }
-
-    while (cupsFileGets(fp, line, sizeof(line)))
-    {
-      if (strcmp(line, "</Tokens>"))
-        cupsFilePrintf(tokens, "%s\n", line);
-    }
-
-    cupsFileClose(fp);
-  }
-
-  cupsFilePuts(tokens, "</Tokens>\n");
-
-  cupsFileClose(tokens);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'compare_html()' - Compare the titles of two HTML files.
- */
-
-static int				/* O - Result of comparison */
-compare_html(_cups_html_t *a,		/* I - First file */
-             _cups_html_t *b)		/* I - Second file */
-{
-  return (_cups_strcasecmp(a->title, b->title));
-}
-
-
-/*
- * 'compare_sections()' - Compare the names of two help sections.
- */
-
-static int				/* O - Result of comparison */
-compare_sections(_cups_section_t *a,	/* I - First section */
-                 _cups_section_t *b)	/* I - Second section */
-{
-  return (_cups_strcasecmp(a->name, b->name));
-}
-
-
-/*
- * 'compare_sections_files()' - Compare the number of files and section names.
- */
-
-static int				/* O - Result of comparison */
-compare_sections_files(
-    _cups_section_t *a,			/* I - First section */
-    _cups_section_t *b)			/* I - Second section */
-{
-  int	ret = cupsArrayCount(b->files) - cupsArrayCount(a->files);
-
-  if (ret)
-    return (ret);
-  else
-    return (_cups_strcasecmp(a->name, b->name));
-}
-
-
-/*
- * 'write_index()' - Write an index file for the CUPS help.
- */
-
-static void
-write_index(const char   *path,		/* I - File to write */
-            help_index_t *hi)		/* I - Index of files */
-{
-  cups_file_t		*fp;		/* Output file */
-  help_node_t		*node;		/* Current help node */
-  _cups_section_t	*section,	/* Current section */
-			key;		/* Section search key */
-  _cups_html_t		*html;		/* Current HTML file */
-  cups_array_t		*sections,	/* Sections in index */
-			*sections_files,/* Sections sorted by size */
-			*columns[3];	/* Columns in final HTML file */
-  int			column,		/* Current column */
-			lines[3],	/* Number of lines in each column */
-			min_column,	/* Smallest column */
-			min_lines;	/* Smallest number of lines */
-
-
- /*
-  * Build an array of sections and their files.
-  */
-
-  sections = cupsArrayNew((cups_array_func_t)compare_sections, NULL);
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes);
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes))
-  {
-    if (node->anchor)
-      continue;
-
-    key.name = node->section ? node->section : "Miscellaneous";
-    if ((section = (_cups_section_t *)cupsArrayFind(sections, &key)) == NULL)
-    {
-      section        = (_cups_section_t *)calloc(1, sizeof(_cups_section_t));
-      section->name  = key.name;
-      section->files = cupsArrayNew((cups_array_func_t)compare_html, NULL);
-
-      cupsArrayAdd(sections, section);
-    }
-
-    html = (_cups_html_t *)calloc(1, sizeof(_cups_html_t));
-    html->path  = node->filename;
-    html->title = node->text;
-
-    cupsArrayAdd(section->files, html);
-  }
-
- /*
-  * Build a sorted list of sections based on the number of files in each section
-  * and the section name...
-  */
-
-  sections_files = cupsArrayNew((cups_array_func_t)compare_sections_files,
-                                NULL);
-  for (section = (_cups_section_t *)cupsArrayFirst(sections);
-       section;
-       section = (_cups_section_t *)cupsArrayNext(sections))
-    cupsArrayAdd(sections_files, section);
-
- /*
-  * Then build three columns to hold everything, trying to balance the number of
-  * lines in each column...
-  */
-
-  for (column = 0; column < 3; column ++)
-  {
-    columns[column] = cupsArrayNew((cups_array_func_t)compare_sections, NULL);
-    lines[column]   = 0;
-  }
-
-  for (section = (_cups_section_t *)cupsArrayFirst(sections_files);
-       section;
-       section = (_cups_section_t *)cupsArrayNext(sections_files))
-  {
-    for (min_column = 0, min_lines = lines[0], column = 1;
-         column < 3;
-	 column ++)
-    {
-      if (lines[column] < min_lines)
-      {
-        min_column = column;
-        min_lines  = lines[column];
-      }
-    }
-
-    cupsArrayAdd(columns[min_column], section);
-    lines[min_column] += cupsArrayCount(section->files) + 2;
-  }
-
- /*
-  * Write the HTML file...
-  */
-
-  if ((fp = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
-            strerror(errno));
-    exit(1);
-  }
-
-  cupsFilePuts(fp, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 "
-                   "Transitional//EN\" "
-		   "\"http://www.w3.org/TR/html4/loose.dtd\">\n"
-		   "<html>\n"
-		   "<head>\n"
-		   "<title>CUPS Documentation</title>\n"
-		   "<link rel='stylesheet' type='text/css' "
-		   "href='cups-printable.css'>\n"
-		   "</head>\n"
-		   "<body>\n"
-		   "<h1 class='title'>CUPS Documentation</h1>\n"
-		   "<table width='100%' summary=''>\n"
-		   "<tr>\n");
-
-  for (column = 0; column < 3; column ++)
-  {
-    if (column)
-      cupsFilePuts(fp, "<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n");
-
-    cupsFilePuts(fp, "<td valign='top' width='33%'>");
-    for (section = (_cups_section_t *)cupsArrayFirst(columns[column]);
-         section;
-	 section = (_cups_section_t *)cupsArrayNext(columns[column]))
-    {
-      cupsFilePrintf(fp, "<h2 class='title'>%s</h2>\n", section->name);
-      for (html = (_cups_html_t *)cupsArrayFirst(section->files);
-           html;
-	   html = (_cups_html_t *)cupsArrayNext(section->files))
-	cupsFilePrintf(fp, "<p class='compact'><a href='%s'>%s</a></p>\n",
-	               html->path, html->title);
-    }
-    cupsFilePuts(fp, "</td>\n");
-  }
-  cupsFilePuts(fp, "</tr>\n"
-                   "</table>\n"
-		   "</body>\n"
-		   "</html>\n");
-  cupsFileClose(fp);
-}
-
-
-/*
- * 'write_info()' - Write the Info.plist file.
- */
-
-static void
-write_info(const char *path,		/* I - File to write */
-           const char *revision)	/* I - Subversion revision number */
-{
-  cups_file_t	*fp;			/* File */
-
-
-  if ((fp = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
-            strerror(errno));
-    exit(1);
-  }
-
-  cupsFilePrintf(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-		     "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" "
-		     "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-		     "<plist version=\"1.0\">\n"
-		     "<dict>\n"
-		     "\t<key>CFBundleIdentifier</key>\n"
-		     "\t<string>org.cups.docset</string>\n"
-		     "\t<key>CFBundleName</key>\n"
-		     "\t<string>CUPS Documentation</string>\n"
-		     "\t<key>CFBundleVersion</key>\n"
-		     "\t<string>%d.%d.%s</string>\n"
-		     "\t<key>CFBundleShortVersionString</key>\n"
-		     "\t<string>%d.%d.%d</string>\n"
-		     "\t<key>DocSetFeedName</key>\n"
-		     "\t<string>cups.org</string>\n"
-		     "\t<key>DocSetFeedURL</key>\n"
-		     "\t<string>http://www.cups.org/org.cups.docset.atom"
-		     "</string>\n"
-		     "\t<key>DocSetPublisherIdentifier</key>\n"
-		     "\t<string>org.cups</string>\n"
-		     "\t<key>DocSetPublisherName</key>\n"
-		     "\t<string>CUPS</string>\n"
-		     "</dict>\n"
-		     "</plist>\n",
-		     CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, revision,
-		     CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH);
-
-  cupsFileClose(fp);
-}
-
-
-/*
- * 'write_nodes()' - Write the Nodes.xml file.
- */
-
-static void
-write_nodes(const char   *path,		/* I - File to write */
-            help_index_t *hi)		/* I - Index of files */
-{
-  cups_file_t	*fp;			/* Output file */
-  int		id;			/* Current node ID */
-  help_node_t	*node;			/* Current help node */
-  int		subnodes;		/* Currently in Subnodes for file? */
-  int		needclose;		/* Need to close the current node? */
-
-
-  if ((fp = cupsFileOpen(path, "w")) == NULL)
-  {
-    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
-            strerror(errno));
-    exit(1);
-  }
-
-  cupsFilePuts(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-		   "<DocSetNodes version=\"1.0\">\n"
-		   "<TOC>\n"
-		   "<Node id=\"0\">\n"
-		   "<Name>CUPS Documentation</Name>\n"
-		   "<Path>Documentation/index.html</Path>\n"
-		   "</Node>\n");
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes), id = 1, subnodes = 0,
-           needclose = 0;
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes), id ++)
-  {
-    if (node->anchor)
-    {
-      if (!subnodes)
-      {
-        cupsFilePuts(fp, "<Subnodes>\n");
-	subnodes = 1;
-      }
-
-      cupsFilePrintf(fp, "<Node id=\"%d\">\n"
-                         "<Path>Documentation/%s</Path>\n"
-			 "<Anchor>%s</Anchor>\n"
-			 "<Name>%s</Name>\n"
-			 "</Node>\n", id, node->filename, node->anchor,
-		     node->text);
-    }
-    else
-    {
-      if (subnodes)
-      {
-        cupsFilePuts(fp, "</Subnodes>\n");
-	subnodes = 0;
-      }
-
-      if (needclose)
-        cupsFilePuts(fp, "</Node>\n");
-
-      cupsFilePrintf(fp, "<Node id=\"%d\">\n"
-                         "<Path>Documentation/%s</Path>\n"
-			 "<Name>%s</Name>\n", id, node->filename, node->text);
-      needclose = 1;
-    }
-  }
-
-  if (subnodes)
-    cupsFilePuts(fp, "</Subnodes>\n");
-
-  if (needclose)
-    cupsFilePuts(fp, "</Node>\n");
-
-  cupsFilePuts(fp, "</TOC>\n"
-		   "</DocSetNodes>\n");
-
-  cupsFileClose(fp);
-}
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/printers.c

@@ -1,23 +1,14 @@
 /*
- * "$Id$"
+ * Printer status CGI for CUPS.
  *
- *   Printer status CGI for CUPS.
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * 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.
+ * 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/".
  */
 
 /*
@@ -43,8 +34,7 @@ static void	show_printer(http_t *http, const char *printer);
  */
 
 int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+main(void)
 {
   const char	*printer;		/* Printer name */
   const char	*user;			/* Username */
@@ -172,8 +162,8 @@ main(int  argc,				/* I - Number of command-line arguments */
       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, "purge-jobs"))
-      do_printer_op(http, printer, IPP_PURGE_JOBS, cgiText(_("Purge Jobs")));
+    else if (!strcmp(op, "cancel-jobs"))
+      do_printer_op(http, printer, IPP_OP_CANCEL_JOBS, cgiText(_("Cancel Jobs")));
     else if (!_cups_strcasecmp(op, "print-self-test-page"))
       cgiPrintCommand(http, printer, "PrintSelfTestPage",
                       cgiText(_("Print Self-Test Page")));
@@ -293,8 +283,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_PURGE_JOBS)
-      cgiCopyTemplateLang("printer-purge.tmpl");
+    else if (op == IPP_OP_CANCEL_JOBS)
+      cgiCopyTemplateLang("printer-cancel-jobs.tmpl");
   }
 
   cgiEndHTML();
@@ -314,8 +304,7 @@ 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			ascending,	/* Order of printers (0 = descending) */
-			first,		/* First printer to show */
+  int			first,		/* First printer to show */
 			count;		/* Number of printers */
   const char		*var;		/* Form variable */
   void			*search;	/* Search data */
@@ -397,25 +386,10 @@ show_all_printers(http_t     *http,	/* I - Connection to server */
     sprintf(val, "%d", count);
     cgiSetVariable("TOTAL", val);
 
-    if ((var = cgiGetVariable("ORDER")) != NULL && *var)
-      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);
-    }
+    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);
 
    /*
     * Save navigation URLs...
@@ -435,6 +409,12 @@ 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...
     */
@@ -571,8 +551,3 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
    cgiEndHTML();
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/search.c

@@ -1,22 +1,14 @@
 /*
- * "$Id$"
+ * Search routines for CUPS.
  *
- *   Search routines for CUPS.
+ * Copyright 2007-2018 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   cgiCompileSearch() - Compile a search string.
- *   cgiDoSearch()      - Do a search of some text.
- *   cgiFreeSearch()    - Free a compiled search context.
+ * 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/".
  */
 
 /*
@@ -38,12 +30,12 @@ cgiCompileSearch(const char *query)	/* I - Query string */
   char		*s,			/* Regular expression string */
 		*sptr,			/* Pointer into RE string */
 		*sword;			/* Pointer to start of word */
-  int		slen;			/* Allocated size of RE string */
+  size_t	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 */
-  int		wlen;			/* Word length */
+  size_t	wlen;			/* Word length */
   char		*lword;			/* Last word in query */
 
 
@@ -139,7 +131,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
       for (qend = qptr + 1; *qend && !isspace(*qend); qend ++);
     }
 
-    wlen = qend - qptr;
+    wlen = (size_t)(qend - qptr);
 
    /*
     * Look for logic words: AND, OR
@@ -174,7 +166,7 @@ cgiCompileSearch(const char *query)	/* I - Query string */
       * string + RE overhead...
       */
 
-      wlen = (sptr - s) + 2 * 4 * wlen + 2 * strlen(prefix) + 11;
+      wlen = (size_t)(sptr - s) + 2 * 4 * wlen + 2 * strlen(prefix) + 11;
       if (lword)
         wlen += strlen(lword);
 
@@ -373,9 +365,5 @@ void
 cgiFreeSearch(void *search)		/* I - Search context */
 {
   regfree((regex_t *)search);
+  free(search);
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/template.c

@@ -1,27 +1,14 @@
 /*
- * "$Id$"
+ * CGI template function.
  *
- *   CGI template function.
+ * Copyright 2007-2015 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * 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...
+ * 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 "cgi-private.h"
@@ -266,7 +253,7 @@ cgi_copy(FILE *out,			/* I - Output file */
         else if (s > name && ch == '?')
 	  break;
 	else if (s < (name + sizeof(name) - 1))
-          *s++ = ch;
+          *s++ = (char)ch;
 
       *s = '\0';
 
@@ -443,7 +430,7 @@ cgi_copy(FILE *out,			/* I - Output file */
       *   {name~refex?true:false}    Regex match
       */
 
-      op = ch;
+      op = (char)ch;
 
       if (ch == '?')
       {
@@ -486,7 +473,7 @@ cgi_copy(FILE *out,			/* I - Output file */
 	    innerptr = innername;
 	    while ((ch = getc(in)) != EOF && ch != '}')
 	      if (innerptr < (innername + sizeof(innername) - 1))
-	        *innerptr++ = ch;
+	        *innerptr++ = (char)ch;
 	    *innerptr = '\0';
 
             if (innername[0] == '#')
@@ -498,26 +485,26 @@ cgi_copy(FILE *out,			/* I - Output file */
 	      if ((innerval = cgiGetArray(innername, atoi(innerptr) - 1)) == NULL)
 	        *s = '\0';
 	      else
-	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
+	        strlcpy(s, innerval, sizeof(compare) - (size_t)(s - compare));
 	    }
 	    else if (innername[0] == '?')
 	    {
 	      if ((innerval = cgiGetArray(innername + 1, element)) == NULL)
 		*s = '\0';
 	      else
-	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
+	        strlcpy(s, innerval, sizeof(compare) - (size_t)(s - compare));
             }
 	    else if ((innerval = cgiGetArray(innername, element)) == NULL)
-	      snprintf(s, sizeof(compare) - (s - compare), "{%s}", innername);
+	      snprintf(s, sizeof(compare) - (size_t)(s - compare), "{%s}", innername);
 	    else
-	      strlcpy(s, innerval, sizeof(compare) - (s - compare));
+	      strlcpy(s, innerval, sizeof(compare) - (size_t)(s - compare));
 
             s += strlen(s);
 	  }
           else if (ch == '\\')
-	    *s++ = getc(in);
+	    *s++ = (char)getc(in);
 	  else
-            *s++ = ch;
+            *s++ = (char)ch;
 
         *s = '\0';
 
@@ -553,7 +540,7 @@ cgi_copy(FILE *out,			/* I - Output file */
 	      if (regcomp(&re, compare, REG_EXTENDED | REG_ICASE))
 	      {
 	        fprintf(stderr,
-		        "ERROR: Unable to compile regular expresion \"%s\"!\n",
+		        "ERROR: Unable to compile regular expression \"%s\"!\n",
 			compare);
 		result = 0;
 	      }
@@ -659,39 +646,7 @@ cgi_puts(const char *s,			/* I - String to output */
   while (*s)
   {
     if (*s == '<')
-    {
-     /*
-      * Pass <A HREF="url"> and </A>, otherwise quote it...
-      */
-
-      if (!_cups_strncasecmp(s, "<A HREF=\"", 9))
-      {
-        fputs("<A HREF=\"", out);
-	s += 9;
-
-	while (*s && *s != '\"')
-	{
-          if (*s == '&')
-            fputs("&amp;", out);
-	  else
-	    putc(*s, out);
-
-	  s ++;
-	}
-
-        if (*s)
-	  s ++;
-
-	fputs("\">", out);
-      }
-      else if (!_cups_strncasecmp(s, "</A>", 4))
-      {
-        fputs("</A>", out);
-	s += 3;
-      }
-      else
-        fputs("&lt;", out);
-    }
+      fputs("&lt;", out);
     else if (*s == '>')
       fputs("&gt;", out);
     else if (*s == '\"')
@@ -726,8 +681,3 @@ cgi_puturi(const char *s,		/* I - String to output */
     s ++;
   }
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/testcgi.c

@@ -1,21 +1,14 @@
 /*
- * "$Id$"
+ * CGI test program for CUPS.
  *
- *   CGI test program for CUPS.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2005 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2005 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()       - Test the help index code.
- *   list_nodes() - List nodes in an array...
+ * 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/".
  */
 
 /*
@@ -30,8 +23,7 @@
  */
 
 int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+main(void)
 {
  /*
   * Test file upload/multi-part submissions...
@@ -68,8 +60,3 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/testhi.c

@@ -1,21 +1,14 @@
 /*
- * "$Id$"
+ * Help index test program for CUPS.
  *
- *   Help index test program for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()       - Test the help index code.
- *   list_nodes() - List nodes in an array...
+ * 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/".
  */
 
 /*
@@ -106,8 +99,3 @@ list_nodes(const char   *title,		/* I - Title string */
     printf(" (%d words)\n", cupsArrayCount(node->words));
   }
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/testtemplate.c

@@ -1,20 +1,14 @@
 /*
- * "$Id$"
+ * CGI template test program for CUPS.
  *
- *   CGI template test program for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 2006 by Easy Software Products.
  *
- *   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.
+ * 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/".
  */
 
 /*
@@ -96,8 +90,3 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/var.c

@@ -1,55 +1,23 @@
 /*
- * "$Id$"
+ * CGI form variable and array functions for CUPS.
  *
- *   CGI form variable and array functions for CUPS.
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 1997-2005 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2005 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * 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.
+ * 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...
  */
 
 /*#define DEBUG*/
 #include "cgi-private.h"
 #include <cups/http.h>
-#include <cups/md5-private.h>
 
 
 /*
@@ -65,10 +33,10 @@
 
 typedef struct				/**** Form variable structure ****/
 {
-  const char	*name;			/* Name of variable */
+  char		*name;			/* Name of variable */
   int		nvalues,		/* Number of values */
 		avalues;		/* Number of values allocated */
-  const char	**values;		/* Value(s) of variable */
+  char		**values;		/* Value(s) of variable */
 } _cgi_var_t;
 
 
@@ -171,10 +139,10 @@ cgiClearVariables(void)
 
   for (v = form_vars, i = form_count; i > 0; v ++, i --)
   {
-    _cupsStrFree(v->name);
+    free(v->name);
     for (j = 0; j < v->nvalues; j ++)
       if (v->values[j])
-        _cupsStrFree(v->values[j]);
+        free(v->values[j]);
   }
 
   form_count = 0;
@@ -200,7 +168,7 @@ cgiGetArray(const char *name,		/* I - Name of array variable */
   if (element < 0 || element >= var->nvalues)
     return (NULL);
 
-  return (_cupsStrRetain(var->values[element]));
+  return (strdup(var->values[element]));
 }
 
 
@@ -266,7 +234,7 @@ cgiGetVariable(const char *name)	/* I - Name of variable */
 		  var->values[var->nvalues - 1]));
 #endif /* DEBUG */
 
-  return ((var == NULL) ? NULL : _cupsStrRetain(var->values[var->nvalues - 1]));
+  return ((var == NULL) ? NULL : strdup(var->values[var->nvalues - 1]));
 }
 
 
@@ -414,10 +382,9 @@ cgiSetArray(const char *name,		/* I - Name of variable */
   {
     if (element >= var->avalues)
     {
-      const char **temp;		/* Temporary pointer */
+      char **temp;			/* Temporary pointer */
 
-      temp = (const char **)realloc((void *)(var->values),
-                                    sizeof(char *) * (element + 16));
+      temp = (char **)realloc((void *)(var->values), sizeof(char *) * (size_t)(element + 16));
       if (!temp)
         return;
 
@@ -433,9 +400,9 @@ cgiSetArray(const char *name,		/* I - Name of variable */
       var->nvalues = element + 1;
     }
     else if (var->values[element])
-      _cupsStrFree((char *)var->values[element]);
+      free((char *)var->values[element]);
 
-    var->values[element] = _cupsStrAlloc(value);
+    var->values[element] = strdup(value);
   }
 }
 
@@ -466,9 +433,9 @@ cgiSetCookie(const char *name,		/* I - Name */
     printf(" expires=%s;", httpGetDateString2(expires, date, sizeof(date)));
   }
   if (secure)
-    puts(" secure;");
+    puts(" httponly; secure;");
   else
-    putchar('\n');
+    puts(" httponly;");
 }
 
 
@@ -492,10 +459,9 @@ cgiSetSize(const char *name,		/* I - Name of variable */
 
   if (size >= var->avalues)
   {
-    const char **temp;			/* Temporary pointer */
+    char **temp;			/* Temporary pointer */
 
-    temp = (const char **)realloc((void *)(var->values),
-				  sizeof(char *) * (size + 16));
+    temp = (char **)realloc((void *)(var->values), sizeof(char *) * (size_t)(size + 16));
     if (!temp)
       return;
 
@@ -512,7 +478,7 @@ cgiSetSize(const char *name,		/* I - Name of variable */
   {
     for (i = size; i < var->nvalues; i ++)
       if (var->values[i])
-        _cupsStrFree((void *)(var->values[i]));
+        free((void *)(var->values[i]));
   }
 
   var->nvalues = size;
@@ -547,9 +513,9 @@ cgiSetVariable(const char *name,	/* I - Name of variable */
   {
     for (i = 0; i < var->nvalues; i ++)
       if (var->values[i])
-        _cupsStrFree((char *)var->values[i]);
+        free((char *)var->values[i]);
 
-    var->values[0] = _cupsStrAlloc(value);
+    var->values[0] = strdup(value);
     var->nvalues   = 1;
   }
 }
@@ -581,7 +547,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, (form_alloc + 16) * sizeof(_cgi_var_t));
+      temp_vars = realloc(form_vars, (size_t)(form_alloc + 16) * sizeof(_cgi_var_t));
 
     if (!temp_vars)
       return;
@@ -592,13 +558,13 @@ cgi_add_variable(const char *name,	/* I - Variable name */
 
   var = form_vars + form_count;
 
-  if ((var->values = calloc(element + 1, sizeof(char *))) == NULL)
+  if ((var->values = calloc((size_t)element + 1, sizeof(char *))) == NULL)
     return;
 
-  var->name            = _cupsStrAlloc(name);
+  var->name            = strdup(name);
   var->nvalues         = element + 1;
   var->avalues         = element + 1;
-  var->values[element] = _cupsStrAlloc(value);
+  var->values[element] = strdup(value);
 
   form_count ++;
 }
@@ -630,9 +596,9 @@ cgi_find_variable(const char *name)	/* I - Name of variable */
   if (form_count < 1 || name == NULL)
     return (NULL);
 
-  key.name = name;
+  key.name = (char *)name;
 
-  return ((_cgi_var_t *)bsearch(&key, form_vars, form_count, sizeof(_cgi_var_t),
+  return ((_cgi_var_t *)bsearch(&key, form_vars, (size_t)form_count, sizeof(_cgi_var_t),
                            (int (*)(const void *, const void *))cgi_compare_variables));
 }
 
@@ -655,6 +621,8 @@ cgi_initialize_cookies(void)
 
   while (*cookie)
   {
+    int	skip = 0;			/* Skip this cookie? */
+
    /*
     * Skip leading whitespace...
     */
@@ -670,9 +638,14 @@ cgi_initialize_cookies(void)
 
     for (ptr = name; *cookie && *cookie != '=';)
       if (ptr < (name + sizeof(name) - 1))
+      {
         *ptr++ = *cookie++;
+      }
       else
-        break;
+      {
+        skip = 1;
+	cookie ++;
+      }
 
     if (*cookie != '=')
       break;
@@ -688,26 +661,38 @@ cgi_initialize_cookies(void)
     {
       for (cookie ++, ptr = value; *cookie && *cookie != '\"';)
         if (ptr < (value + sizeof(value) - 1))
+	{
 	  *ptr++ = *cookie++;
+	}
 	else
-	  break;
+	{
+	  skip = 1;
+	  cookie ++;
+	}
 
       if (*cookie == '\"')
         cookie ++;
+      else
+        skip = 1;
     }
     else
     {
       for (ptr = value; *cookie && *cookie != ';';)
         if (ptr < (value + sizeof(value) - 1))
+	{
 	  *ptr++ = *cookie++;
+	}
 	else
-	  break;
+	{
+	  skip = 1;
+	  cookie ++;
+	}
     }
 
     if (*cookie == ';')
       cookie ++;
     else if (*cookie)
-      break;
+      skip = 1;
 
     *ptr = '\0';
 
@@ -716,7 +701,7 @@ cgi_initialize_cookies(void)
     * "$"...
     */
 
-    if (name[0] != '$')
+    if (name[0] != '$' && !skip)
       num_cookies = cupsAddOption(name, value, num_cookies, &cookies);
   }
 }
@@ -769,8 +754,8 @@ cgi_initialize_multipart(
 		*ptr,			/* Pointer into name/filename */
 		*end;			/* End of buffer */
   int		ch,			/* Character from file */
-		fd,			/* Temporary file descriptor */
-		blen;			/* Length of boundary string */
+		fd;			/* Temporary file descriptor */
+  size_t	blen;			/* Length of boundary string */
 
 
   DEBUG_printf(("cgi_initialize_multipart(boundary=\"%s\")\n", boundary));
@@ -835,22 +820,22 @@ cgi_initialize_multipart(
 
 	while ((ch = getchar()) != EOF)
 	{
-	  *ptr++ = ch;
+	  *ptr++ = (char)ch;
 
-          if ((ptr - line) >= blen && !memcmp(ptr - blen, bstring, blen))
+          if ((size_t)(ptr - line) >= blen && !memcmp(ptr - blen, bstring, blen))
 	  {
 	    ptr -= blen;
 	    break;
 	  }
 
-          if ((ptr - line - blen) >= 8192)
+          if ((ptr - line - (int)blen) >= 8192)
 	  {
 	   /*
 	    * Write out the first 8k of the buffer...
 	    */
 
 	    write(fd, line, 8192);
-	    memmove(line, line + 8192, ptr - line - 8192);
+	    memmove(line, line + 8192, (size_t)(ptr - line - 8192));
 	    ptr -= 8192;
 	  }
 	}
@@ -860,7 +845,7 @@ cgi_initialize_multipart(
 	*/
 
 	if (ptr > line)
-          write(fd, line, ptr - line);
+          write(fd, line, (size_t)(ptr - line));
 
 	close(fd);
       }
@@ -877,9 +862,9 @@ cgi_initialize_multipart(
 	while ((ch = getchar()) != EOF)
 	{
 	  if (ptr < end)
-	    *ptr++ = ch;
+	    *ptr++ = (char)ch;
 
-          if ((ptr - line) >= blen && !memcmp(ptr - blen, bstring, blen))
+          if ((size_t)(ptr - line) >= blen && !memcmp(ptr - blen, bstring, blen))
 	  {
 	    ptr -= blen;
 	    break;
@@ -979,12 +964,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 */
-  int	length,				/* Length of input data */
-	nbytes,				/* Number of bytes read this read() */
-	tbytes,				/* Total number of bytes read */
-	status;				/* Return status */
+  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 */
 
 
   DEBUG_puts("cgi_initialize_post: Initializing variables using POST method...");
@@ -1001,8 +986,8 @@ cgi_initialize_post(void)
   * Get the length of the input stream and allocate a buffer for it...
   */
 
-  length = atoi(content_length);
-  data   = malloc(length + 1);
+  length = (size_t)strtol(content_length, NULL, 10);
+  data   = malloc(length + 1); /* lgtm [cpp/uncontrolled-allocation-size] */
 
   if (data == NULL)
     return (0);
@@ -1011,8 +996,8 @@ cgi_initialize_post(void)
   * Read the data into the buffer...
   */
 
-  for (tbytes = 0; tbytes < length; tbytes += nbytes)
-    if ((nbytes = read(0, data + tbytes, length - tbytes)) < 0)
+  for (tbytes = 0; tbytes < length; tbytes += (size_t)nbytes)
+    if ((nbytes = read(0, data + tbytes, (size_t)(length - tbytes))) < 0)
     {
       if (errno != EAGAIN)
       {
@@ -1126,7 +1111,7 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
               ch = *data - '0';
               if (ch > 9)
         	ch -= 7;
-              *s = ch << 4;
+              *s = (char)(ch << 4);
 
               data ++;
               ch = *data - '0';
@@ -1216,11 +1201,11 @@ cgi_set_sid(void)
 {
   char			buffer[512],	/* SID data */
 			sid[33];	/* SID string */
-  _cups_md5_state_t	md5;		/* MD5 state */
   unsigned char		sum[16];	/* MD5 sum */
   const char		*remote_addr,	/* REMOTE_ADDR */
 			*server_name,	/* SERVER_NAME */
 			*server_port;	/* SERVER_PORT */
+  struct timeval	curtime;	/* Current time */
 
 
   if ((remote_addr = getenv("REMOTE_ADDR")) == NULL)
@@ -1230,18 +1215,17 @@ cgi_set_sid(void)
   if ((server_port = getenv("SERVER_PORT")) == NULL)
     server_port = "SERVER_PORT";
 
-  CUPS_SRAND(time(NULL));
+  gettimeofday(&curtime, NULL);
+  CUPS_SRAND(curtime.tv_sec + curtime.tv_usec);
   snprintf(buffer, sizeof(buffer), "%s:%s:%s:%02X%02X%02X%02X%02X%02X%02X%02X",
            remote_addr, server_name, server_port,
 	   (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255,
 	   (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255,
 	   (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255,
 	   (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255);
-  _cupsMD5Init(&md5);
-  _cupsMD5Append(&md5, (unsigned char *)buffer, (int)strlen(buffer));
-  _cupsMD5Finish(&md5, sum);
+  cupsHashData("md5", (unsigned char *)buffer, strlen(buffer), sum, sizeof(sum));
 
-  cgiSetCookie(CUPS_SID, httpMD5String(sum, sid), "/", NULL, 0, 0);
+  cgiSetCookie(CUPS_SID, cupsHashString(sum, sizeof(sum), sid, sizeof(sid)), "/", NULL, 0, 0);
 
   return (cupsGetOption(CUPS_SID, num_cookies, cookies));
 }
@@ -1264,7 +1248,7 @@ cgi_sort_variables(void)
   if (form_count < 2)
     return;
 
-  qsort(form_vars, form_count, sizeof(_cgi_var_t),
+  qsort(form_vars, (size_t)form_count, sizeof(_cgi_var_t),
         (int (*)(const void *, const void *))cgi_compare_variables);
 
 #ifdef DEBUG
@@ -1304,8 +1288,3 @@ cgi_unlink_file(void)
     form_file = NULL;
   }
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/websearch.c

@@ -1,116 +0,0 @@
-/*
- * "$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$".
- */

conf/Makefile

@@ -1,16 +1,14 @@
 #
-# "$Id$"
+# Configuration file makefile for CUPS.
 #
-#   Configuration file makefile for CUPS.
+# Copyright 2007-2015 by Apple Inc.
+# Copyright 1993-2006 by Easy Software Products.
 #
-#   Copyright 2007-2012 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/".
+# 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 ../Makedefs
@@ -76,8 +74,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 \
@@ -136,8 +134,3 @@ uninstall:
 		$(RM) $(BUILDROOT)$(PAMDIR)/cups; \
 		$(RMDIR) $(BUILDROOT)$(PAMDIR); \
 	fi
-
-
-#
-# End of "$Id$".
-#

conf/cups-files.conf.in

@@ -1,7 +1,5 @@
 #
-# "$Id$"
-#
-# Sample file/directory/user/group configuration file for the CUPS scheduler.
+# File/directory/user/group configuration file for the CUPS scheduler.
 # See "man cups-files.conf" for a complete description of this file.
 #
 
@@ -17,6 +15,7 @@
 #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@
 
@@ -76,11 +75,8 @@ PageLog @CUPS_LOGDIR@/page_log
 # Location of helper programs...
 #ServerBin @CUPS_SERVERBIN@
 
-# SSL/TLS certificate for the scheduler...
-#ServerCertificate @CUPS_SERVERCERT@
-
-# SSL/TLS private key for the scheduler...
-#ServerKey @CUPS_SERVERKEY@
+# SSL/TLS keychain for the scheduler...
+#ServerKeychain @CUPS_SERVERKEYCHAIN@
 
 # Location of other configuration files...
 #ServerRoot @CUPS_SERVERROOT@
@@ -95,7 +91,3 @@ PageLog @CUPS_LOGDIR@/page_log
 # scheduler startup and cannot be one of the standard (public) temporary
 # directory locations for security reasons...
 #TempDir @CUPS_REQUESTS@/tmp
-
-#
-# End of "$Id$".
-#

conf/cupsd.conf.in

@@ -1,13 +1,12 @@
 #
-# "$Id$"
-#
-# Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
+# Configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
 # complete description of this file.
 #
 
 # Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug"
 # for troubleshooting...
 LogLevel @CUPS_LOG_LEVEL@
+@CUPS_PAGE_LOG_FORMAT@
 
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
@@ -40,6 +39,13 @@ 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...
@@ -129,6 +135,48 @@ WebInterface @CUPS_WEBIF@
   </Limit>
 </Policy>
 
-#
-# End of "$Id$".
-#
+# 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>

conf/mime.convs.in

@@ -1,20 +1,18 @@
 #
-# "$Id$"
+# 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.
 #
-#   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.
+# Base MIME conversions file for CUPS.
 #
-#   Base MIME conversions file for CUPS.
+# Copyright 2007-2016 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products.
 #
-#   Copyright 2007-2011 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 ########################################################################
@@ -47,6 +45,7 @@ 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
 
 ########################################################################
 #
@@ -57,7 +56,3 @@ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 #
 
 @DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
-
-#
-# End of "$Id$".
-#

conf/mime.types

@@ -1,20 +1,18 @@
 #
-# "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $"
+# Base MIME types file for CUPS.
 #
-#   Base MIME types file for CUPS.
+# DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
+# VERSIONS OF CUPS.  Instead, create a "local.types" file that
+# reflects your local configuration changes.
 #
-#   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
-#   VERSIONS OF CUPS.  Instead, create a "local.types" file that
-#   reflects your local configuration changes.
+# Copyright 2007-2017 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products.
 #
-#   Copyright 2007-2011 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 ########################################################################
@@ -37,6 +35,7 @@
 #                                       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
@@ -70,7 +69,7 @@
 #
 
 #application/msword		doc string(0,<D0CF11E0A1B11AE1>)
-application/pdf			pdf string(0,%PDF)
+application/pdf			pdf regex(0,^[\n\r]*%PDF)
 application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
 				contains(0,128,<1B>%-12345X) + \
 				(contains(0,4096,"LANGUAGE=POSTSCRIPT") \
@@ -80,6 +79,7 @@ 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(100)
+image/pwg-raster		string(0,"RaS2") + string(4,PwgRaster<00>) priority(150)
 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,6 +106,7 @@ 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
@@ -123,8 +124,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) + \
-				(string(0,/*) string(0,//)
+				printable(0,1024) + ! css + \
+				(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) +\
@@ -152,7 +153,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(0,"2SaR") \
+				(string(0,"RaS2") + !string(4,PwgRaster<00>)) string(0,"2SaR") \
 				string(0,"RaS3") string(0,"3SaR")
 application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 				string(0,<1B>@) \
@@ -168,7 +169,3 @@ application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 #
 
 application/octet-stream
-
-#
-# End of "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $".
-#

conf/snmp.conf.in

@@ -1,13 +1,7 @@
 #
-# "$Id$"
-#
-#   Sample SNMP configuration file for CUPS.  See "man cups-snmp.conf" for a
-#   complete description of this file.
+# 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$".
-#

config-scripts/cups-common.m4

@@ -1,30 +1,22 @@
 dnl
-dnl "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $"
+dnl Common configuration stuff for CUPS.
 dnl
-dnl   Common configuration stuff for CUPS.
+dnl Copyright 2007-2019 by Apple Inc.
+dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2013 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+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
-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="1.7.0"
+CUPS_VERSION="AC_PACKAGE_VERSION"
 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 ],
@@ -33,8 +25,8 @@ AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" str
 AC_SUBST(CUPS_VERSION)
 AC_SUBST(CUPS_REVISION)
 AC_SUBST(CUPS_BUILD)
-AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION$CUPS_REVISION")
-AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "CUPS/$CUPS_VERSION$CUPS_REVISION")
+AC_DEFINE_UNQUOTED(CUPS_SVERSION, "AC_PACKAGE_NAME v$CUPS_VERSION$CUPS_REVISION")
+AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "AC_PACKAGE_NAME/$CUPS_VERSION$CUPS_REVISION")
 
 dnl Default compiler flags...
 CFLAGS="${CFLAGS:=}"
@@ -50,14 +42,20 @@ AC_PROG_CXX(clang++ c++ g++)
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(CHMOD,chmod)
-AC_PATH_PROG(GZIP,gzip)
+AC_PATH_PROG(GZIPPROG,gzip)
+AC_MSG_CHECKING(for install-sh script)
+INSTALL="`pwd`/install-sh"
+AC_SUBST(INSTALL)
+AC_MSG_RESULT(using $INSTALL)
 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)
 AC_PATH_PROG(SED,sed)
 AC_PATH_PROG(XDGOPEN,xdg-open)
+
 if test "x$XDGOPEN" = x; then
 	CUPS_HTMLVIEW="htmlview"
 else
@@ -65,11 +63,6 @@ else
 fi
 AC_SUBST(CUPS_HTMLVIEW)
 
-AC_MSG_CHECKING(for install-sh script)
-INSTALL="`pwd`/install-sh"
-AC_SUBST(INSTALL)
-AC_MSG_RESULT(using $INSTALL)
-
 if test "x$AR" = x; then
 	AC_MSG_ERROR([Unable to find required library archive command.])
 fi
@@ -89,7 +82,7 @@ fi
 AC_SUBST(INSTALLSTATIC)
 
 dnl Check for pkg-config, which is used for some other tests later on...
-AC_PATH_PROG(PKGCONFIG, pkg-config)
+AC_PATH_TOOL(PKGCONFIG, pkg-config)
 
 dnl Check for libraries...
 AC_SEARCH_LIBS(abs, m, AC_DEFINE(HAVE_ABS))
@@ -134,11 +127,9 @@ 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,
@@ -147,6 +138,9 @@ 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)...
@@ -168,7 +162,7 @@ AC_CHECK_FUNCS(statfs statvfs)
 
 dnl Checks for string functions.
 AC_CHECK_FUNCS(strdup strlcat strlcpy)
-if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then
+if test "$host_os_name" = "hp-ux" -a "$host_os_version" = "1020"; then
 	echo Forcing snprintf emulation for HP-UX.
 else
 	AC_CHECK_FUNCS(snprintf vsnprintf)
@@ -187,8 +181,8 @@ dnl Check for vsyslog function.
 AC_CHECK_FUNCS(vsyslog)
 
 dnl Checks for signal functions.
-case "$uname" in
-	Linux | GNU)
+case "$host_os_name" in
+	linux* | gnu*)
 		# Do not use sigset on Linux or GNU HURD
 		;;
 	*)
@@ -202,6 +196,12 @@ 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;
@@ -230,7 +230,7 @@ AC_SUBST(LIBUSB)
 AC_SUBST(USBQUIRKS)
 
 if test "x$PKGCONFIG" != x; then
-	if test x$enable_libusb = xyes -o $uname != Darwin; 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)
@@ -240,6 +240,9 @@ if test "x$PKGCONFIG" != x; then
 			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
@@ -263,20 +266,20 @@ dnl ZLIB
 INSTALL_GZIP=""
 LIBZ=""
 AC_CHECK_HEADER(zlib.h,
-    AC_CHECK_LIB(z, gzgets,
+    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
+	if test "x$GZIPPROG" != x; then
 		INSTALL_GZIP="-z"
-	fi))
+	fi]))
 AC_SUBST(INSTALL_GZIP)
 AC_SUBST(LIBZ)
 
 dnl Flags for "ar" command...
-case $uname in
-        Darwin* | *BSD*)
+case $host_os_name in
+        darwin* | *bsd*)
                 ARFLAGS="-rcv"
                 ;;
         *)
@@ -303,20 +306,15 @@ fi
 LIBS="$SAVELIBS"
 
 dnl Check for DBUS support
-if test -d /etc/dbus-1; then
-	DBUSDIR="/etc/dbus-1"
-else
-	DBUSDIR=""
-fi
-
-AC_ARG_ENABLE(dbus, [  --disable-dbus           build without DBUS support])
+AC_ARG_ENABLE(dbus, [  --disable-dbus          build without DBUS support])
 AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
 	DBUSDIR="$withval")
 
+DBUSDIR=""
 DBUS_NOTIFIER=""
 DBUS_NOTIFIERLIBS=""
 
-if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then
+if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin; then
 	AC_MSG_CHECKING(for DBUS)
 	if $PKGCONFIG --exists dbus-1; then
 		AC_MSG_RESULT(yes)
@@ -329,7 +327,12 @@ if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then
 		LIBS="$LIBS $DBUS_NOTIFIERLIBS"
 		AC_CHECK_FUNC(dbus_message_iter_init_append,
 			      AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND))
+		AC_CHECK_FUNC(dbus_threads_init,
+			      AC_DEFINE(HAVE_DBUS_THREADS_INIT))
 		LIBS="$SAVELIBS"
+		if test -d /etc/dbus-1; then
+			DBUSDIR="/etc/dbus-1"
+		fi
 	else
 		AC_MSG_RESULT(no)
 	fi
@@ -345,8 +348,8 @@ CUPS_DEFAULT_SYSTEM_AUTHKEY=""
 CUPS_SYSTEM_AUTHKEY=""
 INSTALLXPC=""
 
-case $uname in
-        Darwin*)
+case $host_os_name in
+        darwin*)
                 BACKLIBS="$BACKLIBS -framework IOKit"
                 SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices"
                 LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS"
@@ -356,7 +359,6 @@ case $uname in
 		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H))
 		AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H))
 		AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H))
-		AC_CHECK_HEADER(IOKit/pwr_mgt/IOPMLibPrivate.h,AC_DEFINE(HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H))
 
 		dnl Check for dynamic store function...
 		AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName)
@@ -366,9 +368,6 @@ case $uname in
 		AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
 		AC_CHECK_FUNCS(mbr_uid_to_uuid)
 
-                dnl Check for the vproc_transaction_begin/end stuff...
-		AC_CHECK_FUNCS(vproc_transaction_begin)
-
 		dnl Need <dlfcn.h> header...
 		AC_CHECK_HEADER(dlfcn.h,AC_DEFINE(HAVE_DLFCN_H))
 
@@ -390,28 +389,23 @@ case $uname in
 			if test "x$default_adminkey" != xdefault; then
 				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
 				CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey"
-			elif grep -q system.print.operator /etc/authorization; then
+			else
 				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
 				CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin"
-			else
-				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
-				CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences"
 			fi
 
 			if test "x$default_operkey" != xdefault; then
 				CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin"
-			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"
+				CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
 			fi])
 		AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
 
 		dnl Check for sandbox/Seatbelt support
-		if test $uversion -ge 100; then
+		if test $host_os_version -ge 100; then
 			AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
 		fi
-		if test $uversion -ge 110 -a $uversion -lt 120; then
+		if test $host_os_version -ge 110 -a $host_os_version -lt 120; then
 			# Broken public headers in 10.7.x...
 			AC_MSG_CHECKING(for sandbox/private.h presence)
 			if test -f /usr/local/include/sandbox/private.h; then
@@ -460,7 +454,3 @@ case "$COMPONENTS" in
 esac
 
 AC_SUBST(BUILDDIRS)
-
-dnl
-dnl End of "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $".
-dnl

config-scripts/cups-compiler.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id: cups-compiler.m4 7871 2008-08-27 21:12:43Z mike $"
+dnl Compiler stuff for CUPS.
 dnl
-dnl   Compiler stuff for CUPS.
+dnl Copyright 2007-2018 by Apple Inc.
+dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2013 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl 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
@@ -48,6 +46,10 @@ 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=""
@@ -65,7 +67,7 @@ else
 fi
 
 if test -z "$with_ldarchflags"; then
-	if test "$uname" = Darwin; then
+	if test "$host_os_name" = darwin; then
 		# Only create Intel programs by default
 		LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch ppc64//'`"
 	else
@@ -103,14 +105,14 @@ if test -n "$GCC"; then
 	fi
 
 	# Generate position-independent code as needed...
-	if test $PICFLAG = 1 -a $uname != AIX; then
+	if test $PICFLAG = 1; 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(if GCC supports -fstack-protector)
+	AC_MSG_CHECKING(whether compiler supports -fstack-protector)
 	OLDCFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fstack-protector"
 	AC_TRY_LINK(,,
@@ -130,10 +132,10 @@ if test -n "$GCC"; then
 		# exploits that depend on a fixed address for common functions.
 		#
 		# Not available to LSB binaries...
-		AC_MSG_CHECKING(if GCC supports -fPIE)
+		AC_MSG_CHECKING(whether compiler supports -fPIE)
 		OLDCFLAGS="$CFLAGS"
-		case "$uname" in
-			Darwin*)
+		case "$host_os_name" in
+			darwin*)
 				CFLAGS="$CFLAGS -fPIE -Wl,-pie"
 				AC_TRY_COMPILE(,,[
 					PIEFLAGS="-fPIE -Wl,-pie"
@@ -154,25 +156,25 @@ if test -n "$GCC"; then
 
 	if test "x$with_optim" = x; then
 		# Add useful warning options for tracking down problems...
-		OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM"
+		OPTIM="-Wall -Wno-format-y2k -Wunused -Wno-unused-result -Wsign-conversion $OPTIM"
+
+		# Test GCC version for certain warning flags since -Werror
+		# doesn't trigger...
+		gccversion=`$CC --version | head -1 | awk '{print $NF}'`
+		case "$gccversion" in
+			7.* | 8.*)
+				OPTIM="$OPTIM -Wno-format-truncation -Wno-tautological-compare"
+				;;
+		esac
 
 		# Additional warning options for development testing...
-		if test -d .svn; then
-			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"
+		if test -d .git; then
+			OPTIM="-Werror $OPTIM"
 		fi
 	fi
 
-	case "$uname" in
-		Darwin*)
+	case "$host_os_name" in
+		darwin*)
 			# -D_FORTIFY_SOURCE=2 adds additional object size
 			# checking, basically wrapping all string functions
 			# with buffer-limited ones.  Not strictly needed for
@@ -181,52 +183,18 @@ 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"
+				RELROFLAGS="-Wl,-z,relro,-z,now"
 			fi
 			;;
 	esac
 else
 	# Add vendor-specific compiler options...
-	case $uname in
-		AIX*)
-			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-O2 -qmaxmem=6000"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
-			fi
-			;;
-		HP-UX*)
-			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="+O2"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
-			fi
-
-			CFLAGS="-Ae $CFLAGS"
-
-			if test $PICFLAG = 1; then
-				OPTIM="+z $OPTIM"
-			fi
-			;;
-		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*)
+	case $host_os_name in
+		sunos*)
 			# Solaris
 			if test -z "$OPTIM"; then
 				if test "x$with_optim" = x; then
@@ -236,20 +204,6 @@ 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
@@ -259,7 +213,7 @@ else
 			# should contribute the necessary options to
 			# cups-support@cups.org...
 			echo "Building CUPS with default compiler optimizations; contact"
-			echo "cups-bugs@cups.org with uname and compiler options needed"
+			echo "cups-devel@cups.org with uname and compiler options needed"
 			echo "for your platform, or set the CFLAGS and LDFLAGS environment"
 			echo "variables before running configure."
 			;;
@@ -267,34 +221,10 @@ else
 fi
 
 # Add general compiler options per platform...
-case $uname in
-	HP-UX*)
-		# HP-UX 10.20 (at least) needs this definition to get the
-		# h_errno global...
-		OPTIM="$OPTIM -D_XOPEN_SOURCE_EXTENDED"
-
-		# HP-UX 11.00 (at least) needs this definition to get the
-		# u_short type used by the IP headers...
-		OPTIM="$OPTIM -D_INCLUDE_HPUX_SOURCE"
-
-		# HP-UX 11.23 (at least) needs this definition to get the
-		# IPv6 header to work...
-		OPTIM="$OPTIM -D_HPUX_SOURCE"
-		;;
-
-	Linux*)
+case $host_os_name in
+	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 7871 2008-08-27 21:12:43Z mike $".
-dnl

config-scripts/cups-defaults.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $"
+dnl Default cupsd configuration settings for CUPS.
 dnl
-dnl   Default cupsd configuration settings for CUPS.
+dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 2006-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
-dnl   Copyright 2006-2007 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Default languages...
@@ -24,10 +22,10 @@ AC_ARG_WITH(languages, [  --with-languages        set installed languages, defau
 	esac])
 AC_SUBST(LANGUAGES)
 
-dnl OS X bundle-based localization support
-AC_ARG_WITH(bundledir, [  --with-bundledir        set OS X localization bundle directory ],
+dnl macOS bundle-based localization support
+AC_ARG_WITH(bundledir, [  --with-bundledir        set macOS localization bundle directory ],
 	CUPS_BUNDLEDIR="$withval",
-	if test "x$uname" = xDarwin -a $uversion -ge 100; then
+	if test "x$host_os_name" = xdarwin -a $host_os_version -ge 100; then
 		CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A"
 		LANGUAGES=""
 	else
@@ -39,21 +37,41 @@ 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$uname" = xDarwin; then
+	[if test "x$host_os_name" = 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",
-	CUPS_CUPSD_FILE_PERM="500")
+	[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
@@ -78,12 +96,21 @@ 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=actions],
+AC_ARG_WITH(access_log_level, [  --with-access-log-level set default AccessLogLevel value, default=none],
 	CUPS_ACCESS_LOG_LEVEL="$withval",
-	CUPS_ACCESS_LOG_LEVEL="actions")
+	CUPS_ACCESS_LOG_LEVEL="none")
 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
@@ -134,7 +161,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$uname = xDarwin; then
+	if test x$host_os_name = xdarwin; then
 		if test x`id -u _lp 2>/dev/null` = x; then
 			CUPS_USER="lp";
 		else
@@ -167,7 +194,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$uname = xDarwin; then
+	if test x$host_os_name = xdarwin; then
 		if test x`id -g _lp 2>/dev/null` = x; then
 			CUPS_GROUP="lp";
 		else
@@ -200,7 +227,7 @@ fi
 
 AC_ARG_WITH(system_groups, [  --with-system-groups    set default system groups for CUPS],
 	CUPS_SYSTEM_GROUPS="$withval",
-	if test x$uname = xDarwin; then
+	if test x$host_os_name = xdarwin; then
 		CUPS_SYSTEM_GROUPS="admin"
 	else
 		AC_MSG_CHECKING(for default system groups)
@@ -253,15 +280,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 $uname in
-			Darwin*)
-				if test $uversion -ge 90; then
+		case $host_os_name in
+			darwin*)
+				if test $host_os_version -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"
 				;;
 			*)
@@ -285,8 +312,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 $uname in
-			Darwin*)
+		case $host_os_name in
+			darwin*)
 				CUPS_DEFAULT_LPD_CONFIG_FILE="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist"
 				;;
 			*)
@@ -353,7 +380,7 @@ AC_ARG_WITH(snmp-address, [  --with-snmp-address     set SNMP query address, def
 	else
 		CUPS_SNMP_ADDRESS="Address $withval"
 	fi,
-	if test "x$uname" = xDarwin; then
+	if test "x$host_os_name" = xdarwin; then
 		CUPS_SNMP_ADDRESS=""
 	else
 		CUPS_SNMP_ADDRESS="Address @LOCAL"
@@ -375,7 +402,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 OS X])
+AC_ARG_ENABLE(webif, [  --enable-webif          enable the web interface by default, default=no for macOS])
 case "x$enable_webif" in
 	xno)
 		CUPS_WEBIF=No
@@ -386,7 +413,7 @@ case "x$enable_webif" in
 		CUPS_DEFAULT_WEBIF=1
 		;;
 	*)
-		if test $uname = Darwin; then
+		if test $host_os_name = darwin; then
 			CUPS_WEBIF=No
 			CUPS_DEFAULT_WEBIF=0
 		else
@@ -398,7 +425,3 @@ esac
 
 AC_SUBST(CUPS_WEBIF)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)
-
-dnl
-dnl End of "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $".
-dnl

config-scripts/cups-directories.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id: cups-directories.m4 7799 2008-07-25 20:06:08Z mike $"
+dnl Directory stuff for CUPS.
 dnl
-dnl   Directory stuff for CUPS.
+dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2013 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_PREFIX_DEFAULT(/)
@@ -76,7 +74,7 @@ fi
 dnl Fix "localstatedir" variable if it hasn't been specified...
 if test "$localstatedir" = "\${prefix}/var"; then
 	if test "$prefix" = "/"; then
-		if test "$uname" = Darwin; then
+		if test "$host_os_name" = darwin; then
 			localstatedir="/private/var"
 		else
 			localstatedir="/var"
@@ -89,7 +87,7 @@ fi
 dnl Fix "sysconfdir" variable if it hasn't been specified...
 if test "$sysconfdir" = "\${prefix}/etc"; then
 	if test "$prefix" = "/"; then
-		if test "$uname" = Darwin; then
+		if test "$host_os_name" = darwin; then
 			sysconfdir="/private/etc"
 		else
 			sysconfdir="/etc"
@@ -101,17 +99,12 @@ fi
 
 dnl Fix "libdir" variable...
 if test "$libdir" = "\${exec_prefix}/lib"; then
-	case "$uname" in
-		Linux*)
+	case "$host_os_name" in
+		linux*)
 			if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
 				libdir="$exec_prefix/lib64"
 			fi
 			;;
-		HP-UX*)
-			if test -d /usr/lib/hpux32; then
-				libdir="$exec_prefix/lib/hpux32"
-			fi
-			;;
 	esac
 fi
 
@@ -126,119 +119,6 @@ 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"
-			;;
-
-		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="")
@@ -285,7 +165,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$uname" = xDarwin; then
+	if test "x$host_os_name" = xdarwin; then
 		CUPS_CACHEDIR="$localstatedir/spool/cups/cache"
 	else
 		CUPS_CACHEDIR="$localstatedir/cache/cups"
@@ -350,15 +230,11 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
 
 # Locale data
 if test "$localedir" = "\${datarootdir}/locale"; then
-	case "$uname" in
-		Linux | GNU | *BSD* | Darwin*)
+	case "$host_os_name" 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"
@@ -389,9 +265,9 @@ AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
 AC_SUBST(CUPS_REQUESTS)
 
 # Server executables...
-case "$uname" in
-	*BSD* | Darwin*)
-		# *BSD and Darwin (MacOS X)
+case "$host_os_name" in
+	*bsd* | darwin*)
+		# *BSD and Darwin (macOS)
 		INSTALL_SYSV=""
 		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
 		;;
@@ -413,9 +289,9 @@ AC_SUBST(CUPS_SERVERROOT)
 
 # Transient run-time state
 AC_ARG_WITH(rundir, [  --with-rundir           set transient run-time state directory],CUPS_STATEDIR="$withval",[
-	case "$uname" in
-		Darwin*)
-			# Darwin (OS X)
+	case "$host_os_name" in
+		darwin*)
+			# Darwin (macOS)
 			CUPS_STATEDIR="$CUPS_SERVERROOT"
 			;;
 		*)
@@ -425,7 +301,3 @@ AC_ARG_WITH(rundir, [  --with-rundir           set transient run-time state dire
 	esac])
 AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
 AC_SUBST(CUPS_STATEDIR)
-
-dnl
-dnl End of "$Id: cups-directories.m4 7799 2008-07-25 20:06:08Z mike $".
-dnl

config-scripts/cups-dnssd.m4

@@ -1,15 +1,13 @@
 dnl
-dnl "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $"
+dnl DNS Service Discovery (aka Bonjour) stuff for CUPS.
 dnl
-dnl   DNS Service Discovery (aka Bonjour) stuff for CUPS.
+dnl Copyright 2007-2017 by Apple Inc.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl 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])
@@ -26,7 +24,7 @@ DNSSD_BACKEND=""
 IPPFIND_BIN=""
 IPPFIND_MAN=""
 
-if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
+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)
@@ -43,9 +41,9 @@ fi
 
 if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then
 	AC_CHECK_HEADER(dns_sd.h, [
-		case "$uname" in
-			Darwin*)
-				# Darwin and MacOS X...
+		case "$host_os_name" in
+			darwin*)
+				# Darwin and macOS...
 				AC_DEFINE(HAVE_DNSSD)
 				DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration"
 				DNSSD_BACKEND="dnssd"
@@ -80,7 +78,3 @@ AC_SUBST(DNSSDLIBS)
 AC_SUBST(DNSSD_BACKEND)
 AC_SUBST(IPPFIND_BIN)
 AC_SUBST(IPPFIND_MAN)
-
-dnl
-dnl End of "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $".
-dnl

config-scripts/cups-gssapi.m4

@@ -1,19 +1,17 @@
 dnl
-dnl   "$Id$"
+dnl GSSAPI/Kerberos library detection for CUPS.
 dnl
-dnl   GSSAPI/Kerberos library detection for CUPS.
+dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 2006-2007 by Easy Software Products.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
-dnl   Copyright 2006-2007 by Easy Software Products.
+dnl This file contains Kerberos support code, copyright 2006 by
+dnl Jelmer Vernooij.
 dnl
-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 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
 
 AC_ARG_ENABLE(gssapi, [  --disable-gssapi        disable GSSAPI support])
@@ -22,11 +20,11 @@ LIBGSSAPI=""
 AC_SUBST(LIBGSSAPI)
 
 if test x$enable_gssapi != xno; then
-	AC_PATH_PROG(KRB5CONFIG, krb5-config)
+	AC_PATH_TOOL(KRB5CONFIG, krb5-config)
 	if test "x$KRB5CONFIG" != x; then
-		case "$uname" in
-			Darwin)
-				# OS X weak-links to the Kerberos framework...
+		case "$host_os_name" in
+			darwin)
+				# macOS 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
@@ -36,7 +34,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])
@@ -54,13 +52,13 @@ if test x$enable_gssapi != xno; then
 		AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
 	else
 		# Check for vendor-specific implementations...
-		case "$uname" in
-			HP-UX*)
+		case "$host_os_name" 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")
@@ -71,38 +69,9 @@ 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
-			gssdir="/System/Library/Frameworks/GSS.framework"
-			AC_MSG_CHECKING(for GSS/gssapi.h presence)
-			if test -f $gssdir/Headers/gssapi.h; then
-				AC_DEFINE(HAVE_GSS_GSSAPI_H)
-				AC_MSG_RESULT(yes)
-			else
-				AC_MSG_RESULT(no)
-			fi
-			AC_MSG_CHECKING(for GSS/gssapi_generic.h presence)
-			if test -f $gssdir/Headers/gssapi_generic.h; then
-				AC_DEFINE(HAVE_GSSAPI_GENERIC_H)
-				AC_MSG_RESULT(yes)
-			else
-				AC_MSG_RESULT(no)
-			fi
-			AC_MSG_CHECKING(for GSS/gssapi_spi.h presence)
-			if test -f $gssdir/PrivateHeaders/gssapi_spi.h; then
-				AC_MSG_RESULT(yes)
-				AC_MSG_CHECKING(for GSS/gssapi_spi.h usability)
-				if test -s $gssdir/PrivateHeaders/gssapi_spi.h; then
-					AC_MSG_RESULT(yes)
-					AC_DEFINE(HAVE_GSS_GSSAPI_SPI_H)
-				else
-					AC_MSG_RESULT(no)
-				fi
-			else
-				AC_MSG_RESULT(no)
-				if test $uversion -ge 110 -a $uversion -lt 120; then
-					# Broken public headers in 10.7.x...
-					AC_MSG_ERROR(Run 'sudo mkdir -p $gssdir/PrivateHeaders' and 'sudo touch $gssdir/PrivateHeaders/gssapi_spi.h' to build CUPS.)
-				fi
-			fi
+			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))
 		else
 			AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H))
 			AC_CHECK_HEADER(gssapi/gssapi.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_H))
@@ -156,7 +125,3 @@ fi
 
 AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-largefile.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl Large file support stuff for CUPS.
 dnl
-dnl   Large file support stuff for CUPS.
+dnl Copyright 2007-2011 by Apple Inc.
+dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Check for largefile support...
@@ -46,7 +44,3 @@ 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 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-launchd.m4

@@ -1,43 +0,0 @@
-dnl
-dnl "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z 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 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-libtool.m4

@@ -1,21 +1,22 @@
 dnl
-dnl "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl Libtool stuff for CUPS.
 dnl
-dnl   Libtool stuff for CUPS.
+dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
-AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported
+AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=/path/to/libtool
                           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."
@@ -24,16 +25,40 @@ AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported
 		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)"
-	DSO="\$(CC)"
+
+else
+	LD_CC="\$(CC)"
+	LD_CXX="\$(CXX)"
+
+	LIBTOOL_CC=""
+	LIBTOOL_CXX=""
+	LIBTOOL_INSTALL=""
 fi
 
-dnl
-dnl End of "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl
+AC_SUBST(LD_CC)
+AC_SUBST(LD_CXX)
+
+AC_SUBST(LIBTOOL)
+AC_SUBST(LIBTOOL_CC)
+AC_SUBST(LIBTOOL_CXX)
+AC_SUBST(LIBTOOL_INSTALL)

config-scripts/cups-manpages.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl Manpage stuff for CUPS.
 dnl
-dnl   Manpage stuff for CUPS.
+dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Fix "mandir" variable...
@@ -21,9 +19,9 @@ if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
 fi
 
 if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
-	case "$uname" in
-        	Darwin* | Linux | GNU | *BSD* | AIX*)
-        		# Darwin, MacOS X, Linux, GNU HURD, *BSD, and AIX
+	case "$host_os_name" in
+        	darwin* | linux* | gnu* | *bsd*)
+        		# Darwin, macOS, Linux, GNU HURD, and *BSD
         		mandir="/usr/share/man"
         		AMANDIR="/usr/share/man"
         		PMANDIR="/usr/share/man"
@@ -44,17 +42,17 @@ AC_SUBST(AMANDIR)
 AC_SUBST(PMANDIR)
 
 dnl Setup manpage extensions...
-case "$uname" in
-	SunOS* | HP-UX*)
-		# Solaris and HP-UX
+case "$host_os_name" in
+	sunos*)
+		# Solaris
 		MAN1EXT=1
 		MAN5EXT=5
 		MAN7EXT=7
 		MAN8EXT=1m
 		MAN8DIR=1m
 		;;
-	Linux* | GNU* | Darwin*)
-		# Linux, GNU Hurd, and OS X
+	linux* | gnu* | darwin*)
+		# Linux, GNU Hurd, and macOS
 		MAN1EXT=1.gz
 		MAN5EXT=5.gz
 		MAN7EXT=7.gz
@@ -76,7 +74,3 @@ AC_SUBST(MAN5EXT)
 AC_SUBST(MAN7EXT)
 AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)
-
-dnl
-dnl End of "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-network.m4

@@ -1,19 +1,22 @@
 dnl
-dnl "$Id: cups-network.m4 7918 2008-09-08 22:03:01Z mike $"
+dnl Networking stuff for CUPS.
 dnl
-dnl   Networking stuff for CUPS.
+dnl Copyright 2007-2016 by Apple Inc.
+dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
-AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H))
+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_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(gethostbyaddr, nsl)
 AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
@@ -25,7 +28,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 "$uname" != "OSF1"; then
+if test "$host_os_name" != "osf1"; then
 	AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
 	AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
 fi
@@ -42,9 +45,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 "$uname" in
-			Darwin*)
-				# Darwin and MaxOS X do their own thing...
+		case "$host_os_name" in
+			darwin*)
+				# Darwin and macOS do their own thing...
 				CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd"
 				;;
 			*)
@@ -65,10 +68,3 @@ 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 7918 2008-09-08 22:03:01Z mike $".
-dnl

config-scripts/cups-opsys.m4

@@ -1,39 +1,39 @@
 dnl
-dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl Operating system stuff for CUPS.
 dnl
-dnl   Operating system stuff for CUPS.
+dnl Copyright 2007-2018 by Apple Inc.
+dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
-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`
+dnl Get the build and host platforms and split the host_os value
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
 
-case "$uname" in
-	Darwin*)
-		uname="Darwin"
-		if test $uversion -lt 120; then
-			AC_MSG_ERROR([Sorry, this version of CUPS requires OS X 10.8 or higher.])
-		fi
-		;;
+[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
 
-	GNU* | GNU/*)
-		uname="GNU"
-		;;
-	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
-dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
+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)
+
+AC_PATH_PROGS(CODE_SIGN, codesign true)

config-scripts/cups-pam.m4

@@ -1,25 +1,18 @@
 dnl
-dnl "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $"
+dnl PAM stuff for CUPS.
 dnl
-dnl   PAM stuff for CUPS.
+dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(pam, [  --disable-pam           disable PAM support])
-AC_ARG_WITH(pam_module, [  --with-pam-module       specify the PAM module to use])
-
-dnl Don't use PAM with AIX...
-if test $uname = AIX; then
-	enable_pam=no
-fi
+AC_ARG_WITH(pam_module, [  --with-pam-module       set the PAM module to use])
 
 PAMDIR=""
 PAMFILE="pam.std"
@@ -59,9 +52,9 @@ if test x$enable_pam != xno; then
 
 	LIBS="$SAVELIBS"
 
-	case "$uname" in
-		Darwin*)
-			# Darwin/OS X
+	case "$host_os_name" in
+		darwin*)
+			# Darwin/macOS
 			if test "x$with_pam_module" != x; then
 				PAMFILE="pam.$with_pam_module"
 			elif test -f /usr/lib/pam/pam_opendirectory.so.2; then
@@ -96,7 +89,3 @@ AC_SUBST(PAMFILE)
 AC_SUBST(PAMLIBS)
 AC_SUBST(PAMMOD)
 AC_SUBST(PAMMODAUTH)
-
-dnl
-dnl End of "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $".
-dnl

config-scripts/cups-poll.m4

@@ -1,22 +1,16 @@
 dnl
-dnl "$Id$"
+dnl Select/poll stuff for CUPS.
 dnl
-dnl   Select/poll stuff for CUPS.
+dnl Copyright 2007-2011 by Apple Inc.
+dnl Copyright 2006 by Easy Software Products, all rights reserved.
 dnl
-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 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
 
 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$".
-dnl

config-scripts/cups-scripting.m4

@@ -1,26 +1,26 @@
 dnl
-dnl "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $"
+dnl Scripting configuration stuff for CUPS.
 dnl
-dnl   Scripting configuration stuff for CUPS.
+dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
-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 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
 
 dnl Do we have Java?
 AC_ARG_WITH(java, [  --with-java             set Java interpreter for web interfaces ],
 	CUPS_JAVA="$withval",
-	CUPS_JAVA="")
+	CUPS_JAVA="auto")
 
-if test "x$CUPS_JAVA" = x; then
+if test "x$CUPS_JAVA" = xauto; 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,11 +32,13 @@ fi
 dnl Do we have Perl?
 AC_ARG_WITH(perl, [  --with-perl             set Perl interpreter for web interfaces ],
 	CUPS_PERL="$withval",
-	CUPS_PERL="")
+	CUPS_PERL="auto")
 
-if test "x$CUPS_PERL" = x; then
+if test "x$CUPS_PERL" = xauto; 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")
@@ -48,9 +50,9 @@ fi
 dnl Do we have PHP?
 AC_ARG_WITH(php, [  --with-php              set PHP interpreter for web interfaces ],
 	CUPS_PHP="$withval",
-	CUPS_PHP="")
+	CUPS_PHP="auto")
 
-if test "x$CUPS_PHP" = x; then
+if test "x$CUPS_PHP" = xauto; then
 	AC_PATH_PROG(PHPCGI,php-cgi)
 	if test "x$PHPCGI" = x; then
 		AC_PATH_PROG(PHP,php)
@@ -58,6 +60,8 @@ if test "x$CUPS_PHP" = x; then
 	else
 		CUPS_PHP="$PHPCGI"
 	fi
+elif test "x$CUPS_PHP" = xno; then
+        CUPS_PHP=""
 fi
 
 AC_DEFINE_UNQUOTED(CUPS_PHP, "$CUPS_PHP")
@@ -71,11 +75,13 @@ fi
 dnl Do we have Python?
 AC_ARG_WITH(python, [  --with-python           set Python interpreter for web interfaces ],
 	CUPS_PYTHON="$withval",
-	CUPS_PYTHON="")
+	CUPS_PYTHON="auto")
 
-if test "x$CUPS_PYTHON" = x; then
+if test "x$CUPS_PYTHON" = xauto; 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")
@@ -83,7 +89,3 @@ 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 7915 2008-09-07 22:18:29Z mike $".
-dnl

config-scripts/cups-sharedlibs.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $"
+dnl Shared library support for CUPS.
 dnl
-dnl   Shared library support for CUPS.
+dnl Copyright 2007-2018 by Apple Inc.
+dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 PICFLAG=1
@@ -23,100 +21,33 @@ LIBCUPSBASE="lib$cupsbase"
 LIBCUPSSTATIC="lib$cupsbase.a"
 
 if test x$enable_shared != xno; then
-	case "$uname" in
-		SunOS*)
+	case "$host_os_name" in
+		sunos*)
 			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)"
 			;;
-		UNIX_S*)
+		linux* | gnu* | *bsd*)
 			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"
-			LIBCUPSMIME="libcupsmime.so.1"
-			LIBCUPSPPDC="libcupsppdc.so.1"
 			DSO="\$(CC)"
 			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
 			;;
-		Darwin*)
+		darwin*)
 			LIBCUPS="lib$cupsbase.2.dylib"
-			LIBCUPSCGI="libcupscgi.1.dylib"
 			LIBCUPSIMAGE="libcupsimage.2.dylib"
-			LIBCUPSMIME="libcupsmime.1.dylib"
-			LIBCUPSPPDC="libcupsppdc.1.dylib"
 			DSO="\$(CC)"
 			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."
 			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,-soname,\`basename \$@\` -shared \$(OPTIM)"
@@ -125,10 +56,7 @@ if test x$enable_shared != xno; then
 else
 	PICFLAG=0
 	LIBCUPS="lib$cupsbase.a"
-	LIBCUPSCGI="libcupscgi.a"
 	LIBCUPSIMAGE="libcupsimage.a"
-	LIBCUPSMIME="libcupsmime.a"
-	LIBCUPSPPDC="libcupsppdc.a"
 	DSO=":"
 	DSOXX=":"
 fi
@@ -138,10 +66,7 @@ AC_SUBST(DSOXX)
 AC_SUBST(DSOFLAGS)
 AC_SUBST(LIBCUPS)
 AC_SUBST(LIBCUPSBASE)
-AC_SUBST(LIBCUPSCGI)
 AC_SUBST(LIBCUPSIMAGE)
-AC_SUBST(LIBCUPSMIME)
-AC_SUBST(LIBCUPSPPDC)
 AC_SUBST(LIBCUPSSTATIC)
 
 if test x$enable_shared = xno; then
@@ -151,19 +76,11 @@ if test x$enable_shared = xno; then
 	EXTLINKCUPS="-lcups"
 	EXTLINKCUPSIMAGE="-lcupsimage"
 else
-	if test $uname = AIX; then
-		LINKCUPS="-l${cupsbase}_s"
-		LINKCUPSIMAGE="-lcupsimage_s"
+	LINKCUPS="-l${cupsbase}"
+	LINKCUPSIMAGE="-lcupsimage"
 
-		EXTLINKCUPS="-lcups_s"
-		EXTLINKCUPSIMAGE="-lcupsimage_s"
-	else
-		LINKCUPS="-l${cupsbase}"
-		LINKCUPSIMAGE="-lcupsimage"
-
-		EXTLINKCUPS="-lcups"
-		EXTLINKCUPSIMAGE="-lcupsimage"
-	fi
+	EXTLINKCUPS="-lcups"
+	EXTLINKCUPSIMAGE="-lcupsimage"
 fi
 
 AC_SUBST(EXTLINKCUPS)
@@ -185,21 +102,8 @@ 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 $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*)
+	case $host_os_name in
+                sunos*)
                 	# Solaris...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-R$libdir $DSOFLAGS"
@@ -207,7 +111,7 @@ if test "$DSO" != ":"; then
 				EXPORT_LDFLAGS="-R$libdir"
 			fi
 			;;
-                *BSD*)
+                *bsd*)
                         # *BSD...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
@@ -215,7 +119,7 @@ if test "$DSO" != ":"; then
 				EXPORT_LDFLAGS="-Wl,-R$libdir"
 			fi
 			;;
-                Linux | GNU)
+                linux* | gnu*)
                         # Linux, and HURD...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
@@ -232,7 +136,3 @@ fi
 AC_SUBST(DSOLIBS)
 AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
-
-dnl
-dnl End of "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $".
-dnl

config-scripts/cups-ssl.m4

@@ -1,44 +1,34 @@
 dnl
-dnl "$Id: cups-ssl.m4 7241 2008-01-22 22:34:52Z mike $"
+dnl TLS stuff for CUPS.
 dnl
-dnl   OpenSSL/GNUTLS stuff for CUPS.
+dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl 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_SERVERCERT=""
-CUPS_SERVERKEY=""
+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 $uname = Darwin; then
+	if test $host_os_name = darwin; then
 	    AC_CHECK_HEADER(Security/SecureTransport.h, [
 	    	have_ssl=1
 		AC_DEFINE(HAVE_SSL)
 		AC_DEFINE(HAVE_CDSASSL)
-		CUPS_SERVERCERT="/Library/Keychains/System.keychain"
+		CUPS_SERVERKEYCHAIN="/Library/Keychains/System.keychain"
 
 		dnl Check for the various security headers...
 		AC_CHECK_HEADER(Security/SecureTransportPriv.h,
@@ -59,14 +49,18 @@ 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_CSSMERRORSTRING)
+		AC_DEFINE(HAVE_SECKEYCHAINOPEN)])
+
+		if test $host_os_version -ge 150; then
+			AC_DEFINE(HAVE_SSLSETENABLEDCIPHERS)
+		fi
 	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_PROG(LIBGNUTLSCONFIG,libgnutls-config)
-    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
+    	AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
 	if $PKGCONFIG --exists gnutls; then
 	    have_ssl=1
 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
@@ -82,59 +76,15 @@ if test x$enable_ssl != xno; then
 	fi
 
 	if test $have_ssl = 1; then
-	    CUPS_SERVERCERT="ssl/server.crt"
-	    CUPS_SERVERKEY="ssl/server.key"
+	    CUPS_SERVERKEYCHAIN="ssl"
 
-            if $PKGCONFIG --exists gcrypt; then
-	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
-	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
-	    elif test "x$LIBGCRYPTCONFIG" != x; then
-	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
-	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
-	    fi
-	fi
-    fi
-
-    dnl Check for the OpenSSL library last...
-    if test $have_ssl = 0 -a "x$enable_openssl" != "xno"; then
-	AC_CHECK_HEADER(openssl/ssl.h,[
-	    dnl Save the current libraries so the crypto stuff isn't always
-	    dnl included...
 	    SAVELIBS="$LIBS"
-
-	    dnl Some ELF systems can't resolve all the symbols in libcrypto
-	    dnl if libcrypto was linked against RSAREF, and fail to link the
-	    dnl test program correctly, even though a correct installation
-	    dnl of OpenSSL exists.  So we test the linking three times in
-	    dnl case the RSAREF libraries are needed.
-
-	    for libcrypto in \
-		"-lcrypto" \
-		"-lcrypto -lrsaref" \
-		"-lcrypto -lRSAglue -lrsaref"
-	    do
-		AC_CHECK_LIB(ssl,SSL_new,
-		    [have_ssl=1
-		     SSLFLAGS="-DOPENSSL_DISABLE_OLD_DES_SUPPORT"
-		     SSLLIBS="-lssl $libcrypto"
-		     AC_DEFINE(HAVE_SSL)
-		     AC_DEFINE(HAVE_LIBSSL)],,
-		    $libcrypto)
-
-		if test "x${SSLLIBS}" != "x"; then
-		    break
-		fi
-	    done
-
-	    if test "x${SSLLIBS}" != "x"; then
-		CUPS_SERVERCERT="ssl/server.crt"
-		CUPS_SERVERKEY="ssl/server.key"
-
-		LIBS="$SAVELIBS $SSLLIBS"
-		AC_CHECK_FUNCS(SSL_set_tlsext_host_name)
-	    fi
-
-	    LIBS="$SAVELIBS"])
+	    LIBS="$LIBS $SSLLIBS"
+	    AC_CHECK_FUNC(gnutls_fips140_set_mode, AC_DEFINE(HAVE_GNUTLS_FIPS140_SET_MODE))
+	    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"
+	fi
     fi
 fi
 
@@ -143,19 +93,14 @@ 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 -o x$enable_openssl = xyes; then
+elif test x$enable_cdsa = xyes -o x$enable_gnutls = xyes; then
     AC_MSG_ERROR([Unable to enable SSL support.])
 fi
 
-AC_SUBST(CUPS_SERVERCERT)
-AC_SUBST(CUPS_SERVERKEY)
+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 7241 2008-01-22 22:34:52Z mike $".
-dnl

config-scripts/cups-startup.m4

@@ -0,0 +1,187 @@
+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

config-scripts/cups-threads.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $"
+dnl Threading stuff for CUPS.
 dnl
-dnl   Threading stuff for CUPS.
+dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(threads, [  --disable-threads       disable multi-threading support])
@@ -38,7 +36,7 @@ if test "x$enable_threads" != xno; then
 
 				# Solaris requires -D_POSIX_PTHREAD_SEMANTICS to
 				# be POSIX-compliant... :(
-				if test $uname = SunOS; then
+				if test $host_os_name = sunos; then
 					PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
 				fi
 				break
@@ -48,7 +46,3 @@ if test "x$enable_threads" != xno; then
 fi
 
 AC_SUBST(PTHREAD_FLAGS)
-
-dnl
-dnl End of "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config.h.in

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
+ * Configuration file for CUPS.
  *
- *   Configuration file for CUPS.
+ * Copyright 2007-2017 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2013 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_CONFIG_H_
@@ -93,7 +91,7 @@
  * Default MaxCopies value...
  */
 
-#define CUPS_DEFAULT_MAX_COPIES	100
+#define CUPS_DEFAULT_MAX_COPIES	9999
 
 
 /*
@@ -131,6 +129,13 @@
 #define CUPS_STATEDIR	"/var/run/cups"
 
 
+/*
+ * Do we have posix_spawn?
+ */
+
+#undef HAVE_POSIX_SPAWN
+
+
 /*
  * Do we have ZLIB?
  */
@@ -143,10 +148,7 @@
  * 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
@@ -238,6 +240,13 @@
 #undef HAVE_VSYSLOG
 
 
+/*
+ * Do we have the systemd journal functions?
+ */
+
+#undef HAVE_SYSTEMD_SD_JOURNAL_H
+
+
 /*
  * Do we have the (v)snprintf() functions?
  */
@@ -290,15 +299,29 @@
 
 #undef HAVE_CDSASSL
 #undef HAVE_GNUTLS
-#undef HAVE_LIBSSL
+#undef HAVE_SSPISSL
 #undef HAVE_SSL
 
 
 /*
- * Do we have the SSL_set_tlsext_host_name function?
+ * Do we have the gnutls_fips140_set_mode function?
  */
 
-#undef HAVE_SSL_SET_TLSEXT_HOST_NAME
+#undef HAVE_GNUTLS_FIPS140_SET_MODE
+
+
+/*
+ * 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
 
 
 /*
@@ -323,6 +346,27 @@
 #undef HAVE_CSSMERRORSTRING
 
 
+/*
+ * Do we have the SecGenerateSelfSignedCertificate function?
+ */
+
+#undef HAVE_SECGENERATESELFSIGNEDCERTIFICATE
+
+
+/*
+ * Do we have the SecKeychainOpen function?
+ */
+
+#undef HAVE_SECKEYCHAINOPEN
+
+
+/*
+ * Do we have (a working) SSLSetEnabledCiphers function?
+ */
+
+#undef HAVE_SSLSETENABLEDCIPHERS
+
+
 /*
  * Do we have libpaper?
  */
@@ -428,13 +472,6 @@
 #undef HAVE_STRUCT_SOCKADDR_SA_LEN
 
 
-/*
- * Do we have the AIX usersec.h header file?
- */
-
-#undef HAVE_USERSEC_H
-
-
 /*
  * Do we have pthread support?
  */
@@ -442,6 +479,13 @@
 #undef HAVE_PTHREAD_H
 
 
+/*
+ * Do we have on-demand support (launchd/systemd/upstart)?
+ */
+
+#undef HAVE_ONDEMAND
+
+
 /*
  * Do we have launchd support?
  */
@@ -450,6 +494,20 @@
 #undef HAVE_LAUNCHD
 
 
+/*
+ * Do we have systemd support?
+ */
+
+#undef HAVE_SYSTEMD
+
+
+/*
+ * Do we have upstart support?
+ */
+
+#undef HAVE_UPSTART
+
+
 /*
  * Various scripting languages...
  */
@@ -464,24 +522,6 @@
 #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 CoreFoundation public and private headers?
  */
@@ -506,7 +546,14 @@
 
 
 /*
- * Do we have OS X 10.4's mbr_XXX functions?
+ * Do we have the getgrouplist() function?
+ */
+
+#undef HAVE_GETGROUPLIST
+
+
+/*
+ * Do we have macOS 10.4's mbr_XXX functions?
  */
 
 #undef HAVE_MEMBERSHIP_H
@@ -522,19 +569,13 @@
 #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
 
 
 /*
@@ -611,7 +652,7 @@
 
 #ifdef HAVE_ARC4RANDOM
 #  define CUPS_RAND() arc4random()
-#  define CUPS_SRAND(v) arc4random_stir()
+#  define CUPS_SRAND(v)
 #elif defined(HAVE_RANDOM)
 #  define CUPS_RAND() random()
 #  define CUPS_SRAND(v) srandom(v)
@@ -624,13 +665,6 @@
 #endif /* HAVE_ARC4RANDOM */
 
 
-/*
- * Do we have vproc_transaction_begin/end?
- */
-
-#undef HAVE_VPROC_TRANSACTION_BEGIN
-
-
 /*
  * Do we have libusb?
  */
@@ -665,7 +699,7 @@
 
 
 /*
- * Location of OS X localization bundle, if any.
+ * Location of macOS localization bundle, if any.
  */
 
 #undef CUPS_BUNDLEDIR
@@ -704,7 +738,3 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !HAVE_ABS && !abs */
 
 #endif /* !_CUPS_CONFIG_H_ */
-
-/*
- * End of "$Id$".
- */

configure.ac

@@ -1,19 +1,21 @@
 dnl
-dnl "$Id$"
+dnl Configuration script for CUPS.
 dnl
-dnl   Configuration script for CUPS.
+dnl Copyright 2007-2019 by Apple Inc.
+dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
-AC_INIT(cups/cups.h)
+dnl We need at least autoconf 2.60...
+AC_PREREQ(2.60)
+
+dnl Package name and version...
+AC_INIT([CUPS], [2.2.13], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
@@ -32,7 +34,7 @@ sinclude(config-scripts/cups-ssl.m4)
 sinclude(config-scripts/cups-pam.m4)
 sinclude(config-scripts/cups-largefile.m4)
 sinclude(config-scripts/cups-dnssd.m4)
-sinclude(config-scripts/cups-launchd.m4)
+sinclude(config-scripts/cups-startup.m4)
 sinclude(config-scripts/cups-defaults.m4)
 sinclude(config-scripts/cups-scripting.m4)
 
@@ -66,14 +68,9 @@ AC_OUTPUT(Makedefs
 	  conf/pam.std
 	  conf/snmp.conf
 	  cups-config
-	  data/testprint
 	  desktop/cups.desktop
-	  doc/help/ref-cups-files-conf.html
-	  doc/help/ref-cupsd-conf.html
 	  doc/index.html
 	  man/client.conf.man
-	  man/cups-deviced.man
-	  man/cups-driverd.man
 	  man/cups-files.conf.man
 	  man/cups-lpd.man
 	  man/cups-snmp.man
@@ -85,12 +82,12 @@ AC_OUTPUT(Makedefs
 	  scheduler/cups.sh
 	  scheduler/cups.xml
 	  scheduler/org.cups.cups-lpd.plist
+	  scheduler/org.cups.cups-lpdAT.service
+	  scheduler/org.cups.cupsd.path
+	  scheduler/org.cups.cupsd.service
+	  scheduler/org.cups.cupsd.socket
  	  templates/header.tmpl
           packaging/cups.list
 	  $LANGFILES)
 
 chmod +x cups-config
-
-dnl
-dnl End of "$Id$".
-dnl