Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.3rc2@4306 a1ca3aef-8c08-0410-bb20-df032aa958be

CHANGES.txt

@@ -1,34 +1,6 @@
-CHANGES.txt - 2007-08-13
+CHANGES.txt - 2007-07-30
 ------------------------
 
-
-CHANGES IN CUPS V1.3.0
-
-	- The scheduler did not handle out-of-file conditions
-	  gracefully when accepting new connections, leading to
-	  heavy CPU usage.
-	- The scheduler did not detect ServerBin misconfigurations
-	  (STR #2470)
-	- "AuthType Default" did not work as expected when the
-	  "DefaultAuthType foo" line appeared after it in the
-	  cupsd.conf file.
-	- The on-line help did not describe many common printing
-	  options (STR #1846)
-	- The IPP backend did not return the "auth required" status
-	  when printing to a Kerberos-protected queue.
-	- The scheduler was not looking in the correct directories
-	  for LSB PPD files (STR #2464)
-	- Changed references to ESP Ghostscript to GPL Ghostscript
-	  (STR #2463)
-	- The PostScript filter did not cleanly terminate when
-	  the job was canceled or stopped.
-	- Fixed generation of Kerberos credentials for remote
-	  printing.  Note that this requires a recent version of
-	  MIT Kerberos with a working krb5_cc_new_unique()
-	  function or Heimdal Kerberos.
-	- Added Portuguese and updated Italian message catalogs.
-
-
 CHANGES IN CUPS V1.3rc2
 
 	- Added more range checking to the pdftops filter. 

INSTALL.txt

@@ -1,15 +1,13 @@
-INSTALL - CUPS v1.3.0 - 2007-08-13
-----------------------------------
+INSTALL - CUPS v1.3rc2 - 2007-07-30
+-----------------------------------
 
 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".
 
-**** IF YOU HAVE A NON-POSTSCRIPT PRINTER AND ARE NOT       ****
-**** RUNNING MAC OS X, YOU WILL ALSO NEED TO INSTALL GPL    ****
-**** GHOSTSCRIPT WITH THE "cups" DRIVER AFTER YOU INSTALL   ****
-**** CUPS.                                                  ****
+**** IF YOU HAVE A NON-POSTSCRIPT PRINTER, YOU WILL ALSO    ****
+**** NEED TO INSTALL ESP GHOSTSCRIPT AFTER YOU INSTALL CUPS ****
 
 
 BEFORE YOU BEGIN
@@ -22,7 +20,7 @@ BEFORE YOU BEGIN
     The makefiles used by the project should work with all
     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).
+    FreeBSD users should use GNU make (gmake).
 
     Besides these tools you'll want the JPEG, PNG, TIFF, and ZLIB
     libraries for image support, the CDSA, GNU TLS, or OpenSSL
@@ -31,16 +29,10 @@ BEFORE YOU BEGIN
     compile and run without these, however you'll miss out on
     many of the features provided by CUPS.
 
-    Kerberos support requires a very recent version of the MIT
-    implementation with the krb5_cc_new_unique() function or the
-    Heimdal implementation, along with the corresponding GSSAPI
-    pieces.
-
     Also, please note that CUPS no longer includes the
     Ghostscript- based pstoraster filter.  You *must* download
-    GPL Ghostscript separately from the CUPS web site if you want
-    to print PostScript files to non-PostScript printers on
-    operating systems other than Mac OS X.
+    ESP Ghostscript separately from the CUPS web site if you want
+    to print PostScript files to non-PostScript printers.
 
 
 COMPILING FROM SUBVERSION

README.txt

@@ -1,5 +1,5 @@
-README - CUPS v1.3.0 - 2007-08-13
----------------------------------
+README - CUPS v1.3rc2 - 2007-07-30
+----------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
 instead...
@@ -22,11 +22,12 @@ INTRODUCTION
     to support real-world printing under UNIX.
 
     CUPS includes an image file RIP that supports printing of
-    image files to non-PostScript printers.  GPL Ghostscript now
-    includes the "cups" driver to support printing of PostScript
-    files within the CUPS driver framework.  Sample drivers for
-    Dymo, EPSON, HP, OKIDATA, and Zebra printers are included that
-    use these filters.
+    image files to non-PostScript printers.  A customized version
+    of GPL Ghostscript for CUPS called ESP Ghostscript is
+    available separately to support printing of PostScript files
+    within the CUPS driver framework.  Sample drivers for Dymo,
+    EPSON, HP, OKIDATA, and Zebra printers are included that use
+    these filters.
 
     CUPS is licensed under the GNU General Public License and GNU
     Library General Public License versions 2.

backend/Makefile

@@ -17,8 +17,8 @@
 
 include ../Makedefs
 
-RBACKENDS =	ipp lpd
-UBACKENDS =	$(PAP) $(LEGACY_BACKENDS) serial snmp socket usb
+RBACKENDS =	lpd
+UBACKENDS =	ipp $(PAP) $(LEGACY_BACKENDS) serial snmp socket usb
 TARGETS	=	betest test1284 libbackend.a $(RBACKENDS) $(UBACKENDS)
 LIBOBJS	=	ieee1284.o runloop.o
 OBJS	=	betest.o ipp.o lpd.o pap.o parallel.o scsi.o \

backend/ipp.c

@@ -51,7 +51,6 @@
  */
 
 static char	*password = NULL;	/* Password for device URI */
-static int	password_tries = 0;	/* Password tries */
 #ifdef __APPLE__
 static char	pstmpname[1024] = "";	/* Temporary PostScript file name */
 #endif /* __APPLE__ */
@@ -1179,20 +1178,7 @@ main(int  argc,				/* I - Number of command-line args */
   * Return the queue status...
   */
 
-  if (ipp_status == IPP_NOT_AUTHORIZED)
-  {
-   /*
-    * Authorization failures here mean that we need Kerberos.  Username +
-    * password authentication is handled in the password_cb function.
-    */
-
-    fputs("ATTR: auth-info-required=negotiate\n", stderr);
-    return (CUPS_BACKEND_AUTH_REQUIRED);
-  }
-  else if (ipp_status > IPP_OK_CONFLICT)
-    return (CUPS_BACKEND_FAILED);
-  else
-    return (CUPS_BACKEND_OK);
+  return (ipp_status > IPP_OK_CONFLICT ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
 }
 
 
@@ -1373,12 +1359,8 @@ password_cb(const char *prompt)		/* I - Prompt (not used) */
 {
   (void)prompt;
 
-  if (password && password_tries < 3)
-  {
-    password_tries ++;
-
+  if (password)
     return (password);
-  }
   else
   {
    /*

backend/socket.c

@@ -432,7 +432,6 @@ side_cb(int print_fd,			/* I - Print file */
   cups_sc_status_t	status;		/* Request/response status */
   char			data[2048];	/* Request/response data */
   int			datalen;	/* Request/response data size */
-  const char		*device_id;	/* 1284DEVICEID env var */
 
 
   datalen = sizeof(data);
@@ -463,14 +462,6 @@ side_cb(int print_fd,			/* I - Print file */
         datalen = 1;
         break;
 
-    case CUPS_SC_CMD_GET_DEVICE_ID :
-        if ((device_id = getenv("1284DEVICEID")) != NULL)
-	{
-	  strlcpy(data, device_id, sizeof(data));
-	  datalen = (int)strlen(data);
-	  break;
-	}
-
     default :
         status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
 	datalen = 0;

backend/usb-darwin.c

@@ -267,7 +267,7 @@ static void copy_devicestring(io_service_t usbInterface, CFStringRef *deviceID,
 static void device_added(void *userdata, io_iterator_t iterator);
 static void get_device_id(cups_sc_status_t *status, char *data, int *datalen);
 static void iterate_printers(iterator_callback_t callBack, void *userdata);
-static void parse_options(const char *options, char *serial, int serial_size, UInt32 *location, Boolean *wait_eof);
+static void parse_options(const char *options, char *serial, UInt32 *location, Boolean *wait_eof);
 static void release_deviceinfo(CFStringRef *make, CFStringRef *model, CFStringRef *serial);
 static void setup_cfLanguage(void);
 static void soft_reset();
@@ -329,7 +329,7 @@ print_device(const char *uri,		/* I - Device URI */
 
   setup_cfLanguage();
 
-  parse_options(options, serial, sizeof(serial), &location, &g.wait_eof);
+  parse_options(options, serial, &location, &g.wait_eof);
 
   if (resource[0] == '/')
     resource++;
@@ -1546,10 +1546,10 @@ CFStringRef cfstr_create_trim(const char *cstr)
 
 static void parse_options(const char *options,
 			  char *serial,
-			  int serial_size,
 			  UInt32 *location,
 			  Boolean *wait_eof)
 {
+  char	*serialnumber;		/* ?serial=<serial> or ?location=<location> */
   char	optionName[255],	/* Name of option */
 	value[255],		/* Value of option */
 	*ptr;			/* Pointer into name or value */
@@ -1562,6 +1562,8 @@ static void parse_options(const char *options,
   if (!options)
     return;
 
+  serialnumber = NULL;
+
   while (*options != '\0')
   {
     /* Get the name... */
@@ -1605,7 +1607,8 @@ static void parse_options(const char *options,
     }
     else if (strcasecmp(optionName, "serial") == 0)
     {
-      strlcpy(serial, value, serial_size);
+      strcpy(serial, value);
+      serialnumber = serial;
     }
     else if (strcasecmp(optionName, "location") == 0 && location)
       *location = strtol(value, NULL, 16);

conf/mime.convs.in

@@ -95,8 +95,8 @@ image/x-xpixmap		application/vnd.cups-raster	100	imagetoraster
 #image/x-xwindowdump	application/vnd.cups-raster	100	imagetoraster
 image/x-sun-raster	application/vnd.cups-raster	100	imagetoraster
 
-# pstoraster is part of GPL Ghostscript...
-application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
+# pstoraster is now part of ESP Ghostscript...
+#application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
 
 ########################################################################
 #

config-scripts/cups-common.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 6790 2007-08-13 20:09:45Z mike $"
+dnl "$Id: cups-common.m4 6749 2007-07-31 00:00:21Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Versio number information...
-CUPS_VERSION="1.3.0"
+CUPS_VERSION="1.3rc2"
 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'`"
@@ -286,5 +286,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
 dnl
-dnl End of "$Id: cups-common.m4 6790 2007-08-13 20:09:45Z mike $".
+dnl End of "$Id: cups-common.m4 6749 2007-07-31 00:00:21Z mike $".
 dnl

config-scripts/cups-defaults.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-defaults.m4 6754 2007-08-01 19:00:07Z mike $"
+dnl "$Id: cups-defaults.m4 6740 2007-07-26 23:07:46Z mike $"
 dnl
 dnl   Default cupsd configuration settings for the Common UNIX Printing System
 dnl   (CUPS).
@@ -165,7 +165,6 @@ AC_ARG_WITH(cups_user, [  --with-cups-user        set default user for CUPS],
 		else
 			CUPS_USER="_lp";
 		fi
-		AC_MSG_RESULT($CUPS_USER)
 	elif test -f /etc/passwd; then
 		CUPS_USER=""
 		for user in lp lpd guest daemon nobody; do
@@ -194,7 +193,6 @@ AC_ARG_WITH(cups_group, [  --with-cups-group       set default group for CUPS],
 		else
 			CUPS_GROUP="_lp";
 		fi
-		AC_MSG_RESULT($CUPS_GROUP)
 	elif test -f /etc/group; then
 		GROUP_LIST="_lp lp nobody"
 		CUPS_GROUP=""
@@ -338,5 +336,5 @@ AC_SUBST(CUPS_SNMP_ADDRESS)
 AC_SUBST(CUPS_SNMP_COMMUNITY)
 
 dnl
-dnl End of "$Id: cups-defaults.m4 6754 2007-08-01 19:00:07Z mike $".
+dnl End of "$Id: cups-defaults.m4 6740 2007-07-26 23:07:46Z mike $".
 dnl

config-scripts/cups-gssapi.m4

@@ -60,7 +60,7 @@ if test x$enable_gssapi != xno; then
 
 		AC_CHECK_FUNC(gsskrb5_register_acceptor_identity, 
 			      AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY))
-		AC_CHECK_FUNC(krb5_cc_new_unique, AC_DEFINE(HAVE_KRB5_CC_NEW_UNIQUE))
+		AC_CHECK_FUNC(krb5_cc_resolve, AC_DEFINE(HAVE_KRB5_CC_RESOLVE))
 
 		AC_MSG_CHECKING(for GSS_C_NT_HOSTBASED_SERVICE)
 		if test $ac_cv_header_gssapi_gssapi_h = yes; then

config.h.in

@@ -495,7 +495,7 @@
 #undef HAVE_GSSAPI_GSSAPI_KRB5_H
 #undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
 #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE
-#undef HAVE_KRB5_CC_NEW_UNIQUE
+#undef HAVE_KRB5_CC_RESOLVE
 #undef HAVE_KRB5_H
 #undef HAVE_HEIMDAL
 

cups/auth.c

@@ -293,7 +293,7 @@ cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
     {
 #  ifdef DEBUG
       DEBUG_gss_printf(major_status, minor_status,
-		       "Unable to initialize security context");
+		       "Unable to initialise security context");
 #  endif /* DEBUG */
       return (-1);
     }
@@ -425,8 +425,6 @@ cups_get_gss_creds(
 
   snprintf(buf, sizeof(buf), "%s@%s", service_name, fqdn);
 
-  DEBUG_printf(("cups_get_gss_creds: Looking up %s...\n", buf));
-
   token.value  = buf;
   token.length = strlen(buf);
   server_name  = GSS_C_NO_NAME;

doc/help/kerberos.html

@@ -11,15 +11,6 @@ to a remote authenticated queue. This document describes how to configure
 CUPS to use Kerberos authentication and provides helpful links to the MIT
 help pages for configuring Kerberos on your systems and network.</P>
 
-<BLOCKQUOTE><B>Note:</B>
-
-<P>In order to use Kerberos-authenticated shared printers, you <EM>must</EM> be
-running a version of MIT Kerberos with the <TT>krb5_cc_new_unique()</TT>
-function or Heimdal Kerberos. Otherwise, only local Kerberos authentication
-is supported.</P>
-
-</BLOCKQUOTE>
-
 
 <H2 CLASS="title"><A NAME="KRB5">Configuring Kerberos on Your System</A></H2>
 
@@ -135,9 +126,8 @@ lines to the policies you want to protect with authentication, for example:</P>
 <H2 CLASS="title"><A NAME="IMPLEMENT">Implementation Information</A></H2>
 
 <P>CUPS implements Kerberos over HTTP using GSS API and the service name
-"ipp". Delegation of credentials, which is needed when printing to a
-remote/shared printer with Kerberos authentication, is currently only supported
-when using a single KDC on your network.</P>
+"ipp". Delegation of credentials (needed for remote printers with
+authentication) is only supported when using a single KDC on your network.</P>
 
 <P>After getting a user's Kerberos credentials, CUPS strips the "@KDC"
 portion of the username so that it can check the group membership locally,

doc/help/options.html

@@ -137,16 +137,16 @@ queue.</P>
 printing more than one copy of a file:</P>
 
 <PRE CLASS="command">
-lp -n <EM>num-copies</EM> filename
-lpr -#<EM>num-copies</EM> filename
+lp -n <I>num-copies</I> filename
+lpr -#<I>num-copies</I> filename
 </PRE>
 
 <P>Copies are normally <EM>not</EM> collated for you. Use the
 <CODE>-o Collate=True</CODE> option to get collated copies:</P>
 
 <PRE CLASS="command">
-lp -n <EM>num-copies</EM> -o Collate=True filename
-lpr -#<EM>num-copies</EM> -o Collate=True filename
+lp -n <I>num-copies</I> -o Collate=True filename
+lpr -#<I>num-copies</I> -o Collate=True filename
 </PRE>
 
 
@@ -156,11 +156,11 @@ lpr -#<EM>num-copies</EM> -o Collate=True filename
 HREF="man-lprm.html">lprm(1)</A> commands cancel a print job:</P>
 
 <PRE CLASS="command">
-cancel <EM>job-id</EM>
-lprm <EM>job-id</EM>
+cancel <I>job-id</I>
+lprm <I>job-id</I>
 </PRE>
 
-<P>The <EM>job-id</EM> is the number that was reported to you by
+<P>The <I>job-id</I> is the number that was reported to you by
 the <B>lp</B> command. You can also get the job ID using the <A
 HREF="man-lpq.html">lpq(1)</A> or <A
 HREF="man-lpstat.html">lpstat</A> commands:</P>
@@ -177,10 +177,10 @@ lpstat
 job to a new printer or class:</P>
 
 <PRE CLASS="command">
-lpmove <EM>job-id</EM> <i>destination</i>
+lpmove <I>job-id</I> <i>destination</i>
 </PRE>
 
-<P>The <EM>job-id</EM> is the number that was reported to you by
+<P>The <I>job-id</I> is the number that was reported to you by
 the <B>lp</B> or <B>lpstat</B> commands. <i>Destination</i> is the
 name of a printer or class that you want to actually print the job.
 
@@ -256,10 +256,10 @@ lpoptions -p printer -l
 <P>When <CODE>Custom</CODE> is listed for the <CODE>PageSize</CODE> option, you can specify custom media sizes using one of the following forms:</P>
 
 <PRE CLASS="command">
-lp -o media=Custom.<EM>WIDTH</EM>x<EM>LENGTH</EM> filename
-lp -o media=Custom.<EM>WIDTH</EM>x<EM>LENGTH</EM>in filename
-lp -o media=Custom.<EM>WIDTH</EM>x<EM>LENGTH</EM>cm filename
-lp -o media=Custom.<EM>WIDTH</EM>x<EM>LENGTH</EM>mm filename
+lp -o media=Custom.<I>WIDTH</I>x<I>LENGTH</I> filename
+lp -o media=Custom.<I>WIDTH</I>x<I>LENGTH</I>in filename
+lp -o media=Custom.<I>WIDTH</I>x<I>LENGTH</I>cm filename
+lp -o media=Custom.<I>WIDTH</I>x<I>LENGTH</I>mm filename
 </PRE>
 
 <P>where "WIDTH" and "LENGTH" are the width and length of the media in points, inches, centimeters, or millimeters, respectively.</P>
@@ -294,7 +294,6 @@ page depending on the value of N:</P>
 
 </UL>
 
-
 <H3><A NAME="SIDES">Printing On Both Sides of the Paper</A></H3>
 
 <P>The <CODE>-o sides=two-sided-short-edge</CODE> and <CODE>-o
@@ -318,7 +317,6 @@ lp -o sides=one-sided filename
 lpr -o sides=one-sided filename
 </PRE>
 
-
 <H3><A NAME="JOBSHEETS">Selecting the Banner Page(s)</A></H3>
 
 <P>The <CODE>-o jobsheets=start,end</CODE> option sets the banner
@@ -362,60 +360,6 @@ configuration; CUPS includes the following banner files:</P>
 </UL>
 
 
-<H3><A NAME="JOBHOLDUNTIL">Holding Jobs for Later Printing</A></H3>
-
-<P>The <CODE>-o job-hold-until=when</CODE> option tells CUPS to
-delay printing until the "when" time, which can be one of the
-following:</P>
-
-<UL>
-
-	<LI><CODE>-o job-hold-until=indefinite</CODE>; print only
-	after released by the user or an administrator</LI>
-
-	<LI><CODE>-o job-hold-until=day-time</CODE>; print from
-	6am to 6pm local time</LI>
-
-	<LI><CODE>-o job-hold-until=night</CODE>; print from
-	6pm to 6am local time</LI>
-
-	<LI><CODE>-o job-hold-until=second-shift</CODE>; print from
-	4pm to 12am local time</LI>
-
-	<LI><CODE>-o job-hold-until=third-shift</CODE>; print from
-	12am to 8am local time</LI>
-
-	<LI><CODE>-o job-hold-until=weekend</CODE>; print on Saturday
-	or Sunday</LI>
-
-	<LI><CODE>-o job-hold-until=HH:MM</CODE>; print at the specified
-	UTC time</LI>
-
-</UL>
-
-<H3><A NAME="RELEASEJOB">Releasing Held Jobs</A></H3>
-
-<P>Aside from the web interface, you can use the <B>lp</B> command
-to release a held job:</P>
-
-<PRE CLASS="command">
-lp -i <em>job-id</em> -H resume
-</PRE>
-
-<P>where "job-id" is the job ID reported by the <B>lpstat</B>
-command.</P>
-
-
-<H3><A NAME="JOBPRIORITY">Setting the Job Priority</A></H3>
-
-<P>The <CODE>-o job-priority=NNN</CODE> option tells CUPS to
-assign a priority to your job from 1 (lowest) to 100 (highest),
-which influences where the job appears in the print queue. Higher
-priority jobs are printed before lower priority jobs, however
-submitting a new job with a high priority will not interrupt an
-</P>
-
-
 <H3><A NAME="OUTPUTORDER">Specifying the Output Order</A></H3>
 
 <P>The <CODE>-o outputorder=normal</CODE> and <CODE>-o outputorder=reverse</CODE> options specify the order of the pages. Normal order prints page 1 first, page 2 second, and so forth. Reverse order prints page 1 last.</P>
@@ -503,48 +447,9 @@ lpr -o fitplot filename
 
 <P>The default is to use the size specified in the file.</P>
 
-<BLOCKQUOTE><B>Note:</B>
-
-<P>This feature depends upon an accurate size in
+<BLOCKQUOTE>Note: This feature depends upon an accurate size in
 the print file. If no size is given in the file, the page may be
-scaled incorrectly!
-
-</BLOCKQUOTE>
-
-<H3><A NAME="OUTPUTORDER">Printing in Reverse Order</A></H3>
-
-<P>The <CODE>-o outputorder=reverse</CODE> option will print the
-pages in reverse order:</P>
-
-<PRE CLASS="command">
-lp -o outputorder=reverse filename
-lpr -o outputorder=reverse filename
-</PRE>
-
-<P>Similarly, the <CODE>-o outputorder=normal</CODE> option will
-print starting with page 1:</P>
-
-<PRE CLASS="command">
-lp -o outputorder=normal filename
-lpr -o outputorder=normal filename
-</PRE>
-
-<P>The default is <CODE>-o outputorder=normal</CODE> for
-printers that print face down and <CODE>-o outputorder=reverse</CODE>
-for printers that print face up.
-
-<H3><A NAME="MIRROR">Printing Mirrored Pages</A></H3>
-
-<P>The <CODE>-o mirror</CODE> option flips each page along the
-vertical access to produce a mirrored image:</P>
-
-<PRE CLASS="command">
-lp -o mirror filename
-lpr -o mirror filename
-</PRE>
-
-<P>This is typically used when printing on T-shirt transfer
-media or sometimes on transparencies.</P>
+scaled incorrectly!</BLOCKQUOTE>
 
 <H3><A NAME="RAW">Raw or Unfiltered Output</A></H3>
 
@@ -618,11 +523,11 @@ page-right=value</CODE>, <CODE>-o page-top=value</CODE>, and
 margins:</P>
 
 <PRE CLASS="command">
-lp -o page-left=<EM>value</EM> filename
-lp -o page-right=<EM>value</EM> filename
-lp -o page-top=<EM>value</EM> filename
-lp -o page-bottom=<EM>value</EM> filename
-lpr -o page-left=<EM>value</EM> -o page-right=<EM>value</EM> -o page-top=<EM>value</EM> -o page-bottom=<EM>value</EM> filename
+lp -o page-left=<I>value</I> filename
+lp -o page-right=<I>value</I> filename
+lp -o page-top=<I>value</I> filename
+lp -o page-bottom=<I>value</I> filename
+lpr -o page-left=<I>value</I> -o page-right=<I>value</I> -o page-top=<I>value</I> -o page-bottom=<I>value</I> filename
 </PRE>
 
 <P>The <CODE>value</CODE> argument is the margin in points; each
@@ -640,197 +545,5 @@ lp -o prettyprint filename
 lpr -o prettyprint filename
 </PRE>
 
-<H3><A NAME="WRAP">Turning Off Text Wrapping</A><H3>
-
-<P>The <CODE>-o nowrap</CODE> option disables wrapping of long lines:</P>
-
-<PRE CLASS="command">
-lp -o nowrap filename
-lpr -o nowrap filename
-</PRE>
-
-
-<H2 CLASS="title"><SPAN CLASS="info">Not Supported on Mac OS X</SPAN><A NAME="IMAGEOPTIONS">Image Options</A></H2>
-
-<P>CUPS supports several options that are only used when printing
-image files. These options have absolutely no effect on PostScript, PDF,
-HP-GL/2, or text files.</P>
-
-<H3><A NAME="position">Positioning Images</A></H3>
-
-<P>The <CODE>-o position=name</CODE> option specifies the position of the
-image on the page:
-
-<UL>
-
-	<LI><CODE>center</CODE> - Center the image on the page (default)
-
-	<LI><CODE>top</CODE> - Print the image centered at the top of the page
-
-	<LI><CODE>left</CODE> - Print the image centered on the left of page
-
-	<LI><CODE>right</CODE> - Print the image centered on the right of the page
-
-	<LI><CODE>top-left</CODE> - Print the image at the top left corner of
-	the page
-
-	<LI><CODE>top-right</CODE> - Print the image at the top right corner of
-	the page
-
-	<LI><CODE>bottom</CODE> - Print the image centered at the bottom of
-	the page
-
-	<LI><CODE>bottom-left</CODE> - Print the image at the bottom left
-	corner of the page
-
-	<LI><CODE>bottom-right</CODE> - Print the image at the bottom right
-	corner of the page
-
-</UL>
-
-<H3><A NAME="scaling">Scaling Images</A></H3>
-
-<P>The <CODE>-o scaling=percent</CODE>, <CODE>-o
-ppi=value</CODE>, and <CODE>-o natural-scaling=percent</CODE>
-options change the size of a printed image:
-
-<PRE CLASS="command">
-lp -o scaling=<EM>percent</EM> filename 
-lp -o ppi=<EM>value</EM> filename
-lpr -o natural-scaling=<EM>percent</EM> filename
-</PRE>
-
-<P>The <CODE>scaling=percent</CODE> value is a number from 1 to 800
-specifying the size in relation to the page (<EM>not</EM> the image.) A
-scaling of 100 percent will fill the page as completely as the image
-aspect ratio allows. A scaling of 200 percent will print on up to 4
-pages.
-
-<P>The <CODE>ppi=value</CODE> value is a number from 1 to 1200 specifying the
-resolution of the image in pixels per inch. An image that is 3000x2400
-pixels will print 10x8 inches at 300 pixels per inch, for example. If
-the specified resolution makes the image larger than the page, multiple
-pages will be printed to satisfy the request.
-
-<P>The <CODE>natural-scaling=percent</CODE> value is a number
-from 1 to 800 specifying the size in relation to the natural
-image size. A scaling of 100 percent will print the image at its
-natural size, while a scaling of 50 percent will print the image
-at half its natural size. If the specified scaling makes the
-image larger than the page, multiple pages will be printed to
-satisfy the request.
-
-<H3><A NAME="hue">Adjusting Image Hue (Tint)</A></H3>
-
-<P>The <CODE>-o hue=value</CODE> option will adjust the hue of the
-printed image, much like the tint control on your television:
-
-<PRE CLASS="command">
-lp -o hue=<EM>value</EM> filename
-lpr -o hue=<EM>value</EM> filename
-</PRE>
-
-<P>The <CODE>value</CODE> argument is a number from -360 to 360 and represents
-the color hue rotation. The following table summarizes the change you'll see
-with different colors:</P>
-
-<DIV CLASS="table"><TABLE SUMMARY="Hue Values">
-<TR>
-	<TH>Original</TH>
-	<TH>hue=-45</TH>
-	<TH>hue=45</TH>
-</TR>
-<TR>
-	<TD>Red</TD>
-	<TD>Purple</TD>
-	<TD>Yellow-orange</TD>
-</TR>
-<TR>
-	<TD>Green</TD>
-	<TD>Yellow-green</TD>
-	<TD>Blue-green</TD>
-</TR>
-<TR>
-	<TD>Yellow</TD>
-	<TD>Orange</TD>
-	<TD>Green-yellow</TD>
-</TR>
-<TR>
-	<TD>Blue</TD>
-	<TD>Sky-blue</TD>
-	<TD>Purple</TD>
-</TR>
-<TR>
-	<TD>Magenta</TD>
-	<TD>Indigo</TD>
-	<TD>Crimson</TD>
-</TR>
-<TR>
-	<TD>Cyan</TD>
-	<TD>Blue-green</TD>
-	<TD>Light-navy-blue</TD>
-</TR>
-</TABLE></DIV>
-
-<P>The default hue adjustment is 0.
-
-<H3><A NAME="saturation">Adjusting Image Saturation (Color)</A></H3>
-
-<P>The <CODE>-o saturation=percent</CODE> option adjusts the saturation
-of the colors in an image, much like the color control on your television:</P>
-
-<PRE CLASS="command">
-lp -o saturation=<EM>percent</EM> filename
-lpr -o saturation=<EM>percent</EM> filename
-</PRE>
-
-<P>The <CODE>percent</CODE> argument specifies the color saturation
-from 0 to 200. A color saturation of 0 produces a black-and-white
-print, while a value of 200 will make the colors extremely intense.</P>
-
-<P>The default saturation is 100.</P>
-
-
-<H2 CLASS="title"><A NAME="HPGL2OPTIONS">HP-GL/2 Options</A></H2>
-
-<P>CUPS supports several options that are only used when printing
-HP-GL/2 files. These options have absolutely no effect on PostScript, PDF,
-image, or text files.</P>
-
-<H3><A NAME="blackplot">Printing in Black</A></H3>
-
-<P>The <CODE>-o blackplot</CODE> option specifies that all pens should
-plot in black:</P>
-
-<PRE CLASS="command">
-lp -o blackplot filename
-lpr -o blackplot filename
-</PRE>
-
-<P>The default is to use the colors defined in the plot file or the
-standard pen colors defined in the HP-GL/2 reference manual from
-Hewlett Packard.
-
-<H3><A NAME="penwidth">Setting the Default Pen Width</A></H3>
-
-<P>The <CODE>-o penwidth=value</CODE> option specifies the default pen
-width for HP-GL/2 files:</P>
-
-<PRE CLASS="command">
-lp -o penwidth=<EM>value</EM> filename
-lpr -o penwidth=<EM>value</EM> filename
-</PRE>
-
-<P>The pen width <CODE>value</CODE> specifies the pen width in micrometers.
-The default value of 1000 produces lines that are 1 millimeter in width.
-Specifying a pen width of 0 produces lines that are exactly 1 pixel wide.</P>
-
-<BLOCKQUOTE><B>Note:</B>
-
-<P>This option is ignored when the pen widths are set in the plot
-file.
-
-</BLOCKQUOTE>
-
 </BODY>
 </HTML>

filter/pstops.c

@@ -18,7 +18,6 @@
  *
  *   main()               - Main entry...
  *   add_page()           - Add a page to the pages array...
- *   cancel_job()         - Flag the job as canceled.
  *   check_range()        - Check to see if the current page is selected for
  *   copy_bytes()         - Copy bytes from the input file to stdout...
  *   copy_comments()      - Copy all of the comments section...
@@ -54,7 +53,6 @@
 #include <cups/file.h>
 #include <cups/array.h>
 #include <cups/i18n.h>
-#include <signal.h>
 
 
 /*
@@ -148,19 +146,11 @@ typedef struct				/**** Document information ****/
 				 ((p) % doc->number_up) != 0)
 
 
-/*
- * Local globals...
- */
-
-static int		JobCanceled = 0;/* Set to 1 on SIGTERM */
-
-
 /*
  * Local functions...
  */
 
 static pstops_page_t	*add_page(pstops_doc_t *doc, const char *label);
-static void		cancel_job(int sig);
 static int		check_range(pstops_doc_t *doc, int page);
 static void		copy_bytes(cups_file_t *fp, off_t offset,
 			           size_t length);
@@ -228,9 +218,6 @@ main(int  argc,				/* I - Number of command-line args */
   cups_option_t	*options;		/* Print options */
   char		line[8192];		/* Line buffer */
   size_t	len;			/* Length of line buffer */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
 
 
  /*
@@ -250,22 +237,6 @@ main(int  argc,				/* I - Number of command-line args */
     return (1);
   }
 
- /*
-  * Register a signal handler to cleanly cancel a job.
-  */
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, cancel_job);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-
-  sigemptyset(&action.sa_mask);
-  action.sa_handler = cancel_job;
-  sigaction(SIGTERM, &action, NULL);
-#else
-  signal(SIGTERM, cancel_job);
-#endif /* HAVE_SIGSET */
-
  /*
   * If we have 7 arguments, print the file named on the command-line.
   * Otherwise, send stdin instead...
@@ -450,19 +421,6 @@ add_page(pstops_doc_t *doc,		/* I - Document information */
 }
 
 
-/*
- * 'cancel_job()' - Flag the job as canceled.
- */
-
-static void
-cancel_job(int sig)			/* I - Signal number (unused) */
-{
-  (void)sig;
-
-  JobCanceled = 1;
-}
-
-
 /*
  * 'check_range()' - Check to see if the current page is selected for
  *                   printing.
@@ -868,9 +826,6 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
   fprintf(stderr, "DEBUG: Before page loop - %s", line);
   while (!strncmp(line, "%%Page:", 7))
   {
-    if (JobCanceled)
-      break;
-
     number ++;
 
     if (check_range(doc, (number - 1) / doc->number_up + 1))
@@ -930,7 +885,7 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
 
   number = doc->slow_order ? 0 : doc->page;
 
-  if (doc->temp && !JobCanceled)
+  if (doc->temp)
   {
     int	copy;				/* Current copy */
 
@@ -949,9 +904,6 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
 
     for (copy = !doc->slow_order; copy < doc->copies; copy ++)
     {
-      if (JobCanceled)
-	break;
-
      /*
       * Send end-of-job stuff followed by any start-of-job stuff required
       * for the JCL options...
@@ -1005,9 +957,6 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
 
       while (pageinfo)
       {
-        if (JobCanceled)
-	  break;
-
         number ++;
 
 	if (!ppd || !ppd->num_filters)
@@ -1046,8 +995,7 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
   * Write/copy the trailer...
   */
 
-  if (!JobCanceled)
-    linelen = copy_trailer(fp, doc, ppd, number, line, linelen, linesize);
+  linelen = copy_trailer(fp, doc, ppd, number, line, linelen, linesize);
 }
 
 
@@ -1182,7 +1130,7 @@ copy_non_dsc(cups_file_t  *fp,		/* I - File to read from */
     puts("ESPshowpage");
   }
 
-  if (doc->temp && !JobCanceled)
+  if (doc->temp)
   {
    /*
     * Reopen the temporary file for reading...
@@ -1198,9 +1146,6 @@ copy_non_dsc(cups_file_t  *fp,		/* I - File to read from */
 
     for (copy = 1; copy < doc->copies; copy ++)
     {
-      if (JobCanceled)
-	break;
-
       if (!ppd || !ppd->num_filters)
 	fputs("PAGE: 1 1\n", stderr);
 

packaging/cups.list.in

@@ -125,9 +125,6 @@
 %subpackage ko
 %description Korean support
 
-%subpackage nl
-%description Dutch support
-
 %subpackage no
 %description Norwegian support
 
@@ -400,16 +397,12 @@ f 0644 root sys $LOCALEDIR/it/cups_it.po locale/cups_it.po
 f 0644 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
 %subpackage ko
 f 0644 root sys $LOCALEDIR/ko/cups_ko.po locale/cups_ko.po
-%subpackage nl
-f 0644 root sys $LOCALEDIR/nl/cups_nl.po locale/cups_nl.po
 %subpackage no
 f 0644 root sys $LOCALEDIR/no/cups_no.po locale/cups_no.po
 %subpackage pl
 f 0644 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po
 %subpackage pt
 f 0644 root sys $LOCALEDIR/pt/cups_pt.po locale/cups_pt.po
-f 0644 root sys $LOCALEDIR/pt_BR/cups_pt_BR.po locale/cups_pt_BR.po
-f 0644 root sys $LOCALEDIR/pt_PT/cups_pt_PT.po locale/cups_pt_PT.po
 %subpackage ru
 f 0644 root sys $LOCALEDIR/ru/cups_ru.po locale/cups_ru.po
 %subpackage sv

packaging/cups.spec.in

@@ -117,11 +117,6 @@ Summary: Common UNIX Printing System - Korean support
 Group: System Environment/Daemons
 Requires: %{name} = %{epoch}:%{version}
 
-%package nl
-Summary: Common UNIX Printing System - Dutch support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
 %package no
 Summary: Common UNIX Printing System - Nowegian support
 Group: System Environment/Daemons
@@ -219,10 +214,6 @@ UNIX
 The Common UNIX Printing System provides a portable printing layer for 
 UNIX® operating systems. This package provides Korean support.
 
-%description nl
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This package provides Dutch support.
-
 %description no
 The Common UNIX Printing System provides a portable printing layer for 
 UNIX® operating systems. This package provides Norwegian support.
@@ -353,7 +344,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/cups
 %dir /usr/lib/cups/backend
 /usr/lib/cups/backend/http
-%attr(0700,root,root) /usr/lib/cups/backend/ipp
+/usr/lib/cups/backend/ipp
 %attr(0700,root,root) /usr/lib/cups/backend/lpd
 /usr/lib/cups/backend/parallel
 /usr/lib/cups/backend/scsi
@@ -570,10 +561,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 /usr/share/locale/ko/cups_ko.po
 
-%files nl
-%defattr(-,root,root)
-/usr/share/locale/nl/cups_nl.po
-
 %files no
 %defattr(-,root,root)
 /usr/share/locale/no/cups_no.po
@@ -591,8 +578,6 @@ rm -rf $RPM_BUILD_ROOT
 %files pt
 %defattr(-,root,root)
 /usr/share/locale/pt/cups_pt.po
-/usr/share/locale/pt_BR/cups_pt_BR.po
-/usr/share/locale/pt_PT/cups_pt_PT.po
 
 %files ru
 %defattr(-,root,root)

ppd/deskjet.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "DESKJET.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "HP"
 *ModelName: "HP DeskJet Series"
 *ShortNickName: "HP DeskJet Series"
 *NickName: "HP DeskJet Series, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: True
 *DefaultColorSpace: RGB
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 1
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertohp"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *UIConstraints: *PageSize A3 *InputSlot Envelope
 *UIConstraints: *InputSlot Envelope *PageSize A3
 *UIConstraints: *PageSize A4 *InputSlot Envelope
@@ -508,42 +507,6 @@
 *pt.MediaType Special/Special Paper: ""
 *pt.MediaType Transparency/Transparência: ""
 *pt.MediaType Glossy/Papel acetinado: ""
-*pt_PT.Translation Manufacturer/HP: ""
-*pt_PT.Translation ModelName/HP DeskJet Series: ""
-*pt_PT.Translation ShortNickName/HP DeskJet Series: ""
-*pt_PT.Translation NickName/HP DeskJet Series, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize Executive/Executive - 7.25x10.5in: ""
-*pt_PT.PageSize Tabloid/Tabloid - 11x17in: ""
-*pt_PT.PageSize A3/A3 - 297x420mm: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.PageSize A5/A5 - 148x210mm: ""
-*pt_PT.PageSize B5/B5 - 182x257mm: ""
-*pt_PT.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
-*pt_PT.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
-*pt_PT.PageSize EnvC5/C5 Envelope - 162x229mm: ""
-*pt_PT.PageSize EnvDL/DL Envelope - 110x220mm: ""
-*pt_PT.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
-*pt_PT.Translation ColorModel/Modo Cor: ""
-*pt_PT.ColorModel Gray/Grayscale: ""
-*pt_PT.ColorModel RGB/Inativo: ""
-*pt_PT.ColorModel CMYK/CMYK: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 150dpi/150dpi: ""
-*pt_PT.Resolution 300dpi/300dpi: ""
-*pt_PT.Resolution 600dpi/600 DPI Grayscale: ""
-*pt_PT.Translation InputSlot/Media Source: ""
-*pt_PT.InputSlot Tray/Tray: ""
-*pt_PT.InputSlot Manual/Alimentação Manual: ""
-*pt_PT.InputSlot Envelope/Envelope Feed: ""
-*pt_PT.Translation MediaType/Media Type: ""
-*pt_PT.MediaType Plain/Papel normal: ""
-*pt_PT.MediaType Bond/Papel bond: ""
-*pt_PT.MediaType Special/Special Paper: ""
-*pt_PT.MediaType Transparency/Transparência: ""
-*pt_PT.MediaType Glossy/Papel acetinado: ""
 *sv.Translation Manufacturer/HP: ""
 *sv.Translation ModelName/HP DeskJet Series: ""
 *sv.Translation ShortNickName/HP DeskJet Series: ""
@@ -688,4 +651,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of DESKJET.PPD, 31445 bytes.
+*% End of DESKJET.PPD, 29820 bytes.

ppd/dymo.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "DYMO.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Dymo"
 *ModelName: "Dymo Label Printer"
 *ShortNickName: "Dymo Label Printer"
 *NickName: "Dymo Label Printer, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w81h252
@@ -329,29 +328,6 @@
 *pt.cupsDarkness Medium/Medium: ""
 *pt.cupsDarkness Normal/Normal: ""
 *pt.cupsDarkness Dark/Dark: ""
-*pt_PT.Translation Manufacturer/Dymo: ""
-*pt_PT.Translation ModelName/Dymo Label Printer: ""
-*pt_PT.Translation ShortNickName/Dymo Label Printer: ""
-*pt_PT.Translation NickName/Dymo Label Printer, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize w81h252/Address - 1 1/8x3 1/2in: ""
-*pt_PT.PageSize w101h252/Large Address - 1 4/10x3 1/2in: ""
-*pt_PT.PageSize w54h144/Return Address - 3/4x2in: ""
-*pt_PT.PageSize w167h288/Shipping Address - 2 5/16x4in: ""
-*pt_PT.PageSize w162h540/Internet Postage 2-Part - 2 1/4x7 1/2in: ""
-*pt_PT.PageSize w162h504/Internet Postage 3-Part - 2 1/4x7in: ""
-*pt_PT.PageSize w41h248/File Folder - 9/16x3 7/16in: ""
-*pt_PT.PageSize w41h144/Hanging Folder - 9/16x2in: ""
-*pt_PT.PageSize w153h198/3.5" Disk - 2 1/8x2 3/4in: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 136dpi/136dpi: ""
-*pt_PT.Resolution 203dpi/203dpi: ""
-*pt_PT.Resolution 300dpi/300dpi: ""
-*pt_PT.Translation cupsDarkness/Darkness: ""
-*pt_PT.cupsDarkness Light/Light: ""
-*pt_PT.cupsDarkness Medium/Medium: ""
-*pt_PT.cupsDarkness Normal/Normal: ""
-*pt_PT.cupsDarkness Dark/Dark: ""
 *sv.Translation Manufacturer/Dymo: ""
 *sv.Translation ModelName/Dymo Label Printer: ""
 *sv.Translation ShortNickName/Dymo Label Printer: ""
@@ -457,4 +433,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of DYMO.PPD, 22651 bytes.
+*% End of DYMO.PPD, 21501 bytes.

ppd/epson24.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "EPSON24.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Epson"
 *ModelName: "Epson 24-Pin Series"
 *ShortNickName: "Epson 24-Pin Series"
 *NickName: "Epson 24-Pin Series, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 1
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -232,21 +231,6 @@
 *pt.Resolution 180dpi/180dpi: ""
 *pt.Resolution 360x180dpi/360x180dpi: ""
 *pt.Resolution 360x180dpi/360x180dpi: ""
-*pt_PT.Translation Manufacturer/Epson: ""
-*pt_PT.Translation ModelName/Epson 24-Pin Series: ""
-*pt_PT.Translation ShortNickName/Epson 24-Pin Series: ""
-*pt_PT.Translation NickName/Epson 24-Pin Series, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 60dpi/60dpi: ""
-*pt_PT.Resolution 120x60dpi/120x60dpi: ""
-*pt_PT.Resolution 180dpi/180dpi: ""
-*pt_PT.Resolution 360x180dpi/360x180dpi: ""
-*pt_PT.Resolution 360x180dpi/360x180dpi: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson 24-Pin Series: ""
 *sv.Translation ShortNickName/Epson 24-Pin Series: ""
@@ -328,4 +312,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of EPSON24.PPD, 15121 bytes.
+*% End of EPSON24.PPD, 14411 bytes.

ppd/epson9.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "EPSON9.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Epson"
 *ModelName: "Epson 9-Pin Series"
 *ShortNickName: "Epson 9-Pin Series"
 *NickName: "Epson 9-Pin Series, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -210,19 +209,6 @@
 *pt.Resolution 60x720dpi/60x720dpi: ""
 *pt.Resolution 120x72dpi/120x72dpi: ""
 *pt.Resolution 240x72dpi/240x72dpi: ""
-*pt_PT.Translation Manufacturer/Epson: ""
-*pt_PT.Translation ModelName/Epson 9-Pin Series: ""
-*pt_PT.Translation ShortNickName/Epson 9-Pin Series: ""
-*pt_PT.Translation NickName/Epson 9-Pin Series, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 60x720dpi/60x720dpi: ""
-*pt_PT.Resolution 120x72dpi/120x72dpi: ""
-*pt_PT.Resolution 240x72dpi/240x72dpi: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson 9-Pin Series: ""
 *sv.Translation ShortNickName/Epson 9-Pin Series: ""
@@ -298,4 +284,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of EPSON9.PPD, 13823 bytes.
+*% End of EPSON9.PPD, 13190 bytes.

ppd/intelbar.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "INTELBAR.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Intellitech"
 *ModelName: "Intellitech IntelliBar Label Printer"
 *ShortNickName: "Intellibar Label Printer"
 *NickName: "Intellitech IntelliBar Label Printer, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,15 +29,15 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *CustominTearInterval True: "<</cupsRowCount 2 1 roll>>setpagedevice"
 *CustominCutInterval True: "<</cupsRowStep 2 1 roll>>setpagedevice"
 *cupsVersion: 1.3
 *cupsModelNumber: 32
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *UIConstraints: *inPrintMode Standard *inCutInterval
 *UIConstraints: *inCutInterval *inPrintMode Standard
 *UIConstraints: *inPrintMode Standard *inTearInterval
@@ -1010,90 +1009,6 @@
 *pt.inCutInterval 8/Every 8 Labels: ""
 *pt.inCutInterval 9/Every 9 Labels: ""
 *pt.inCutInterval 10/Every 10 Labels: ""
-*pt_PT.Translation Manufacturer/Intellitech: ""
-*pt_PT.Translation ModelName/Intellitech IntelliBar Label Printer: ""
-*pt_PT.Translation ShortNickName/Intellibar Label Printer: ""
-*pt_PT.Translation NickName/Intellitech IntelliBar Label Printer, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize w288h432/4.00x6.00": ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 300dpi/300dpi: ""
-*pt_PT.Translation PrinterSettings/Printer Settings: ""
-*pt_PT.Translation inPrintDensity/Print Density: ""
-*pt_PT.inPrintDensity Default/Rápido: ""
-*pt_PT.inPrintDensity -15/-15: ""
-*pt_PT.inPrintDensity -14/-14: ""
-*pt_PT.inPrintDensity -13/-13: ""
-*pt_PT.inPrintDensity -12/-12: ""
-*pt_PT.inPrintDensity -11/-11: ""
-*pt_PT.inPrintDensity -10/-10: ""
-*pt_PT.inPrintDensity -9/-9: ""
-*pt_PT.inPrintDensity -8/-8: ""
-*pt_PT.inPrintDensity -7/-7: ""
-*pt_PT.inPrintDensity -6/-6: ""
-*pt_PT.inPrintDensity -5/-5: ""
-*pt_PT.inPrintDensity -4/-4: ""
-*pt_PT.inPrintDensity -3/-3: ""
-*pt_PT.inPrintDensity -2/-2: ""
-*pt_PT.inPrintDensity -1/-1: ""
-*pt_PT.inPrintDensity 0/0: ""
-*pt_PT.inPrintDensity 1/1: ""
-*pt_PT.inPrintDensity 2/2: ""
-*pt_PT.inPrintDensity 3/3: ""
-*pt_PT.inPrintDensity 4/4: ""
-*pt_PT.inPrintDensity 5/5: ""
-*pt_PT.inPrintDensity 6/6: ""
-*pt_PT.inPrintDensity 7/7: ""
-*pt_PT.inPrintDensity 8/8: ""
-*pt_PT.inPrintDensity 9/9: ""
-*pt_PT.inPrintDensity 10/10: ""
-*pt_PT.inPrintDensity 11/11: ""
-*pt_PT.inPrintDensity 12/12: ""
-*pt_PT.inPrintDensity 13/13: ""
-*pt_PT.inPrintDensity 14/14: ""
-*pt_PT.inPrintDensity 15/15: ""
-*pt_PT.Translation inPrintRate/Print Speed: ""
-*pt_PT.inPrintRate Default/Rápido: ""
-*pt_PT.inPrintRate 15/15 mm/sec.: ""
-*pt_PT.inPrintRate 20/20 mm/sec.: ""
-*pt_PT.inPrintRate 30/30 mm/sec.: ""
-*pt_PT.inPrintRate 40/40 mm/sec.: ""
-*pt_PT.inPrintRate 60/60 mm/sec.: ""
-*pt_PT.inPrintRate 80/80 mm/sec.: ""
-*pt_PT.inPrintRate 100/100 mm/sec.: ""
-*pt_PT.inPrintRate 120/120 mm/sec.: ""
-*pt_PT.inPrintRate 150/150 mm/sec.: ""
-*pt_PT.inPrintRate 200/200 mm/sec.: ""
-*pt_PT.inPrintRate 250/250 mm/sec.: ""
-*pt_PT.inPrintRate 300/300 mm/sec.: ""
-*pt_PT.Translation inPrintMode/Print Mode: ""
-*pt_PT.inPrintMode Standard/Standard: ""
-*pt_PT.inPrintMode Tear/Tear: ""
-*pt_PT.inPrintMode Cut/Cut: ""
-*pt_PT.Translation inTearInterval/Print and Tear: ""
-*pt_PT.inTearInterval None/Disabled: ""
-*pt_PT.inTearInterval 1/Every Label: ""
-*pt_PT.inTearInterval 2/Every 2 Labels: ""
-*pt_PT.inTearInterval 3/Every 3 Labels: ""
-*pt_PT.inTearInterval 4/Every 4 Labels: ""
-*pt_PT.inTearInterval 5/Every 5 Labels: ""
-*pt_PT.inTearInterval 6/Every 6 Labels: ""
-*pt_PT.inTearInterval 7/Every 7 Labels: ""
-*pt_PT.inTearInterval 8/Every 8 Labels: ""
-*pt_PT.inTearInterval 9/Every 9 Labels: ""
-*pt_PT.inTearInterval 10/Every 10 Labels: ""
-*pt_PT.Translation inCutInterval/Print and Cut: ""
-*pt_PT.inCutInterval None/Disabled: ""
-*pt_PT.inCutInterval 1/Every Label: ""
-*pt_PT.inCutInterval 2/Every 2 Labels: ""
-*pt_PT.inCutInterval 3/Every 3 Labels: ""
-*pt_PT.inCutInterval 4/Every 4 Labels: ""
-*pt_PT.inCutInterval 5/Every 5 Labels: ""
-*pt_PT.inCutInterval 6/Every 6 Labels: ""
-*pt_PT.inCutInterval 7/Every 7 Labels: ""
-*pt_PT.inCutInterval 8/Every 8 Labels: ""
-*pt_PT.inCutInterval 9/Every 9 Labels: ""
-*pt_PT.inCutInterval 10/Every 10 Labels: ""
 *sv.Translation Manufacturer/Intellitech: ""
 *sv.Translation ModelName/Intellitech IntelliBar Label Printer: ""
 *sv.Translation ShortNickName/Intellibar Label Printer: ""
@@ -1382,4 +1297,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of INTELBAR.PPD, 53625 bytes.
+*% End of INTELBAR.PPD, 50314 bytes.

ppd/laserjet.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "LASERJET.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "HP"
 *ModelName: "HP LaserJet Series PCL 4/5"
 *ShortNickName: "HP LaserJet Series PCL 4/5"
 *NickName: "HP LaserJet Series PCL 4/5, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertohp"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *UIConstraints: *Duplex *Option1 False
 *UIConstraints: *Option1 False *Duplex
 *UIConstraints: *PageSize A3 *InputSlot Envelope
@@ -531,44 +530,6 @@
 *pt.Translation Option1/Duplexer: ""
 *pt.Option1 False/Não instalado: ""
 *pt.Option1 True/Instalada: ""
-*pt_PT.Translation Manufacturer/HP: ""
-*pt_PT.Translation ModelName/HP LaserJet Series PCL 4/5: ""
-*pt_PT.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
-*pt_PT.Translation NickName/HP LaserJet Series PCL 4/5, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize Executive/Executive - 7.25x10.5in: ""
-*pt_PT.PageSize Tabloid/Tabloid - 11x17in: ""
-*pt_PT.PageSize A3/A3 - 297x420mm: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.PageSize A5/A5 - 148x210mm: ""
-*pt_PT.PageSize B5/B5 - 182x257mm: ""
-*pt_PT.PageSize EnvISOB5/ISOB5 Envelope - 176x250mm: ""
-*pt_PT.PageSize Env10/#10 Envelope - 4.13x9.5in: ""
-*pt_PT.PageSize EnvC5/C5 Envelope - 162x229mm: ""
-*pt_PT.PageSize EnvDL/DL Envelope - 110x220mm: ""
-*pt_PT.PageSize EnvMonarch/Monarch Envelope - 3.875x7.5in: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 150dpi/150dpi: ""
-*pt_PT.Resolution 300dpi/300dpi: ""
-*pt_PT.Resolution 600dpi/600dpi: ""
-*pt_PT.Translation InputSlot/Media Source: ""
-*pt_PT.InputSlot Default/Rápido: ""
-*pt_PT.InputSlot Tray1/Bandeja 1: ""
-*pt_PT.InputSlot Tray2/Bandeja 2: ""
-*pt_PT.InputSlot Tray3/Bandeja 3: ""
-*pt_PT.InputSlot Tray4/Bandeja 4: ""
-*pt_PT.InputSlot Manual/Alimentação Manual: ""
-*pt_PT.InputSlot Envelope/Envelope Feed: ""
-*pt_PT.Translation Duplex/Impressão em Frente e Verso: ""
-*pt_PT.Duplex None/Off (1-Sided): ""
-*pt_PT.Duplex DuplexNoTumble/Long-Edge (Portrait): ""
-*pt_PT.Duplex DuplexTumble/Short-Edge (Landscape): ""
-*pt_PT.Translation InstallableOptions/Installable Options: ""
-*pt_PT.Translation Option1/Duplexer: ""
-*pt_PT.Option1 False/Não instalado: ""
-*pt_PT.Option1 True/Instalada: ""
 *sv.Translation Manufacturer/HP: ""
 *sv.Translation ModelName/HP LaserJet Series PCL 4/5: ""
 *sv.Translation ShortNickName/HP LaserJet Series PCL 4/5: ""
@@ -719,4 +680,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of LASERJET.PPD, 33308 bytes.
+*% End of LASERJET.PPD, 31536 bytes.

ppd/okidat24.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "OKIDAT24.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Oki"
 *ModelName: "Oki 24-Pin Series"
 *ShortNickName: "Oki 24-Pin Series"
 *NickName: "Oki 24-Pin Series, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 1
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -232,21 +231,6 @@
 *pt.Resolution 180dpi/180dpi: ""
 *pt.Resolution 360x180dpi/360x180dpi: ""
 *pt.Resolution 360dpi/360dpi: ""
-*pt_PT.Translation Manufacturer/Oki: ""
-*pt_PT.Translation ModelName/Oki 24-Pin Series: ""
-*pt_PT.Translation ShortNickName/Oki 24-Pin Series: ""
-*pt_PT.Translation NickName/Oki 24-Pin Series, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 60dpi/60dpi: ""
-*pt_PT.Resolution 120x60dpi/120x60dpi: ""
-*pt_PT.Resolution 180dpi/180dpi: ""
-*pt_PT.Resolution 360x180dpi/360x180dpi: ""
-*pt_PT.Resolution 360dpi/360dpi: ""
 *sv.Translation Manufacturer/Oki: ""
 *sv.Translation ModelName/Oki 24-Pin Series: ""
 *sv.Translation ShortNickName/Oki 24-Pin Series: ""
@@ -328,4 +312,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of OKIDAT24.PPD, 14887 bytes.
+*% End of OKIDAT24.PPD, 14193 bytes.

ppd/okidata9.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "OKIDATA9.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Oki"
 *ModelName: "Oki 9-Pin Series"
 *ShortNickName: "Oki 9-Pin Series"
 *NickName: "Oki 9-Pin Series, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 0
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -210,19 +209,6 @@
 *pt.Resolution 60x720dpi/60x720dpi: ""
 *pt.Resolution 120x72dpi/120x72dpi: ""
 *pt.Resolution 240x72dpi/240x72dpi: ""
-*pt_PT.Translation Manufacturer/Oki: ""
-*pt_PT.Translation ModelName/Oki 9-Pin Series: ""
-*pt_PT.Translation ShortNickName/Oki 9-Pin Series: ""
-*pt_PT.Translation NickName/Oki 9-Pin Series, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 60x720dpi/60x720dpi: ""
-*pt_PT.Resolution 120x72dpi/120x72dpi: ""
-*pt_PT.Resolution 240x72dpi/240x72dpi: ""
 *sv.Translation Manufacturer/Oki: ""
 *sv.Translation ModelName/Oki 9-Pin Series: ""
 *sv.Translation ShortNickName/Oki 9-Pin Series: ""
@@ -298,4 +284,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of OKIDATA9.PPD, 13707 bytes.
+*% End of OKIDATA9.PPD, 13082 bytes.

ppd/sample.drv

@@ -80,10 +80,9 @@ Attribute "cupsVersion" "" "1.3"
 Attribute "FileSystem" "" "False"
 Attribute "LandscapeOrientation" "" "Plus90"
 Attribute "LanguageLevel" "" "3"
+Attribute "Product" "" "(GNU Ghostscript)"
 Attribute "Product" "" "(ESP Ghostscript)"
-Attribute "Product" "" "(GPL Ghostscript)"
-Attribute "PSVersion" "" "(3010.000) 81504"
-Attribute "PSVersion" "" "(3010.000) 860"
+Attribute "PSVersion" "" "(3010.000) 81501"
 Attribute "TTRasterizer" "" "Type42"
 
 Copyright "Copyright 2007 by Apple Inc."

ppd/stcolor.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "STCOLOR.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Epson"
 *ModelName: "Epson Stylus Color Series"
 *ShortNickName: "Epson Stylus Color Series"
 *NickName: "Epson Stylus Color Series, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: True
 *DefaultColorSpace: RGB
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 2
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -288,25 +287,6 @@
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
-*pt_PT.Translation Manufacturer/Epson: ""
-*pt_PT.Translation ModelName/Epson Stylus Color Series: ""
-*pt_PT.Translation ShortNickName/Epson Stylus Color Series: ""
-*pt_PT.Translation NickName/Epson Stylus Color Series, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 180dpi/180dpi: ""
-*pt_PT.Resolution 360dpi/360dpi: ""
-*pt_PT.Resolution 720dpi/720dpi: ""
-*pt_PT.Translation ColorModel/Modo Cor: ""
-*pt_PT.ColorModel CMYK/CMYK: ""
-*pt_PT.ColorModel Gray/Grayscale: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson Stylus Color Series: ""
 *sv.Translation ShortNickName/Epson Stylus Color Series: ""
@@ -400,4 +380,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STCOLOR.PPD, 18258 bytes.
+*% End of STCOLOR.PPD, 17384 bytes.

ppd/stcolor2.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "STCOLOR2.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Epson"
 *ModelName: "Epson New Stylus Color Series"
 *ShortNickName: "Epson New Stylus Color Series"
 *NickName: "Epson New Stylus Color Series, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: True
 *DefaultColorSpace: RGB
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 4
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -288,25 +287,6 @@
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
-*pt_PT.Translation Manufacturer/Epson: ""
-*pt_PT.Translation ModelName/Epson New Stylus Color Series: ""
-*pt_PT.Translation ShortNickName/Epson New Stylus Color Series: ""
-*pt_PT.Translation NickName/Epson New Stylus Color Series, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 180dpi/180dpi: ""
-*pt_PT.Resolution 360dpi/360dpi: ""
-*pt_PT.Resolution 720dpi/720dpi: ""
-*pt_PT.Translation ColorModel/Modo Cor: ""
-*pt_PT.ColorModel CMYK/CMYK: ""
-*pt_PT.ColorModel Gray/Grayscale: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson New Stylus Color Series: ""
 *sv.Translation ShortNickName/Epson New Stylus Color Series: ""
@@ -400,4 +380,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STCOLOR2.PPD, 18444 bytes.
+*% End of STCOLOR2.PPD, 17558 bytes.

ppd/stphoto.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "STPHOTO.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Epson"
 *ModelName: "Epson Stylus Photo Series"
 *ShortNickName: "Epson Stylus Photo Series"
 *NickName: "Epson Stylus Photo Series, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: True
 *DefaultColorSpace: RGB
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 3
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -288,25 +287,6 @@
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
-*pt_PT.Translation Manufacturer/Epson: ""
-*pt_PT.Translation ModelName/Epson Stylus Photo Series: ""
-*pt_PT.Translation ShortNickName/Epson Stylus Photo Series: ""
-*pt_PT.Translation NickName/Epson Stylus Photo Series, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 180dpi/180dpi: ""
-*pt_PT.Resolution 360dpi/360dpi: ""
-*pt_PT.Resolution 720dpi/720dpi: ""
-*pt_PT.Translation ColorModel/Modo Cor: ""
-*pt_PT.ColorModel CMYK/CMYK: ""
-*pt_PT.ColorModel Gray/Grayscale: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson Stylus Photo Series: ""
 *sv.Translation ShortNickName/Epson Stylus Photo Series: ""
@@ -400,4 +380,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STPHOTO.PPD, 18259 bytes.
+*% End of STPHOTO.PPD, 17385 bytes.

ppd/stphoto2.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "STPHOTO2.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Epson"
 *ModelName: "Epson New Stylus Photo Series"
 *ShortNickName: "Epson New Stylus Photo Series"
 *NickName: "Epson New Stylus Photo Series, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: True
 *DefaultColorSpace: RGB
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 5
 *cupsManualCopies: True
 *cupsFilter: "application/vnd.cups-raster 50 rastertoepson"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: Letter
@@ -288,25 +287,6 @@
 *pt.Translation ColorModel/Modo Cor: ""
 *pt.ColorModel CMYK/CMYK: ""
 *pt.ColorModel Gray/Grayscale: ""
-*pt_PT.Translation Manufacturer/Epson: ""
-*pt_PT.Translation ModelName/Epson New Stylus Photo Series: ""
-*pt_PT.Translation ShortNickName/Epson New Stylus Photo Series: ""
-*pt_PT.Translation NickName/Epson New Stylus Photo Series, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_PT.PageSize Letter/Letter - 8.5x11in: ""
-*pt_PT.PageSize Legal/Legal - 8.5x14in: ""
-*pt_PT.PageSize A4/A4 - 210x297mm: ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 180dpi/180dpi: ""
-*pt_PT.Resolution 360dpi/360dpi: ""
-*pt_PT.Resolution 720dpi/720dpi: ""
-*pt_PT.Translation ColorModel/Modo Cor: ""
-*pt_PT.ColorModel CMYK/CMYK: ""
-*pt_PT.ColorModel Gray/Grayscale: ""
 *sv.Translation Manufacturer/Epson: ""
 *sv.Translation ModelName/Epson New Stylus Photo Series: ""
 *sv.Translation ShortNickName/Epson New Stylus Photo Series: ""
@@ -400,4 +380,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of STPHOTO2.PPD, 18445 bytes.
+*% End of STPHOTO2.PPD, 17559 bytes.

ppd/zebra.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "ZEBRA.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Zebra"
 *ModelName: "Zebra ZPL Label Printer"
 *ShortNickName: "Zebra ZPL Label Printer"
 *NickName: "Zebra ZPL Label Printer, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 18
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
@@ -2783,237 +2782,6 @@
 *pt.zeErrorReprint Saved/Rápido: ""
 *pt.zeErrorReprint Always/Always: ""
 *pt.zeErrorReprint Never/Never: ""
-*pt_PT.Translation Manufacturer/Zebra: ""
-*pt_PT.Translation ModelName/Zebra ZPL Label Printer: ""
-*pt_PT.Translation ShortNickName/Zebra ZPL Label Printer: ""
-*pt_PT.Translation NickName/Zebra ZPL Label Printer, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize w90h18/1.25x0.25": ""
-*pt_PT.PageSize w90h162/1.25x2.25": ""
-*pt_PT.PageSize w108h18/1.50x0.25": ""
-*pt_PT.PageSize w108h36/1.50x0.50": ""
-*pt_PT.PageSize w108h72/1.50x1.00": ""
-*pt_PT.PageSize w108h144/1.50x2.00": ""
-*pt_PT.PageSize w144h26/2.00x0.37": ""
-*pt_PT.PageSize w144h36/2.00x0.50": ""
-*pt_PT.PageSize w144h72/2.00x1.00": ""
-*pt_PT.PageSize w144h90/2.00x1.25": ""
-*pt_PT.PageSize w144h288/2.00x4.00": ""
-*pt_PT.PageSize w144h396/2.00x5.50": ""
-*pt_PT.PageSize w162h36/2.25x0.50": ""
-*pt_PT.PageSize w162h90/2.25x1.25": ""
-*pt_PT.PageSize w162h288/2.25x4.00": ""
-*pt_PT.PageSize w162h396/2.25x5.50": ""
-*pt_PT.PageSize w171h396/2.38x5.50": ""
-*pt_PT.PageSize w180h72/2.50x1.00": ""
-*pt_PT.PageSize w180h144/2.50x2.00": ""
-*pt_PT.PageSize w198h90/2.75x1.25": ""
-*pt_PT.PageSize w216h72/3.00x1.00": ""
-*pt_PT.PageSize w216h90/3.00x1.25": ""
-*pt_PT.PageSize w216h144/3.00x2.00": ""
-*pt_PT.PageSize w216h216/3.00x3.00": ""
-*pt_PT.PageSize w216h360/3.00x5.00": ""
-*pt_PT.PageSize w234h144/3.25x2.00": ""
-*pt_PT.PageSize w234h360/3.25x5.00": ""
-*pt_PT.PageSize w234h396/3.25x5.50": ""
-*pt_PT.PageSize w234h419/3.25x5.83": ""
-*pt_PT.PageSize w234h563/3.25x7.83": ""
-*pt_PT.PageSize w252h72/3.50x1.00": ""
-*pt_PT.PageSize w288h72/4.00x1.00": ""
-*pt_PT.PageSize w288h144/4.00x2.00": ""
-*pt_PT.PageSize w288h180/4.00x2.50": ""
-*pt_PT.PageSize w288h216/4.00x3.00": ""
-*pt_PT.PageSize w288h288/4.00x4.00": ""
-*pt_PT.PageSize w288h360/4.00x5.00": ""
-*pt_PT.PageSize w288h432/4.00x6.00": ""
-*pt_PT.PageSize w288h468/4.00x6.50": ""
-*pt_PT.PageSize w288h936/4.00x13.00": ""
-*pt_PT.PageSize w432h72/6.00x1.00": ""
-*pt_PT.PageSize w432h144/6.00x2.00": ""
-*pt_PT.PageSize w432h216/6.00x3.00": ""
-*pt_PT.PageSize w432h288/6.00x4.00": ""
-*pt_PT.PageSize w432h360/6.00x5.00": ""
-*pt_PT.PageSize w432h432/6.00x6.00": ""
-*pt_PT.PageSize w432h468/6.00x6.50": ""
-*pt_PT.PageSize w576h72/8.00x1.00": ""
-*pt_PT.PageSize w576h144/8.00x2.00": ""
-*pt_PT.PageSize w576h216/8.00x3.00": ""
-*pt_PT.PageSize w576h288/8.00x4.00": ""
-*pt_PT.PageSize w576h360/8.00x5.00": ""
-*pt_PT.PageSize w576h432/8.00x6.00": ""
-*pt_PT.PageSize w576h468/8.00x6.50": ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 203dpi/203dpi: ""
-*pt_PT.Resolution 300dpi/300dpi: ""
-*pt_PT.Resolution 600dpi/600dpi: ""
-*pt_PT.Translation zeMediaTracking/Media Tracking: ""
-*pt_PT.zeMediaTracking Continuous/Continuous: ""
-*pt_PT.zeMediaTracking Web/Non-continuous (Web sensing): ""
-*pt_PT.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
-*pt_PT.Translation MediaType/Media Type: ""
-*pt_PT.MediaType Saved/Rápido: ""
-*pt_PT.MediaType Thermal/Thermal Transfer Media: ""
-*pt_PT.MediaType Direct/Direct Thermal Media: ""
-*pt_PT.Translation PrinterSettings/Printer Settings: ""
-*pt_PT.Translation Darkness/Darkness: ""
-*pt_PT.Darkness -1/Rápido: ""
-*pt_PT.Darkness 1/1: ""
-*pt_PT.Darkness 2/2: ""
-*pt_PT.Darkness 3/3: ""
-*pt_PT.Darkness 4/4: ""
-*pt_PT.Darkness 5/5: ""
-*pt_PT.Darkness 6/6: ""
-*pt_PT.Darkness 7/7: ""
-*pt_PT.Darkness 8/8: ""
-*pt_PT.Darkness 9/9: ""
-*pt_PT.Darkness 10/10: ""
-*pt_PT.Darkness 11/11: ""
-*pt_PT.Darkness 12/12: ""
-*pt_PT.Darkness 13/13: ""
-*pt_PT.Darkness 14/14: ""
-*pt_PT.Darkness 15/15: ""
-*pt_PT.Darkness 16/16: ""
-*pt_PT.Darkness 17/17: ""
-*pt_PT.Darkness 18/18: ""
-*pt_PT.Darkness 19/19: ""
-*pt_PT.Darkness 20/20: ""
-*pt_PT.Darkness 21/21: ""
-*pt_PT.Darkness 22/22: ""
-*pt_PT.Darkness 23/23: ""
-*pt_PT.Darkness 24/24: ""
-*pt_PT.Darkness 25/25: ""
-*pt_PT.Darkness 26/26: ""
-*pt_PT.Darkness 27/27: ""
-*pt_PT.Darkness 28/28: ""
-*pt_PT.Darkness 29/29: ""
-*pt_PT.Darkness 30/30: ""
-*pt_PT.Translation zePrintRate/Print Rate: ""
-*pt_PT.zePrintRate Default/Rápido: ""
-*pt_PT.zePrintRate 1/1 inch/sec.: ""
-*pt_PT.zePrintRate 2/2 inches/sec.: ""
-*pt_PT.zePrintRate 3/3 inches/sec.: ""
-*pt_PT.zePrintRate 4/4 inches/sec.: ""
-*pt_PT.zePrintRate 5/5 inches/sec.: ""
-*pt_PT.zePrintRate 6/6 inches/sec.: ""
-*pt_PT.zePrintRate 7/7 inches/sec.: ""
-*pt_PT.zePrintRate 8/8 inches/sec.: ""
-*pt_PT.zePrintRate 9/9 inches/sec.: ""
-*pt_PT.zePrintRate 10/10 inches/sec.: ""
-*pt_PT.zePrintRate 11/11 inches/sec.: ""
-*pt_PT.zePrintRate 12/12 inches/sec.: ""
-*pt_PT.Translation zeLabelTop/Label Top: ""
-*pt_PT.zeLabelTop 200/Rápido: ""
-*pt_PT.zeLabelTop -120/-120: ""
-*pt_PT.zeLabelTop -115/-115: ""
-*pt_PT.zeLabelTop -110/-110: ""
-*pt_PT.zeLabelTop -105/-105: ""
-*pt_PT.zeLabelTop -100/-100: ""
-*pt_PT.zeLabelTop -95/-95: ""
-*pt_PT.zeLabelTop -90/-90: ""
-*pt_PT.zeLabelTop -85/-85: ""
-*pt_PT.zeLabelTop -80/-80: ""
-*pt_PT.zeLabelTop -75/-75: ""
-*pt_PT.zeLabelTop -70/-70: ""
-*pt_PT.zeLabelTop -65/-65: ""
-*pt_PT.zeLabelTop -60/-60: ""
-*pt_PT.zeLabelTop -55/-55: ""
-*pt_PT.zeLabelTop -50/-50: ""
-*pt_PT.zeLabelTop -45/-45: ""
-*pt_PT.zeLabelTop -40/-40: ""
-*pt_PT.zeLabelTop -35/-35: ""
-*pt_PT.zeLabelTop -30/-30: ""
-*pt_PT.zeLabelTop -25/-25: ""
-*pt_PT.zeLabelTop -20/-20: ""
-*pt_PT.zeLabelTop -15/-15: ""
-*pt_PT.zeLabelTop -10/-10: ""
-*pt_PT.zeLabelTop -5/-5: ""
-*pt_PT.zeLabelTop 0/0: ""
-*pt_PT.zeLabelTop 5/5: ""
-*pt_PT.zeLabelTop 10/10: ""
-*pt_PT.zeLabelTop 15/15: ""
-*pt_PT.zeLabelTop 20/20: ""
-*pt_PT.zeLabelTop 25/25: ""
-*pt_PT.zeLabelTop 30/30: ""
-*pt_PT.zeLabelTop 35/35: ""
-*pt_PT.zeLabelTop 40/40: ""
-*pt_PT.zeLabelTop 45/45: ""
-*pt_PT.zeLabelTop 50/50: ""
-*pt_PT.zeLabelTop 55/55: ""
-*pt_PT.zeLabelTop 60/60: ""
-*pt_PT.zeLabelTop 65/65: ""
-*pt_PT.zeLabelTop 70/70: ""
-*pt_PT.zeLabelTop 75/75: ""
-*pt_PT.zeLabelTop 80/80: ""
-*pt_PT.zeLabelTop 85/85: ""
-*pt_PT.zeLabelTop 90/90: ""
-*pt_PT.zeLabelTop 95/95: ""
-*pt_PT.zeLabelTop 100/100: ""
-*pt_PT.zeLabelTop 105/105: ""
-*pt_PT.zeLabelTop 110/110: ""
-*pt_PT.zeLabelTop 115/115: ""
-*pt_PT.zeLabelTop 120/120: ""
-*pt_PT.Translation zePrintMode/Print Mode: ""
-*pt_PT.zePrintMode Saved/Rápido: ""
-*pt_PT.zePrintMode Tear/Tear-Off: ""
-*pt_PT.zePrintMode Peel/Peel-Off: ""
-*pt_PT.zePrintMode Rewind/Rewind: ""
-*pt_PT.zePrintMode Applicator/Applicator: ""
-*pt_PT.zePrintMode Cutter/Cutter: ""
-*pt_PT.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
-*pt_PT.zeTearOffPosition 1000/Rápido: ""
-*pt_PT.zeTearOffPosition -120/-120: ""
-*pt_PT.zeTearOffPosition -115/-115: ""
-*pt_PT.zeTearOffPosition -110/-110: ""
-*pt_PT.zeTearOffPosition -105/-105: ""
-*pt_PT.zeTearOffPosition -100/-100: ""
-*pt_PT.zeTearOffPosition -95/-95: ""
-*pt_PT.zeTearOffPosition -90/-90: ""
-*pt_PT.zeTearOffPosition -85/-85: ""
-*pt_PT.zeTearOffPosition -80/-80: ""
-*pt_PT.zeTearOffPosition -75/-75: ""
-*pt_PT.zeTearOffPosition -70/-70: ""
-*pt_PT.zeTearOffPosition -65/-65: ""
-*pt_PT.zeTearOffPosition -60/-60: ""
-*pt_PT.zeTearOffPosition -55/-55: ""
-*pt_PT.zeTearOffPosition -50/-50: ""
-*pt_PT.zeTearOffPosition -45/-45: ""
-*pt_PT.zeTearOffPosition -40/-40: ""
-*pt_PT.zeTearOffPosition -35/-35: ""
-*pt_PT.zeTearOffPosition -30/-30: ""
-*pt_PT.zeTearOffPosition -25/-25: ""
-*pt_PT.zeTearOffPosition -20/-20: ""
-*pt_PT.zeTearOffPosition -15/-15: ""
-*pt_PT.zeTearOffPosition -10/-10: ""
-*pt_PT.zeTearOffPosition -5/-5: ""
-*pt_PT.zeTearOffPosition 0/0: ""
-*pt_PT.zeTearOffPosition 5/5: ""
-*pt_PT.zeTearOffPosition 10/10: ""
-*pt_PT.zeTearOffPosition 15/15: ""
-*pt_PT.zeTearOffPosition 20/20: ""
-*pt_PT.zeTearOffPosition 25/25: ""
-*pt_PT.zeTearOffPosition 30/30: ""
-*pt_PT.zeTearOffPosition 35/35: ""
-*pt_PT.zeTearOffPosition 40/40: ""
-*pt_PT.zeTearOffPosition 45/45: ""
-*pt_PT.zeTearOffPosition 50/50: ""
-*pt_PT.zeTearOffPosition 55/55: ""
-*pt_PT.zeTearOffPosition 60/60: ""
-*pt_PT.zeTearOffPosition 65/65: ""
-*pt_PT.zeTearOffPosition 70/70: ""
-*pt_PT.zeTearOffPosition 75/75: ""
-*pt_PT.zeTearOffPosition 80/80: ""
-*pt_PT.zeTearOffPosition 85/85: ""
-*pt_PT.zeTearOffPosition 90/90: ""
-*pt_PT.zeTearOffPosition 95/95: ""
-*pt_PT.zeTearOffPosition 100/100: ""
-*pt_PT.zeTearOffPosition 105/105: ""
-*pt_PT.zeTearOffPosition 110/110: ""
-*pt_PT.zeTearOffPosition 115/115: ""
-*pt_PT.zeTearOffPosition 120/120: ""
-*pt_PT.Translation zeErrorReprint/Reprint After Error: ""
-*pt_PT.zeErrorReprint Saved/Rápido: ""
-*pt_PT.zeErrorReprint Always/Always: ""
-*pt_PT.zeErrorReprint Never/Never: ""
 *sv.Translation Manufacturer/Zebra: ""
 *sv.Translation ModelName/Zebra ZPL Label Printer: ""
 *sv.Translation ShortNickName/Zebra ZPL Label Printer: ""
@@ -3743,4 +3511,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRA.PPD, 138038 bytes.
+*% End of ZEBRA.PPD, 129744 bytes.

ppd/zebracpl.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "ZEBRACPL.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Zebra"
 *ModelName: "Zebra CPCL Label Printer"
 *ShortNickName: "Zebra CPCL Label Printer"
 *NickName: "Zebra CPCL Label Printer, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 19
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
@@ -1366,121 +1365,6 @@
 *pt.zeErrorReprint Saved/Rápido: ""
 *pt.zeErrorReprint Always/Always: ""
 *pt.zeErrorReprint Never/Never: ""
-*pt_PT.Translation Manufacturer/Zebra: ""
-*pt_PT.Translation ModelName/Zebra CPCL Label Printer: ""
-*pt_PT.Translation ShortNickName/Zebra CPCL Label Printer: ""
-*pt_PT.Translation NickName/Zebra CPCL Label Printer, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize w144h72/2.00x1.00": ""
-*pt_PT.PageSize w144h90/2.00x1.25": ""
-*pt_PT.PageSize w144h144/2.00x2.00": ""
-*pt_PT.PageSize w144h216/2.00x3.00": ""
-*pt_PT.PageSize w209h72/2.9 x 1": ""
-*pt_PT.PageSize w288h144/4.00x2.00": ""
-*pt_PT.PageSize w288h216/4.00x3.00": ""
-*pt_PT.PageSize w288h288/4.00x4.00": ""
-*pt_PT.PageSize w288h360/4.00x5.00": ""
-*pt_PT.PageSize w288h432/4.00x6.00": ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 203dpi/203dpi: ""
-*pt_PT.Translation zeMediaTracking/Media Tracking: ""
-*pt_PT.zeMediaTracking Continuous/Continuous: ""
-*pt_PT.zeMediaTracking Web/Non-continuous (Web sensing): ""
-*pt_PT.zeMediaTracking Mark/Non-continuous (Mark sensing): ""
-*pt_PT.Translation PrinterSettings/Printer Settings: ""
-*pt_PT.Translation Darkness/Darkness: ""
-*pt_PT.Darkness -1/Rápido: ""
-*pt_PT.Darkness 1/1: ""
-*pt_PT.Darkness 2/2: ""
-*pt_PT.Darkness 3/3: ""
-*pt_PT.Darkness 4/4: ""
-*pt_PT.Darkness 5/5: ""
-*pt_PT.Darkness 6/6: ""
-*pt_PT.Darkness 7/7: ""
-*pt_PT.Darkness 8/8: ""
-*pt_PT.Darkness 9/9: ""
-*pt_PT.Darkness 10/10: ""
-*pt_PT.Darkness 11/11: ""
-*pt_PT.Darkness 12/12: ""
-*pt_PT.Darkness 13/13: ""
-*pt_PT.Darkness 14/14: ""
-*pt_PT.Darkness 15/15: ""
-*pt_PT.Darkness 16/16: ""
-*pt_PT.Darkness 17/17: ""
-*pt_PT.Darkness 18/18: ""
-*pt_PT.Darkness 19/19: ""
-*pt_PT.Darkness 20/20: ""
-*pt_PT.Darkness 21/21: ""
-*pt_PT.Darkness 22/22: ""
-*pt_PT.Darkness 23/23: ""
-*pt_PT.Darkness 24/24: ""
-*pt_PT.Darkness 25/25: ""
-*pt_PT.Darkness 26/26: ""
-*pt_PT.Darkness 27/27: ""
-*pt_PT.Darkness 28/28: ""
-*pt_PT.Darkness 29/29: ""
-*pt_PT.Darkness 30/30: ""
-*pt_PT.Translation zePrintRate/Print Rate: ""
-*pt_PT.zePrintRate Default/Rápido: ""
-*pt_PT.zePrintRate 1/1 inch/sec.: ""
-*pt_PT.zePrintRate 2/2 inches/sec.: ""
-*pt_PT.zePrintRate 3/3 inches/sec.: ""
-*pt_PT.zePrintRate 4/4 inches/sec.: ""
-*pt_PT.Translation zeTearOffPosition/Tear-Off Adjust Position: ""
-*pt_PT.zeTearOffPosition 1000/Rápido: ""
-*pt_PT.zeTearOffPosition -120/-120: ""
-*pt_PT.zeTearOffPosition -115/-115: ""
-*pt_PT.zeTearOffPosition -110/-110: ""
-*pt_PT.zeTearOffPosition -105/-105: ""
-*pt_PT.zeTearOffPosition -100/-100: ""
-*pt_PT.zeTearOffPosition -95/-95: ""
-*pt_PT.zeTearOffPosition -90/-90: ""
-*pt_PT.zeTearOffPosition -85/-85: ""
-*pt_PT.zeTearOffPosition -80/-80: ""
-*pt_PT.zeTearOffPosition -75/-75: ""
-*pt_PT.zeTearOffPosition -70/-70: ""
-*pt_PT.zeTearOffPosition -65/-65: ""
-*pt_PT.zeTearOffPosition -60/-60: ""
-*pt_PT.zeTearOffPosition -55/-55: ""
-*pt_PT.zeTearOffPosition -50/-50: ""
-*pt_PT.zeTearOffPosition -45/-45: ""
-*pt_PT.zeTearOffPosition -40/-40: ""
-*pt_PT.zeTearOffPosition -35/-35: ""
-*pt_PT.zeTearOffPosition -30/-30: ""
-*pt_PT.zeTearOffPosition -25/-25: ""
-*pt_PT.zeTearOffPosition -20/-20: ""
-*pt_PT.zeTearOffPosition -15/-15: ""
-*pt_PT.zeTearOffPosition -10/-10: ""
-*pt_PT.zeTearOffPosition -5/-5: ""
-*pt_PT.zeTearOffPosition 0/0: ""
-*pt_PT.zeTearOffPosition 5/5: ""
-*pt_PT.zeTearOffPosition 10/10: ""
-*pt_PT.zeTearOffPosition 15/15: ""
-*pt_PT.zeTearOffPosition 20/20: ""
-*pt_PT.zeTearOffPosition 25/25: ""
-*pt_PT.zeTearOffPosition 30/30: ""
-*pt_PT.zeTearOffPosition 35/35: ""
-*pt_PT.zeTearOffPosition 40/40: ""
-*pt_PT.zeTearOffPosition 45/45: ""
-*pt_PT.zeTearOffPosition 50/50: ""
-*pt_PT.zeTearOffPosition 55/55: ""
-*pt_PT.zeTearOffPosition 60/60: ""
-*pt_PT.zeTearOffPosition 65/65: ""
-*pt_PT.zeTearOffPosition 70/70: ""
-*pt_PT.zeTearOffPosition 75/75: ""
-*pt_PT.zeTearOffPosition 80/80: ""
-*pt_PT.zeTearOffPosition 85/85: ""
-*pt_PT.zeTearOffPosition 90/90: ""
-*pt_PT.zeTearOffPosition 95/95: ""
-*pt_PT.zeTearOffPosition 100/100: ""
-*pt_PT.zeTearOffPosition 105/105: ""
-*pt_PT.zeTearOffPosition 110/110: ""
-*pt_PT.zeTearOffPosition 115/115: ""
-*pt_PT.zeTearOffPosition 120/120: ""
-*pt_PT.Translation zeErrorReprint/Reprint After Error: ""
-*pt_PT.zeErrorReprint Saved/Rápido: ""
-*pt_PT.zeErrorReprint Always/Always: ""
-*pt_PT.zeErrorReprint Never/Never: ""
 *sv.Translation Manufacturer/Zebra: ""
 *sv.Translation ModelName/Zebra CPCL Label Printer: ""
 *sv.Translation ShortNickName/Zebra CPCL Label Printer: ""
@@ -1862,4 +1746,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRACPL.PPD, 67894 bytes.
+*% End of ZEBRACPL.PPD, 63701 bytes.

ppd/zebraep1.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "ZEBRAEP1.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Zebra"
 *ModelName: "Zebra EPL1 Label Printer"
 *ShortNickName: "Zebra EPL1 Label Printer"
 *NickName: "Zebra EPL1 Label Printer, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 16
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
@@ -1150,94 +1149,6 @@
 *pt.zePrintRate 1.5/1.5 inch/sec.: ""
 *pt.zePrintRate 2/2 inches/sec.: ""
 *pt.zePrintRate 2.5/2.5 inches/sec.: ""
-*pt_PT.Translation Manufacturer/Zebra: ""
-*pt_PT.Translation ModelName/Zebra EPL1 Label Printer: ""
-*pt_PT.Translation ShortNickName/Zebra EPL1 Label Printer: ""
-*pt_PT.Translation NickName/Zebra EPL1 Label Printer, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize w90h18/1.25x0.25": ""
-*pt_PT.PageSize w90h162/1.25x2.25": ""
-*pt_PT.PageSize w108h18/1.50x0.25": ""
-*pt_PT.PageSize w108h36/1.50x0.50": ""
-*pt_PT.PageSize w108h72/1.50x1.00": ""
-*pt_PT.PageSize w108h144/1.50x2.00": ""
-*pt_PT.PageSize w144h26/2.00x0.37": ""
-*pt_PT.PageSize w144h36/2.00x0.50": ""
-*pt_PT.PageSize w144h72/2.00x1.00": ""
-*pt_PT.PageSize w144h90/2.00x1.25": ""
-*pt_PT.PageSize w144h288/2.00x4.00": ""
-*pt_PT.PageSize w144h396/2.00x5.50": ""
-*pt_PT.PageSize w162h36/2.25x0.50": ""
-*pt_PT.PageSize w162h90/2.25x1.25": ""
-*pt_PT.PageSize w162h288/2.25x4.00": ""
-*pt_PT.PageSize w162h396/2.25x5.50": ""
-*pt_PT.PageSize w171h396/2.38x5.50": ""
-*pt_PT.PageSize w180h72/2.50x1.00": ""
-*pt_PT.PageSize w180h144/2.50x2.00": ""
-*pt_PT.PageSize w198h90/2.75x1.25": ""
-*pt_PT.PageSize w216h72/3.00x1.00": ""
-*pt_PT.PageSize w216h90/3.00x1.25": ""
-*pt_PT.PageSize w216h144/3.00x2.00": ""
-*pt_PT.PageSize w216h216/3.00x3.00": ""
-*pt_PT.PageSize w216h360/3.00x5.00": ""
-*pt_PT.PageSize w234h144/3.25x2.00": ""
-*pt_PT.PageSize w234h360/3.25x5.00": ""
-*pt_PT.PageSize w234h396/3.25x5.50": ""
-*pt_PT.PageSize w234h419/3.25x5.83": ""
-*pt_PT.PageSize w234h563/3.25x7.83": ""
-*pt_PT.PageSize w252h72/3.50x1.00": ""
-*pt_PT.PageSize w288h72/4.00x1.00": ""
-*pt_PT.PageSize w288h144/4.00x2.00": ""
-*pt_PT.PageSize w288h180/4.00x2.50": ""
-*pt_PT.PageSize w288h216/4.00x3.00": ""
-*pt_PT.PageSize w288h288/4.00x4.00": ""
-*pt_PT.PageSize w288h360/4.00x5.00": ""
-*pt_PT.PageSize w288h432/4.00x6.00": ""
-*pt_PT.PageSize w288h468/4.00x6.50": ""
-*pt_PT.PageSize w288h936/4.00x13.00": ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 203dpi/203dpi: ""
-*pt_PT.Resolution 300dpi/300dpi: ""
-*pt_PT.Resolution 600dpi/600dpi: ""
-*pt_PT.Translation PrinterSettings/Printer Settings: ""
-*pt_PT.Translation Darkness/Darkness: ""
-*pt_PT.Darkness -1/Rápido: ""
-*pt_PT.Darkness 1/1: ""
-*pt_PT.Darkness 2/2: ""
-*pt_PT.Darkness 3/3: ""
-*pt_PT.Darkness 4/4: ""
-*pt_PT.Darkness 5/5: ""
-*pt_PT.Darkness 6/6: ""
-*pt_PT.Darkness 7/7: ""
-*pt_PT.Darkness 8/8: ""
-*pt_PT.Darkness 9/9: ""
-*pt_PT.Darkness 10/10: ""
-*pt_PT.Darkness 11/11: ""
-*pt_PT.Darkness 12/12: ""
-*pt_PT.Darkness 13/13: ""
-*pt_PT.Darkness 14/14: ""
-*pt_PT.Darkness 15/15: ""
-*pt_PT.Darkness 16/16: ""
-*pt_PT.Darkness 17/17: ""
-*pt_PT.Darkness 18/18: ""
-*pt_PT.Darkness 19/19: ""
-*pt_PT.Darkness 20/20: ""
-*pt_PT.Darkness 21/21: ""
-*pt_PT.Darkness 22/22: ""
-*pt_PT.Darkness 23/23: ""
-*pt_PT.Darkness 24/24: ""
-*pt_PT.Darkness 25/25: ""
-*pt_PT.Darkness 26/26: ""
-*pt_PT.Darkness 27/27: ""
-*pt_PT.Darkness 28/28: ""
-*pt_PT.Darkness 29/29: ""
-*pt_PT.Darkness 30/30: ""
-*pt_PT.Translation zePrintRate/Print Rate: ""
-*pt_PT.zePrintRate Default/Rápido: ""
-*pt_PT.zePrintRate 1/1 inch/sec.: ""
-*pt_PT.zePrintRate 1.5/1.5 inch/sec.: ""
-*pt_PT.zePrintRate 2/2 inches/sec.: ""
-*pt_PT.zePrintRate 2.5/2.5 inches/sec.: ""
 *sv.Translation Manufacturer/Zebra: ""
 *sv.Translation ModelName/Zebra EPL1 Label Printer: ""
 *sv.Translation ShortNickName/Zebra EPL1 Label Printer: ""
@@ -1538,4 +1449,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRAEP1.PPD, 59283 bytes.
+*% End of ZEBRAEP1.PPD, 56110 bytes.

ppd/zebraep2.ppd

@@ -14,14 +14,13 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "ZEBRAEP2.PPD"
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *Manufacturer: "Zebra"
 *ModelName: "Zebra EPL2 Label Printer"
 *ShortNickName: "Zebra EPL2 Label Printer"
 *NickName: "Zebra EPL2 Label Printer, 1.3"
-*PSVersion: "(3010.000) 81504"
-*PSVersion: "(3010.000) 860"
+*PSVersion: "(3010.000) 81501"
 *LanguageLevel: "3"
 *ColorDevice: False
 *DefaultColorSpace: Gray
@@ -30,13 +29,13 @@
 *LandscapeOrientation: Plus90
 *TTRasterizer: Type42
 *% Driver-defined attributes...
+*Product: "(GNU Ghostscript)"
 *Product: "(ESP Ghostscript)"
-*Product: "(GPL Ghostscript)"
 *cupsVersion: 1.3
 *cupsModelNumber: 17
 *cupsManualCopies: False
 *cupsFilter: "application/vnd.cups-raster 50 rastertolabel"
-*cupsLanguages: "da de es fi fr it ja ko no pt pt_PT sv zh zh_TW"
+*cupsLanguages: "da de es fi fr it ja ko no pt sv zh zh_TW"
 *OpenUI *PageSize/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageSize
 *DefaultPageSize: w288h360
@@ -1241,102 +1240,6 @@
 *pt.zePrintRate 4/4 inches/sec.: ""
 *pt.zePrintRate 5/5 inches/sec.: ""
 *pt.zePrintRate 6/6 inches/sec.: ""
-*pt_PT.Translation Manufacturer/Zebra: ""
-*pt_PT.Translation ModelName/Zebra EPL2 Label Printer: ""
-*pt_PT.Translation ShortNickName/Zebra EPL2 Label Printer: ""
-*pt_PT.Translation NickName/Zebra EPL2 Label Printer, 1.3: ""
-*pt_PT.Translation PageSize/Media Size: ""
-*pt_PT.PageSize w90h18/1.25x0.25": ""
-*pt_PT.PageSize w90h162/1.25x2.25": ""
-*pt_PT.PageSize w108h18/1.50x0.25": ""
-*pt_PT.PageSize w108h36/1.50x0.50": ""
-*pt_PT.PageSize w108h72/1.50x1.00": ""
-*pt_PT.PageSize w108h144/1.50x2.00": ""
-*pt_PT.PageSize w144h26/2.00x0.37": ""
-*pt_PT.PageSize w144h36/2.00x0.50": ""
-*pt_PT.PageSize w144h72/2.00x1.00": ""
-*pt_PT.PageSize w144h90/2.00x1.25": ""
-*pt_PT.PageSize w144h288/2.00x4.00": ""
-*pt_PT.PageSize w144h396/2.00x5.50": ""
-*pt_PT.PageSize w162h36/2.25x0.50": ""
-*pt_PT.PageSize w162h90/2.25x1.25": ""
-*pt_PT.PageSize w162h288/2.25x4.00": ""
-*pt_PT.PageSize w162h396/2.25x5.50": ""
-*pt_PT.PageSize w171h396/2.38x5.50": ""
-*pt_PT.PageSize w180h72/2.50x1.00": ""
-*pt_PT.PageSize w180h144/2.50x2.00": ""
-*pt_PT.PageSize w198h90/2.75x1.25": ""
-*pt_PT.PageSize w216h72/3.00x1.00": ""
-*pt_PT.PageSize w216h90/3.00x1.25": ""
-*pt_PT.PageSize w216h144/3.00x2.00": ""
-*pt_PT.PageSize w216h216/3.00x3.00": ""
-*pt_PT.PageSize w216h360/3.00x5.00": ""
-*pt_PT.PageSize w234h144/3.25x2.00": ""
-*pt_PT.PageSize w234h360/3.25x5.00": ""
-*pt_PT.PageSize w234h396/3.25x5.50": ""
-*pt_PT.PageSize w234h419/3.25x5.83": ""
-*pt_PT.PageSize w234h563/3.25x7.83": ""
-*pt_PT.PageSize w252h72/3.50x1.00": ""
-*pt_PT.PageSize w288h72/4.00x1.00": ""
-*pt_PT.PageSize w288h144/4.00x2.00": ""
-*pt_PT.PageSize w288h180/4.00x2.50": ""
-*pt_PT.PageSize w288h216/4.00x3.00": ""
-*pt_PT.PageSize w288h288/4.00x4.00": ""
-*pt_PT.PageSize w288h360/4.00x5.00": ""
-*pt_PT.PageSize w288h432/4.00x6.00": ""
-*pt_PT.PageSize w288h468/4.00x6.50": ""
-*pt_PT.PageSize w288h936/4.00x13.00": ""
-*pt_PT.Translation Resolution/Resolution: ""
-*pt_PT.Resolution 203dpi/203dpi: ""
-*pt_PT.Resolution 300dpi/300dpi: ""
-*pt_PT.Resolution 600dpi/600dpi: ""
-*pt_PT.Translation MediaType/Media Type: ""
-*pt_PT.MediaType Saved/Rápido: ""
-*pt_PT.MediaType Thermal/Thermal Transfer Media: ""
-*pt_PT.MediaType Direct/Direct Thermal Media: ""
-*pt_PT.Translation PrinterSettings/Printer Settings: ""
-*pt_PT.Translation Darkness/Darkness: ""
-*pt_PT.Darkness -1/Rápido: ""
-*pt_PT.Darkness 1/1: ""
-*pt_PT.Darkness 2/2: ""
-*pt_PT.Darkness 3/3: ""
-*pt_PT.Darkness 4/4: ""
-*pt_PT.Darkness 5/5: ""
-*pt_PT.Darkness 6/6: ""
-*pt_PT.Darkness 7/7: ""
-*pt_PT.Darkness 8/8: ""
-*pt_PT.Darkness 9/9: ""
-*pt_PT.Darkness 10/10: ""
-*pt_PT.Darkness 11/11: ""
-*pt_PT.Darkness 12/12: ""
-*pt_PT.Darkness 13/13: ""
-*pt_PT.Darkness 14/14: ""
-*pt_PT.Darkness 15/15: ""
-*pt_PT.Darkness 16/16: ""
-*pt_PT.Darkness 17/17: ""
-*pt_PT.Darkness 18/18: ""
-*pt_PT.Darkness 19/19: ""
-*pt_PT.Darkness 20/20: ""
-*pt_PT.Darkness 21/21: ""
-*pt_PT.Darkness 22/22: ""
-*pt_PT.Darkness 23/23: ""
-*pt_PT.Darkness 24/24: ""
-*pt_PT.Darkness 25/25: ""
-*pt_PT.Darkness 26/26: ""
-*pt_PT.Darkness 27/27: ""
-*pt_PT.Darkness 28/28: ""
-*pt_PT.Darkness 29/29: ""
-*pt_PT.Darkness 30/30: ""
-*pt_PT.Translation zePrintRate/Print Rate: ""
-*pt_PT.zePrintRate Default/Rápido: ""
-*pt_PT.zePrintRate 1/1 inch/sec.: ""
-*pt_PT.zePrintRate 1.5/1.5 inch/sec.: ""
-*pt_PT.zePrintRate 2/2 inches/sec.: ""
-*pt_PT.zePrintRate 2.5/2.5 inches/sec.: ""
-*pt_PT.zePrintRate 3/3 inches/sec.: ""
-*pt_PT.zePrintRate 4/4 inches/sec.: ""
-*pt_PT.zePrintRate 5/5 inches/sec.: ""
-*pt_PT.zePrintRate 6/6 inches/sec.: ""
 *sv.Translation Manufacturer/Zebra: ""
 *sv.Translation ModelName/Zebra EPL2 Label Printer: ""
 *sv.Translation ShortNickName/Zebra EPL2 Label Printer: ""
@@ -1661,4 +1564,4 @@
 *Font Times-Roman: Standard "(1.05)" Standard ROM
 *Font ZapfChancery-MediumItalic: Standard "(1.05)" Standard ROM
 *Font ZapfDingbats: Special "(001.005)" Special ROM
-*% End of ZEBRAEP2.PPD, 64281 bytes.
+*% End of ZEBRAEP2.PPD, 60772 bytes.

scheduler/auth.c

@@ -366,34 +366,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
                   con->uri, con->best, con->best ? con->best->location : "");
 
   if (con->best && con->best->type != AUTH_NONE)
-  {
-    if (con->best->type == AUTH_DEFAULT)
-      type = DefaultAuthType;
-    else
-      type = con->best->type;
-  }
-  else if (!strncmp(con->uri, "/printers/", 10) ||
-           !strncmp(con->uri, "/classes/", 9))
-  {
-   /*
-    * Lookup the printer or class and see what kind of authentication it
-    * needs...
-    */
-
-    cupsd_printer_t	*p;		/* Printer or class */
-
-
-    if (!strncmp(con->uri, "/printers/", 10))
-      p = cupsdFindDest(con->uri + 10);
-    else
-      p = cupsdFindDest(con->uri + 9);
-
-    if (p && p->num_auth_info_required > 0 &&
-        !strcmp(p->auth_info_required[0], "negotiate"))
-      type = AUTH_NEGOTIATE;
-    else
-      type = DefaultAuthType;       
-  }
+    type = con->best->type;
   else
     type = DefaultAuthType;
 
@@ -948,7 +921,6 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 			output_token = GSS_C_EMPTY_BUFFER;
 					/* Output token for username */
     gss_name_t		client_name;	/* Client name */
-    unsigned int	ret_flags;	/* Credential flags */
 
 
 #  ifdef __APPLE__
@@ -988,7 +960,10 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
     */
 
     if ((server_creds = get_gss_creds(GSSServiceName)) == NULL)
+    {
+      con->no_negotiate = 1;
       return;	
+    }
 
    /*
     * Decode the authorization string to get the input token...
@@ -1014,7 +989,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 					  &client_name,
 					  NULL,
 					  &con->gss_output_token,
-					  &ret_flags,
+					  NULL,
 					  NULL,
 					  &con->gss_delegated_cred);
 
@@ -1027,18 +1002,12 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
       if (context != GSS_C_NO_CONTEXT)
 	gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);
 
-      gss_release_cred(&minor_status, &server_creds);
+      con->no_negotiate = 1;
       return;
     }
 
    /*
-    * Release our credentials...
-    */
-
-    gss_release_cred(&minor_status, &server_creds);
-
-   /*
-    * Get the username associated with the client's credentials...
+    * Get the username associated with the credentials...
     */
 
     if (!con->gss_delegated_cred)
@@ -1059,6 +1028,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
                            "cupsdAuthorize: Error getting username");
 	gss_release_name(&minor_status, &client_name);
 	gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);
+	con->no_negotiate = 1;
 	return;
       }
 
@@ -2464,8 +2434,7 @@ get_gss_creds(const char *service_name)	/* I - Service name */
     return (NULL);
   }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG,
-                  "get_gss_creds: Attempting to acquire credentials for %s...", 
+  cupsdLogMessage(CUPSD_LOG_INFO, "Attempting to acquire credentials for %s...", 
                   (char *)token.value);
 
   server_creds = GSS_C_NO_CREDENTIAL;
@@ -2481,8 +2450,7 @@ get_gss_creds(const char *service_name)	/* I - Service name */
     return (NULL);
   }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG,
-                  "get_gss_creds: Credentials acquired successfully for %s.", 
+  cupsdLogMessage(CUPSD_LOG_INFO, "Credentials acquired successfully for %s.", 
                   (char *)token.value);
 
   gss_release_name(&minor_status, &server_name);

scheduler/auth.h

@@ -25,7 +25,6 @@
  * HTTP authorization types and levels...
  */
 
-#define AUTH_DEFAULT		-1	/* Use DefaultAuthType */
 #define AUTH_NONE		0	/* No authentication */
 #define AUTH_BASIC		1	/* Basic authentication */
 #define AUTH_DIGEST		2	/* Digest authentication */

scheduler/client.c

@@ -161,13 +161,9 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */
   if ((con->http.fd = accept(lis->fd, (struct sockaddr *)con->http.hostaddr,
                              &addrlen)) < 0)
   {
-    if (errno == ENFILE || errno == EMFILE)
-      cupsdPauseListening();
-
     cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to accept client connection - %s.",
                     strerror(errno));
     free(con);
-
     return;
   }
 
@@ -2396,7 +2392,7 @@ cupsdSendHeader(
   {
     if (auth_type == AUTH_NONE)
     {
-      if (!con->best || con->best->type <= AUTH_NONE)
+      if (!con->best || con->best->type == AUTH_NONE)
 	auth_type = DefaultAuthType;
       else
 	auth_type = con->best->type;
@@ -2410,7 +2406,8 @@ cupsdSendHeader(
       snprintf(auth_str, sizeof(auth_str), "Digest realm=\"CUPS\", nonce=\"%s\"",
 	       con->http.hostname);
 #ifdef HAVE_GSSAPI
-    else if (auth_type == AUTH_NEGOTIATE && con->gss_output_token.length == 0)
+    else if (auth_type == AUTH_NEGOTIATE && !con->no_negotiate &&
+	     con->gss_output_token.length == 0)
       strlcpy(auth_str, "Negotiate", sizeof(auth_str));
 #endif /* HAVE_GSSAPI */
 
@@ -4252,6 +4249,8 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
       commptr ++;
   }
 
+  cupsdLogMessage(CUPSD_LOG_INFO, "commptr=\"%s\"", commptr);
+
   if (*commptr == '?' && con->operation == HTTP_GET && !con->query_string)
   {
     commptr ++;

scheduler/client.h

@@ -53,6 +53,7 @@ struct cupsd_client_s
   int			serverport;	/* Server port for connection */
 #ifdef HAVE_GSSAPI
   int			gss_have_creds;	/* Have authenticated credentials */
+  int			no_negotiate;	/* Don't offer WWW-Authenticate: Negotiate */
   gss_buffer_desc 	gss_output_token;
 					/* Output token for Negotiate header */
   gss_cred_id_t 	gss_delegated_cred;
@@ -90,8 +91,6 @@ VAR http_encryption_t	LocalEncryption	VALUE(HTTP_ENCRYPT_IF_REQUESTED);
 					/* Local port encryption to use */
 VAR cups_array_t	*Listeners	VALUE(NULL);
 					/* Listening sockets */
-VAR time_t		ListeningPaused	VALUE(0);
-					/* Time when listening was paused */
 VAR cups_array_t	*Clients	VALUE(NULL);
 					/* HTTP clients */
 VAR http_addrlist_t	*ServerAddrs	VALUE(NULL);

scheduler/conf.c

@@ -56,8 +56,7 @@ typedef enum
 {
   CUPSD_VARTYPE_INTEGER,		/* Integer option */
   CUPSD_VARTYPE_STRING,			/* String option */
-  CUPSD_VARTYPE_BOOLEAN,		/* Boolean option */
-  CUPSD_VARTYPE_PATHNAME		/* File/directory name option */
+  CUPSD_VARTYPE_BOOLEAN			/* Boolean option */
 } cupsd_vartype_t;
 
 typedef struct
@@ -82,7 +81,7 @@ static cupsd_var_t	variables[] =
   { "BrowseInterval",		&BrowseInterval,	CUPSD_VARTYPE_INTEGER },
 #ifdef HAVE_LDAP
   { "BrowseLDAPBindDN",		&BrowseLDAPBindDN,	CUPSD_VARTYPE_STRING },
-  { "BrowseLDAPCACertFile",	&BrowseLDAPCACertFile,	CUPSD_VARTYPE_PATHNAME },
+  { "BrowseLDAPCACertFile",	&BrowseLDAPCACertFile,	CUPSD_VARTYPE_STRING },
   { "BrowseLDAPDN",		&BrowseLDAPDN,		CUPSD_VARTYPE_STRING },
   { "BrowseLDAPPassword",	&BrowseLDAPPassword,	CUPSD_VARTYPE_STRING },
   { "BrowseLDAPServer",		&BrowseLDAPServer,	CUPSD_VARTYPE_STRING },
@@ -153,20 +152,20 @@ static cupsd_var_t	variables[] =
   { "RIPCache",			&RIPCache,		CUPSD_VARTYPE_STRING },
   { "RootCertDuration",		&RootCertDuration,	CUPSD_VARTYPE_INTEGER },
   { "ServerAdmin",		&ServerAdmin,		CUPSD_VARTYPE_STRING },
-  { "ServerBin",		&ServerBin,		CUPSD_VARTYPE_PATHNAME },
+  { "ServerBin",		&ServerBin,		CUPSD_VARTYPE_STRING },
 #ifdef HAVE_SSL
-  { "ServerCertificate",	&ServerCertificate,	CUPSD_VARTYPE_PATHNAME },
+  { "ServerCertificate",	&ServerCertificate,	CUPSD_VARTYPE_STRING },
 #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
-  { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_PATHNAME },
+  { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_STRING },
 #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
 #endif /* HAVE_SSL */
   { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
-  { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
+  { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_STRING },
   { "StateDir",			&StateDir,		CUPSD_VARTYPE_STRING },
 #ifdef HAVE_AUTHORIZATION_H
   { "SystemGroupAuthKey",	&SystemGroupAuthKey,	CUPSD_VARTYPE_STRING },
 #endif /* HAVE_AUTHORIZATION_H */
-  { "TempDir",			&TempDir,		CUPSD_VARTYPE_PATHNAME },
+  { "TempDir",			&TempDir,		CUPSD_VARTYPE_STRING },
   { "Timeout",			&Timeout,		CUPSD_VARTYPE_INTEGER },
   { "UseNetworkDefault",	&UseNetworkDefault,	CUPSD_VARTYPE_BOOLEAN }
 };
@@ -1004,7 +1003,7 @@ cupsdReadConfiguration(void)
 
       po = cupsdAddPolicyOp(p, NULL, IPP_PAUSE_PRINTER);
       po->order_type = AUTH_ALLOW;
-      po->type       = AUTH_DEFAULT;
+      po->type       = DefaultAuthType;
       po->level      = AUTH_USER;
 
       cupsdAddName(po, "@SYSTEM");
@@ -1707,7 +1706,7 @@ parse_aaa(cupsd_location_t *loc,	/* I - Location */
     }
     else if (!strcasecmp(value, "default"))
     {
-      loc->type = AUTH_DEFAULT;
+      loc->type = DefaultAuthType;
 
       if (loc->level == AUTH_ANON)
 	loc->level = AUTH_USER;
@@ -3077,20 +3076,6 @@ read_configuration(cups_file_t *fp)	/* I - File to read from */
 	                      value, linenum);
 	    break;
 
-	case CUPSD_VARTYPE_PATHNAME :
-            if (value[0] == '/')
-	      strlcpy(temp, value, sizeof(temp));
-	    else
-	      snprintf(temp, sizeof(temp), "%s/%s", ServerRoot, value);
-
-            if (access(temp, 0))
-	    {
-	      cupsdLogMessage(CUPSD_LOG_ERROR,
-	                      "File or directory for \"%s %s\" on line %d "
-			      "does not exist!", line, value, linenum);
-              break;
-	    }
-
 	case CUPSD_VARTYPE_STRING :
 	    cupsdSetString((char **)var->ptr, value);
 	    break;

scheduler/cups-driverd.c

@@ -684,9 +684,9 @@ list_ppds(int        request_id,	/* I - Request ID */
   * Load PPDs from LSB-defined locations...
   */
 
-  load_ppds("/usr/local/share/ppd", "lsb/local", 1);
-  load_ppds("/usr/share/ppd", "lsb/usr", 1);
-  load_ppds("/opt/share/ppd", "lsb/opt", 1);
+  load_ppds("/usr/local/share/ppds", "lsb/local", 1);
+  load_ppds("/usr/share/ppds", "lsb/usr", 1);
+  load_ppds("/opt/share/ppds", "lsb/opt", 1);
 #endif /* __APPLE__ */
 
  /*

scheduler/cups-lpd.c

@@ -597,48 +597,46 @@ get_printer(http_t        *http,	/* I - HTTP connection */
 
     name = dest;
   }
-  else
+
+ /*
+  * Get values from the response...
+  */
+
+  if (accepting)
   {
-   /*
-    * Get values from the response...
-    */
-
-    if (accepting)
-    {
-      if ((attr = ippFindAttribute(response, "printer-is-accepting-jobs",
-				   IPP_TAG_BOOLEAN)) == NULL)
-	syslog(LOG_ERR, "No printer-is-accepting-jobs attribute found in "
-			"response from server!");
-      else
-	*accepting = attr->values[0].boolean;
-    }
-
-    if (shared)
-    {
-      if ((attr = ippFindAttribute(response, "printer-is-shared",
-				   IPP_TAG_BOOLEAN)) == NULL)
-      {
-	syslog(LOG_ERR, "No printer-is-shared attribute found in "
-			"response from server!");
-	*shared = 1;
-      }
-      else
-	*shared = attr->values[0].boolean;
-    }
-
-    if (state)
-    {
-      if ((attr = ippFindAttribute(response, "printer-state",
-				   IPP_TAG_ENUM)) == NULL)
-	syslog(LOG_ERR, "No printer-state attribute found in "
-			"response from server!");
-      else
-	*state = (ipp_pstate_t)attr->values[0].integer;
-    }
-
-    ippDelete(response);
+    if ((attr = ippFindAttribute(response, "printer-is-accepting-jobs",
+				 IPP_TAG_BOOLEAN)) == NULL)
+      syslog(LOG_ERR, "No printer-is-accepting-jobs attribute found in "
+		      "response from server!");
+    else
+      *accepting = attr->values[0].boolean;
   }
 
+  if (shared)
+  {
+    if ((attr = ippFindAttribute(response, "printer-is-shared",
+				 IPP_TAG_BOOLEAN)) == NULL)
+    {
+      syslog(LOG_ERR, "No printer-is-shared attribute found in "
+		      "response from server!");
+      *shared = 1;
+    }
+    else
+      *shared = attr->values[0].boolean;
+  }
+
+  if (state)
+  {
+    if ((attr = ippFindAttribute(response, "printer-state",
+				 IPP_TAG_ENUM)) == NULL)
+      syslog(LOG_ERR, "No printer-state attribute found in "
+		      "response from server!");
+    else
+      *state = (ipp_pstate_t)attr->values[0].integer;
+  }
+
+  ippDelete(response);
+
  /*
   * Override shared value for LPD using system-specific APIs...
   */

scheduler/cupsd.h

@@ -158,11 +158,6 @@ VAR time_t		ReloadTime	VALUE(0);
 					/* Time of reload request... */
 VAR int			NeedReload	VALUE(RELOAD_ALL);
 					/* Need to load configuration? */
-
-#ifdef HAVE_GSSAPI
-VAR krb5_context	KerberosContext;/* Kerberos context for credentials */
-#endif /* HAVE_GSSAPI */
-
 #ifdef HAVE_LAUNCH_H
 VAR int			Launchd		VALUE(0);
 					/* Running from launchd */

scheduler/ipp.c

@@ -8255,81 +8255,72 @@ static void
 save_krb5_creds(cupsd_client_t *con,	/* I - Client connection */
                 cupsd_job_t    *job)	/* I - Job */
 {
-#  if !defined(HAVE_KRB5_CC_NEW_UNIQUE) && !defined(HAVE_HEIMDAL)
-  cupsdLogMessage(CUPSD_LOG_INFO,
-                  "Sorry, your version of Kerberos does not support delegated "
-		  "credentials!");
-  return;
-
-#  else
-  krb5_error_code error;		/* Kerberos error code */
+  krb5_context	krb_context;		/* Kerberos context */
+  krb5_ccache	ccache;			/* Credentials cache */
   OM_uint32	major_status,		/* Major status code */
 		minor_status;		/* Minor status code */
 
 
-#   ifdef __APPLE__
- /*
-  * If the weak-linked GSSAPI/Kerberos library is not present, don't try
-  * to use it...
-  */
+#  ifdef __APPLE__
+   /*
+    * If the weak-linked GSSAPI/Kerberos library is not present, don't try
+    * to use it...
+    */
 
-  if (krb5_init_context == NULL)
-    return;
-#    endif /* __APPLE__ */
+    if (krb5_init_context == NULL)
+    {
+      cupsdLogMessage(CUPSD_LOG_DEBUG,
+		      "save_krb5_creds: GSSAPI/Kerberos framework is not "
+		      "present");
+      return;
+    }
+#  endif /* __APPLE__ */
 
  /*
-  * We MUST create a file-based cache because memory-based caches are
-  * only valid for the current process/address space.
-  *
-  * Due to various bugs/features in different versions of Kerberos, we
-  * need either the krb5_cc_new_unique() function or Heimdal's version
-  * of krb5_cc_gen_new() to create a new FILE: credential cache that
-  * can be passed to the backend.  These functions create a temporary
-  * file (typically in /tmp) containing the cached credentials, which
-  * are removed when we have successfully printed a job.
+  * Setup a cached context for the job filters to use...
   */
 
-#    ifdef HAVE_KRB5_CC_NEW_UNIQUE
-  if ((error = krb5_cc_new_unique(KerberosContext, "FILE", NULL,
-                                  &(job->ccache))) != 0)
-#    else /* HAVE_HEIMDAL */
-  if ((error = krb5_cc_gen_new(krb_context, &krb5_fcc_ops,
-                               &(job->ccache))) != 0)
-#    endif /* HAVE_KRB5_CC_NEW_UNIQUE */
+  if (krb5_init_context(&krb_context))
   {
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create new credentials (%d/%s)",
-                    error, strerror(errno));
-    job->ccache = NULL;
+    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to initialize Kerberos context");
     return;
   }
 
  /*
-  * Copy the user's credentials to the new cache file...
+  * We MUST create a file-based cache because memory-based caches are
+  * only valid for the current process/address space.
   */
 
+#  ifdef HAVE_KRB5_CC_RESOLVE
+  if (krb5_cc_resolve(krb_context, "FILE:", &ccache))
+#  elif defined(HAVE_HEIMDAL)
+  if (krb5_cc_gen_new(krb_context, &krb5_fcc_ops, &ccache))
+#  else
+  if (krb5_cc_gen_new(krb_context, &ccache))
+#  endif /* HAVE_HEIMDAL */
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create new credentials");
+    return;
+  }
+
   major_status = gss_krb5_copy_ccache(&minor_status, con->gss_delegated_cred,
-				      job->ccache);
+				      ccache);
 
   if (GSS_ERROR(major_status))
   {
     cupsdLogGSSMessage(CUPSD_LOG_ERROR, major_status, minor_status,
                        "Unable to import client credentials cache");
-    krb5_cc_destroy(KerberosContext, job->ccache);
-    job->ccache = NULL;
+    krb5_cc_destroy(krb_context, ccache);
     return;
   }
 
- /*
-  * Add the KRB5CCNAME environment variable to the job so that the
-  * backend can use the credentials when printing.
-  */
-
   cupsdSetStringf(&(job->ccname), "KRB5CCNAME=FILE:%s",
-                  krb5_cc_get_name(KerberosContext, job->ccache));
+                  krb5_cc_get_name(krb_context, ccache));
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] save_krb5_creds: %s", job->id,
                   job->ccname);
-#  endif /* HAVE_KRB5_CC_NEW_UNIQUE || HAVE_HEIMDAL */
+
+  krb5_cc_close(krb_context, ccache);
 }
 #endif /* HAVE_GSSAPI && HAVE_KRB5_H */
 

scheduler/job.c

@@ -229,20 +229,6 @@ cupsdCancelJob(cupsd_job_t  *job,	/* I - Job to cancel */
   cupsdClearString(&job->auth_domain);
   cupsdClearString(&job->auth_password);
 
-#ifdef HAVE_GSSAPI
- /*
-  * Destroy the credential cache and clear the KRB5CCNAME env var string.
-  */
-
-  if (job->ccache)
-  {
-    krb5_cc_destroy(KerberosContext, job->ccache);
-    job->ccache = NULL;
-  }
-
-  cupsdClearString(&job->ccname);
-#endif /* HAVE_GSSAPI */
-
  /*
   * Remove the print file for good if we aren't preserving jobs or
   * files...
@@ -1804,17 +1790,21 @@ free_job(cupsd_job_t *job)		/* I - Job */
   cupsdClearString(&job->auth_domain);
   cupsdClearString(&job->auth_password);
 #ifdef HAVE_GSSAPI
- /*
-  * Destroy the credential cache and clear the KRB5CCNAME env var string.
-  */
-
-  if (job->ccache)
+  if (job->ccname)
   {
-    krb5_cc_destroy(KerberosContext, job->ccache);
-    job->ccache = NULL;
-  }
+   /*
+    * First erase the credential cache file, then clear the string referencing
+    * it.  We know the filename since the string will be of the form
+    * "KRB5CCNAME=FILE:/foo/bar"...
+    */
 
-  cupsdClearString(&job->ccname);
+    if (cupsdRemoveFile(job->ccname + 16) && errno != ENOENT)
+      cupsdLogMessage(CUPSD_LOG_ERROR,
+                      "[Job %d] Unable to remove Kerberos credential cache: %s",
+		      job->id, strerror(errno));
+
+    cupsdClearString(&job->ccname);
+  }
 #endif /* HAVE_GSSAPI */
 
   if (job->num_files > 0)
@@ -3604,10 +3594,7 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
 
       if ((attr = cupsGetOption("auth-info-required", num_attrs,
                                 attrs)) != NULL)
-      {
         cupsdSetAuthInfoRequired(job->printer, attr, NULL);
-	cupsdSaveAllPrinters();
-      }
 
       if ((attr = cupsGetOption("printer-alert", num_attrs, attrs)) != NULL)
       {

scheduler/job.h

@@ -57,7 +57,6 @@ typedef struct cupsd_job_s
 			*auth_domain,	/* AUTH_DOMAIN environment variable, if any */
 			*auth_password;	/* AUTH_PASSWORD environment variable, if any */
 #ifdef HAVE_GSSAPI
-  krb5_ccache		ccache;		/* Kerberos credential cache */
   char			*ccname;	/* KRB5CCNAME environment variable */
 #endif /* HAVE_GSSAPI */
 } cupsd_job_t;

scheduler/listen.c

@@ -75,10 +75,6 @@ cupsdPauseListening(void)
   if (cupsArrayCount(Clients) == MaxClients)
     cupsdLogMessage(CUPSD_LOG_WARN,
                     "Max clients reached, holding new connections...");
-  else if (errno == ENFILE || errno == EMFILE)
-    cupsdLogMessage(CUPSD_LOG_WARN,
-                    "Too many open files, holding new connections for "
-		    "30 seconds...");
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdPauseListening: Clearing input bits...");
 
@@ -86,8 +82,6 @@ cupsdPauseListening(void)
        lis;
        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
     cupsdRemoveSelect(lis->fd);
-
-  ListeningPaused = time(NULL) + 30;
 }
 
 
@@ -104,7 +98,9 @@ cupsdResumeListening(void)
   if (cupsArrayCount(Listeners) < 1)
     return;
 
-  cupsdLogMessage(CUPSD_LOG_INFO, "Resuming new connection processing...");
+  if (cupsArrayCount(Clients) >= (MaxClients - 1))
+    cupsdLogMessage(CUPSD_LOG_WARN, "Resuming new connection processing...");
+
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "cupsdResumeListening: Setting input bits...");
 
@@ -112,8 +108,6 @@ cupsdResumeListening(void)
        lis;
        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
     cupsdAddSelect(lis->fd, (cupsd_selfunc_t)cupsdAcceptClient, NULL, lis);
-
-  ListeningPaused = 0;
 }
 
 

scheduler/main.c

@@ -462,24 +462,6 @@ main(int  argc,				/* I - Number of command-line args */
     PSQUpdateQuotaProc = dlsym(PSQLibRef, PSQLibFuncName);
 #endif /* __APPLE__ && HAVE_DLFCN_H */
 
-#ifdef HAVE_GSSAPI
-#  ifdef __APPLE__
- /*
-  * If the weak-linked GSSAPI/Kerberos library is not present, don't try
-  * to use it...
-  */
-
-  if (krb5_init_context != NULL)
-#  endif /* __APPLE__ */
-
- /*
-  * Setup a Kerberos context for the scheduler to use...
-  */
-
-  if (krb5_init_context(&KerberosContext))
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to initialize Kerberos context");
-#endif /* HAVE_GSSAPI */
-
  /*
   * Startup the server...
   */
@@ -801,14 +783,6 @@ main(int  argc,				/* I - Number of command-line args */
     }
 #endif /* HAVE_LAUNCHD */
 
-   /*
-    * Resume listening for new connections as needed...
-    */
-
-    if (ListeningPaused && ListeningPaused <= current_time &&
-        cupsArrayCount(Clients) < MaxClients)
-      cupsdResumeListening();
-
    /*
     * Expire subscriptions and unload completed jobs as needed...
     */
@@ -986,11 +960,17 @@ main(int  argc,				/* I - Number of command-line args */
                     "Scheduler shutting down due to program error.");
 
  /*
-  * Close all network clients...
+  * Close all network clients and stop all jobs...
   */
 
   cupsdStopServer();
 
+  cupsdFreeAllJobs();
+
+#ifdef __APPLE__
+  cupsdStopSystemMonitor();
+#endif /* __APPLE__ */
+
 #ifdef HAVE_LAUNCHD
  /*
   * Update the launchd KeepAlive file as needed...
@@ -1000,36 +980,6 @@ main(int  argc,				/* I - Number of command-line args */
     launchd_checkout();
 #endif /* HAVE_LAUNCHD */
 
- /*
-  * Stop all jobs...
-  */
-
-  cupsdFreeAllJobs();
-
-#ifdef __APPLE__
- /*
-  * Stop monitoring system event monitoring...
-  */
-
-  cupsdStopSystemMonitor();
-#endif /* __APPLE__ */
-
-#ifdef HAVE_GSSAPI
- /*
-  * Free the scheduler's Kerberos context...
-  */
-
-#  ifdef __APPLE__
- /*
-  * If the weak-linked GSSAPI/Kerberos library is not present, don't try
-  * to use it...
-  */
-
-  if (krb5_init_context != NULL)
-#  endif /* __APPLE__ */
-  krb5_free_context(KerberosContext);
-#endif /* HAVE_GSSAPI */
-
 #ifdef __APPLE__
 #ifdef HAVE_DLFCN_H
  /* 
@@ -1715,21 +1665,6 @@ select_timeout(int fds)			/* I - Number of descriptors returned */
   timeout = now + 86400;		/* 86400 == 1 day */
   why     = "do nothing";
 
- /*
-  * Check whether we are accepting new connections...
-  */
-
-  if (ListeningPaused > 0 && cupsArrayCount(Clients) < MaxClients &&
-      ListeningPaused < timeout)
-  {
-    if (ListeningPaused <= now)
-      timeout = now;
-    else
-      timeout = ListeningPaused;
-
-    why = "resume listening";
-  }
-
  /*
   * Check the activity and close old clients...
   */

scheduler/process.c

@@ -131,13 +131,6 @@ cupsdStartProcess(
                   "cupsdStartProcess(\"%s\", %p, %p, %d, %d, %d)",
                   command, argv, envp, infd, outfd, errfd);
 
-  if (access(command, X_OK))
-  {
-    cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to execute %s: %s", command,
-                    strerror(errno));
-    return (0);
-  }
-
 #if defined(__APPLE__)
   if (envp)
   {

scheduler/testlpd.c

@@ -32,7 +32,6 @@
 #include <cups/string.h>
 #include <stdlib.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <errno.h>
 #include <signal.h>
 #include <unistd.h>