From b93671244e94868fdcb9cafead4cd13b244e06e4 Mon Sep 17 00:00:00 2001
From: Michael Sweet
Date: Tue, 15 Mar 2016 10:40:30 -0400
Subject: [PATCH] Import CUPS v2.0.0
---
CHANGES.txt | 14 +-
INSTALL.txt | 9 +-
README.txt | 17 +-
backend/org.cups.usb-quirks | 6 +
config-scripts/cups-common.m4 | 6 +-
configure | 2 +-
cups/tls-darwin.c | 6 +-
cups/tls-gnutls.c | 5 +-
cups/tls-sspi.c | 6 +-
doc/es/index.html.in | 55 +
doc/help/accounting.html | 13 +-
doc/help/cgi.html | 8 +-
doc/help/glossary.html | 9 +-
doc/help/kerberos.html | 4 +-
doc/help/network.html | 8 +-
doc/help/overview.html | 2 +-
doc/help/policies.html | 267 +-
doc/help/security.html | 7 +-
locale/cups_es.po | 2551 ++++++++++++++---
packaging/cups.spec | 4 +-
scheduler/conf.c | 16 +-
scheduler/listen.c | 29 +-
scheduler/printers.c | 99 +-
templates/es/add-class.tmpl | 37 +
templates/es/add-printer.tmpl | 44 +
templates/es/add-rss-subscription.tmpl | 44 +
templates/es/admin.tmpl | 97 +
templates/es/choose-device.tmpl | 52 +
templates/es/choose-make.tmpl | 61 +
templates/es/choose-model.tmpl | 57 +
templates/es/choose-serial.tmpl | 49 +
templates/es/choose-uri.tmpl | 41 +
templates/es/class-added.tmpl | 4 +
templates/es/class-confirm.tmpl | 6 +
templates/es/class-deleted.tmpl | 3 +
templates/es/class-jobs-header.tmpl | 1 +
templates/es/class-modified.tmpl | 3 +
templates/es/class.tmpl | 41 +
templates/es/classes-header.tmpl | 1 +
templates/es/classes.tmpl | 11 +
templates/es/command.tmpl | 8 +
templates/es/edit-config.tmpl | 20 +
templates/es/error-op.tmpl | 5 +
templates/es/error.tmpl | 5 +
templates/es/header.tmpl.in | 35 +
templates/es/help-header.tmpl | 41 +
templates/es/help-printable.tmpl | 9 +
templates/es/help-trailer.tmpl | 0
templates/es/job-cancel.tmpl | 4 +
templates/es/job-hold.tmpl | 3 +
templates/es/job-move.tmpl | 23 +
templates/es/job-moved.tmpl | 4 +
templates/es/job-release.tmpl | 3 +
templates/es/job-restart.tmpl | 3 +
templates/es/jobs-header.tmpl | 5 +
templates/es/jobs.tmpl | 37 +
templates/es/list-available-printers.tmpl | 7 +
templates/es/modify-class.tmpl | 31 +
templates/es/modify-printer.tmpl | 39 +
templates/es/norestart.tmpl | 4 +
templates/es/option-boolean.tmpl | 6 +
templates/es/option-conflict.tmpl | 7 +
templates/es/option-header.tmpl | 5 +
templates/es/option-pickmany.tmpl | 6 +
templates/es/option-pickone.tmpl | 18 +
templates/es/option-trailer.tmpl | 5 +
templates/es/pager.tmpl | 6 +
templates/es/printer-accept.tmpl | 5 +
templates/es/printer-added.tmpl | 3 +
templates/es/printer-cancel-jobs.tmpl | 4 +
templates/es/printer-configured.tmpl | 4 +
templates/es/printer-confirm.tmpl | 6 +
templates/es/printer-default.tmpl | 9 +
templates/es/printer-deleted.tmpl | 3 +
templates/es/printer-jobs-header.tmpl | 1 +
templates/es/printer-modified.tmpl | 3 +
templates/es/printer-purge.tmpl | 8 +
templates/es/printer-reject.tmpl | 5 +
templates/es/printer-start.tmpl | 5 +
templates/es/printer-stop.tmpl | 5 +
templates/es/printer.tmpl | 43 +
templates/es/printers-header.tmpl | 1 +
templates/es/printers.tmpl | 11 +
templates/es/restart.tmpl | 4 +
templates/es/samba-export.tmpl | 55 +
templates/es/samba-exported.tmpl | 1 +
templates/es/search.tmpl | 10 +
templates/es/set-printer-options-header.tmpl | 24 +
templates/es/set-printer-options-trailer.tmpl | 14 +
templates/es/subscription-added.tmpl | 1 +
templates/es/subscription-canceled.tmpl | 1 +
templates/es/test-page.tmpl | 4 +
templates/es/trailer.tmpl | 5 +
templates/es/users.tmpl | 27 +
test/run-stp-tests.sh | 6 +-
xcode/CUPS.xcodeproj/project.pbxproj | 2 +
96 files changed, 3620 insertions(+), 684 deletions(-)
create mode 100644 doc/es/index.html.in
create mode 100644 templates/es/add-class.tmpl
create mode 100644 templates/es/add-printer.tmpl
create mode 100644 templates/es/add-rss-subscription.tmpl
create mode 100644 templates/es/admin.tmpl
create mode 100644 templates/es/choose-device.tmpl
create mode 100644 templates/es/choose-make.tmpl
create mode 100644 templates/es/choose-model.tmpl
create mode 100644 templates/es/choose-serial.tmpl
create mode 100644 templates/es/choose-uri.tmpl
create mode 100644 templates/es/class-added.tmpl
create mode 100644 templates/es/class-confirm.tmpl
create mode 100644 templates/es/class-deleted.tmpl
create mode 100644 templates/es/class-jobs-header.tmpl
create mode 100644 templates/es/class-modified.tmpl
create mode 100644 templates/es/class.tmpl
create mode 100644 templates/es/classes-header.tmpl
create mode 100644 templates/es/classes.tmpl
create mode 100644 templates/es/command.tmpl
create mode 100644 templates/es/edit-config.tmpl
create mode 100644 templates/es/error-op.tmpl
create mode 100644 templates/es/error.tmpl
create mode 100644 templates/es/header.tmpl.in
create mode 100644 templates/es/help-header.tmpl
create mode 100644 templates/es/help-printable.tmpl
create mode 100644 templates/es/help-trailer.tmpl
create mode 100644 templates/es/job-cancel.tmpl
create mode 100644 templates/es/job-hold.tmpl
create mode 100644 templates/es/job-move.tmpl
create mode 100644 templates/es/job-moved.tmpl
create mode 100644 templates/es/job-release.tmpl
create mode 100644 templates/es/job-restart.tmpl
create mode 100644 templates/es/jobs-header.tmpl
create mode 100644 templates/es/jobs.tmpl
create mode 100644 templates/es/list-available-printers.tmpl
create mode 100644 templates/es/modify-class.tmpl
create mode 100644 templates/es/modify-printer.tmpl
create mode 100644 templates/es/norestart.tmpl
create mode 100644 templates/es/option-boolean.tmpl
create mode 100644 templates/es/option-conflict.tmpl
create mode 100644 templates/es/option-header.tmpl
create mode 100644 templates/es/option-pickmany.tmpl
create mode 100644 templates/es/option-pickone.tmpl
create mode 100644 templates/es/option-trailer.tmpl
create mode 100644 templates/es/pager.tmpl
create mode 100644 templates/es/printer-accept.tmpl
create mode 100644 templates/es/printer-added.tmpl
create mode 100644 templates/es/printer-cancel-jobs.tmpl
create mode 100644 templates/es/printer-configured.tmpl
create mode 100644 templates/es/printer-confirm.tmpl
create mode 100644 templates/es/printer-default.tmpl
create mode 100644 templates/es/printer-deleted.tmpl
create mode 100644 templates/es/printer-jobs-header.tmpl
create mode 100644 templates/es/printer-modified.tmpl
create mode 100644 templates/es/printer-purge.tmpl
create mode 100644 templates/es/printer-reject.tmpl
create mode 100644 templates/es/printer-start.tmpl
create mode 100644 templates/es/printer-stop.tmpl
create mode 100644 templates/es/printer.tmpl
create mode 100644 templates/es/printers-header.tmpl
create mode 100644 templates/es/printers.tmpl
create mode 100644 templates/es/restart.tmpl
create mode 100644 templates/es/samba-export.tmpl
create mode 100644 templates/es/samba-exported.tmpl
create mode 100644 templates/es/search.tmpl
create mode 100644 templates/es/set-printer-options-header.tmpl
create mode 100644 templates/es/set-printer-options-trailer.tmpl
create mode 100644 templates/es/subscription-added.tmpl
create mode 100644 templates/es/subscription-canceled.tmpl
create mode 100644 templates/es/test-page.tmpl
create mode 100644 templates/es/trailer.tmpl
create mode 100644 templates/es/users.tmpl
diff --git a/CHANGES.txt b/CHANGES.txt
index b7c0b26a0..84405df66 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,15 @@
-CHANGES.txt - 2.0rc1 - 2014-09-02
----------------------------------
+CHANGES.txt - 2.0.0 - 2014-10-01
+--------------------------------
+
+CHANGES IN CUPS V2.0.0
+
+ - The scheduler did not preserve listener sockets from launchd or
+ systemd after a restart ()
+ - Added some USB quirk rules for the libusb-based USB backend
+ (STR #4482)
+ - Spanish localization update (STR #4487)
+ - Updated documentation for 2.0.0 release.
+
CHANGES IN CUPS V2.0rc1
diff --git a/INSTALL.txt b/INSTALL.txt
index 77b1628c1..d05de97ec 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
-INSTALL - CUPS v2.0rc1 - 2014-09-02
------------------------------------
+INSTALL - CUPS v2.0.0 - 2014-10-01
+----------------------------------
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
@@ -98,6 +98,11 @@ CONFIGURATION
and diagnose a variety of common problems - use the "--enable-unit-tests"
configure option to run them at build time.
+ On OS X, use the "--with-archflags" option to build with the correct set of
+ architectures:
+
+ ./configure --with-archflags="-arch i386 -arch x86_64" ...
+
Once you have configured things, just type:
make ENTER
diff --git a/README.txt b/README.txt
index d9c0adb55..a2f12f2dc 100644
--- a/README.txt
+++ b/README.txt
@@ -1,18 +1,5 @@
-README - CUPS v2.0rc1 - 2014-09-02
-----------------------------------
-
-********************************************************************************
-********************************************************************************
-******** ********
-******** ********
-******** THIS IS BETA-RELEASE SOFTWARE AND SHOULD NOT BE USED ON ********
-******** PRODUCTION SYSTEMS. ********
-******** ********
-******** ********
-********************************************************************************
-********************************************************************************
-
-
+README - CUPS v2.0.0 - 2014-10-01
+---------------------------------
Looking for compile instructions? Read the file "INSTALL.txt" instead...
diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
index 5a7b2e09a..aecb9ea69 100644
--- a/backend/org.cups.usb-quirks
+++ b/backend/org.cups.usb-quirks
@@ -215,3 +215,9 @@
# Lexmark E238 (STR #4448)
0x043d 0x009a no-reattach
+
+# Canon MX310 (STR #4482)
+0x04a9 0x1728 unidir
+
+# Canon MX320 (STR #4482)
+0x04A9 0x1736 unidir
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 20168172c..88aaabbc1 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
dnl
-dnl "$Id: cups-common.m4 12140 2014-08-30 01:51:22Z msweet $"
+dnl "$Id: cups-common.m4 12180 2014-10-01 12:08:02Z msweet $"
dnl
dnl Common configuration stuff for CUPS.
dnl
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
AC_CONFIG_HEADER(config.h)
dnl Version number information...
-CUPS_VERSION=2.0rc1
+CUPS_VERSION=2.0.0
CUPS_REVISION=
#if test -z "$CUPS_REVISION" -a -d .svn; then
# CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
@@ -462,5 +462,5 @@ esac
AC_SUBST(BUILDDIRS)
dnl
-dnl End of "$Id: cups-common.m4 12140 2014-08-30 01:51:22Z msweet $".
+dnl End of "$Id: cups-common.m4 12180 2014-10-01 12:08:02Z msweet $".
dnl
diff --git a/configure b/configure
index dab003f8c..5a7a5dfe3 100755
--- a/configure
+++ b/configure
@@ -2520,7 +2520,7 @@ esac
ac_config_headers="$ac_config_headers config.h"
-CUPS_VERSION=2.0rc1
+CUPS_VERSION=2.0.0
CUPS_REVISION=
#if test -z "$CUPS_REVISION" -a -d .svn; then
# CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
index dab7ba9e6..be788a608 100644
--- a/cups/tls-darwin.c
+++ b/cups/tls-darwin.c
@@ -1,5 +1,5 @@
/*
- * "$Id: tls-darwin.c 12094 2014-08-19 12:15:11Z msweet $"
+ * "$Id: tls-darwin.c 12159 2014-09-23 14:56:14Z msweet $"
*
* TLS support code for CUPS on OS X.
*
@@ -15,7 +15,7 @@
* This file is subject to the Apple OS-Developed Software exception.
*/
-/**** This file is included from http.c ****/
+/**** This file is included from tls.c ****/
/*
* Include necessary headers...
@@ -1660,5 +1660,5 @@ http_cdsa_write(
/*
- * End of "$Id: tls-darwin.c 12094 2014-08-19 12:15:11Z msweet $".
+ * End of "$Id: tls-darwin.c 12159 2014-09-23 14:56:14Z msweet $".
*/
diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
index 5b32a8a67..36331d437 100644
--- a/cups/tls-gnutls.c
+++ b/cups/tls-gnutls.c
@@ -1,5 +1,5 @@
/*
- * "$Id: tls-gnutls.c 12125 2014-08-28 15:49:29Z msweet $"
+ * "$Id: tls-gnutls.c 12159 2014-09-23 14:56:14Z msweet $"
*
* TLS support code for CUPS using GNU TLS.
*
@@ -15,6 +15,7 @@
* This file is subject to the Apple OS-Developed Software exception.
*/
+/**** This file is included from tls.c ****/
/*
* Include necessary headers...
@@ -1291,5 +1292,5 @@ _httpTLSWrite(http_t *http, /* I - Connection to server */
/*
- * End of "$Id: tls-gnutls.c 12125 2014-08-28 15:49:29Z msweet $".
+ * End of "$Id: tls-gnutls.c 12159 2014-09-23 14:56:14Z msweet $".
*/
diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c
index a676830d1..171fa45bf 100644
--- a/cups/tls-sspi.c
+++ b/cups/tls-sspi.c
@@ -1,5 +1,5 @@
/*
- * "$Id: tls-sspi.c 12094 2014-08-19 12:15:11Z msweet $"
+ * "$Id: tls-sspi.c 12159 2014-09-23 14:56:14Z msweet $"
*
* TLS support for CUPS on Windows using SSPI.
*
@@ -14,6 +14,8 @@
* This file is subject to the Apple OS-Developed Software exception.
*/
+/**** This file is included from tls.c ****/
+
/*
* Include necessary headers...
*/
@@ -2359,5 +2361,5 @@ http_sspi_verify(
/*
- * End of "$Id: tls-sspi.c 12094 2014-08-19 12:15:11Z msweet $".
+ * End of "$Id: tls-sspi.c 12159 2014-09-23 14:56:14Z msweet $".
*/
diff --git a/doc/es/index.html.in b/doc/es/index.html.in
new file mode 100644
index 000000000..11680f755
--- /dev/null
+++ b/doc/es/index.html.in
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+ Inicio - CUPS @CUPS_VERSION@@CUPS_REVISION@
+
+
+
+
+
+
CUPS @CUPS_VERSION@
+
CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por Apple Inc. para OS X® y otros sistemas operativos tipo UNIX® .
+
+
+
+
+
+
diff --git a/doc/help/accounting.html b/doc/help/accounting.html
index 66c34ec1f..d25d5019a 100644
--- a/doc/help/accounting.html
+++ b/doc/help/accounting.html
@@ -10,8 +10,7 @@
CUPS supports a variety of printer accounting schemes. Aside from the
built-in quota and page logging
-support, there are several third-party solutions that can be found on
-www.cups.org .
+support, there are several third-party solutions that can be found online.
@@ -27,7 +26,7 @@ options determine whether and how quotas are enforced for a printer.
The job-quota-period
option determines the time interval for
quota tracking. The interval is expressed in seconds, so a day is
86,400, a week is 604,800, and a month is 2,592,000 seconds. The
-job-k-limit
option specifies the job size limit in killobytes. The
+job-k-limit
option specifies the job size limit in killobytes. The
job-page-limit
option specifies the number of pages limit.
For quotas to be enforced, the period and at least one of the limits
@@ -50,13 +49,7 @@ can be used to easily determine that information.
-CUPS logs every page that is printed on a system to the
-page_log file. Page logging
-is only available for drivers that provide page accounting information,
-typically all PostScript and CUPS raster devices. Raw queues and queues
-using third-party solutions such as Foomatic generally do not have
-useful page accounting information available.
-
+CUPS can log every page that is printed on a system to the page_log file. Page logging must be enabled by setting the PageLogFormat
directive in the cupsd.conf file and is only available for drivers that provide page accounting information, typically all PostScript and CUPS raster devices. Raw queues and queues using third-party solutions such as Foomatic generally do not have useful page accounting information available.