Bump version.

Fix test suite with dylibs.

.gitattributes

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

.gitignore

@@ -1,16 +1,14 @@
+*.a
+*.bck
+*.gz
+*.o
+.buildrev
 autom4te.cache
 config.h
 config.log
 config.status
 cups-config
 Makedefs
-*.a
-*.cgi
-*.dylib
-*.gz
-*.o
-*.so
-*.so.*
 backend/dnssd
 backend/http
 backend/ipp
@@ -26,6 +24,11 @@ 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
@@ -35,15 +38,21 @@ 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
@@ -55,8 +64,13 @@ 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
@@ -64,6 +78,7 @@ filter/rastertohp
 filter/rastertolabel
 filter/rastertopwg
 filter/test.raster
+filter/testclient
 filter/testraster
 locale/checkpo
 locale/po2strings
@@ -79,10 +94,13 @@ 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/
@@ -133,10 +151,17 @@ systemv/lpoptions
 systemv/lpstat
 systemv/reject
 templates/header.tmpl
+templates/*/header.tmpl
 test/cups-str-*.html
-test/error_log-*
+test/*_log-*
 test/ippfind
 test/ippfind-static
 test/ippserver
+test/ippserver-shared
 test/ipptool
-test/ipptool-static
+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-2.1.txt

@@ -3,28 +3,39 @@ CHANGES-2.1.txt
 
 CHANGES IN CUPS V2.1.4
 
-	- Documentation update (STR #4772)
+	- 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
-	  (STR #4750)
+	  (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
-	  (STR #4754)
+	  (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 (STR #4752)
+	  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 (STR #4755)
-	- Localization fix (STR #4756)
+	  when the web interface was disabled (Issue #4755)
+	- Localization fix (Issue #4756)
 
 
 CHANGES IN CUPS V2.1.2
@@ -46,56 +57,56 @@ CHANGES IN CUPS V2.1.1
 	  <rdar://problem/23135122>, <rdar://problem/23135207>,
 	  <rdar://problem/23144290>, <rdar://problem/23144358>,
 	  <rdar://problem/23144461>)
-	- The cupsGetPPD* functions did not work with IPP printers (STR #4725)
+	- 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 (STR #4549)
+	  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
-	  (STR #4707)
+	  (Issue #4707)
 	- Current Primera printers were incorrectly reported as Fargo printers
-	  (STR #4708)
+	  (Issue #4708)
 	- The IPP backend did not always handle jobs getting canceled at the
 	  printer (<rdar://problem/22716820>)
-	- Scheduler logging change (STR #4728)
-	- Added USB quirk for Canon MP530 (STR #4730)
+	- 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 (STR #4733)
+	  classes (Issue #4733)
 	- Changing the printer-is-shared value for a remote queue did not
-	  produce an error (STR #4738)
+	  produce an error (Issue #4738)
 	- The IPP backend incorrectly included the job-password attribute in
 	  Validate-Job requests (<rdar://problem/23531939>)
-	- Updated localizations (STR #4709)
+	- Updated localizations (Issue #4709)
 
 
 CHANGES IN CUPS V2.1.0
 
-	- Fixed more scheduler crash bugs in the new logging code (STR #4687,
-	  STR #4690)
+	- 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 (STR #4703)
+	  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 (STR #4684)
-	- The new PDF file type rule did not work (STR #4692)
+	  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 (STR #4706)
-	- Fixed some configure script issues (STR #4694, STR #4695, STR #4698)
-	- Documentation updates (STR #4691, STR #4693)
+	  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 (STR #4655, STR #4658,
-	  STR #4661)
-	- Fixed domain socket support on Linux (STR #4679)
-	- Fixed signal handlers in the dnssd and usb backends (STR #4671)
+	- 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 (STR #4659)
-	- Configure script changes for systemd support (STR #4669)
-	- Updated autoconf sources to use newer form of AC_INIT (STR #4664)
+	  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
@@ -110,30 +121,30 @@ CHANGES IN CUPS V2.1b1
 	- The IPP backend now updates the cupsMandatory values when the printer
 	  configuration changes (<rdar://problem/18126570>)
 	- No longer install banner files since third-party banner filters now
-	  supply their own (STR #4518)
+	  supply their own (Issue #4518)
 	- Added support for EXPECT-ALL directive in ipptool test files
-	  (STR #4469)
+	  (Issue #4469)
 	- Added support for WITH-VALUE-FROM predicate in ipptool test files
-	  (STR #4470)
+	  (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 (STR #4258)
+	- 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
-	  (STR #4589)
+	  (Issue #4589)
 	- The scheduler now validates ErrorPolicy values in config files
-	  (STR #4591)
-	- Long cookies caused the web interface to stop working (STR #4619)
+	  (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
-	  (STR #4630)
+	  (Issue #4630)
 	- The scheduler now supports advanced ASL and journald logging when
-	  "syslog" output is configured (STR #4474)
+	  "syslog" output is configured (Issue #4474)
 	- The scheduler now supports logging to stderr when running in the
-	  foreground (STR #4505)
+	  foreground (Issue #4505)
 

CHANGES-IPPTOOL.txt

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

CHANGES.md

@@ -0,0 +1,420 @@
+CHANGES - 2.2.10 - 2018-12-07
+=============================
+
+
+Changes in CUPS v2.2.10
+-----------------------
+
+- CVE-2018-4700: 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,22 +0,0 @@
-CHANGES.txt - 2.2b1 - 2016-03-10
---------------------------------
-
-CHANGES IN CUPS V2.2b1
-
-	- 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 OS X
-	  (<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>)

CONTRIBUTING.md

@@ -1,5 +1,4 @@
-CONTRIBUTING.txt - 2016/01/28
------------------------------
+# 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
@@ -12,10 +11,11 @@ Apple using the Apple Contributor Agreement:
 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.
+should be provided as-is or in an archive.  Github pull requests can also be
+used to submit changes.
 
 
-HOW TO CONTACT THE DEVELOPERS
+## 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
@@ -24,7 +24,7 @@ CUPS usage questions and new software announcements while the "cups-devel"
 mailing list provides a forum for CUPS developers and monitoring new bugs.
 
 
-INTERFACES
+## INTERFACES
 
 CUPS interfaces, including the C APIs and command-line arguments, environment
 variables, configuration files, and output format, are stable across patch
@@ -47,7 +47,7 @@ published C API to access data stored in a file to avoid compatibility problems
 in the future.
 
 
-BUILD SYSTEM
+## 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
@@ -62,7 +62,7 @@ specific extensions, and GNU libtool is not portable or reliable enough for
 CUPS.
 
 
-VERSION NUMBERING
+## 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
@@ -71,13 +71,13 @@ 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.
+> 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:
 
@@ -113,14 +113,14 @@ minor version numbers followed by the release candidate number:
     2.2rc1
 
 
-CODING GUIDELINES
+## 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
+### 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
@@ -128,10 +128,10 @@ 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, OS X, UNIX, and Windows.
+> 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:
@@ -154,7 +154,7 @@ the following additional comment appears after the contact information:
      * This file is subject to the Apple OS-Developed Software exception.
 
 
-HEADER FILES
+### 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
@@ -170,7 +170,7 @@ Typically a private API header file will include the corresponding public API
 header file.
 
 
-COMMENTS
+### COMMENTS
 
 All source code utilizes block comments within functions to describe the
 operations being performed by a group of statements; avoid putting a comment
@@ -201,27 +201,26 @@ comments ("// comment"):
      } while (i == (sizeof(array) / sizeof(array[0])));
 
 
-INDENTATION
+### 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);
+      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
@@ -240,28 +239,28 @@ spaces after each "case" and "default" case:
     }
 
 
-SPACING
+### 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
+### RETURN VALUES
 
 Parenthesis surround values returned from a function:
 
     return (CUPS_STATE_IDLE);
 
 
-FUNCTIONS
+### 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.
+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.
+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
@@ -295,16 +294,16 @@ text in the function description comment:
                            function name with an underscore)
 
 
-VARIABLES
+### 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
+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
+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.
 
@@ -315,26 +314,26 @@ comment block describing the variable:
     static int  that_variable;   /* The current state of that */
 
 
-TYPES
+### 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.
+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.
+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
+### 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.
+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.
+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:
@@ -346,12 +345,12 @@ is documented similar to the variable naming policy above:
     };
 
 
-CONSTANTS
+### CONSTANTS
 
 All constant names are uppercase with underscores between words, e.g.,
-"CUPS_THIS_CONSTANT", "CUPS_THAT_CONSTANT", etc.  Constants begin with an
+"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",
+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
@@ -366,14 +365,14 @@ Comment blocks immediately follow each constant:
     } cups_tray_t;
 
 
-MAKEFILE GUIDELINES
+## 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
+### 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
@@ -381,7 +380,7 @@ 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
+### MAKEFILE DOCUMENTATION
 
 Each makefile starts with the standard CUPS header containing the description
 of the file, and CUPS copyright and license notice:
@@ -399,7 +398,7 @@ of the file, and CUPS copyright and license notice:
     #
 
 
-PORTABLE MAKEFILE CONSTRUCTION
+### 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
@@ -410,22 +409,22 @@ is a list of assumptions we follow when constructing makefiles:
   the target, e.g.:
 
       target:
-      <tab> target commands
+      TAB target commands
 
 - Dependencies; we assume that the make program supports recursive dependencies
   on targets, e.g.:
 
       target: foo bar
-      <tab> target commands
+      TAB target commands
 
       foo: bla
-      <tab> foo commands
+      TAB foo commands
 
       bar:
-      <tab> bar commands
+      TAB bar commands
 
       bla:
-      <tab> bla commands
+      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:
@@ -449,7 +448,7 @@ is a list of assumptions we follow when constructing makefiles:
 
       .SUFFIXES: .c .o
       .c.o:
-      <tab> $(CC) $(CFLAGS) -o $@ -c $<
+      TAB $(CC) $(CFLAGS) -o $@ -c $<
 
 - Include Files; we assume that the make program supports the include
   directive, e.g.:
@@ -470,7 +469,7 @@ is a list of assumptions we follow when constructing makefiles:
 - Shell; we assume a POSIX-compatible shell is present on the build system.
 
 
-STANDARD VARIABLES
+### STANDARD VARIABLES
 
 The following variables are defined in the "Makedefs" file generated by the
 autoconf software:
@@ -523,7 +522,7 @@ autoconf software:
 - srcdir; the source directory.
 
 
-STANDARD TARGETS
+### STANDARD TARGETS
 
 The following standard targets are defined in each makefile:
 
@@ -548,58 +547,58 @@ The following standard targets are defined in each makefile:
   (also see "INSTALL/UNINSTALL SUPPORT").
 
 
-OBJECT FILES
+### OBJECT FILES
 
 Object files (the result of compiling a C or C++ source file) have the
 extension ".o".
 
 
-PROGRAMS
+### 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)
+    TAB echo Linking $@...
+    TAB $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
-STATIC LIBRARIES
+### 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) $@
+    TAB echo Creating $@...
+    TAB $(RM) $@
+    TAB $(AR) $(ARFLAGS) $@ $(OBJECTS)
+    TAB $(RANLIB) $@
 
-SHARED LIBRARIES
+### 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
+    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
+    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
+### DEPENDENCIES
 
 Static dependencies are expressed in each makefile following the target, for
 example:
@@ -612,21 +611,21 @@ generate them.  Automatic dependencies are stored in a file named
 target rule is used to create the automatic dependencies:
 
     depend:
