Merge changes from CUPS 1.7svn-r10578.

git-svn-id: svn+ssh:https://src.apple.com/svn/cups/easysw/current@3891 a1ca3aef-8c08-0410-bb20-df032aa958be

CHANGES-1.5.txt

@@ -3,6 +3,15 @@ CHANGES-1.5.txt
 
 CHANGES IN CUPS V1.5.4
 
+ - Documentation updates (STR #4112, STR #4130, STR #4134)
+ - Fixes for libusb-based USB backend (STR #4128)
+ - The lpq command did not show the owner or title of jobs unless passed
+ a username on the command-line (STR #4135)
+ - Localized empty strings contained the message catalog metadata
+ (STR #4119)
+ - Fixed a crash in the libusb-based USB backend (STR #4099)
+ - The cups-lpd mini-daemon no longer handled jobs with multiple copies
+ (STR #4118)
  - Multiple libusb backend fixes (STR #4098, STR #4100)
  - The IPP backend no longer tries to get the job status for printers
  that do not implement the required operation (STR #4083)

CHANGES-1.6.txt

@@ -0,0 +1,109 @@
+CHANGES-1.6.txt
+---------------
+
+CHANGES IN CUPS V1.6.2
+
+ - The scheduler did not recognize dnssd: or ipps: URIs as Bonjour shared
+ queues (STR #4158)
+ - Applications could not get the PPD file for statically-configured
+ Bonjour-shared print queues (STR #4159)
+ - The cupsd.conf file included obsolete browsing directives (STR #4157)
+ - Fixed a USB backend compatibility issue on systems using libusb
+ (STR #4155)
+ - Some Bonjour features were not available on systems with Avahi
+ (STR #4156)
+ - CUPS now includes the port number in the Host: header for HTTP
+ requests.
+ - Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
+ out.
+
+
+CHANGES IN CUPS V1.6.1
+
+ - Documentation fix (STR #4149)
+ - RPM packaging fixes (STR #4129, #4145)
+ - The Japanese and English web interface headers were swapped
+ (STR #4148)
+
+
+CHANGES IN CUPS V1.6.0
+
+ - Document changes (STR #4131)
+ - Added new Catalan (STR #4107) and Spanish (STR #4137) localizations.
+
+
+CHANGES IN CUPS V1.6rc1
+
+ - Added a new Japanese localization (STR #4122)
+ - The SNMP backend no longer exits if it is unable to obtain an IPv6
+ socket (STR #4109)
+ - The LPD backend incorrectly used "localhost" in the control file
+ instead of the current hostname.
+
+
+CHANGES IN CUPS V1.6b1
+
+ - Documentation updates (STR #3927, STR #3980, STR #4010, STR #4068)
+ - The scheduler now consolidates all PPD updates from filters at the
+ end of the job (STR #4075)
+ - CUPS now supports color management using colord (STR #3808)
+ - CUPS now supports Bonjour using Avahi (STR #3066)
+ - The PreserveJobFiles and PreserveJobHistory directives now support
+ specification of a time interval (STR #3143)
+ - PPD files can now be archived in (gzip'd) tar files to further reduce
+ the disk space used by PPD files (STR #3772)
+ - The network backends now deal with printers that report their levels
+ in percent but do not specify a maximum capacity of 100 (STR #3551)
+ - The network backends now report full/almost-full waste bins in
+ printers along with end-of-life for cleaning pads (STR #4017)
+ - Added a configure option to set the permissions of the installed
+ cupsd (STR #3459)
+ - Added a new WITH-ALL-VALUES directive to ipptool EXPECT predicates
+ (STR #3949)
+ - CUPS now supports a User directive in client.conf and the CUPS_USER
+ environment variable for overriding the default username (STR #3114)
+ - Now set the PJL USERNAME variable as needed (STR #3100)
+ - Added support for usernames and passwords longer than 32 characters
+ (STR #2856)
+ - Added a new MaxHoldTime directive to automatically cancel jobs that
+ have been held indefinitely after a specific number of seconds
+ (STR #2291)
+ - The LPD backend now uses the originating host name when it is not the
+ local system (STR #2053)
+ - CUPS now prefers the suffix "dpcm" when reporting resolution in dots-
+ per-centimeter (STR #4006)
+ - The configure script and build system no longer support building of
+ separate 32-bit and 64-bit libraries.
+ - The "brightness", "columns", "fitplot", "gamma", "hue",
+ "natural-scaling", "penwidth", "position", "ppi", "saturation", and
+ "scaling" options are not longer supported (STR #4010)
+ - The "page-bottom", "page-left", "page-right", "page-top",
+ "prettyprint", and "wrap" options have been deprecated (STR #4010)
+ - The scheduler now reports the standard "number-of-documents" attribute
+ instead of the CUPS-specific "document-count" attribute in
+ job objects.
+ - Added new destination connection and enumeration functions (STR #3924)
+ - Added new option, localization, and job submission functions that do
+ not depend on PPD files (STR #3925)
+ - Added a new MaxJobTime directive for cupsd that specifies the maximum
+ amount of time allowed for a job to complete before it is canceled.
+ - The default password callback now supports passwords up to 127
+ characters.
+ - The scheduler now supports a DefaultAuthType of "auto" to
+ automatically choose between Basic (username/password) and Negotiate
+ (Kerberos) authentication.
+ - cupsSideChannelSNMPGet/Walk now support OIDs and values up to 64k in
+ length.
+ - CUPS no longer supports automatic remote printers or implicit classes
+ via the CUPS, LDAP, or SLP protocols (STR #3922, STR #3923)
+ - The PPD APIs are now deprecated and will be removed in a future
+ version of CUPS (STR #3927)
+ - The default IPP version for requests is now 2.0 (STR #3929)
+ - The IPP APIs no longer expose the ipp_t or ipp_attribute_t structures
+ and instead provide accessor functions (STR #3928)
+ - The scheduler will no longer run programs with group write permission.
+ - The PHP module has been removed (STR #3932)
+ - The bannertops, commandtoescpx, commandtopclx, imagetops,
+ imagetoraster, pdftops, rastertoescpx, rastertopclx, and texttops
+ filters have been removed (STR #3930)
+ - The serial and parallel backends have been removed (STR 3935)

CHANGES-IPPTOOL.txt

@@ -1,10 +1,16 @@
-CHANGES-IPPTOOL.txt - 2012-02-28
+CHANGES-IPPTOOL.txt - 2012-08-23
 --------------------------------
 
 This file provides a list of changes to the ipptool binary distribution posted
 on cups.org.
 
 
+2012-MM-DD
+
+ - Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
+ out.
+
+
 2012-02-28
 
  - Changed behavior of WITH-VALUES "/regex/" to not require all values to

CHANGES.txt

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

CREDITS.txt

@@ -1,4 +1,4 @@
-CREDITS.txt - 2010-03-13
+CREDITS.txt - 2012-07-16
 ------------------------
 
 Few projects are completed by one person, and CUPS is no exception. We'd
@@ -17,7 +17,7 @@ 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.
+ Iñaki Larrañaga - Basque localization.
  Kenshi Muto - Japanese localization, patches, and
  testing.
  Tomohiro Kato - Japanese localization.
@@ -27,16 +27,18 @@ like to thank the following individuals for their contributions:
  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.
  Daniel Nylander - Swedish localization.
- Niklas 'Nille' �kerstr�m - Swedish localization.
+ Niklas 'Nille' Åkerström - Swedish localization.
+ Naruiko Ogasawara - Japanese localization.
  Giulio Orsero - Bug fixes and testing.
  Michal Osowiecki - Polish localization.
  Citra Paska - Indonesian localization.
  Kurt Pfeifle - Bug fixes, beta testing, evangelism.
  Vincenzo Reale - Italian localization.
  Petter Reinholdtsen - HP-UX compiler stuff.
- Juan Pablo Gonz�lez Riopedre - Spanish localization.
+ Juan Pablo González Riopedre - Spanish localization.
  Opher Shachar - Hebrew localization.
  Stuart Stevens - HP JetDirect IPP information.
  Andrea Suatoni - IRIX desktop integration and testing.

INSTALL.txt

@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.6.0 - 2012-05-23
+INSTALL - CUPS v1.7b1 - 2012-08-10
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more

README.txt

@@ -1,5 +1,5 @@
-README - CUPS v1.6.0 - 2012-05-23
-----------------------------------
+README - CUPS v1.7b1 - 2012-08-10
+---------------------------------
 
 Looking for compile instructions? Read the file "INSTALL.txt"
 instead...
@@ -8,7 +8,7 @@ instead...
 INTRODUCTION
 
  CUPS is a standards-based, open source printing system developed by Apple
- Inc. for Mac OS® X and other UNIX®-like operating systems. CUPS uses the
+ 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

backend/Makefile

@@ -128,7 +128,7 @@ install-exec: $(INSTALLXPC)
  $(RM) $(SERVERBIN)/backend/$$file; \
  $(LN) ipp $(SERVERBIN)/backend/$$file; \
  done
- if test "x$(DNSSD_BACKEND)" != x; then \
+ if test "x$(DNSSD_BACKEND)" != x -a `uname` = Darwin; then \
  $(RM) $(SERVERBIN)/backend/mdns; \
  $(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \
  fi
@@ -232,8 +232,10 @@ libbackend.a: $(LIBOBJS)
 dnssd: dnssd.o ../cups/$(LIBCUPS) libbackend.a
  echo Linking $@...
  $(CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
- $(RM) mdns
- $(LN) dnssd mdns
+ if test `uname` = Darwin; then \
+ $(RM) mdns; \
+ $(LN) dnssd mdns; \
+ fi
 
 
 #

backend/ipp.c

@@ -169,7 +169,7 @@ static const char *password_cb(const char *);
 static void report_attr(ipp_attribute_t *attr);
 static void report_printer_state(ipp_t *ipp);
 #if defined(HAVE_GSSAPI) && defined(HAVE_XPC)
-static int run_as_user(int argc, char *argv[], uid_t uid,
+static int run_as_user(char *argv[], uid_t uid,
  const char *device_uri, int fd);
 #endif /* HAVE_GSSAPI && HAVE_XPC */
 static void sigterm_handler(int sig);
@@ -348,7 +348,7 @@ main(int argc, /* I - Number of command-line args */
  if (uid > 0)
  {
  if (argc == 6)
- return (run_as_user(argc, argv, uid, device_uri, 0));
+ return (run_as_user(argv, uid, device_uri, 0));
  else
  {
  int status = 0; /* Exit status */
@@ -357,7 +357,7 @@ main(int argc, /* I - Number of command-line args */
  {
  if ((fd = open(argv[i], O_RDONLY)) >= 0)
  {
- status = run_as_user(argc, argv, uid, device_uri, fd);
+ status = run_as_user(argv, uid, device_uri, fd);
  close(fd);
  }
  else
@@ -1080,7 +1080,7 @@ main(int argc, /* I - Number of command-line args */
  get_job_attrs = 1;
  }
 
- if (!send_document)
+ if (create_job && !send_document)
  {
  fputs("DEBUG: Printer supports Create-Job but not Send-Document.\n",
  stderr);
@@ -2839,8 +2839,7 @@ report_printer_state(ipp_t *ipp) /* I - IPP response */
  */
 
 static int /* O - Exit status */
-run_as_user(int argc, /* I - Number of command-line args */
- char *argv[], /* I - Command-line arguments */
+run_as_user(char *argv[], /* I - Command-line arguments */
  uid_t uid, /* I - User ID */
  const char *device_uri, /* I - Device URI */
  int fd) /* I - File to print */

backend/lpd.c

@@ -936,7 +936,7 @@ lpd_queue(const char *hostname, /* I - Host to connect to */
  return (CUPS_BACKEND_FAILED);
  }
 
- if (orighost)
+ if (orighost && _cups_strcasecmp(orighost, "localhost"))
  strlcpy(localhost, orighost, sizeof(localhost));
  else
  httpGetHostname(NULL, localhost, sizeof(localhost));

backend/snmp.c

@@ -251,7 +251,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
 
 #ifdef AF_INET6
  if ((ipv6 = _cupsSNMPOpen(AF_INET6)) < 0)
- return (1);
+ perror("DEBUG: Unable to create IPv6 socket");
 #else
  ipv6 = -1;
 #endif /* AF_INET6 */