Load cups into easysw/current.

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

CHANGES.txt

@@ -1,6 +1,68 @@
-CHANGES.txt - 2006-09-21
+CHANGES.txt - 2006-10-20
 ------------------------
 
+CHANGES IN CUPS V1.2.5
+
+ - Documentation updates (STR #2038)
+ - The SNMP backend no longer uses IPP for Epson printers
+ (STR #2028)
+ - Updated the configure script for Tru64 UNIX 5.1 (STR
+ #2033)
+ - Tru64 5.1B's getaddrinfo() and getnameinfo() functions
+ leak file descriptors (STR #2034)
+ - cupsAddDest() didn't add the parent destination's
+ options and attributes.
+ - ppdConflicts() did not handle custom option
+ constraints.
+ - Raw printing of gzip'd files did not work (STR #2009)
+ - The scheduler no longer preserves default option
+ choices when the new PPD no longer provides the old
+ default choice (STR #1929)
+ - The Linux SCSI backend is now only built if the SCSI
+ development headers are installed.
+ - USB printing to Minolta printers did not work (STR
+ #2019)
+ - Windows clients could not monitor the queue status (STR
+ #2006)
+ - The scheduler didn't log the operation name in the
+ access_log file for Create-Job and Print-Job requests.
+ - The PostScript filter now separates collated copies
+ with any required JCL commands so that JCL-based
+ finishing options act on the individual copies and not
+ all of the copies as a single document.
+ - The PostScript filter now disables duplex printing when
+ printing a 1-page document.
+ - cups-lpd didn't pass the correct
+ job-originating-host-name value (STR #2023)
+ - Fixed some speling errors in the German message catalog
+ (STR #2012)
+ - cupstestppd did not catch PPD files with bad
+ UIConstraints values (STR #2016)
+ - The USB backend did not work with the current udev-
+ created printers if the first printer was disconnected
+ (STR #2017)
+ - Mirrored and rotated printing did not work with some
+ documents (STR #2004)
+ - 2-sided printing with banners did not work properly on
+ some printers (STR #2018)
+ - Updated the raw type rule to handle PJL within the
+ first 4k of a print job (STR #1969)
+ - Added an Estonian translation (STR #1957)
+ - Clarified the documentation for the cupsd.conf @LOCAL
+ and @IF(name) allow/deny functionality (STR #1992)
+ - The PostScript filters did not escape the Title and For
+ comments in the print job header (STR #1988)
+ - The scheduler would use 100% CPU if browsing was
+ disabled and the cupsd.conf file contained BrowsePoll
+ lines (STR #1994)
+ - The cupsDirRead() function did not work properly on
+ non-POSIX-compliant systems (STR #2001)
+ - The cupsFile functions didn't handle read/write errors
+ properly (STR #1996)
+ - The DBUS support now works with older versions of the
+ DBUS library.
+
+
 CHANGES IN CUPS V1.2.4
 
  - The --with-printcap configure option did not work (STR

CREDITS.txt

@@ -1,4 +1,4 @@
-CREDITS.txt - 2006-04-17
+CREDITS.txt - 2006-10-02
 ------------------------
 
 Few projects are completed by one person, and CUPS is no exception. We'd
@@ -20,6 +20,7 @@ like to thank the following individuals for their contributions:
  testing.
  Kiko - Bug fixes.
  Sergey V. Kovalyov - ESP Print Pro and CUPS beta tester.
+ Marek Laane - Estonian translation.
  Mark Lawrence - Microsoft interoperability testing.
  Jeff Licquia - Bug fixes, beta testing, evangelism.
  Jason McMullan - Original CUPS RPM distributions.

INSTALL.txt

@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.2.0 - 2006-05-08
+INSTALL - CUPS v1.2.5 - 2006-10-20
 ----------------------------------
 
 This file describes how to compile and install CUPS from source

README.txt

@@ -1,4 +1,4 @@
-README - CUPS v1.2.3 - 2006-08-28
+README - CUPS v1.2.5 - 2006-10-20
 ---------------------------------
 
 Looking for compile instructions? Read the file "INSTALL.txt"

backend/scsi.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: scsi.c 5023 2006-01-29 14:39:44Z mike $"
+ * "$Id: scsi.c 6032 2006-10-12 19:19:47Z mike $"
  *
  * SCSI printer backend for the Common UNIX Printing System (CUPS).
  *
@@ -80,7 +80,7 @@ void list_devices(void);
 int print_device(const char *resource, int fd, int copies);
 
 
-#ifdef __linux__
+#if defined(__linux__) && defined(HAVE_SCSI_SG_H)
 # include "scsi-linux.c"
 #elif defined(__sgi)
 # include "scsi-irix.c"
@@ -90,7 +90,7 @@ int print_device(const char *resource, int fd, int copies);
  */
 void list_devices(void) {}
 int print_device(const char *resource, int fd, int copies) { return (CUPS_BACKEND_FAILED); }
-#endif /* __linux */
+#endif /* __linux && HAVE_SCSI_SG_H */
 
 
 /*
@@ -220,5 +220,5 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id: scsi.c 5023 2006-01-29 14:39:44Z mike $".
+ * End of "$Id: scsi.c 6032 2006-10-12 19:19:47Z mike $".
  */

backend/snmp.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp.c 5976 2006-09-20 22:46:15Z mike $"
+ * "$Id: snmp.c 6049 2006-10-20 15:07:21Z mike $"
  *
  * SNMP discovery backend for the Common UNIX Printing System (CUPS).
  *
@@ -1728,13 +1728,14 @@ probe_device(snmp_cache_t *device) /* I - Device */
  debug_printf("DEBUG: %.3f Probing %s...\n", run_time(), device->addrname);
 
  if (device->make_and_model &&
- (!strncasecmp(device->make_and_model, "Kyocera", 7) ||
+ (!strncasecmp(device->make_and_model, "Epson", 5) ||
+ !strncasecmp(device->make_and_model, "Kyocera", 7) ||
  !strncasecmp(device->make_and_model, "Lexmark", 7) ||
  !strncasecmp(device->make_and_model, "Tektronix", 9) ||
  !strncasecmp(device->make_and_model, "Xerox", 5)))
  {
  /*
- * Kyocera, Lexmark, Tektronix, and Xerox printers often lock up on
+ * Epson, Kyocera, Lexmark, Tektronix, and Xerox printers often lock up on
  * IPP probes, so exclude them from the IPP connection test...
  */
 
@@ -2454,5 +2455,5 @@ update_cache(snmp_cache_t *device, /* I - Device */
 
 
 /*
- * End of "$Id: snmp.c 5976 2006-09-20 22:46:15Z mike $".
+ * End of "$Id: snmp.c 6049 2006-10-20 15:07:21Z mike $".
  */

backend/usb-unix.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-unix.c 5726 2006-07-12 20:00:11Z mike $"
+ * "$Id: usb-unix.c 6032 2006-10-12 19:19:47Z mike $"
  *
  * USB port backend for the Common UNIX Printing System (CUPS).
  *
@@ -79,12 +79,13 @@ print_device(const char *uri, /* I - Device URI */
  do
  {
  /*
- * Disable backchannel data when printing to Canon USB printers - apparently
- * Canon printers will return the IEEE-1284 device ID over and over and over
- * when they get a read request...
+ * Disable backchannel data when printing to Canon or Minolta USB
+ * printers - apparently these printers will return the IEEE-1284
+ * device ID over and over and over when they get a read request...
  */
 
- use_bc = strcasecmp(hostname, "Canon") != 0;
+ use_bc = strcasecmp(hostname, "Canon") != 0 ||
+ strstr(hostname, "Minolta") != NULL;
 
  if ((device_fd = open_device(uri, &use_bc)) == -1)
  {
@@ -185,44 +186,52 @@ void
 list_devices(void)
 {
 #ifdef __linux
- int i; /* Looping var */
- int fd; /* File descriptor */
- char format[255], /* Format for device filename */
- device[255], /* Device filename */
- device_id[1024], /* Device ID string */
- device_uri[1024], /* Device URI string */
- make_model[1024]; /* Make and model */
-
-
- /*
- * First figure out which USB printer filename to use...
- */
-
- if (!access("/dev/usblp0", 0))
- strcpy(format, "/dev/usblp%d");
- else if (!access("/dev/usb/usblp0", 0))
- strcpy(format, "/dev/usb/usblp%d");
- else
- strcpy(format, "/dev/usb/lp%d");
+ int i; /* Looping var */
+ int fd; /* File descriptor */
+ char device[255], /* Device filename */
+ device_id[1024], /* Device ID string */
+ device_uri[1024], /* Device URI string */
+ make_model[1024]; /* Make and model */
 
  /*
- * Then open each USB device...
+ * Try to open each USB device...
  */
 
  for (i = 0; i < 16; i ++)
  {
- sprintf(device, format, i);
+ /*
+ * Linux has a long history of changing the standard filenames used
+ * for USB printer devices. We get the honor of trying them all...
+ */
 
- if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
+ sprintf(device, "/dev/usblp%d", i);
+
+ if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
  {
- if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
- make_model, sizeof(make_model),
- "usb", device_uri, sizeof(device_uri)))
- printf("direct %s \"%s\" \"%s USB #%d\" \"%s\"\n", device_uri,
- make_model, make_model, i + 1, device_id);
+ if (errno != ENOENT)
+ continue;
 
- close(fd);
+ sprintf(device, "/dev/usb/lp%d", i);
+
+ if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
+ {
+ if (errno != ENOENT)
+ continue;
+
+ sprintf(device, "/dev/usb/usblp%d", i);
+
+ if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
+ continue;
+ }
  }
+
+ if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
+ make_model, sizeof(make_model),
+ "usb", device_uri, sizeof(device_uri)))
+ printf("direct %s \"%s\" \"%s USB #%d\" \"%s\"\n", device_uri,
+ make_model, make_model, i + 1, device_id);
+
+ close(fd);
  }
 #elif defined(__sgi)
 #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
@@ -309,35 +318,41 @@ open_device(const char *uri, /* I - Device URI */
 
  int i; /* Looping var */
  int busy; /* Are any ports busy? */
- char format[255], /* Format for device filename */
- device[255], /* Device filename */
+ char device[255], /* Device filename */
  device_id[1024], /* Device ID string */
  make_model[1024], /* Make and model */
  device_uri[1024]; /* Device URI string */
 
 
  /*
- * First figure out which USB printer filename to use...
- */
-
- if (!access("/dev/usblp0", 0))
- strcpy(format, "/dev/usblp%d");
- else if (!access("/dev/usb/usblp0", 0))
- strcpy(format, "/dev/usb/usblp%d");
- else
- strcpy(format, "/dev/usb/lp%d");
-
- /*
- * Then find the correct USB device...
+ * Find the correct USB device...
  */
 
  do
  {
  for (busy = 0, i = 0; i < 16; i ++)
  {
- sprintf(device, format, i);
+ /*
+ * Linux has a long history of changing the standard filenames used
+ * for USB printer devices. We get the honor of trying them all...
+ */
+
+ sprintf(device, "/dev/usblp%d", i);
+
+ if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
+ {
+ sprintf(device, "/dev/usb/lp%d", i);
+
+ if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
+ {
+ sprintf(device, "/dev/usb/usblp%d", i);
+
+ if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
+ continue;
+ }
+ }
 
- if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
+ if (fd >= 0)
  {
  backendGetDeviceID(fd, device_id, sizeof(device_id),
  make_model, sizeof(make_model),
@@ -510,5 +525,5 @@ open_device(const char *uri, /* I - Device URI */
 
 
 /*
- * End of "$Id: usb-unix.c 5726 2006-07-12 20:00:11Z mike $".
+ * End of "$Id: usb-unix.c 6032 2006-10-12 19:19:47Z mike $".
  */

conf/mime.types

@@ -1,5 +1,5 @@
 #
-# "$Id: mime.types 5402 2006-04-14 19:21:03Z mike $"
+# "$Id: mime.types 6003 2006-10-02 16:26:04Z mike $"
 #
 # MIME types file for the Common UNIX Printing System (CUPS).
 #
@@ -154,8 +154,8 @@ application/vnd.cups-raster string(0,"RaSt") string(0,"tSaR")
 application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \
  string(0,<1B>@) \
  (contains(0,128,<1B>%-12345X) + \
- (contains(0,1024,"LANGUAGE=PCL") \
- contains(0,1024,"LANGUAGE = PCL")))
+ (contains(0,4096,"LANGUAGE=PCL") \
+ contains(0,4096,"LANGUAGE = PCL")))
 
 ########################################################################
 #
@@ -167,5 +167,5 @@ application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \
 application/octet-stream
 
 #
-# End of "$Id: mime.types 5402 2006-04-14 19:21:03Z mike $".
+# End of "$Id: mime.types 6003 2006-10-02 16:26:04Z mike $".
 #