-    <tab> $(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies
+    TAB $(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies
 
-We regenerate the automatic dependencies on an OS X system and express any
-non-OS X dependencies statically in the makefile.
+We regenerate the automatic dependencies on an macOS system and express any
+non-macOS dependencies statically in the makefile.
 
 
-INSTALL/UNINSTALL SUPPORT
+### 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
+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.
 

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.10 - 2018-12-07
+===================================
+
+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,213 +0,0 @@
-INSTALL - CUPS v2.2b1 - 2015-09-14
-----------------------------------
-
-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.
-
-    On OS X, use the "--with-archflags" option to build with the correct set of
-    architectures:
-
-        ./configure --with-archflags="-arch i386 -arch x86_64" ...
-
-    Once you have configured things, just type:
-
-	make ENTER
-
-    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:
-
-	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
-	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.
-
-
-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-2013 by Apple Inc.
+		      Copyright 2007-2016 by Apple Inc.
 			     1 Infinite Loop
 			  Cupertino, CA 95014 USA
 
@@ -70,8 +70,8 @@ the following special exception:
 	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

Makedefs.in

@@ -1,34 +1,42 @@
 #
-# "$Id$"
-#
 # Common makefile definitions for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2018 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/".
+# missing or damaged, see the license at "http://www.cups.org/".
 #
 
+#
+# CUPS version...
+#
+
+CUPS_VERSION    =       @CUPS_VERSION@
+
+
 #
 # Programs...
 #
 
 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@
 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...
 #
@@ -143,7 +163,7 @@ IPPFIND_MAN	=	@IPPFIND_MAN@
 LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
 			-L../scheduler @LDARCHFLAGS@ \
 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
+LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
 LIBS		=	$(LINKCUPS) $(COMMONLIBS)
 ONDEMANDFLAGS	=	@ONDEMANDFLAGS@
@@ -261,8 +281,3 @@ USBQUIRKS	=	@USBQUIRKS@
 	echo -n Compressing $<...
 	$(RM) $@
 	gzip -v9 <$< >$@
-
-
-#
-# End of "$Id$"
-#

Makefile

@@ -1,16 +1,14 @@
 #
-# "$Id$"
-#
 # Top-level Makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2018 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/".
+# missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include Makedefs
@@ -268,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...
@@ -322,22 +288,15 @@ sloc:
 
 EPMFLAGS	=	-v --output-dir dist $(EPMARCH)
 
-bsd deb pkg slackware:
+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
@@ -348,8 +307,3 @@ dist:	all
 #
 
 .NOTPARALLEL:
-
-
-#
-# End of "$Id$".
-#

README.md

@@ -0,0 +1,160 @@
+README - CUPS v2.2.10 - 2018-12-07
+==================================
+
+Looking for compile instructions?  Read the file `INSTALL.md` instead...
+
+
+INTRODUCTION
+------------
+
+
+CUPS is a standards-based, open source printing system developed by Apple Inc.
+for macOS® and other UNIX®-like operating systems.  CUPS uses the Internet
+Printing Protocol ("IPP") and provides System V and Berkeley command-line
+interfaces, a web interface, and a C API to manage printers and print jobs.  It
+supports printing to both local (parallel, serial, USB) and networked printers,
+and printers can be shared from one computer to another, even over the Internet!
+
+Internally, CUPS uses PostScript Printer Description ("PPD") files to describe
+printer capabilities and features and a wide variety of generic and device-
+specific programs to convert and print many types of files.  Sample drivers are
+included with CUPS to support many Dymo, EPSON, HP, Intellitech, OKIDATA, and
+Zebra printers.  Many more drivers are available online and (in some cases) on
+the driver CD-ROM that came with your printer.
+
+CUPS is licensed under the GNU General Public License and GNU Library General
+Public License versions 2.  See the file "LICENSE.txt" for more information.
+
+
+READING THE DOCUMENTATION
+-------------------------
+
+Once you have installed the software you can access the documentation (and a
+bunch of other stuff) online at <http://localhost:631/>.
+
+If you're having trouble getting that far, the documentation is located under
+the `doc/help` and `man` directories.
+
+Please read the documentation before asking questions.
+
+
+GETTING SUPPORT AND OTHER RESOURCES
+-----------------------------------
+
+If you have problems, *read the documentation first!*  We also provide two
+mailing lists which are available at <https://lists.cups.org/mailman/listinfo>.
+
+See the CUPS web site at <https://www.cups.org/> for other resources.
+
+
+SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
+------------------------------------------------
+
+CUPS includes a web-based administration tool that allows you to manage
+printers, classes, and jobs on your server.  Open <http://localhost:631/admin/>
+in your browser to access the printer administration tools:
+
+*Do not* use the hostname for your machine - it will not work with the default
+CUPS configuration.  To enable administration access on other addresses, check
+the `Allow Remote Administration` box and click on the `Change Settings button.
+
+You will be asked for the administration password (root or any other user in the
+sys/system/root/admin/lpadmin group on your system) when performing any
+administrative function.
+
+
+SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
+-----------------------------------------------
+
+CUPS currently uses PPD (PostScript Printer Description) files that describe
+printer capabilities and driver programs needed for each printer.  The
+`everywhere` PPD is used for nearly all modern networks printers sold since
+about 2009.  For example, the following command creates a print queue for a
+printer at address 11.22.33.44:
+
+    lpadmin -p printername -E -v ipp://11.22.33.44/ipp/print -m everywhere
+
+CUPS also includes several sample PPD files you can use for "legacy" printers:
+
+    Driver                         PPD Name
+    -----------------------------  ------------------------------
+    Dymo Label Printers            drv:///sample.drv/dymo.ppd
+    Intellitech Intellibar         drv:///sample.drv/intelbar.ppd
+    EPSON 9-pin Series             drv:///sample.drv/epson9.ppd
+    EPSON 24-pin Series            drv:///sample.drv/epson24.ppd
+    Generic PCL Laser Printer      drv:///sample.drv/generpcl.ppd
+    Generic PostScript Printer     drv:///sample.drv/generic.ppd
+    HP DeskJet Series              drv:///sample.drv/deskjet.ppd
+    HP LaserJet Series             drv:///sample.drv/laserjet.ppd
+    OKIDATA 9-Pin Series           drv:///sample.drv/okidata9.ppd
+    OKIDATA 24-Pin Series          drv:///sample.drv/okidat24.ppd
+    Zebra CPCL Label Printer       drv:///sample.drv/zebracpl.ppd
+    Zebra EPL1 Label Printer       drv:///sample.drv/zebraep1.ppd
+    Zebra EPL2 Label Printer       drv:///sample.drv/zebraep2.ppd
+    Zebra ZPL Label Printer        drv:///sample.drv/zebra.ppd
+
+You can run the `lpinfo -m` command to list all of the available drivers:
+
+    lpinfo -m
+
+Run the `lpinfo -v` command to list the available printers:
+
+    lpinfo -v
+
+Then use the correct URI to add the printer using the `lpadmin` command:
+
+    lpadmin -p printername -E -v device-uri -m ppd-name
+
+Current network printers typically use `ipp` or `ipps` URIS:
+
+    lpadmin -p printername -E -v ipp://11.22.33.44/ipp/print -m everywhere
+    lpadmin -p printername -E -v ipps://11.22.33.44/ipp/print -m everywhere
+
+Older network printers typically use `socket` or `lpd` URIs:
+
+    lpadmin -p printername -E -v socket://11.22.33.44 -m ppd-name
+    lpadmin -p printername -E -v lpd://11.22.33.44/ -m ppd-name
+
+The sample drivers provide basic printing capabilities, but generally do not
+exercise the full potential of the printers or CUPS.  Other drivers provide
+greater printing capabilities.
+
+
+PRINTING FILES
+--------------
+
+CUPS provides both the System V `lp` and Berkeley `lpr` commands for printing:
+
+    lp filename
+    lpr filename
+
+Both the `lp` and `lpr` commands support printing options for the driver:
+
+    lp -o media=A4 -o resolution=600dpi filename
+    lpr -o media=A4 -o resolution=600dpi filename
+
+CUPS recognizes many types of images files as well as PDF, PostScript, and text
+files, so you can print those files directly rather than through an application.
+
+If you have an application that generates output specifically for your printer
+then you need to use the `-oraw` or `-l` options:
+
+    lp -o raw filename
+    lpr -l filename
+
+This will prevent the filters from misinterpreting your print file.
+
+
+LEGAL STUFF
+-----------
+
+CUPS is copyright © 2007-2018 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,152 +0,0 @@
-README - CUPS v2.2b1 - 2015-09-14
----------------------------------
-
-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 two
-    mailing lists which are available at:
-
-	http://www.cups.org/lists.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 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.
-
-
-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-2015 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.

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-2014 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
@@ -26,7 +24,7 @@ include ../Makedefs
 # 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 \
@@ -88,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
 
 
 #
@@ -209,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)
 
 
@@ -219,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)
 
 
@@ -229,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)
 
@@ -251,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; \
@@ -264,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
 
@@ -275,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)" $@
 
 
 #
@@ -284,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)" $@
 
 
 #
@@ -293,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)" $@
 
 
 #
@@ -302,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
 
 
@@ -312,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,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Backend support definitions for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -314,6 +312,7 @@ extern int		backendGetDeviceID(int fd, char *device_id,
 extern int		backendGetMakeModel(const char *device_id,
 			                    char *make_model,
 				            size_t make_model_size);
+extern http_addrlist_t	*backendLookup(const char *hostname, int port, int *cancel);
 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,9 +1,7 @@
 /*
- * "$Id$"
- *
  * DNS-SD discovery backend for CUPS.
  *
- * Copyright 2008-2015 by Apple Inc.
+ * Copyright 2008-2018 by Apple Inc.
  *
  * These coded instructions, statements, and computer programs are the
  * property of Apple Inc. and are protected by Federal copyright
@@ -96,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,
@@ -105,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,
@@ -123,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) __attribute__((noreturn));
+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,
@@ -138,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,
@@ -155,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));
 
 
 /*
@@ -951,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 */
@@ -1190,9 +1188,9 @@ 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)
     {
      /*
@@ -1202,7 +1200,7 @@ query_callback(
       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);
     }
   }
@@ -1259,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
@@ -1315,8 +1320,3 @@ unquote(char       *dst,		/* I - Destination buffer */
 
   *dst = '\0';
 }
-
-
-/*
- * End of "$Id$".
- */

backend/ieee1284.c

@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * IEEE-1284 support functions for CUPS.
  *
  * Copyright 2007-2015 by Apple Inc.
@@ -90,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.
@@ -473,8 +471,3 @@ backendGetMakeModel(
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/lpd.c

@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Line Printer Daemon backend for CUPS.
  *
  * Copyright 2007-2016 by Apple Inc.
@@ -26,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>
@@ -113,7 +111,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 */
@@ -413,23 +410,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);
@@ -638,11 +623,11 @@ cups_rresvport(int *port,		/* IO - Port number to bind to */
   * -1...
   */
 
-#ifdef WIN32
+#ifdef _WIN32
   closesocket(fd);
 #else
   close(fd);
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
   return (-1);
 }
@@ -750,11 +735,11 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
   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 */
 
 
  /*
@@ -882,8 +867,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)
 	{
@@ -901,13 +885,13 @@ 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;
@@ -938,7 +922,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));
@@ -949,7 +933,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."));
@@ -1313,8 +1297,3 @@ sigterm_handler(int sig)		/* I - Signal */
 
   abort_job = 1;
 }
-
-
-/*
- * End of "$Id$".
- */

backend/network.c

@@ -1,9 +1,7 @@
 /*
- * "$Id$"
- *
  * Common backend network APIs for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -28,7 +26,6 @@
  * 'backendCheckSideChannel()' - Check the side-channel for pending requests.
  */
 
-
 void
 backendCheckSideChannel(
     int         snmp_fd,		/* I - SNMP socket */
@@ -48,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.
  */
@@ -301,8 +357,3 @@ backendNetworkSideCB(
 
   return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
 }
-
-
-/*
- * End of "$Id$".
- */

backend/org.cups.usb-quirks

@@ -8,10 +8,17 @@
 #   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
@@ -52,67 +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-1250 Laser Printer, https://bugs.debian.org/712512
+# 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
+# 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
@@ -121,13 +131,16 @@
 # 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
+# Samsung ML-2160 Series (https://bugzilla.redhat.com/show_bug.cgi?id=873123)
+0x04e8 0x330f unidir
+
+# All Zebra devices (https://bugs.launchpad.net/bugs/1001028)
 0x0a5f unidir
 
 # Canon CP-10
@@ -217,27 +230,66 @@
 # Lexmark E238 (<rdar://problem/14493054>)
 0x043d 0x00d7 no-reattach
 
-# Lexmark E238 (STR #4448)
+# Lexmark E238 (Issue #4448)
 0x043d 0x009a no-reattach
 
-# Canon MX310 (STR #4482)
+# Canon MX310 (Issue #4482)
 0x04a9 0x1728 unidir
 
-# Canon MX320 (STR #4482)
+# Canon MX320 (Issue #4482)
 0x04A9 0x1736 unidir
 
-# All Intermec devices (STR #4553)
+# All Intermec devices (Issue #4553)
 0x067e no-reattach
 
-# HP LaserJet 1150 (STR #4549)
+# HP LaserJet 1150 (Issue #4549)
 0x03f0 0x0f17 delay-close
 
-# HP LaserJet 1300 (STR #4549)
+# HP LaserJet 1300 (Issue #4549)
 0x03f0 0x1017 delay-close
 0x03f0 0x1117 delay-close
 
-# HP LaserJet 1320 (STR #4549)
+# 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
+
+# Zebra ZD420 (Issue #5395)
+0x0a5f 0x0120 unidir no-reattach

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,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Common run loop APIs for CUPS backends.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -79,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."));
@@ -307,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",
@@ -525,8 +523,3 @@ backendWaitLoop(
 
   return (1);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/snmp-supplies.c

@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * SNMP supplies functions for CUPS.
  *
  * Copyright 2008-2015 by Apple Inc.
@@ -1096,8 +1094,3 @@ utf16_to_utf8(
 
   cupsUTF32ToUTF8(dst, temp, (int)dstsize);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/snmp.c

@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * SNMP discovery backend for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -1361,8 +1359,3 @@ update_cache(snmp_cache_t *device,	/* I - Device */
 
   list_device(device);
 }
-
-
-/*
- * End of "$Id$".
- */

backend/socket.c

@@ -1,9 +1,7 @@
 /*
- * "$Id$"
- *
  * AppSocket backend for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2018 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -25,7 +23,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #  include <winsock.h>
 #else
 #  include <unistd.h>
@@ -34,7 +32,7 @@
 #  include <netinet/in.h>
 #  include <arpa/inet.h>
 #  include <netdb.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 
 /*
@@ -71,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) */
@@ -266,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...
@@ -349,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)
 	{
@@ -368,13 +348,13 @@ 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;
@@ -422,8 +402,10 @@ 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."));
@@ -431,7 +413,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
   fputs("STATE: +cups-waiting-for-job-completed\n", stderr);
 
-  if (waiteof)
+  if (waiteof && tbytes >= 0)
   {
    /*
     * Shutdown the socket and wait for the other end to finish...
@@ -468,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);
 }
 
 
@@ -514,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,9 +1,7 @@
 /*
- * "$Id$"
- *
  * Backend test program for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2018 by Apple Inc.
  * Copyright 1997-2005 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -40,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);
 
@@ -677,8 +675,3 @@ walk_cb(const char *oid,		/* I - OID */
 
   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-darwin.c

@@ -1,7 +1,5 @@
 /*
- * "$Id$"
- *
- * Copyright 2005-2015 Apple Inc. All rights reserved.
+ * Copyright 2005-2016 Apple Inc. All rights reserved.
  *
  * IMPORTANT:  This Apple software is supplied to you by Apple Computer,
  * Inc. ("Apple") in consideration of your agreement to the following
@@ -204,7 +202,7 @@ typedef struct classdriver_s		/**** g.classdriver context ****/
 
 } classdriver_t;
 
-typedef Boolean (*iterator_callback_t)(void *refcon, io_service_t obj, CFStringRef deviceIDString, UInt32 deviceLocation, UInt8 interfaceNum, UInt8 alternateSetting);
+typedef Boolean (*iterator_callback_t)(io_service_t obj, printer_interface_t printerIntf, void *refcon);
 
 typedef struct iterator_reference_s	/**** Iterator reference data */
 {
@@ -233,6 +231,7 @@ typedef struct globals_s
   UInt32		location;
   UInt8			interfaceNum;
   UInt8			alternateSetting;
+  UInt8                 interfaceProtocol;
 
   CFRunLoopTimerRef 	status_timer;
 
@@ -266,8 +265,8 @@ int Iterating = 0;			/* Are we iterating the bus? */
  * Local functions...
  */
 
-static Boolean find_device_cb(void *refcon, io_service_t obj, CFStringRef deviceIDString, UInt32 deviceLocation, UInt8 interfaceNum, UInt8 alternateSetting);
-static Boolean list_device_cb(void *refcon, io_service_t obj, CFStringRef deviceIDString, UInt32 deviceLocation, UInt8 interfaceNum, UInt8 alternateSetting);
+static Boolean list_device_cb(io_service_t obj, printer_interface_t printerIntf, void *refcon);
+static Boolean find_device_cb(io_service_t obj, printer_interface_t printerIntf, void *refcon);
 
 static CFStringRef cfstr_create_trim(const char *cstr);
 static CFStringRef copy_value_for_key(CFStringRef deviceID, CFStringRef *keys);
@@ -286,16 +285,15 @@ static void parse_options(char *options, char *serial, int serial_size, UInt32 *
 static void setup_cfLanguage(void);
 static void soft_reset(void);
 static void status_timer_cb(CFRunLoopTimerRef timer, void *info);
-static void log_usb_class_driver(int is_64bit);
 #define IS_64BIT 1
 #define IS_NOT_64BIT 0
 
 #if defined(__i386__) || defined(__x86_64__)
 static pid_t	child_pid;		/* Child PID */
-static void run_legacy_backend(int argc, char *argv[], int fd) __attribute__((noreturn));	/* Starts child backend process running as a ppc executable */
+static void run_legacy_backend(int argc, char *argv[], int fd) _CUPS_NORETURN;	/* Starts child backend process running as a ppc executable */
 #endif /* __i386__ || __x86_64__ */
 static void sigterm_handler(int sig);	/* SIGTERM handler */
-static void sigquit_handler(int sig, siginfo_t *si, void *unused) __attribute__((noreturn));
+static void sigquit_handler(int sig, siginfo_t *si, void *unused) _CUPS_NORETURN;
 
 #ifdef PARSE_PS_ERRORS
 static const char *next_line (const char *buffer);
@@ -303,7 +301,7 @@ static void parse_pserror (char *sockBuffer, int len);
 #endif /* PARSE_PS_ERRORS */
 
 static printer_interface_t usb_printer_interface_interface(io_service_t usbClass);
-static IOUSBDeviceInterface **usb_device_interface_for_device(io_service_t usbDevice);
+
 static CFStringRef copy_printer_interface_deviceid(printer_interface_t printer, UInt8 alternateSetting);
 static CFStringRef copy_printer_interface_indexed_description(printer_interface_t  printer, UInt8 index, UInt16 language);
 static CFStringRef deviceIDCopyManufacturer(CFStringRef deviceID);
@@ -420,10 +418,17 @@ print_device(const char *uri,		/* I - Device URI */
       g.printer_obj = 0x0;
       g.classdriver = 0x0;
     }
-
     fprintf(stderr, "DEBUG: Looking for '%s %s'\n", hostname, resource);
 
-    iterate_printers(find_device_cb, NULL);
+    do
+    {
+      iterate_printers(find_device_cb, NULL);
+      if (g.printer_obj != 0x0)
+        break;
+
+      _cupsLangPrintFilter(stderr, "INFO", _("Waiting for printer to become available."));
+      sleep(5);
+    } while (true);
 
     fputs("DEBUG: Opening connection\n", stderr);
 
@@ -465,11 +470,6 @@ print_device(const char *uri,		/* I - Device URI */
       return (CUPS_BACKEND_STOP);
     }
 
-#ifdef __x86_64__
-    if (status == noErr && driverBundlePath != NULL && CFStringCompare(driverBundlePath, kUSBGenericTOPrinterClassDriver, 0) != kCFCompareEqualTo)
-      log_usb_class_driver(IS_64BIT);
-#endif /* __x86_64__ */
-
     if (driverBundlePath)
       CFRelease(driverBundlePath);
 
@@ -1118,257 +1118,234 @@ sidechannel_thread(void *reference)
 /*
  * 'iterate_printers()' - Iterate over all the printers.
  */
-
 static void iterate_printers(iterator_callback_t callBack, void *userdata)
 {
-    Iterating = 1;
+  Iterating = 1;
 
-    mach_port_t	masterPort = 0x0;
-    kern_return_t kr = IOMasterPort (bootstrap_port, &masterPort);
+  iterator_reference_t reference = { callBack, userdata, true };
 
-    if (kr == kIOReturnSuccess && masterPort != 0x0)
+  IONotificationPortRef addNotification = IONotificationPortCreate(kIOMasterPortDefault);
+
+  int printingClass = kUSBPrintingClass;
+  int printingSubclass = kUSBPrintingSubclass;
+
+  CFNumberRef interfaceClass = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &printingClass);
+  CFNumberRef interfaceSubClass = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &printingSubclass);
+
+  CFMutableDictionaryRef usbPrinterMatchDictionary = IOServiceMatching(kIOUSBInterfaceClassName);
+  CFDictionaryAddValue(usbPrinterMatchDictionary, CFSTR("bInterfaceClass"), interfaceClass);
+  CFDictionaryAddValue(usbPrinterMatchDictionary, CFSTR("bInterfaceSubClass"), interfaceSubClass);
+
+  CFRelease(interfaceClass);
+  CFRelease(interfaceSubClass);
+
+  io_iterator_t add_iterator = IO_OBJECT_NULL;
+  IOServiceAddMatchingNotification(addNotification, kIOMatchedNotification,
+                usbPrinterMatchDictionary, &device_added, &reference, &add_iterator);
+  if (add_iterator != IO_OBJECT_NULL)
+  {
+    device_added (&reference, add_iterator);
+    if (reference.keepRunning)
     {
-        iterator_reference_t reference = { callBack, userdata, true };
-
-        IONotificationPortRef addNotification = IONotificationPortCreate(masterPort);
-        io_iterator_t addIterator = IO_OBJECT_NULL;
-
-        kr = IOServiceAddMatchingNotification(addNotification, kIOFirstMatchNotification, IOServiceMatching(kIOUSBDeviceClassName),
-                                              &device_added, &reference, &addIterator);
-        if (kr == kIOReturnSuccess && addIterator != IO_OBJECT_NULL)
-        {
-            device_added(&reference, addIterator);
-            if (reference.keepRunning)
-            {
-                CFRunLoopAddSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(addNotification), kCFRunLoopDefaultMode);
-                CFRunLoopRun();
-            }
-            IOObjectRelease(addIterator);
-        }
-        mach_port_deallocate(mach_task_self(), masterPort);
+      CFRunLoopAddSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(addNotification), kCFRunLoopDefaultMode);
+      CFRunLoopRun();
     }
-
-    Iterating = 0;
+    IOObjectRelease(add_iterator);
+  }
+  Iterating = 0;
 }
 
 
 /*
  * 'device_added()' - Device added notifier.
  */
-#define IsPrintingInterface(c,s,p) ((c) == kUSBPrintingInterfaceClass && (s) == kUSBPrintingSubclass && (p) != kUSBPrintingProtocolIPP)
-
 static void device_added(void *userdata, io_iterator_t iterator)
 {
-    iterator_reference_t *reference = userdata;
-    io_service_t device;
+  iterator_reference_t *reference = userdata;
+  io_service_t intf;
 
-    while (reference->keepRunning && (device = IOIteratorNext(iterator)) != 0x0)
+  while (reference->keepRunning && (intf = IOIteratorNext(iterator)) != 0x0)
+  {
+    printer_interface_t printerIntf = usb_printer_interface_interface(intf);
+    if (printerIntf != NULL)
     {
-        UInt32 locationID = 0;
-        IOUSBDeviceInterface **devIntf = NULL;
-        io_iterator_t intfIterator = IO_OBJECT_NULL;
-        io_object_t intf = IO_OBJECT_NULL;
+      UInt8 intfClass = 0, intfSubClass = 0;
 
-        devIntf = usb_device_interface_for_device(device);
-        if (devIntf == NULL)
-            goto device_added_done;
-
-        UInt16 vendorUniqueID;
-        if ((*devIntf)->GetDeviceVendor(devIntf, &vendorUniqueID) != kIOReturnSuccess || vendorUniqueID == kAppleVendorID || vendorUniqueID == 0x0A5C)
-            goto device_added_done;
-
-        if ((*devIntf)->GetLocationID(devIntf, &locationID) != kIOReturnSuccess)
-            goto device_added_done;
-
-        IOUSBFindInterfaceRequest req = { kIOUSBFindInterfaceDontCare, kIOUSBFindInterfaceDontCare, kIOUSBFindInterfaceDontCare, kIOUSBFindInterfaceDontCare };
-        if ((*devIntf)->CreateInterfaceIterator(devIntf, &req, &intfIterator) != kIOReturnSuccess)
-            goto device_added_done;
-
-        while (reference->keepRunning && (intf = IOIteratorNext(intfIterator)))
-        {
-            printer_interface_t printerIntf = usb_printer_interface_interface(intf);
-            if (printerIntf != NULL)
-            {
-                UInt8 intfClass = 0, intfSubclass = 0, intfProtocol = 0, intfNumber = 0;
-
-                (*printerIntf)->GetInterfaceClass(printerIntf, &intfClass);
-                (*printerIntf)->GetInterfaceSubClass(printerIntf, &intfSubclass);
-                (*printerIntf)->GetInterfaceProtocol(printerIntf, &intfProtocol);
-                (*printerIntf)->GetInterfaceNumber(printerIntf, &intfNumber);
-
-                if (IsPrintingInterface(intfClass, intfSubclass, intfProtocol))
-                {
-                    CFStringRef deviceIDString = copy_printer_interface_deviceid(printerIntf, 0);
-                    if (deviceIDString != NULL)
-                    {
-                        reference->keepRunning = reference->callback(userdata, intf, deviceIDString, locationID, intfNumber, 0);
-                        CFRelease(deviceIDString);
-                    }
-                }
-
-                IOUSBInterfaceDescriptor *intfDesc = NULL;
-                while (reference->keepRunning && (intfDesc = (IOUSBInterfaceDescriptor *)(*printerIntf)->FindNextAssociatedDescriptor(printerIntf, intfDesc, kUSBInterfaceDesc)))
-                {
-                    intfClass = intfDesc->bInterfaceClass;
-                    intfSubclass = intfDesc->bInterfaceSubClass;
-                    intfProtocol = intfDesc->bInterfaceProtocol;
-
-                    if ((IsPrintingInterface(intfClass, intfSubclass, intfProtocol)))
-                    {
-                        CFStringRef deviceIDString = copy_printer_interface_deviceid(printerIntf, intfDesc->bAlternateSetting);
-                        if (deviceIDString != NULL)
-                        {
-                            reference->keepRunning = reference->callback(userdata, intf, deviceIDString, locationID, intfNumber, intfDesc->bAlternateSetting);
-                            CFRelease(deviceIDString);
-                        }
-                    }
-                }
-                (*printerIntf)->Release(printerIntf);
-            }
-            IOObjectRelease(intf);
-        }
-
-        device_added_done:
-            if (devIntf != NULL) (*devIntf)->Release(devIntf);
-            if (intfIterator != IO_OBJECT_NULL) IOObjectRelease(intfIterator);
-
-        IOObjectRelease(device);
+      (*printerIntf)->GetInterfaceClass(printerIntf, &intfClass);
+      (*printerIntf)->GetInterfaceSubClass(printerIntf, &intfSubClass);
+      if (intfClass == kUSBPrintingInterfaceClass && intfSubClass == kUSBPrintingSubclass)
+        reference->keepRunning = reference->callback(intf, printerIntf, userdata);
+        (*printerIntf)->Release(printerIntf);
+      }
+      IOObjectRelease(intf);
     }
 
-    /* One last call to the call back now that we are not longer have printers left to iterate...
-     */
     if (reference->keepRunning && reference->callback)
-        reference->keepRunning = reference->callback(reference->userdata, IO_OBJECT_NULL, NULL, 0, 0, 0);
+      reference->keepRunning = reference->callback(IO_OBJECT_NULL, NULL, reference->userdata);
 
     if (!reference->keepRunning)
-        CFRunLoopStop(CFRunLoopGetCurrent());
+      CFRunLoopStop(CFRunLoopGetCurrent());
 }
 
 /*
  * 'list_device_cb()' - list_device iterator callback.
  */
-
-static Boolean list_device_cb(void *refcon, io_service_t obj, CFStringRef deviceIDString, UInt32 deviceLocation, UInt8 interfaceNum, UInt8 alternateSetting)
+static Boolean list_device_cb(io_service_t obj, printer_interface_t printerIntf, void *refcon)
 {
-    (void)refcon;
-    (void)interfaceNum;
-    (void)alternateSetting;
+  (void)refcon;
 
-    if (obj != IO_OBJECT_NULL)
-    {
-        CFStringRef make = deviceIDCopyManufacturer(deviceIDString);
-        CFStringRef model = deviceIDCopyModel(deviceIDString);
-        CFStringRef serial = deviceIDCopySerialNumber(deviceIDString);
+  if (obj != IO_OBJECT_NULL)
+  {
+    CFStringRef deviceIDString = NULL;
+    CFStringRef make = NULL;
+    CFStringRef model = NULL;
+    CFStringRef serial = NULL;
+    UInt32 intfLocation;
 
-        char uristr[1024], makestr[1024], modelstr[1024], serialstr[1024];
-        char optionsstr[1024], idstr[1024], make_modelstr[1024];
+    deviceIDString = copy_printer_interface_deviceid(printerIntf, 0);
+    if (deviceIDString == NULL)
+      goto list_device_done;
 
-        CFStringGetCString(deviceIDString, idstr, sizeof(idstr), kCFStringEncodingUTF8);
-        backendGetMakeModel(idstr, make_modelstr, sizeof(make_modelstr));
+    make = deviceIDCopyManufacturer(deviceIDString);
+    model = deviceIDCopyModel(deviceIDString);
+    serial = deviceIDCopySerialNumber(deviceIDString);
 
-        modelstr[0] = '/';
+    char uristr[1024], makestr[1024], modelstr[1024], serialstr[1024];
+    char optionsstr[1024], idstr[1024], make_modelstr[1024];
 
-        if (make  == NULL || !CFStringGetCString(make, makestr, sizeof(makestr), kCFStringEncodingUTF8))
-            strlcpy(makestr, "Unknown", sizeof(makestr));
+    CFStringGetCString(deviceIDString, idstr, sizeof(idstr), kCFStringEncodingUTF8);
+    backendGetMakeModel(idstr, make_modelstr, sizeof(make_modelstr));
 
-        if (model == NULL || !CFStringGetCString(model, &modelstr[1], sizeof(modelstr)-1, kCFStringEncodingUTF8))
-            strlcpy(modelstr + 1, "Printer", sizeof(modelstr) - 1);
+    modelstr[0] = '/';
 
-        optionsstr[0] = '\0';
-        if (serial != NULL && CFStringGetCString(serial, serialstr, sizeof(serialstr), kCFStringEncodingUTF8))
-            snprintf(optionsstr, sizeof(optionsstr), "?serial=%s", serialstr);
-        else if (deviceLocation != 0)
-            snprintf(optionsstr, sizeof(optionsstr), "?location=%x", (unsigned)deviceLocation);
+    if (make  == NULL || !CFStringGetCString(make, makestr, sizeof(makestr), kCFStringEncodingUTF8))
+      strlcpy(makestr, "Unknown", sizeof(makestr));
 
-        httpAssembleURI(HTTP_URI_CODING_ALL, uristr, sizeof(uristr), "usb", NULL, makestr, 0, modelstr);
-        strlcat(uristr, optionsstr, sizeof(uristr));
+    if (model == NULL || !CFStringGetCString(model, &modelstr[1], sizeof(modelstr)-1, kCFStringEncodingUTF8))
+      strlcpy(modelstr + 1, "Printer", sizeof(modelstr) - 1);
 
-        cupsBackendReport("direct", uristr, make_modelstr, make_modelstr, idstr,
+    optionsstr[0] = '\0';
+    if (serial != NULL && CFStringGetCString(serial, serialstr, sizeof(serialstr), kCFStringEncodingUTF8))
+      snprintf(optionsstr, sizeof(optionsstr), "?serial=%s", serialstr);
+    else if ((*printerIntf)->GetLocationID(printerIntf, &intfLocation) == kIOReturnSuccess)
+      snprintf(optionsstr, sizeof(optionsstr), "?location=%x", (unsigned)intfLocation);
+
+    httpAssembleURI(HTTP_URI_CODING_ALL, uristr, sizeof(uristr), "usb", NULL, makestr, 0, modelstr);
+    strlcat(uristr, optionsstr, sizeof(uristr));
+
+    cupsBackendReport("direct", uristr, make_modelstr, make_modelstr, idstr,
                           NULL);
+  list_device_done:
 
-        if (make != NULL) CFRelease(make);
-        if (model != NULL) CFRelease(model);
-        if (serial != NULL) CFRelease(serial);
-    }
-
-    return obj != IO_OBJECT_NULL;
+    if (make != NULL) CFRelease(make);
+    if (model != NULL) CFRelease(model);
+    if (serial != NULL) CFRelease(serial);
+  }
+  return obj != IO_OBJECT_NULL;
 }
 
 /*
  * 'find_device_cb()' - print_device iterator callback.
  */
-static Boolean find_device_cb(void *refcon, io_service_t obj, CFStringRef deviceIDString, UInt32 deviceLocation, UInt8 interfaceNum, UInt8 alternateSetting)
+static Boolean find_device_cb(io_service_t obj, printer_interface_t printerIntf, void *refcon)
 {
-    Boolean keepLooking = true;
+  (void)refcon;
 
-    if (obj != IO_OBJECT_NULL)
+  Boolean keepLooking = true;
+
+  if (obj != IO_OBJECT_NULL)
+  {
+    CFStringRef deviceIDString = NULL;
+    CFStringRef make = NULL;
+    CFStringRef model = NULL;
+    CFStringRef serial = NULL;
+
+    deviceIDString = copy_printer_interface_deviceid(printerIntf, 0);
+    if (deviceIDString == NULL)
+      goto find_device_done;
+
+    make = deviceIDCopyManufacturer(deviceIDString);
+    model = deviceIDCopyModel(deviceIDString);
+    serial = deviceIDCopySerialNumber(deviceIDString);
+
+    if (make && CFStringCompare(make, g.make, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
     {
-        CFStringRef make = deviceIDCopyManufacturer(deviceIDString);
-        CFStringRef model = deviceIDCopyModel(deviceIDString);
-        CFStringRef serial = deviceIDCopySerialNumber(deviceIDString);
+      if (model && CFStringCompare(model, g.model, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+      {
+        UInt8 intfAltSetting = 0, intfNumber = 0, intfProtocol = 0;
+        UInt32 intfLocation = 0;
 
-        if (make && CFStringCompare(make, g.make, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+        (*printerIntf)->GetInterfaceProtocol(printerIntf, &intfProtocol);
+        (*printerIntf)->GetAlternateSetting(printerIntf, &intfAltSetting);
+        (*printerIntf)->GetInterfaceNumber(printerIntf, &intfNumber);
+        (*printerIntf)->GetLocationID(printerIntf, &intfLocation);
+
+        if (g.serial != NULL && CFStringGetLength(g.serial) > 0)
         {
-            if (model && CFStringCompare(model, g.model, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+          if (serial != NULL && CFStringCompare(serial, g.serial, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+          {
+            g.interfaceProtocol = intfProtocol;
+            g.location = intfLocation;
+            g.alternateSetting = intfAltSetting;
+            if (intfProtocol != kUSBPrintingProtocolIPP)
             {
-                if (g.serial != NULL && CFStringGetLength(g.serial) > 0)
-                {
-                    if (serial != NULL && CFStringCompare(serial, g.serial, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
-                    {
-                        IOObjectRetain(obj);
-                        g.printer_obj = obj;
-                        g.location = deviceLocation;
-                        g.alternateSetting = alternateSetting;
-                        keepLooking = false;
-                    }
-                }
-                else
-                {
-                    if (g.printer_obj != 0)
-                        IOObjectRelease(g.printer_obj);
-
-                    g.alternateSetting = alternateSetting;
-                    g.printer_obj = obj;
-                    IOObjectRetain(obj);
-
-                    if (g.location == 0 || g.location == deviceLocation)
-                        keepLooking = false;
-                }
-
-                if ( !keepLooking )
-                    g.interfaceNum = interfaceNum;
+              g.printer_obj = obj;
+              IOObjectRetain(obj);
             }
+            keepLooking = (intfProtocol == kUSBPrintingProtocolIPP);
+          }
+        }
+        else
+        {
+          if (g.printer_obj != 0)
+            IOObjectRelease(g.printer_obj);
+
+            g.location = intfLocation;
+            g.alternateSetting = intfAltSetting;
+            g.interfaceProtocol = intfProtocol;
+            g.printer_obj = obj;
+            IOObjectRetain(obj);
+
+            if (g.location == 0 || g.location == intfLocation)
+              keepLooking = false;
         }
 
-        if (make) CFRelease(make);
-        if (model) CFRelease(model);
-        if (serial) CFRelease(serial);
-    }
-    else
-    {
-        keepLooking = (g.printer_obj == 0);
-        if (obj == IO_OBJECT_NULL && keepLooking)
-        {
-            CFRunLoopTimerContext context = { 0, refcon, NULL, NULL, NULL };
-            CFRunLoopTimerRef timer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent() + 1.0, 10, 0x0, 0x0, status_timer_cb, &context);
-            if (timer != NULL)
-            {
-                CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopDefaultMode);
-                g.status_timer = timer;
-            }
-        }
+        if (!keepLooking)
+          g.interfaceNum = intfNumber;
+      }
     }
 
-    if (!keepLooking && g.status_timer != NULL)
+  find_device_done:
+    if (deviceIDString != NULL) CFRelease(deviceIDString);
+    if (make != NULL) CFRelease(make);
+    if (model != NULL) CFRelease(model);
+    if (serial != NULL) CFRelease(serial);
+  }
+  else
+  {
+    keepLooking = (g.printer_obj == 0 && g.interfaceProtocol != kUSBPrintingProtocolIPP);
+    if (obj == IO_OBJECT_NULL && keepLooking)
     {
-        fputs("STATE: -offline-report\n", stderr);
-        _cupsLangPrintFilter(stderr, "INFO", _("The printer is now online."));
-        CFRunLoopRemoveTimer(CFRunLoopGetCurrent(), g.status_timer, kCFRunLoopDefaultMode);
-        CFRelease(g.status_timer);
-        g.status_timer = NULL;
+      CFRunLoopTimerContext context = { 0, refcon, NULL, NULL, NULL };
+      CFRunLoopTimerRef timer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent() + 1.0, 10, 0x0, 0x0, status_timer_cb, &context);
+      if (timer != NULL)
+      {
+        CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopDefaultMode);
+        g.status_timer = timer;
+      }
     }
+  }
 
-    return keepLooking;
+  if (!keepLooking && g.status_timer != NULL)
+  {
+    fputs("STATE: -offline-report\n", stderr);
+    _cupsLangPrintFilter(stderr, "INFO", _("The printer is now online."));
+    CFRunLoopRemoveTimer(CFRunLoopGetCurrent(), g.status_timer, kCFRunLoopDefaultMode);
+    CFRelease(g.status_timer);
+    g.status_timer = NULL;
+  }
+
+  return keepLooking;
 }
 
 static CFStringRef deviceIDCopySerialNumber(CFStringRef deviceID)
@@ -1568,23 +1545,6 @@ static printer_interface_t usb_printer_interface_interface(io_service_t usbClass
 	return intf;
 }
 
-static IOUSBDeviceInterface **usb_device_interface_for_device(io_service_t usbDevice)
-{
-	IOUSBDeviceInterface ** intf = NULL;
-	IOCFPlugInInterface **plugin = NULL;
-	SInt32	score;
-
-	int kr = IOCreatePlugInInterfaceForService(usbDevice, kIOUSBDeviceUserClientTypeID, kIOCFPlugInInterfaceID, &plugin, &score);
-	if (kr == kIOReturnSuccess)
-	{
-		(*plugin)->QueryInterface(plugin, CFUUIDGetUUIDBytes(kIOUSBDeviceInterfaceID), (LPVOID *)&intf);
-		IODestroyPlugInInterface(plugin);
-	}
-
-	return intf;
-}
-
-
 static CFStringRef copy_printer_interface_deviceid(printer_interface_t printer, UInt8 alternateSetting)
 {
 	// I have tried to make this function as neat as I can, but the possibility of needing to resend
@@ -2131,8 +2091,6 @@ static void run_legacy_backend(int argc,
 
   if (!usb_legacy_status)
   {
-    log_usb_class_driver(IS_NOT_64BIT);
-
    /*
     * Setup a SIGTERM handler then block it before forking...
     */
@@ -2509,34 +2467,3 @@ static void get_device_id(cups_sc_status_t *status,
 
   *status  = CUPS_SC_STATUS_OK;
 }
-
-
-static void
-log_usb_class_driver(int is_64bit)	/* I - Is the USB class driver 64-bit? */
-{
- /*
-  * Report the usage of legacy USB class drivers to Apple if the user opts into providing
-  * feedback to Apple...
-  */
-
-  aslmsg aslm = asl_new(ASL_TYPE_MSG);
-  if (aslm)
-  {
-    ppd_file_t *ppd = ppdOpenFile(getenv("PPD"));
-    const char *make_model = ppd ? ppd->nickname : NULL;
-    ppd_attr_t *version = ppdFindAttr(ppd, "FileVersion", "");
-
-    asl_set(aslm, "com.apple.message.domain", "com.apple.printing.usb.64bit");
-    asl_set(aslm, "com.apple.message.result", is_64bit ? "yes" : "no");
-    asl_set(aslm, "com.apple.message.signature", make_model ? make_model : "Unknown");
-    asl_set(aslm, "com.apple.message.signature2", version ? version->value : "?.?");
-    asl_set(aslm, "com.apple.message.summarize", "YES");
-    asl_log(NULL, aslm, ASL_LEVEL_NOTICE, "");
-    asl_free(aslm);
-  }
-}
-
-
-/*
- * End of "$Id$".
- */

backend/usb-libusb.c

@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * LIBUSB interface code for CUPS.
  *
  * Copyright 2007-2015 by Apple Inc.
@@ -9,7 +7,7 @@
  * 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -2019,9 +2017,3 @@ soft_reset_printer(
 
   return (errcode);
 }
-
-
-/*
- * End of "$Id$".
- */
-

backend/usb-unix.c

@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * USB port backend for CUPS.
  *
  * This file is included from "usb.c" when compiled on UNIX/Linux.
@@ -600,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/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,6 +1,4 @@
 /*
- * "$Id$"
- *
  * "lpc" command for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -10,7 +8,7 @@
  * 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -435,8 +433,3 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
     ippDelete(response);
   }
 }
-
-
-/*
- * End of "$Id$".
- */

berkeley/lpq.c

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
- *
  * "lpq" command for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2018 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -28,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;
 
 
 /*
@@ -41,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 */
@@ -67,128 +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();
+	  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);
 
@@ -638,8 +647,3 @@ usage(void)
 		  "[-l] [+interval]"));
   exit(1);
 }
-
-
-/*
- * End of "$Id$".
- */

berkeley/lpr.c

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
- *
  * "lpr" command for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2016 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -32,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 */
@@ -56,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)
@@ -307,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...
   */
@@ -338,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);
   }
@@ -429,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/Makefile

@@ -1,16 +1,14 @@
 #
-# "$Id$"
-#
 # CGI makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2018 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/".
+# missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs
@@ -28,7 +26,6 @@ OBJS	=	\
 		classes.o \
 		help.o \
 		jobs.o \
-		makedocset.o \
 		printers.o \
 		testcgi.o \
 		testhi.o \
@@ -40,8 +37,7 @@ CGIS	=	\
 		jobs.cgi \
 		printers.cgi
 LIBTARGETS =	\
-		libcupscgi.a \
-		$(LIBCUPSCGI)
+		libcupscgi.a
 
 UNITTARGETS =	\
 		testcgi \
@@ -79,8 +75,7 @@ unittests:	$(UNITTARGETS)
 #
 
 clean:
-	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
-	$(RM) libcupscgi.so libcupscgi.dylib
+	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
 
 
 #
@@ -128,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"; 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:
 
 
 #
@@ -172,74 +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.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.so.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.la
-#
-
-libcupscgi.la:    $(LIBOBJS)
-	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-		-version-info 1:0 $(LIBS)
 
 
 #
@@ -257,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)" $@
 
 
 #
@@ -315,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
 
@@ -328,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
 
@@ -341,8 +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)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -350,8 +248,3 @@ testtemplate:	testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 #
 
 include Dependencies
-
-
-#
-# End of "$Id$".
-#

cgi-bin/admin.c

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
- *
  * Administration CGI for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2018 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -1139,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"))
     {
      /*
@@ -1284,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();
       }
@@ -4274,8 +4273,3 @@ get_printer_ppd(const char *uri,	/* I - Printer URI */
   else
     return (NULL);
 }
-
-
-/*
- * End of "$Id$".
- */

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,16 +1,14 @@
 /*
- * "$Id$"
- *
  * Class status CGI for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2016 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -299,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 */
@@ -372,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...
@@ -410,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...
     */
@@ -543,8 +531,3 @@ show_class(http_t     *http,		/* I - Connection to server */
 
    cgiEndHTML();
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/help-index.c

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
- *
  * Online help index routines for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2018 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -140,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);
@@ -1303,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,16 +1,14 @@
 /*
- * "$Id$"
- *
  * CGI <-> IPP variable routines for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2016 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -1325,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);
 }
@@ -1360,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 */
@@ -1397,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");
 
  /*
@@ -1419,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);
@@ -1428,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();
@@ -1454,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);
@@ -1464,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...
@@ -1506,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...
     */
@@ -1547,8 +1530,3 @@ cgiText(const char *message)		/* I - Message */
 
   return (_cupsLangString(language, message));
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/jobs.c

@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Job status CGI for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -10,7 +8,7 @@
  * 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -201,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,16 +1,14 @@
 /*
- * "$Id$"
- *
  * Printer status CGI for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2016 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -306,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 */
@@ -389,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...
@@ -427,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...
     */
@@ -563,8 +551,3 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
    cgiEndHTML();
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/search.c

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
- *
  * Search routines for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2018 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -367,9 +365,5 @@ void
 cgiFreeSearch(void *search)		/* I - Search context */
 {
   regfree((regex_t *)search);
+  free(search);
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/template.c

@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * CGI template function.
  *
  * Copyright 2007-2015 by Apple Inc.
@@ -10,7 +8,7 @@
  * 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #include "cgi-private.h"
@@ -683,8 +681,3 @@ cgi_puturi(const char *s,		/* I - String to output */
     s ++;
   }
 }
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/testcgi.c

@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * CGI test program for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -10,7 +8,7 @@
  * 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -62,8 +60,3 @@ main(void)
 
   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,6 +1,4 @@
 /*
- * "$Id$"
- *
  * CGI form variable and array functions for CUPS.
  *
  * Copyright 2007-2015 by Apple Inc.
@@ -10,7 +8,7 @@
  * 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -20,7 +18,6 @@
 /*#define DEBUG*/
 #include "cgi-private.h"
 #include <cups/http.h>
-#include <cups/md5-private.h>
 
 
 /*
@@ -1206,11 +1203,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)
@@ -1220,18 +1217,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));
 }
@@ -1294,8 +1290,3 @@ cgi_unlink_file(void)
     form_file = NULL;
   }
 }
-
-
-/*
- * 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-2015 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
@@ -136,8 +134,3 @@ uninstall:
 		$(RM) $(BUILDROOT)$(PAMDIR)/cups; \
 		$(RMDIR) $(BUILDROOT)$(PAMDIR); \
 	fi
-
-
-#
-# End of "$Id$".
-#

conf/cupsd.conf.in

@@ -134,3 +134,49 @@ WebInterface @CUPS_WEBIF@
     Order deny,allow
   </Limit>
 </Policy>
+
+# Set the kerberized printer/job policies...
+<Policy kerberos>
+  # Job/subscription privacy...
+  JobPrivateAccess default
+  JobPrivateValues default
+  SubscriptionPrivateAccess default
+  SubscriptionPrivateValues default
+
+  # Job-related operations must be done by the owner or an administrator...
+  <Limit Create-Job Print-Job Print-URI Validate-Job>
+    AuthType Negotiate
+    Order deny,allow
+  </Limit>
+
+  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
+    AuthType Negotiate
+    Require user @OWNER @SYSTEM
+    Order deny,allow
+  </Limit>
+
+  # All administration operations require an administrator to authenticate...
+  <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
+    AuthType Default
+    Require user @SYSTEM
+    Order deny,allow
+  </Limit>
+
+  # All printer operations require a printer operator to authenticate...
+  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
+    AuthType Default
+    Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
+    Order deny,allow
+  </Limit>
+
+  # Only the owner or an administrator can cancel or authenticate a job...
+  <Limit Cancel-Job CUPS-Authenticate-Job>
+    AuthType Negotiate
+    Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
+    Order deny,allow
+  </Limit>
+
+  <Limit All>
+    Order deny,allow
+  </Limit>
+</Policy>

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,13 +1,11 @@
 #
-# "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $"
-#
 # 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.
 #
-# Copyright 2007-2015 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -81,12 +79,6 @@ application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
 				 (contains(0,4096,<0a>%!) + \
 				  !contains(0,4096,"ENTER LANGUAGE")))
 
-application/g-code		gcode
-application/sla			stl string(0,"solid ") + contains(0,4096,"facet") + contains(0,4096,"vertex")
-application/vnd.makerbot-s3g	x3g
-model/amf			amf
-model/vnd.collada+xml		dae
-
 
 ########################################################################
 #
@@ -114,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
@@ -132,7 +125,7 @@ application/x-shell		sh printable(0,1024) + string(0,#!) +\
 				 contains(2,80,/sh) contains(2,80,/zsh))
 application/x-csource		c cxx cpp cc C h hpp \
 				printable(0,1024) + ! css + \
-				(string(0,/*) string(0,//)
+				(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) +\
@@ -176,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 $".
-#

config-scripts/cups-common.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id$"
-dnl
 dnl Common configuration stuff for CUPS.
 dnl
-dnl Copyright 2007-2015 by Apple Inc.
+dnl Copyright 2007-2017 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 missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Set the name of the config header file...
@@ -18,21 +16,7 @@ AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
 CUPS_VERSION="AC_PACKAGE_VERSION"
-
-case "$CUPS_VERSION" in
-	*svn)
-		if test -z "$CUPS_REVISION" -a -d .svn; then
-			CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
-		else
-			CUPS_REVISION=""
-		fi
-		;;
-
-	*)
-		CUPS_REVISION=""
-		;;
-esac
-
+CUPS_REVISION=""
 CUPS_BUILD="cups-$CUPS_VERSION"
 
 AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" string ],
@@ -61,6 +45,7 @@ AC_PATH_PROG(CHMOD,chmod)
 AC_PATH_PROG(GZIP,gzip)
 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)
@@ -145,7 +130,6 @@ AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
 AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
 AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H))
 AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H))
-AC_CHECK_HEADER(asl.h,AC_DEFINE(HAVE_ASL_H))
 
 dnl Checks for iconv.h and iconv_open
 AC_CHECK_HEADER(iconv.h,
@@ -178,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)
@@ -197,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
 		;;
 	*)
@@ -215,6 +199,9 @@ 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;
@@ -243,7 +230,7 @@ AC_SUBST(LIBUSB)
 AC_SUBST(USBQUIRKS)
 
 if test "x$PKGCONFIG" != x; then
-	if test x$enable_libusb != xno -a $uname != Darwin; then
+	if test x$enable_libusb != 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)
@@ -291,8 +278,8 @@ 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"
                 ;;
         *)
@@ -319,7 +306,7 @@ fi
 LIBS="$SAVELIBS"
 
 dnl Check for DBUS support
-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")
 
@@ -327,7 +314,7 @@ DBUSDIR=""
 DBUS_NOTIFIER=""
 DBUS_NOTIFIERLIBS=""
 
-if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$uname" != xDarwin; then
+if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin; then
 	AC_MSG_CHECKING(for DBUS)
 	if $PKGCONFIG --exists dbus-1; then
 		AC_MSG_RESULT(yes)
@@ -361,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"
@@ -402,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
@@ -472,7 +454,3 @@ case "$COMPONENTS" in
 esac
 
 AC_SUBST(BUILDDIRS)
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-compiler.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id$"
-dnl
 dnl Compiler stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 2007-2018 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 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
@@ -132,8 +134,8 @@ if test -n "$GCC"; then
 		# Not available to LSB binaries...
 		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,43 +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"
 
-		AC_MSG_CHECKING(whether compiler supports -Wno-unused-result)
-		OLDCFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS -Werror -Wno-unused-result"
-		AC_TRY_COMPILE(,,
-			[OPTIM="$OPTIM -Wno-unused-result"
-			AC_MSG_RESULT(yes)],
-			AC_MSG_RESULT(no))
-		CFLAGS="$OLDCFLAGS"
-
-		AC_MSG_CHECKING(whether compiler supports -Wsign-conversion)
-		OLDCFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS -Werror -Wsign-conversion"
-		AC_TRY_COMPILE(,,
-			[OPTIM="$OPTIM -Wsign-conversion"
-			AC_MSG_RESULT(yes)],
-			AC_MSG_RESULT(no))
-		CFLAGS="$OLDCFLAGS"
-
-		AC_MSG_CHECKING(whether compiler supports -Wno-tautological-compare)
-		OLDCFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS -Werror -Wno-tautological-compare"
-		AC_TRY_COMPILE(,,
-			[OPTIM="$OPTIM -Wno-tautological-compare"
-			AC_MSG_RESULT(yes)],
-			AC_MSG_RESULT(no))
-		CFLAGS="$OLDCFLAGS"
+		# 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
+		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
@@ -199,7 +183,7 @@ 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
@@ -209,8 +193,8 @@ if test -n "$GCC"; then
 	esac
 else
 	# Add vendor-specific compiler options...
-	case $uname in
-		SunOS*)
+	case $host_os_name in
+		sunos*)
 			# Solaris
 			if test -z "$OPTIM"; then
 				if test "x$with_optim" = x; then
@@ -237,14 +221,10 @@ else
 fi
 
 # Add general compiler options per platform...
-case $uname in
-	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"
 		;;
 esac
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-defaults.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id$"
+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-2015 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
@@ -143,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
@@ -176,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
@@ -209,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)
@@ -262,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"
 				;;
 			*)
@@ -294,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"
 				;;
 			*)
@@ -362,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"
@@ -384,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
@@ -395,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
@@ -407,7 +425,3 @@ esac
 
 AC_SUBST(CUPS_WEBIF)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-directories.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id$"
-dnl
 dnl Directory stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 2007-2017 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 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,8 +99,8 @@ 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
@@ -167,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"
@@ -232,8 +230,8 @@ 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"
 			;;
 
@@ -267,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"
 		;;
@@ -291,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"
 			;;
 		*)
@@ -303,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$".
-dnl

config-scripts/cups-dnssd.m4

@@ -1,15 +1,13 @@
 dnl
-dnl "$Id$"
+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-2015 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 -a x$uname != xDarwin; 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$".
-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-2013 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])
@@ -24,9 +22,9 @@ AC_SUBST(LIBGSSAPI)
 if test x$enable_gssapi != xno; then
 	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")
@@ -127,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$"
+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$".
-dnl

config-scripts/cups-libtool.m4

@@ -1,21 +1,22 @@
 dnl
-dnl "$Id$"
+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$".
-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$"
-dnl
 dnl Manpage stuff for CUPS.
 dnl
-dnl Copyright 2007-2013 by Apple Inc.
+dnl Copyright 2007-2017 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 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*)
-        		# Darwin, MacOS X, Linux, GNU HURD, and *BSD
+	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,8 +42,8 @@ AC_SUBST(AMANDIR)
 AC_SUBST(PMANDIR)
 
 dnl Setup manpage extensions...
-case "$uname" in
-	SunOS*)
+case "$host_os_name" in
+	sunos*)
 		# Solaris
 		MAN1EXT=1
 		MAN5EXT=5
@@ -53,8 +51,8 @@ case "$uname" in
 		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$".
-dnl

config-scripts/cups-network.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id$"
-dnl
 dnl Networking stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 2007-2016 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 missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H),,[
@@ -30,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
@@ -47,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"
 				;;
 			*)
@@ -70,7 +68,3 @@ fi
 
 AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
 AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-opsys.m4

@@ -1,39 +1,39 @@
 dnl
-dnl "$Id$"
+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$"
-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,20 +1,18 @@
 dnl
-dnl "$Id$"
+dnl PAM stuff for CUPS.
 dnl
-dnl   PAM stuff for CUPS.
-dnl
-dnl Copyright 2007-2013 by Apple Inc.
+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 file is missing or damaged, see the license at "http://www.cups.org/".
+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])
+AC_ARG_WITH(pam_module, [  --with-pam-module       set the PAM module to use])
 
 PAMDIR=""
 PAMFILE="pam.std"
@@ -54,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
@@ -91,7 +89,3 @@ AC_SUBST(PAMFILE)
 AC_SUBST(PAMLIBS)
 AC_SUBST(PAMMOD)
 AC_SUBST(PAMMODAUTH)
-
-dnl
-dnl End of "$Id$".
-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$"
+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$".
-dnl

config-scripts/cups-sharedlibs.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id$"
-dnl
 dnl Shared library support for CUPS.
 dnl
-dnl Copyright 2007-2013 by Apple Inc.
+dnl Copyright 2007-2018 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 missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 PICFLAG=1
@@ -23,33 +21,24 @@ 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)"
 			;;
-		Linux | GNU | *BSD*)
+		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"
@@ -58,10 +47,7 @@ if test x$enable_shared != xno; then
 			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)"
@@ -70,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
@@ -83,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
@@ -122,8 +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
-                SunOS*)
+	case $host_os_name in
+                sunos*)
                 	# Solaris...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-R$libdir $DSOFLAGS"
@@ -131,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"
@@ -139,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"
@@ -156,7 +136,3 @@ fi
 AC_SUBST(DSOLIBS)
 AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-ssl.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id$"
-dnl
 dnl TLS stuff for CUPS.
 dnl
-dnl Copyright 2007-2015 by Apple Inc.
+dnl Copyright 2007-2017 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 missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(ssl, [  --disable-ssl           disable SSL/TLS support])
@@ -25,7 +23,7 @@ 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)
@@ -54,7 +52,7 @@ if test x$enable_ssl != xno; then
 		AC_DEFINE(HAVE_CSSMERRORSTRING)
 		AC_DEFINE(HAVE_SECKEYCHAINOPEN)])
 
-		if test $uversion -ge 150; then
+		if test $host_os_version -ge 150; then
 			AC_DEFINE(HAVE_SSLSETENABLEDCIPHERS)
 		fi
 	fi
@@ -63,7 +61,6 @@ if test x$enable_ssl != xno; then
     dnl Then look for GNU TLS...
     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
     	AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
-    	AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
 	if $PKGCONFIG --exists gnutls; then
 	    have_ssl=1
 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
@@ -106,7 +103,3 @@ AC_SUBST(SSLLIBS)
 
 EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-startup.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id$"
-dnl
 dnl Launch-on-demand/startup stuff for CUPS.
 dnl
-dnl Copyright 2007-2015 by Apple Inc.
+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 file is missing or damaged, see the license at "http://www.cups.org/".
+dnl missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 ONDEMANDFLAGS=""
@@ -18,30 +16,21 @@ ONDEMANDLIBS=""
 AC_SUBST(ONDEMANDFLAGS)
 AC_SUBST(ONDEMANDLIBS)
 
-dnl Launchd is used on OS X/Darwin...
+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_msg, AC_DEFINE(HAVE_LAUNCHD))
-	if test $uversion -ge 140; then
-		AC_CHECK_FUNC(launch_activate_socket, [
-			AC_DEFINE(HAVE_LAUNCHD)
-			AC_DEFINE(HAVE_LAUNCH_ACTIVATE_SOCKET)])
-	fi
+	AC_CHECK_FUNC(launch_activate_socket, [
+		AC_DEFINE(HAVE_LAUNCHD)
+		AC_DEFINE(HAVE_ONDEMAND)])
 	AC_CHECK_HEADER(launch.h, AC_DEFINE(HAVE_LAUNCH_H))
 
-	case "$uname" in
-		Darwin*)
-			# Darwin, MacOS X
-			LAUNCHD_DIR="/System/Library/LaunchDaemons"
-			# liblaunch is already part of libSystem
-			;;
-		*)
-			# All others; this test will need to be updated
-			;;
-	esac
+	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...
@@ -79,6 +68,7 @@ if test x$enable_systemd != xno; then
 
 		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`"
@@ -87,6 +77,16 @@ if test x$enable_systemd != xno; then
         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)
@@ -117,13 +117,13 @@ if test x$rcdir = x; then
 fi
 
 if test "x$rcstart" = x; then
-	case "$uname" in
-        	Linux | GNU | GNU/k*BSD*)
+	case "$host_os_name" in
+        	linux* | gnu*)
                 	# Linux
                         rcstart="81"
                       	;;
 
-		SunOS*)
+		sunos*)
 			# Solaris
                         rcstart="81"
 			;;
@@ -136,8 +136,8 @@ if test "x$rcstart" = x; then
 fi
 
 if test "x$rcstop" = x; then
-	case "$uname" in
-        	Linux | GNU | GNU/k*BSD*)
+	case "$host_os_name" in
+        	linux* | gnu*)
                 	# Linux
                         rcstop="36"
                       	;;
@@ -185,8 +185,3 @@ if test "x$xinetd" = x; then
 elif test "x$xinetd" != xno; then
 	XINETD="$xinetd"
 fi
-
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-threads.m4

@@ -1,16 +1,14 @@
 dnl
-dnl "$Id$"
+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$".
-dnl

config.h.in

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
- *
  * Configuration file for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2017 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/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_CONFIG_H_
@@ -242,13 +240,6 @@
 #undef HAVE_VSYSLOG
 
 
-/*
- * Do we have the ASL functions?
- */
-
-#undef HAVE_ASL_H
-
-
 /*
  * Do we have the systemd journal functions?
  */
@@ -481,13 +472,19 @@
 #undef HAVE_PTHREAD_H
 
 
+/*
+ * Do we have on-demand support (launchd/systemd/upstart)?
+ */
+
+#undef HAVE_ONDEMAND
+
+
 /*
  * Do we have launchd support?
  */
 
 #undef HAVE_LAUNCH_H
 #undef HAVE_LAUNCHD
-#undef HAVE_LAUNCH_ACTIVATE_SOCKET
 
 
 /*
@@ -497,6 +494,13 @@
 #undef HAVE_SYSTEMD
 
 
+/*
+ * Do we have upstart support?
+ */
+
+#undef HAVE_UPSTART
+
+
 /*
  * Various scripting languages...
  */
@@ -511,24 +515,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?
  */
@@ -553,7 +539,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
@@ -699,7 +692,7 @@
 
 
 /*
- * Location of OS X localization bundle, if any.
+ * Location of macOS localization bundle, if any.
  */
 
 #undef CUPS_BUNDLEDIR
@@ -738,7 +731,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,23 +1,21 @@
 dnl
-dnl "$Id$"
-dnl
 dnl Configuration script for CUPS.
 dnl
-dnl Copyright 2007-2015 by Apple Inc.
+dnl Copyright 2007-2018 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 missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)
 
 dnl Package name and version...
-AC_INIT([CUPS], [2.2svn], [https://www.cups.org/str.php], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.2.10], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
@@ -93,7 +91,3 @@ AC_OUTPUT(Makedefs
 	  $LANGFILES)
 
 chmod +x cups-config
-
-dnl
-dnl End of "$Id$".
-dnl

cups-config.in

@@ -1,21 +1,19 @@
-#! /bin/sh
+#!/bin/sh
 #
-# "$Id$"
+# CUPS configuration utility.
 #
-#   CUPS configuration utility.
+# Copyright 2007-2016 by Apple Inc.
+# Copyright 2001-2006 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2011 by Apple Inc.
-#   Copyright 2001-2006 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 VERSION="@CUPS_VERSION@"
-APIVERSION="1.6"
+APIVERSION="2.2"
 BUILD="@CUPS_BUILD@"
 
 prefix=@prefix@
@@ -140,7 +138,3 @@ while test $# -gt 0; do
 
     shift
 done
-
-#
-# End of "$Id$".
-#

cups/Dependencies

@@ -62,7 +62,7 @@ getdevices.o: getdevices.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h thread-private.h
+  ../cups/cups.h file.h pwg.h thread-private.h adminutil.h
 getifaddrs.o: getifaddrs.c http-private.h ../config.h ../cups/language.h \
   array.h versioning.h ../cups/http.h md5-private.h ipp-private.h \
   ../cups/ipp.h
@@ -261,6 +261,11 @@ testcache.o: testcache.c ppd-private.h ../cups/cups.h file.h versioning.h \
   thread-private.h
 testconflicts.o: testconflicts.c cups.h file.h versioning.h ipp.h http.h \
   array.h language.h pwg.h ppd.h raster.h string-private.h ../config.h
+testcreds.o: testcreds.c cups-private.h string-private.h ../config.h \
+  debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
+  ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
+  md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
+  ../cups/cups.h file.h pwg.h thread-private.h
 testcups.o: testcups.c string-private.h ../config.h cups.h file.h \
   versioning.h ipp.h http.h array.h language.h pwg.h ppd.h raster.h
 testdest.o: testdest.c cups.h file.h versioning.h ipp.h http.h array.h \

cups/Makefile

@@ -1,16 +1,14 @@
 #
-# "$Id$"
+# Library Makefile for CUPS.
 #
-# API library Makefile for CUPS.
-#
-# Copyright 2007-2015 by Apple Inc.
-# Copyright 1997-2006 by Easy Software Products, all rights reserved.
+# Copyright © 2007-2018 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/".
+# missing or damaged, see the license at "http://www.cups.org/".
 #
 # This file is subject to the Apple OS-Developed Software exception.
 #
@@ -87,9 +85,11 @@ TESTOBJS	= \
 		testarray.o \
 		testcache.o \
 		testconflicts.o \
+		testcreds.o \
 		testcups.o \
 		testdest.o \
 		testfile.o \
+		testgetdests.o \
 		testhttp.o \
 		testi18n.o \
 		testipp.o \
@@ -155,9 +155,11 @@ UNITTARGETS =	\
 		testarray \
 		testcache \
 		testconflicts \
+		testcreds \
 		testcups \
 		testdest \
 		testfile \
+		testgetdests \
 		testhttp \
 		testi18n \
 		testipp \
@@ -310,8 +312,9 @@ uninstall:
 
 libcups.so.2:	$(LIBOBJS)
 	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) \
+	$(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) \
 		$(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	$(RM) `basename $@ .2`
 	$(LN) $@ `basename $@ .2`
 
@@ -327,13 +330,14 @@ libcups.2.dylib:	$(LIBOBJS) $(LIBCUPSORDER)
 		grep -v -E -e '^(_cupsConnect|_cupsCharset|_cupsEncodingName|_cupsSetDefaults|_cupsSetHTTPError|_cupsUserDefault)$$' | \
 		sort >t.exp
 	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+	$(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
 		-install_name $(libdir)/$@ \
-		-current_version 2.12.0 \
+		-current_version 2.13.0 \
 		-compatibility_version 2.0.0 \
 		-exported_symbols_list t.exp \
 		$(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
 		$(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	$(RM) libcups.dylib t.exp
 	$(LN) $@ libcups.dylib
 
@@ -344,8 +348,8 @@ libcups.2.dylib:	$(LIBOBJS) $(LIBCUPSORDER)
 
 libcups.la:    $(LIBOBJS)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
-		-rpath $(LIBDIR) -version-info 2:12 $(LIBGSSAPI) $(SSLLIBS) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
+		-rpath $(LIBDIR) -version-info 2:13 $(LIBGSSAPI) $(SSLLIBS) \
 		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -367,12 +371,12 @@ libcups.a:	$(LIBOBJS)
 libcups2.def: $(LIBOBJS) Makefile
 	echo Generating $@...
 	echo "LIBRARY libcups2" >libcups2.def
-	echo "VERSION 2.11" >>libcups2.def
+	echo "VERSION 2.13" >>libcups2.def
 	echo "EXPORTS" >>libcups2.def
 	(nm $(LIBOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}'; \
 	 echo __cups_strcpy; echo __cups_strlcat; echo __cups_strlcpy) | \
 		grep -v -E \
-		    -e 'cups_debug|Apple|BackChannel|Backend|FileCheck|Filter|GSSService|SetNegotiate|SideChannel' \
+		    -e 'cups_debug|Apple|BackChannel|Backend|FileCheck|Filter|GSSService|SetNegotiate|SideChannel|SNMP' \
 		    -e 'Block$$' | \
 		sed -e '1,$$s/^_//' | sort >>libcups2.def
 
@@ -383,8 +387,9 @@ libcups2.def: $(LIBOBJS) Makefile
 
 testadmin:	testadmin.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testadmin.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(LDFLAGS) -o $@ testadmin.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -393,8 +398,9 @@ testadmin:	testadmin.o $(LIBCUPSSTATIC)
 
 testarray:	testarray.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running array API tests...
 	./testarray
 
@@ -405,8 +411,9 @@ testarray:	testarray.o $(LIBCUPSSTATIC)
 
 testcache:	testcache.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -415,8 +422,20 @@ testcache:	testcache.o $(LIBCUPSSTATIC)
 
 testconflicts:	testconflicts.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testconflicts.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(LDFLAGS) -o $@ testconflicts.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+
+
+#
+# testcreds (dependency on static CUPS library is intentional)
+#
+
+testcreds:	testcreds.o $(LIBCUPSSTATIC)
+	echo Linking $@...
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcreds.o $(LIBCUPSSTATIC) \
+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -425,8 +444,9 @@ testconflicts:	testconflicts.o $(LIBCUPSSTATIC)
 
 testcups:	testcups.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testcups.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(LDFLAGS) -o $@ testcups.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -435,8 +455,9 @@ testcups:	testcups.o $(LIBCUPSSTATIC)
 
 testdest:	testdest.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -445,20 +466,33 @@ testdest:	testdest.o $(LIBCUPSSTATIC)
 
 testfile:	testfile.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running file API tests...
 	./testfile
 
 
+#
+# testgetdests (dependency on static CUPS library is intentional)
+#
+
+testgetdests:	testgetdests.o $(LIBCUPSSTATIC)
+	echo Linking $@...
+	$(LD_CC) $(LDFLAGS) -o $@ testgetdests.o $(LIBCUPSSTATIC) \
+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+
+
 #
 # testhttp (dependency on static CUPS library is intentional)
 #
 
 testhttp:	testhttp.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running HTTP API tests...
 	./testhttp
 
@@ -469,8 +503,9 @@ testhttp:	testhttp.o $(LIBCUPSSTATIC)
 
 testipp:	testipp.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running IPP API tests...
 	./testipp
 
@@ -481,8 +516,9 @@ testipp:	testipp.o $(LIBCUPSSTATIC)
 
 testi18n:	testi18n.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running internationalization API tests...
 	./testi18n
 
@@ -493,10 +529,23 @@ testi18n:	testi18n.o $(LIBCUPSSTATIC)
 
 testlang:	testlang.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+	echo Creating locale directory structure...
+	$(RM) -r locale
+	$(MKDIR) locale/en
+	echo 'msgid "No"' > locale/en/cups_en.po
+	echo 'msgstr "No"' >> locale/en/cups_en.po
+	echo 'msgid "Yes"' >> locale/en/cups_en.po
+	echo 'msgstr "Yes"' >> locale/en/cups_en.po
+	for po in ../locale/cups_*.po; do \
+		lang=`basename $$po .po | sed -e '1,$$s/^cups_//'`; \
+		$(MKDIR) locale/$$lang; \
+		$(LN) ../../$$po locale/$$lang; \
+	done
 	echo Running language API tests...
-	./testlang
+	LOCALEDIR=locale ./testlang
 
 
 #
@@ -505,8 +554,9 @@ testlang:	testlang.o $(LIBCUPSSTATIC)
 
 testoptions:	testoptions.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testoptions.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testoptions.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running option API tests...
 	./testoptions
 
@@ -517,8 +567,9 @@ testoptions:	testoptions.o $(LIBCUPSSTATIC)
 
 testppd:	testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running PPD API tests...
 	./testppd
 
@@ -529,8 +580,9 @@ testppd:	testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
 
 testpwg:	testpwg.o $(LIBCUPSSTATIC) test.ppd
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testpwg.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testpwg.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 	echo Running PWG API tests...
 	./testpwg test.ppd
 
@@ -541,8 +593,9 @@ testpwg:	testpwg.o $(LIBCUPSSTATIC) test.ppd
 
 testsnmp:	testsnmp.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testsnmp.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(LDFLAGS) -o $@ testsnmp.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -551,8 +604,9 @@ testsnmp:	testsnmp.o $(LIBCUPSSTATIC)
 
 tlscheck:	tlscheck.o $(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -561,49 +615,27 @@ tlscheck:	tlscheck.o $(LIBCUPSSTATIC)
 
 apihelp:
 	echo Generating CUPS API help files...
-	mxmldoc --section "Programming" \
-		--title "Introduction to CUPS Programming" \
+	$(RM) cupspm.xml
+	mxmldoc --section "Programming" --body cupspm.md \
+		cupspm.xml \
+		auth.c cups.h dest*.c encode.c http.h http*.c ipp.h ipp*.c \
+		options.c tls-darwin.c usersys.c util.c \
+		--coverimage cupspm.png \
+		--epub ../doc/help/cupspm.epub
+	mxmldoc --section "Programming" --body cupspm.md \
+		cupspm.xml > ../doc/help/cupspm.html
+	$(RM) cupspm.xml
+	mxmldoc --section "Programming" --title "Administration APIs" \
 		--css ../doc/cups-printable.css \
-		--header api-overview.header --intro api-overview.shtml \
-		>../doc/help/api-overview.html
-	mxmldoc --section "Programming" --title "Array API" \
-		--css ../doc/cups-printable.css \
-		--header api-array.header --intro api-array.shtml \
-		api-array.xml \
-		array.h array.c >../doc/help/api-array.html
-	mxmldoc --tokens help/api-array.html api-array.xml >../doc/help/api-array.tokens
-	$(RM) api-array.xml
-	mxmldoc --section "Programming" --title "CUPS API" \
-		--css ../doc/cups-printable.css \
-		--header api-cups.header --intro api-cups.shtml \
-		api-cups.xml \
-		cups.h pwg.h adminutil.c dest*.c language.c notify.c \
-		options.c pwg-media.c tempfile.c usersys.c \
-		util.c >../doc/help/api-cups.html
-	mxmldoc --tokens help/api-cups.html api-cups.xml >../doc/help/api-cups.tokens
-	$(RM) api-cups.xml
-	mxmldoc --section "Programming" --title "File and Directory APIs" \
-		--css ../doc/cups-printable.css \
-		--header api-filedir.header --intro api-filedir.shtml \
-		api-filedir.xml \
-		file.h file.c dir.h dir.c >../doc/help/api-filedir.html
-	mxmldoc --tokens api-filedir.xml >../doc/help/api-filedir.tokens
-	$(RM) api-filedir.xml
+		--header api-admin.header --intro api-admin.shtml \
+		api-admin.xml \
+		adminutil.c adminutil.h getdevices.c >../doc/help/api-admin.html
+	$(RM) api-admin.xml
 	mxmldoc --section "Programming" --title "PPD API (DEPRECATED)" \
 		--css ../doc/cups-printable.css \
 		--header api-ppd.header --intro api-ppd.shtml \
 		api-ppd.xml ppd.h ppd-*.c >../doc/help/api-ppd.html
-	mxmldoc --tokens help/api-ppd.html api-ppd.xml >../doc/help/api-ppd.tokens
 	$(RM) api-ppd.xml
-	mxmldoc --section "Programming" --title "HTTP and IPP APIs" \
-		--css ../doc/cups-printable.css \
-		--header api-httpipp.header --intro api-httpipp.shtml \
-		api-httpipp.xml \
-		http.h ipp.h auth.c getdevices.c getputfile.c encode.c \
-		http.c http-addr.c http-support.c ipp.c ipp-support.c \
-		md5passwd.c request.c >../doc/help/api-httpipp.html
-	mxmldoc --tokens help/api-httpipp.html api-httpipp.xml >../doc/help/api-httpipp.tokens
-	$(RM) api-httpipp.xml
 	mxmldoc --section "Programming" \
 		--title "Filter and Backend Programming" \
 		--css ../doc/cups-printable.css \
@@ -611,61 +643,14 @@ apihelp:
 		api-filter.xml \
 		backchannel.c backend.h backend.c sidechannel.c sidechannel.h \
 		>../doc/help/api-filter.html
-	mxmldoc --tokens help/api-filter.html api-filter.xml >../doc/help/api-filter.tokens
 	$(RM) api-filter.xml
 
-framedhelp:
-	echo Generating CUPS API help files...
-	mxmldoc --framed api-overview \
-		--section "Programming" \
-		--title "Introduction to CUPS Programming" \
-		--css ../doc/cups-printable.css \
-		--header api-overview.header --intro api-overview.shtml
-	mxmldoc --framed api-array \
-		--section "Programming" --title "Array API" \
-		--css ../doc/cups-printable.css \
-		--header api-array.header --intro api-array.shtml \
-		array.h array.c
-	mxmldoc --framed api-cups \
-		--section "Programming" --title "CUPS API" \
-		--css ../doc/cups-printable.css \
-		--header api-cups.header --intro api-cups.shtml \
-		cups.h adminutil.c dest*.c language.c notify.c \
-		options.c tempfile.c usersys.c \
-		util.c
-	mxmldoc --framed api-filedir \
-		--section "Programming" --title "File and Directory APIs" \
-		--css ../doc/cups-printable.css \
-		--header api-filedir.header --intro api-filedir.shtml \
-		file.h file.c dir.h dir.c
-	mxmldoc --framed api-ppd \
-		--section "Programming" --title "PPD API (DEPRECATED)" \
-		--css ../doc/cups-printable.css \
-		--header api-ppd.header --intro api-ppd.shtml \
-		ppd.h attr.c conflicts.c custom.c emit.c localize.c mark.c \
-		page.c ppd.c
-	mxmldoc --framed api-httpipp \
-		--section "Programming" --title "HTTP and IPP APIs" \
-		--css ../doc/cups-printable.css \
-		--header api-httpipp.header --intro api-httpipp.shtml \
-		http.h ipp.h auth.c getdevices.c getputfile.c encode.c \
-		http.c http-addr.c http-support.c ipp.c ipp-support.c \
-		md5passwd.c request.c
-	mxmldoc --framed api-filter \
-		--section "Programming" \
-		--title "Filter and Backend Programming" \
-		--css ../doc/cups-printable.css \
-		--header api-filter.header --intro api-filter.shtml \
-		backchannel.c backend.h backend.c sidechannel.c sidechannel.h
-
 
 #
 # Lines of code computation...
 #
 
 sloc:
-	echo "libcupslite: \c"
-	sloccount $(LITEOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
 	echo "libcups: \c"
 	sloccount $(LIBOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
 
@@ -676,8 +661,3 @@ sloc:
 
 include Dependencies
 tls.o: tls-darwin.c tls-gnutls.c tls-sspi.c
-
-
-#
-# End of "$Id$".
-#

cups/adminutil.c

@@ -1,16 +1,14 @@
 /*
- * "$Id$"
- *
  * Administration utility API definitions for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 2001-2007 by Easy Software Products.
  *
  * These coded instructions, statements, and computer programs are the
  * property of Apple Inc. and are protected by Federal copyright
  * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * missing or damaged, see the license at "http://www.cups.org/".
  *
  * This file is subject to the Apple OS-Developed Software exception.
  */
@@ -24,11 +22,11 @@
 #include "adminutil.h"
 #include <fcntl.h>
 #include <sys/stat.h>
-#ifdef WIN32
+#ifdef _WIN32
 #else
 #  include <unistd.h>
 #  include <sys/wait.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 
 /*
@@ -833,7 +831,7 @@ cupsAdminExportSamba(
  * The returned settings should be freed with cupsFreeOptions() when
  * you are done with them.
  *
- * @since CUPS 1.3/OS X 10.5@
+ * @since CUPS 1.3/macOS 10.5@
  */
 
 int					/* O - 1 on success, 0 on failure */
@@ -1149,7 +1147,7 @@ cupsAdminGetServerSettings(
 /*
  * 'cupsAdminSetServerSettings()' - Set settings on the server.
  *
- * @since CUPS 1.3/OS X 10.5@
+ * @since CUPS 1.3/macOS 10.5@
  */
 
 int					/* O - 1 on success, 0 on failure */
@@ -1196,6 +1194,7 @@ cupsAdminSetServerSettings(
   int		cupsd_num_settings;	/* New number of settings */
   int		old_share_printers,	/* Share local printers */
 		old_remote_admin,	/* Remote administration allowed? */
+		old_remote_any,		/* Remote access from anywhere? */
 		old_user_cancel_any,	/* Cancel-job policy set? */
 		old_debug_logging;	/* LogLevel debug set? */
   cups_option_t	*cupsd_settings,	/* New settings */
@@ -1261,12 +1260,12 @@ cupsAdminSetServerSettings(
 
   if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ANY, cupsd_num_settings,
                            cupsd_settings)) != NULL)
-    remote_any = atoi(val);
+    old_remote_any = atoi(val);
   else
-    remote_any = 0;
+    old_remote_any = 0;
 
   DEBUG_printf(("1cupsAdminSetServerSettings: old remote_any=%d",
-                remote_any));
+                old_remote_any));
 
   if ((val = cupsGetOption(CUPS_SERVER_SHARE_PRINTERS, cupsd_num_settings,
                            cupsd_settings)) != NULL)
@@ -1312,12 +1311,23 @@ cupsAdminSetServerSettings(
   DEBUG_printf(("1cupsAdminSetServerSettings: debug_logging=%d",
                 debug_logging));
 
-  if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ANY, num_settings,
-                           settings)) != NULL)
+  if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ANY, num_settings, settings)) != NULL)
+  {
     remote_any = atoi(val);
 
-  DEBUG_printf(("1cupsAdminSetServerSettings: remote_any=%d",
-                remote_any));
+    if (remote_any == old_remote_any)
+    {
+     /*
+      * No change to this setting...
+      */
+
+      remote_any = -1;
+    }
+  }
+  else
+    remote_any = -1;
+
+  DEBUG_printf(("1cupsAdminSetServerSettings: remote_any=%d", remote_any));
 
   if ((val = cupsGetOption(CUPS_SERVER_REMOTE_ADMIN, num_settings,
                            settings)) != NULL)
@@ -1432,7 +1442,7 @@ cupsAdminSetServerSettings(
   while (cupsFileGetConf(cupsd, line, sizeof(line), &value, &linenum))
   {
     if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen")) &&
-        (remote_admin >= 0 || remote_any > 0 || share_printers >= 0))
+        (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
     {
       if (!wrote_port_listen)
       {
@@ -1618,7 +1628,7 @@ cupsAdminSetServerSettings(
 	                 remote_any > 0 ? "all" : "@LOCAL");
       }
       else if (in_root_location &&
-               (remote_admin >= 0 || remote_any > 0 || share_printers >= 0))
+               (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
       {
 	wrote_root_location = 1;
 
@@ -1721,7 +1731,7 @@ cupsAdminSetServerSettings(
       in_cancel_job = 0;
     }
     else if ((((in_admin_location || in_conf_location || in_root_location) &&
-               (remote_admin >= 0 || remote_any > 0)) ||
+               (remote_admin >= 0 || remote_any >= 0)) ||
               (in_root_location && share_printers >= 0)) &&
              (!_cups_strcasecmp(line, "Allow") || !_cups_strcasecmp(line, "Deny") ||
 	      !_cups_strcasecmp(line, "Order")))
@@ -1813,7 +1823,7 @@ cupsAdminSetServerSettings(
   }
 
   if (!wrote_port_listen &&
-      (remote_admin >= 0 || remote_any > 0 || share_printers >= 0))
+      (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
   {
     if (remote_admin > 0 || remote_any > 0 || share_printers > 0)
     {
@@ -1834,7 +1844,7 @@ cupsAdminSetServerSettings(
   }
 
   if (!wrote_root_location &&
-      (remote_admin >= 0 || remote_any > 0 || share_printers >= 0))
+      (remote_admin >= 0 || remote_any >= 0 || share_printers >= 0))
   {
     if (remote_admin > 0 && share_printers > 0)
       cupsFilePuts(temp,
@@ -2011,9 +2021,14 @@ cupsAdminSetServerSettings(
                                 	 old_remote_admin ? "1" : "0",
 					 cupsd_num_settings, &cupsd_settings);
 
-    cupsd_num_settings = cupsAddOption(CUPS_SERVER_REMOTE_ANY,
-                                       remote_any ? "1" : "0",
-				       cupsd_num_settings, &cupsd_settings);
+    if (remote_any >= 0)
+      cupsd_num_settings = cupsAddOption(CUPS_SERVER_REMOTE_ANY,
+					 remote_any ? "1" : "0",
+					 cupsd_num_settings, &cupsd_settings);
+    else
+      cupsd_num_settings = cupsAddOption(CUPS_SERVER_REMOTE_ANY,
+					 old_remote_any ? "1" : "0",
+					 cupsd_num_settings, &cupsd_settings);
 
     if (share_printers >= 0)
       cupsd_num_settings = cupsAddOption(CUPS_SERVER_SHARE_PRINTERS,
@@ -2072,7 +2087,7 @@ do_samba_command(const char *command,	/* I - Command to run */
 		 const char *authfile,	/* I - Samba authentication file */
 		 FILE *logfile)		/* I - Optional log file */
 {
-#ifdef WIN32
+#ifdef _WIN32
   return (1);				/* Always fail on Windows... */
 
 #else
@@ -2139,7 +2154,7 @@ do_samba_command(const char *command,	/* I - Command to run */
     return (WEXITSTATUS(status));
   else
     return (-WTERMSIG(status));
-#endif /* WIN32 */
+#endif /* _WIN32 */
 }
 
 
@@ -2157,9 +2172,9 @@ get_cupsd_conf(
     int             *remote)		/* O - Remote file? */
 {
   int		fd;			/* Temporary file descriptor */
-#ifndef WIN32
+#ifndef _WIN32
   struct stat	info;			/* cupsd.conf file information */
-#endif /* WIN32 */
+#endif /* _WIN32 */
   http_status_t	status;			/* Status of getting cupsd.conf */
   char		host[HTTP_MAX_HOST];	/* Hostname for connection */
 
@@ -2176,7 +2191,7 @@ get_cupsd_conf(
   snprintf(name, namesize, "%s/cupsd.conf", cg->cups_serverroot);
   *remote = 0;
 
-#ifndef WIN32
+#ifndef _WIN32
   if (!_cups_strcasecmp(host, "localhost") && !access(name, R_OK))
   {
    /*
@@ -2203,7 +2218,7 @@ get_cupsd_conf(
       status = HTTP_STATUS_OK;
   }
   else
-#endif /* !WIN32 */
+#endif /* !_WIN32 */
   {
    /*
     * Read cupsd.conf via a HTTP GET request...
@@ -2367,8 +2382,3 @@ write_option(cups_file_t     *dstfp,	/* I - PPD file */
 
   cupsFilePrintf(dstfp, "*JCLCloseUI: *%s\n\n", name);
 }
-
-
-/*
- * End of "$Id$".
- */

cups/adminutil.h

@@ -1,18 +1,16 @@
 /*
- * "$Id$"
+ * Administration utility API definitions for CUPS.
  *
- *   Administration utility API definitions for CUPS.
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 2001-2007 by Easy Software Products.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 2001-2007 by Easy Software Products.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_ADMINUTIL_H_
@@ -42,11 +40,23 @@ extern "C" {
 #  define CUPS_SERVER_DEBUG_LOGGING	"_debug_logging"
 #  define CUPS_SERVER_REMOTE_ADMIN	"_remote_admin"
 #  define CUPS_SERVER_REMOTE_ANY	"_remote_any"
-/*#  define CUPS_SERVER_REMOTE_PRINTERS	"_remote_printers"*/
 #  define CUPS_SERVER_SHARE_PRINTERS	"_share_printers"
 #  define CUPS_SERVER_USER_CANCEL_ANY	"_user_cancel_any"
 
 
+/*
+ * Types and structures...
+ */
+
+typedef void (*cups_device_cb_t)(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, void *user_data);
+					/* Device callback
+					 * @since CUPS 1.4/macOS 10.6@ */
+
+
 /*
  * Functions...
  */
@@ -69,13 +79,15 @@ extern int	cupsAdminSetServerSettings(http_t *http,
 		                           cups_option_t *settings)
 		                           _CUPS_API_1_3;
 
+extern ipp_status_t	cupsGetDevices(http_t *http, int timeout,
+			               const char *include_schemes,
+			               const char *exclude_schemes,
+				       cups_device_cb_t callback,
+				       void *user_data) _CUPS_API_1_4;
+
 
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
 
 #endif /* !_CUPS_ADMINUTIL_H_ */
-
-/*
- * End of "$Id$".
- */

cups/api-admin.header

@@ -1,9 +1,7 @@
 <!--
-  "$Id: api-filedir.header 7279 2008-01-31 01:50:44Z mike $"
+  Administrative API header for CUPS.
 
-  File and Directory API header for CUPS.
-
-  Copyright 2008-2011 by Apple Inc.
+  Copyright 2016 by Apple Inc.
 
   These coded instructions, statements, and computer programs are the
   property of Apple Inc. and are protected by Federal copyright
@@ -12,14 +10,13 @@
   file is missing or damaged, see the license at "http://www.cups.org/".
 -->
 
-<h1 class='title'>File and Directory APIs</h1>
+<h1 class='title'>Administrative APIs</h1>
 
 <div class='summary'><table summary='General Information'>
 <thead>
 <tr>
-	<th>Headers</th>
-	<th>cups/file.h<br>
-	cups/dir.h</th>
+	<th>Header</th>
+	<th>cups/adminutil.h</th>
 </tr>
 </thead>
 <tbody>
@@ -30,7 +27,8 @@
 <tr>
 	<th>See Also</th>
 	<td>Programming: <a href='api-overview.html' target='_top'>Introduction to CUPS Programming</a><br>
-	Programming: <a href='api-cups.html' target='_top'>CUPS API</a></td>
+	Programming: <a href='api-cups.html' target='_top'>CUPS API</a><br>
+	Programming: <a href='api-httpipp.html' target='_top'>HTTP and IPP APIs</a></td>
 </tr>
 </tbody>
 </table></div>

cups/api-admin.shtml

@@ -0,0 +1,96 @@
+<!--
+  Administrative API documentation for CUPS.
+
+  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/".
+-->
+
+<h2 class="title"><a name="OVERVIEW">Overview</a></h2>
+
+<p>The administrative APIs provide convenience functions to perform certain administrative functions with the CUPS scheduler.</p>
+
+<blockquote><b>Note:<b>
+  <p>Administrative functions normally require administrative privileges to execute and must not be used in ordinary user applications!</p>
+</blockquote>
+
+<h3><a name="SETTINGS">Scheduler Settings</a></h3>
+
+<p>The <a href="#cupsAdminGetServerSettings"><code>cupsAdminGetServerSettings</code></a> and <a href="#cupsAdminSetServerSettings"><code>cupsAdminSetServerSettings</code></a> functions allow you to get and set simple directives and their values, respectively, in the <var>cupsd.conf</var> file for the CUPS scheduler. Settings are stored in CUPS option arrays which provide a simple list of string name/value pairs. While any simple <var>cupsd.conf</var> directive name can be specified, the following convenience names are also defined to control common complex directives:</p>
+
+<ul>
+  <li><code>CUPS_SERVER_DEBUG_LOGGING</code></li>: For <code>cupsAdminGetServerSettings</code>, a value of "1" means that the <code>LogLevel</code> directive is set to <code>debug</code> or <code>debug2</code> while a value of "0" means it is set to any other value. For <code>cupsAdminSetServerSettings</code> a value of "1" sets the <code>LogLeveL</code> to <code>debug</code> while a value of "0" sets it to <code>warn</code>.</li>
+  <li><code>CUPS_SERVER_REMOTE_ADMIN</code></li>: A value of "1" specifies that administrative requests are accepted from remote addresses while "0" specifies that requests are only accepted from local addresses (loopback interface and domain sockets).</li>
+  <li><code>CUPS_SERVER_REMOTE_ANY</code></li>: A value of "1" specifies that requests are accepts from any address while "0" specifies that requests are only accepted from the local subnet (when sharing is enabled) or local addresses (loopback interface and domain sockets).</li>
+  <li><code>CUPS_SERVER_SHARE_PRINTERS</code></li>: A value of "1" specifies that printer sharing is enabled for selected printers and remote requests are accepted while a value of "0" specifies that printer sharing is disables and remote requests are not accepted.</li>
+  <li><code>CUPS_SERVER_USER_CANCEL_ANY</code></li>: A value of "1" specifies that the default security policy allows any user to cancel any print job, regardless of the owner. A value of "0" specifies that only administrative users can cancel other user's jobs.</li>
+</ul>
+
+<blockquote><b>Note:</b>
+  <p>Changing settings will restart the CUPS scheduler.</p>
+  <p>When printer sharing or the web interface are enabled, the scheduler's launch-on-demand functionality is effectively disabled. This can affect power usage, system performance, and the security profile of a system.</p>
+</blockquote>
+
+<p>The recommended way to make changes to the <var>cupsd.conf</var> is to first call <a href="#cupsAdminGetServerSettings"><code>cupsAdminGetServerSettings</code></a>, make any changes to the returned option array, and then call <a href="#cupsAdminSetServerSettings"><code>cupsAdminSetServerSettings</code></a> to save those settings. For example, to enable the web interface:</p>
+
+<pre class="example">
+#include &lt;cups/cups.h&gt;
+#include &lt;cups/adminutil.h&gt;
+
+void
+enable_web_interface(void)
+{
+  int num_settings = 0;           /* Number of settings */
+  cups_option_t *settings = NULL; /* Settings */
+
+
+  if (!<a href="#cupsAdminGetServerSettings">cupsAdminGetServerSettings</a>(CUPS_HTTP_DEFAULT, &amp;num_settings, &amp;settings))
+  {
+    fprintf(stderr, "ERROR: Unable to get server settings: %s\n", cupsLastErrorString());
+    return;
+  }
+
+  num_settings = <a href="api-cups.html#cupsAddOption">cupsAddOption</a>("WebInterface", "Yes", num_settings, &amp;settings);
+
+  if (!<a href="#cupsAdminSetServerSettings">cupsAdminSetServerSettings</a>(CUPS_HTTP_DEFAULT, num_settings, settings))
+  {
+    fprintf(stderr, "ERROR: Unable to set server settings: %s\n", cupsLastErrorString());
+  }
+
+  <a href="api-cups.html#cupsFreeOptions">cupsFreeOptions</a>(num_settings, settings);
+}
+</pre>
+
+<h3><a name="DEVICES">Devices</a></h3>
+
+<p>Printers can be discovered through the CUPS scheduler using the <a href="#cupsGetDevices"><code>cupsGetDevices</code></a> API. Typically this API is used to locate printers to add the the system. Each device that is found will cause a supplied callback function to be executed. For example, to list the available printer devices that can be found within 30 seconds:</p>
+
+<pre class="example">
+#include &lt;cups/cups.h&gt;
+#include &lt;cups/adminutil.h&gt;
+
+
+void
+get_devices_cb(
+    const char *device_class,           /* I - Class */
+    const char *device_id,              /* I - 1284 device ID */
+    const char *device_info,            /* I - Description */
+    const char *device_make_and_model,  /* I - Make and model */
+    const char *device_uri,             /* I - Device URI */
+    const char *device_location,        /* I - Location */
+    void       *user_data)              /* I - User data */
+{
+  puts(device_uri);
+}
+
+
+void
+show_devices(void)
+{
+  <a href="#cupsGetDevices">cupsGetDevices</a>(CUPS_HTTP_DEFAULT, 30, NULL, NULL, get_devices_cb, NULL);
+}
+</pre>

cups/api-array.header

@@ -1,34 +0,0 @@
-<!--
-  "$Id: api-array.header 7266 2008-01-29 02:15:29Z mike $"
-
-  Array API header for CUPS.
-
-  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"
-  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'>Array API</h1>
-
-<div class='summary'><table summary='General Information'>
-<thead>
-<tr>
-	<th>Header</th>
-	<th>cups/array.h</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-	<th>Library</th>
-	<td>-lcups</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>

cups/api-array.shtml

@@ -1,196 +0,0 @@
-<!--
-  "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $"
-
-  Array API introduction for CUPS.
-
-  Copyright 2007-2011 by Apple Inc.
-  Copyright 1997-2006 by Easy Software Products, all rights reserved.
-
-  These coded instructions, statements, and computer programs are the
-  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 CUPS array API provides a high-performance generic array container.
-The contents of the array container can be sorted and the container itself is
-designed for optimal speed and memory usage under a wide variety of conditions.
-Sorted arrays use a binary search algorithm from the last found or inserted
-element to quickly find matching elements in the array. Arrays created with the
-optional hash function can often find elements with a single lookup. The
-<a href='#cups_array_t'><code>cups_array_t</code></a> type is used when
-referring to a CUPS array.</p>
-
-<p>The CUPS scheduler (<tt>cupsd</tt>) and many of the CUPS API
-functions use the array API to efficiently manage large lists of
-data.</p>
-
-<h3><a name='MANAGING_ARRAYS'>Managing Arrays</a></h3>
-
-<p>Arrays are created using either the
-<a href='#cupsArrayNew'><code>cupsArrayNew</code></a>,
-<a href='#cupsArrayNew2'><code>cupsArrayNew2</code></a>, or
-<a href='#cupsArrayNew2'><code>cupsArrayNew3</code></a> functions. The
-first function creates a new array with the specified callback function
-and user data pointer:</p>
-
-<pre class='example'>
-#include &lt;cups/array.h&gt;
-
-static int compare_func(void *first, void *second, void *user_data);
-
-void *user_data;
-<a href='#cups_array_t'>cups_array_t</a> *array = <a href='#cupsArrayNew'>cupsArrayNew</a>(compare_func, user_data);
-</pre>
-
-<p>The comparison function (type
-<a href="#cups_arrayfunc_t"><code>cups_arrayfunc_t</code></a>) is called
-whenever an element is added to the array and can be <code>NULL</code> to
-create an unsorted array. The function returns -1 if the first element should
-come before the second, 0 if the first and second elements should have the same
-ordering, and 1 if the first element should come after the second.</p>
-
-<p>The "user_data" pointer is passed to your comparison function. Pass
-<code>NULL</code> if you do not need to associate the elements in your array
-with additional information.</p>
-
-<p>The <a href='#cupsArrayNew2'><code>cupsArrayNew2</code></a> function adds
-two more arguments to support hashed lookups, which can potentially provide
-instantaneous ("O(1)") lookups in your array:</p>
-
-<pre class='example'>
-#include &lt;cups/array.h&gt;
-
-#define HASH_SIZE 512 /* Size of hash table */
-
-static int compare_func(void *first, void *second, void *user_data);
-static int hash_func(void *element, void *user_data);
-
-void *user_data;
-<a href='#cups_array_t'>cups_array_t</a> *hash_array = <a href='#cupsArrayNew2'>cupsArrayNew2</a>(compare_func, user_data, hash_func, HASH_SIZE);
-</pre>
-
-<p>The hash function (type
-<a href="#cups_ahash_func_t"><code>cups_ahash_func_t</code></a>) should return a
-number from 0 to (hash_size-1) that (hopefully) uniquely identifies the
-element and is called whenever you look up an element in the array with
-<a href='#cupsArrayFind'><code>cupsArrayFind</code></a>. The hash size is
-only limited by available memory, but generally should not be larger than
-16384 to realize any performance improvement.</p>
-
-<p>The <a href='#cupsArrayNew3'><code>cupsArrayNew3</code></a> function adds
-copy and free callbacks to support basic memory management of elements:</p>
-
-<pre class='example'>
-#include &lt;cups/array.h&gt;
-
-#define HASH_SIZE 512 /* Size of hash table */
-
-static int compare_func(void *first, void *second, void *user_data);
-static void *copy_func(void *element, void *user_data);
-static void free_func(void *element, void *user_data);
-static int hash_func(void *element, void *user_data);
-
-void *user_data;
-<a href='#cups_array_t'>cups_array_t</a> *array = <a href='#cupsArrayNew3'>cupsArrayNew3</a>(compare_func, user_data, NULL, 0, copy_func, free_func);
-
-<a href='#cups_array_t'>cups_array_t</a> *hash_array = <a href='#cupsArrayNew3'>cupsArrayNew3</a>(compare_func, user_data, hash_func, HASH_SIZE, copy_func, free_func);
-</pre>
-
-<p>Once you have created the array, you add elements using the
-<a href='#cupsArrayAdd'><code>cupsArrayAdd</code></a>
-<a href='#cupsArrayInsert'><code>cupsArrayInsert</code></a> functions.
-The first function adds an element to the array, adding the new element
-after any elements that have the same order, while the second inserts the
-element before others with the same order. For unsorted arrays,
-<a href='#cupsArrayAdd'><code>cupsArrayAdd</code></a> appends the element to
-the end of the array while
-<a href='#cupsArrayInsert'><code>cupsArrayInsert</code></a> inserts the
-element at the beginning of the array. For example, the following code
-creates a sorted array of character strings:</p>
-
-<pre class='example'>
-#include &lt;cups/array.h&gt;
-
-/* Use strcmp() to compare strings - it will ignore the user_data pointer */
-<a href='#cups_array_t'>cups_array_t</a> *array = <a href='#cupsArrayNew'>cupsArrayNew</a>((<a href='#cups_array_func_t'>cups_array_func_t</a>)strcmp, NULL);
-
-/* Add four strings to the array */
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "One Fish");
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "Two Fish");
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "Red Fish");
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "Blue Fish");
-</pre>
-
-<p>Elements are removed using the
-<a href='#cupsArrayRemove'><code>cupsArrayRemove</code></a> function, for
-example:</p>
-
-<pre class='example'>
-#include &lt;cups/array.h&gt;
-
-/* Use strcmp() to compare strings - it will ignore the user_data pointer */
-<a href='#cups_array_t'>cups_array_t</a> *array = <a href='#cupsArrayNew'>cupsArrayNew</a>((<a href='#cups_array_func_t'>cups_array_func_t</a>)strcmp, NULL);
-
-/* Add four strings to the array */
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "One Fish");
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "Two Fish");
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "Red Fish");
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "Blue Fish");
-
-/* Remove "Red Fish" */
-<a href='#cupsArrayRemove'>cupsArrayRemove</a>(array, "Red Fish");
-</pre>
-
-<p>Finally, you free the memory used by the array using the
-<a href='#cupsArrayDelete'><code>cupsArrayDelete</code></a> function. All
-of the memory for the array and hash table (if any) is freed, however <em>CUPS
-does not free the elements unless you provide copy and free functions</em>.</p>
-
-<h3><a name='FINDING_AND_ENUMERATING'>Finding and Enumerating Elements</a></h3>
-
-<p>CUPS provides several functions to find and enumerate elements in an
-array. Each one sets or updates a "current index" into the array, such that
-future lookups will start where the last one left off:</p>
-
-<dl>
-	<dt><a href='#cupsArrayFind'><code>cupsArrayFind</code></a></dt>
-	<dd>Returns the first matching element.</dd>
-	<dt><a href='#cupsArrayFirst'><code>cupsArrayFirst</code></a></dt>
-	<dd>Returns the first element in the array.</dd>
-	<dt><a href='#cupsArrayIndex'><code>cupsArrayIndex</code></a></dt>
-	<dd>Returns the Nth element in the array, starting at 0.</dd>
-	<dt><a href='#cupsArrayLast'><code>cupsArrayLast</code></a></dt>
-	<dd>Returns the last element in the array.</dd>
-	<dt><a href='#cupsArrayNext'><code>cupsArrayNext</code></a></dt>
-	<dd>Returns the next element in the array.</dd>
-	<dt><a href='#cupsArrayPrev'><code>cupsArrayPrev</code></a></dt>
-	<dd>Returns the previous element in the array.</dd>
-</dl>
-
-<p>Each of these functions returns <code>NULL</code> when there is no
-corresponding element.  For example, a simple <code>for</code> loop using the
-<a href='#cupsArrayFirst'><code>cupsArrayFirst</code></a> and
-<a href='#cupsArrayNext'><code>cupsArrayNext</code></a> functions will
-enumerate all of the strings in our previous example:</p> 
-
-<pre class='example'>
-#include &lt;cups/array.h&gt;
-
-/* Use strcmp() to compare strings - it will ignore the user_data pointer */
-<a href='#cups_array_t'>cups_array_t</a> *array = <a href='#cupsArrayNew'>cupsArrayNew</a>((<a href='#cups_array_func_t'>cups_array_func_t</a>)strcmp, NULL);
-
-/* Add four strings to the array */
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "One Fish");
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "Two Fish");
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "Red Fish");
-<a href='#cupsArrayAdd'>cupsArrayAdd</a>(array, "Blue Fish");
-
-/* Show all of the strings in the array */
-char *s;
-for (s = (char *)<a href='#cupsArrayFirst'>cupsArrayFirst</a>(array); s != NULL; s = (char *)<a href='#cupsArrayNext'>cupsArrayNext</a>(array))
-  puts(s);
-</pre>

cups/api-cups.header

@@ -1,40 +0,0 @@
-<!--
-  "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $"
-
-  CUPS API header for CUPS.
-
-  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"
-  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'>CUPS API</h1>
-
-<div class='summary'><table summary='General Information'>
-<thead>
-<tr>
-	<th>Header</th>
-	<th>cups/cups.h</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-	<th>Library</th>
-	<td>-lcups</td>
-</tr>
-<tr>
-	<th>See Also</th>
-	<td>Programming: <a href='api-overview.html' target='_top'>Introduction to CUPS Programming</a><br>
-	Programming: <a href='api-array.html' target='_top'>Array API</a><br>
-	Programming: <a href='api-filedir.html' target='_top'>File and Directory APIs</a><br>
-	Programming: <a href='api-filter.html' target='_top'>Filter and Backend Programming</a><br>
-	Programming: <a href='api-httpipp.html' target='_top'>HTTP and IPP APIs</a><br>
-	Programming: <a href='api-ppd.html' target='_top'>PPD API</a><br>
-	Programming: <a href='api-raster.html' target='_top'>Raster API</a></td>
-</tr>
-</tbody>
-</table></div>