Import cups.org releases

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

CHANGES.txt

@@ -1,6 +1,18 @@
-CHANGES.txt - 2011-05-20
+CHANGES.txt - 2011-05-26
 ------------------------
 
+CHANGES IN CUPS V1.5b2
+
+	- Documentation updates.
+	- Localization updates (STR #3845)
+	- Compiler warning cleanup.
+	- Fixed PIE support for Linux (STR #3846)
+	- Made httpSetTimeout API public and use it in the IPP backend to avoid
+	  timeout errors.
+	- The scheduler incorrectly set the "authenticated" printer-type bit for
+	  remote queues using authentication.
+
+
 CHANGES IN CUPS V1.5b1
 
 	- The CUPS library now supports per-connection HTTP timeouts and

INSTALL.txt

@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.5b1 - 2011-05-20
+INSTALL - CUPS v1.5b2 - 2011-05-26
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more

README.txt

@@ -1,4 +1,4 @@
-README - CUPS v1.5b1 - 2011-05-20
+README - CUPS v1.5b2 - 2011-05-26
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"

backend/ipp.c

@@ -553,6 +553,7 @@ main(int  argc,				/* I - Number of command-line args */
   if (argc == 6)
   {
     num_files    = 0;
+    files        = NULL;
     send_options = !_cups_strcasecmp(final_content_type, "application/pdf") ||
                    !_cups_strcasecmp(final_content_type, "application/vnd.cups-pdf") ||
                    !_cups_strncasecmp(final_content_type, "image/", 6);

config-scripts/cups-common.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 9793 2011-05-20 03:49:49Z mike $"
+dnl "$Id: cups-common.m4 9810 2011-05-26 12:34:56Z mike $"
 dnl
 dnl   Common configuration stuff for CUPS.
 dnl
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION="1.5b1"
+CUPS_VERSION="1.5b2"
 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'`"
@@ -421,5 +421,5 @@ esac
 AC_SUBST(BUILDDIRS)
 
 dnl
-dnl End of "$Id: cups-common.m4 9793 2011-05-20 03:49:49Z mike $".
+dnl End of "$Id: cups-common.m4 9810 2011-05-26 12:34:56Z mike $".
 dnl

config-scripts/cups-compiler.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4 9770 2011-05-12 04:51:01Z mike $"
+dnl "$Id: cups-compiler.m4 9809 2011-05-26 12:24:20Z mike $"
 dnl
 dnl   Compiler stuff for CUPS.
 dnl
@@ -138,7 +138,14 @@ if test -n "$GCC"; then
 	OLDCFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fPIE"
 	AC_TRY_COMPILE(,,
-		[PIEFLAGS="-fPIE -Wl,-pie"
+		[case "$CC" in
+			*clang)
+				PIEFLAGS="-fPIE -Wl,-pie"
+				;;
+			*)
+				PIEFLAGS="-fPIE -pie"
+				;;
+		esac
 		AC_MSG_RESULT(yes)],
 		AC_MSG_RESULT(no))
 	CFLAGS="$OLDCFLAGS"
@@ -146,11 +153,21 @@ if test -n "$GCC"; then
 	if test "x$with_optim" = x; then
 		# Add useful warning options for tracking down problems...
 		OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM"
+
 		# Additional warning options for development testing...
 		if test -d .svn; then
 			OPTIM="-Wshadow $OPTIM"
 			CFLAGS="-Werror-implicit-function-declaration $CFLAGS"
 			PHPOPTIONS="-Wno-shadow"
+		else
+			AC_MSG_CHECKING(if GCC supports -Wno-tautological-compare)
+			OLDCFLAGS="$CFLAGS"
+			CFLAGS="$CFLAGS -Wno-tautological-compare"
+			AC_TRY_COMPILE(,,
+				[OPTIM="$OPTIM -Wno-tautological-compare"
+				AC_MSG_RESULT(yes)],
+				AC_MSG_RESULT(no))
+			CFLAGS="$OLDCFLAGS"
 		fi
 	fi
 
@@ -162,11 +179,6 @@ if test -n "$GCC"; then
 			# CUPS since we already use buffer-limited calls, but
 			# this will catch any additions that are broken.
 			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-
-			if test x$enable_pie = xyes; then
-				# GCC 4 on Mac OS X needs -Wl,-pie as well
-				LDFLAGS="$LDFLAGS -Wl,-pie"
-			fi
 			;;
 
 		HP-UX*)
@@ -548,5 +560,5 @@ case $uname in
 esac
 
 dnl
-dnl End of "$Id: cups-compiler.m4 9770 2011-05-12 04:51:01Z mike $".
+dnl End of "$Id: cups-compiler.m4 9809 2011-05-26 12:24:20Z mike $".
 dnl

cups/file.c

@@ -89,7 +89,7 @@ _cupsFileCheck(
     int                 dorootchecks,	/* I - Check for root permissions? */
     _cups_fc_func_t     cb,		/* I - Callback function */
     void                *context)	/* I - Context pointer for callback */
-    
+
 {
   struct stat		fileinfo;	/* File information */
   char			message[1024],	/* Message string */
@@ -335,6 +335,7 @@ _cupsFileCheckFilter(
 
   switch (result)
   {
+    default :
     case _CUPS_FILE_CHECK_OK :
         prefix = "DEBUG2";
 	break;

cups/pwg-media.c

@@ -103,8 +103,8 @@ static _pwg_media_t const cups_pwg_media[] =
   _PWG_MEDIA_IN("na_eur-edp_12x14in", NULL, NULL, 12, 14),
   _PWG_MEDIA_IN("na_arch-b_12x18in", "arch-b", "ARCHB", 12, 18),
   _PWG_MEDIA_IN("na_12x19_12x19in", NULL, "12x19", 12, 19),
-  _PWG_MEDIA_IN("na_b-plus_12x19.17in", NULL, "SuperB", 12, 19.17),
-  _PWG_MEDIA_IN("na_super-b_13x19in", "super-b", NULL, 13, 19),
+  _PWG_MEDIA_IN("na_b-plus_12x19.17in", NULL, NULL, 12, 19.17),
+  _PWG_MEDIA_IN("na_super-b_13x19in", "super-b", "SuperB", 13, 19),
   _PWG_MEDIA_IN("na_c_17x22in", "c", "AnsiC", 17, 22),
   _PWG_MEDIA_IN("na_arch-c_18x24in", "arch-c", "ARCHC", 18, 24),
   _PWG_MEDIA_IN("na_d_22x34in", "d", "AnsiD", 22, 34),
@@ -226,6 +226,9 @@ static _pwg_media_t const cups_pwg_media[] =
   _PWG_MEDIA_MM("om_dai-pa-kai_275x395mm", NULL, NULL, 275, 395),
   _PWG_MEDIA_MM("prc_10_324x458mm", NULL, "EnvPRC10", 324, 458),
 
+  /* Other English Standard Sheet Media Sizes */
+  _PWG_MEDIA_IN("oe_photo-l_3.5x5in", NULL, "3.5x5", 3.5, 5),
+
   /* Other Metric Standard Sheet Media Sizes */
   _PWG_MEDIA_MM("om_small-photo_100x150mm", NULL, NULL, 100, 150),
   _PWG_MEDIA_MM("om_italian_110x230mm", NULL, "EnvItalian", 110, 230),

data/media.defs

@@ -13,15 +13,18 @@
  *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
-#media "10x11/10 x 11\"" 720 792
-#media "10x13/10 x 13\"" 720 936
-#media "10x14/10 x 14\"" 720 1008
-#media "12x11/12 x 11\"" 864 792
-#media "15x11/15 x 11\"" 1080 792
-#media "7x9/7 x 9\"" 504 648
-#media "8x10/8 x 10\"" 576 720
-#media "9x11/9 x 11\"" 648 792
-#media "9x12/9 x 12\"" 648 864
+#media "3x5/3 x 5" 216 360
+#media "3.5x5/3.5 x 5" 252 360
+#media "5x7/5 x 7" 360 504
+#media "10x11/10 x 11" 720 792
+#media "10x13/10 x 13" 720 936
+#media "10x14/10 x 14" 720 1008
+#media "12x11/12 x 11" 864 792
+#media "15x11/15 x 11" 1080 792
+#media "7x9/7 x 9" 504 648
+#media "8x10/8 x 10" 576 720
+#media "9x11/9 x 11" 648 792
+#media "9x12/9 x 12" 648 864
 #media "A0/A0" 2384 3370
 #media "A0.Transverse/A0 Long Edge" 3370 2384
 #media "A1/A1" 1684 2384

doc/help/spec-ppd.html

@@ -341,7 +341,7 @@ div.contents ul.subcontents li {
 <body>
 <div class='body'>
 <!--
-  "$Id: spec-ppd.html 9740 2011-05-04 06:26:22Z mike $"
+  "$Id: spec-ppd.html 9803 2011-05-26 02:11:20Z mike $"
 
   PPD extension documentation for CUPS.
 
@@ -1647,11 +1647,7 @@ scheduler's <code>DocumentRoot</code> directory, a full HTTP URL
 valid URI which directs the user at additional information
 concerning the condition that is being reported.</p>
 
-<p>Since the reason text is limited to 80 characters by the PPD specification,
-longer text strings can be included by URI-encoding the text with the "text"
-scheme, for example "text:some%20text". Multiple <code>text</code> URIs are
-combined (with spaces between each URI) by the <tt>ppdLocalizeIPPReason</tt>
-into a single string that can be displayed to the user.</p>
+<p>Since the reason text is limited to 80 characters by the PPD specification, longer text strings can be included by URI-encoding the text with the "text" scheme, for example "text:some%20text". Multiple <code>text</code> URIs are combined by the <tt>ppdLocalizeIPPReason</tt> into a single string that can be displayed to the user.</p>
 
 <p>Examples:</p>
 

filter/imagetoraster.c

@@ -502,6 +502,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 	}
 	break;
 
+    default :
     case CUPS_CSPACE_RGB :
     case CUPS_CSPACE_RGBA :
     case CUPS_CSPACE_RGBW :

filter/spec-ppd.shtml

@@ -1208,11 +1208,7 @@ scheduler's <code>DocumentRoot</code> directory, a full HTTP URL
 valid URI which directs the user at additional information
 concerning the condition that is being reported.</p>
 
-<p>Since the reason text is limited to 80 characters by the PPD specification,
-longer text strings can be included by URI-encoding the text with the "text"
-scheme, for example "text:some%20text". Multiple <code>text</code> URIs are
-combined (with spaces between each URI) by the <tt>ppdLocalizeIPPReason</tt>
-into a single string that can be displayed to the user.</p>
+<p>Since the reason text is limited to 80 characters by the PPD specification, longer text strings can be included by URI-encoding the text with the "text" scheme, for example "text:some%20text". Multiple <code>text</code> URIs are combined by the <tt>ppdLocalizeIPPReason</tt> into a single string that can be displayed to the user.</p>
 
 <p>Examples:</p>
 

locale/cups.strings

@@ -387,9 +387,9 @@
 "1.50x2.00\"" = "1.50x2.00\"";
 "10" = "10";
 "10 inches/sec." = "10 inches/sec.";
-"10 x 11\"" = "10 x 11\"";
-"10 x 13\"" = "10 x 13\"";
-"10 x 14\"" = "10 x 14\"";
+"10 x 11" = "10 x 11";
+"10 x 13" = "10 x 13";
+"10 x 14" = "10 x 14";
 "100" = "100";
 "100 mm/sec." = "100 mm/sec.";
 "105" = "105";
@@ -399,7 +399,7 @@
 "115" = "115";
 "12" = "12";
 "12 inches/sec." = "12 inches/sec.";
-"12 x 11\"" = "12 x 11\"";
+"12 x 11" = "12 x 11";
 "120" = "120";
 "120 mm/sec." = "120 mm/sec.";
 "120x60dpi" = "120x60dpi";
@@ -409,7 +409,7 @@
 "14" = "14";
 "15" = "15";
 "15 mm/sec." = "15 mm/sec.";
-"15 x 11\"" = "15 x 11\"";
+"15 x 11" = "15 x 11";
 "150 mm/sec." = "150 mm/sec.";
 "150dpi" = "150dpi";
 "16" = "16";
@@ -456,6 +456,7 @@
 "29" = "29";
 "3" = "3";
 "3 inches/sec." = "3 inches/sec.";
+"3 x 5" = "3 x 5";
 "3.00x1.00\"" = "3.00x1.00\"";
 "3.00x1.25\"" = "3.00x1.25\"";
 "3.00x2.00\"" = "3.00x2.00\"";
@@ -466,6 +467,7 @@
 "3.25x5.50\"" = "3.25x5.50\"";
 "3.25x5.83\"" = "3.25x5.83\"";
 "3.25x7.83\"" = "3.25x7.83\"";
+"3.5 x 5" = "3.5 x 5";
 "3.5\" Disk" = "3.5\" Disk";
 "3.5\" Disk - 2 1/8 x 2 3/4\"" = "3.5\" Disk - 2 1/8 x 2 3/4\"";
 "3.50x1.00\"" = "3.50x1.00\"";
@@ -492,6 +494,7 @@
 "45" = "45";
 "5" = "5";
 "5 inches/sec." = "5 inches/sec.";
+"5 x 7" = "5 x 7";
 "50" = "50";
 "55" = "55";
 "6" = "6";
@@ -511,13 +514,13 @@
 "65" = "65";
 "7" = "7";
 "7 inches/sec." = "7 inches/sec.";
-"7 x 9\"" = "7 x 9\"";
+"7 x 9" = "7 x 9";
 "70" = "70";
 "720dpi" = "720dpi";
 "75" = "75";
 "8" = "8";
 "8 inches/sec." = "8 inches/sec.";
-"8 x 10\"" = "8 x 10\"";
+"8 x 10" = "8 x 10";
 "8.00x1.00\"" = "8.00x1.00\"";
 "8.00x2.00\"" = "8.00x2.00\"";
 "8.00x3.00\"" = "8.00x3.00\"";
@@ -530,8 +533,8 @@
 "85" = "85";
 "9" = "9";
 "9 inches/sec." = "9 inches/sec.";
-"9 x 11\"" = "9 x 11\"";
-"9 x 12\"" = "9 x 12\"";
+"9 x 11" = "9 x 11";
+"9 x 12" = "9 x 12";
 "9-Pin Series" = "9-Pin Series";
 "90" = "90";
 "95" = "95";
@@ -684,6 +687,7 @@
 "Destination \"%s\" is not accepting jobs." = "Destination \"%s\" is not accepting jobs.";
 "Device: uri = %s\n        class = %s\n        info = %s\n        make-and-model = %s\n        device-id = %s\n        location = %s" = "Device: uri = %s\n        class = %s\n        info = %s\n        make-and-model = %s\n        device-id = %s\n        location = %s";
 "Direct Thermal Media" = "Direct Thermal Media";
+"Directory \"%s\" contains a relative path." = "Directory \"%s\" contains a relative path.";
 "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)." = "Directory \"%s\" has insecure permissions (0%o/uid=%d/gid=%d).";
 "Directory \"%s\" is a file." = "Directory \"%s\" is a file.";
 "Directory \"%s\" not available: %s" = "Directory \"%s\" not available: %s";
@@ -779,6 +783,7 @@
 "FanFold German" = "FanFold German";
 "FanFold Legal German" = "FanFold Legal German";
 "Fanfold US" = "Fanfold US";
+"File \"%s\" contains a relative path." = "File \"%s\" contains a relative path.";
 "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d)." = "File \"%s\" has insecure permissions (0%o/uid=%d/gid=%d).";
 "File \"%s\" is a directory." = "File \"%s\" is a directory.";
 "File \"%s\" not available: %s" = "File \"%s\" not available: %s";

scheduler/cupsfilter.c

@@ -400,16 +400,13 @@ main(int  argc,				/* I - Number of command-line args */
     return (1);
   }
 
+  prefilter_type = NULL;
+
   if (all_filters)
-  {
     printer_type = add_printer_filters(command, mime, printer, ppdfile,
 				       &prefilter_type);
-  }
   else
-  {
     printer_type   = mimeType(mime, "application", "vnd.cups-postscript");
-    prefilter_type = NULL;
-  }
 
  /*
   * Get the source and destination types...

scheduler/ipp.c

@@ -3229,7 +3229,7 @@ apple_register_profiles(
   int			num_profiles;	/* Number of profiles */
   OSStatus		error = 0;	/* Last error */
   unsigned		device_id,	/* Printer device ID */
-			profile_id,	/* Profile ID */
+			profile_id = 0,	/* Profile ID */
 			default_profile_id = 0;
 					/* Default profile ID */
   CFMutableDictionaryRef device_name;	/* Printer device name dictionary */
@@ -3681,12 +3681,14 @@ apple_register_profiles(
 
     switch (ppd->colorspace)
     {
+      default :
       case PPD_CS_RGB :
       case PPD_CS_CMY :
           profile_id = _ppdHashName("RGB..");
           apple_init_profile(ppd, NULL, profile, profile_id, "RGB", "RGB",
 	                     NULL);
           break;
+
       case PPD_CS_RGBK :
       case PPD_CS_CMYK :
           profile_id = _ppdHashName("CMYK..");
@@ -3747,6 +3749,7 @@ apple_register_profiles(
 
     switch (ppd->colorspace)
     {
+      default :
       case PPD_CS_RGB :
       case PPD_CS_CMY :
           profile_id = _ppdHashName("RGB..");

scheduler/printers.c

@@ -1841,16 +1841,6 @@ cupsdSetAuthInfoRequired(
   if (!attr || attr->num_values > 4)
     return (0);
 
- /*
-  * Update the printer-type value as needed...
-  */
-
-  if (attr->num_values > 1 ||
-      strcmp(attr->values[0].string.text, "none"))
-    p->type |= CUPS_PRINTER_AUTHENTICATED;
-  else
-    p->type &= ~CUPS_PRINTER_AUTHENTICATED;
-
   for (i = 0; i < attr->num_values; i ++)
   {
     if (!strcmp(attr->values[i].string.text, "none"))

templates/es/choose-serial.tmpl

@@ -9,7 +9,7 @@
 
 <TABLE>
 <TR>
-<TH CLASS="label">Conexi&ocaute;n:</TH>
+<TH CLASS="label">Conexi&oacute;n:</TH>
 <TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
 </TR>
 <TR>
@@ -49,4 +49,4 @@
 </TABLE>
 
 </FORM>
-</DIV>
+</DIV>

templates/eu/add-printer.tmpl

@@ -34,7 +34,7 @@
 </TR>
 <TR>
 <TH CLASS="label">Partekatzea:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
 Partekatu inprimagailu hau</TD>
 </TR>
 <TR>

templates/eu/modify-printer.tmpl

@@ -28,7 +28,7 @@
 </TR>
 <TR>
 <TH CLASS="label">Partekatzea:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
 Partekatu inprimagailu hau</TD>
 </TR>
 <TR>

templates/eu/option-pickmany.tmpl

@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>

templates/eu/option-pickone.tmpl

@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>

templates/id/admin.tmpl

@@ -20,7 +20,7 @@
 <H2 CLASS="title">Tugas</H2>
 
 <P>
-<FORM ACTION="/jobs/" METHDO="GET"><INPUT TYPE="SUBMIT" VALUE="Atur Tugas"></FORM>
+<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Atur Tugas"></FORM>
 </P>
 
 </TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">

templates/it/admin.tmpl

@@ -20,7 +20,7 @@
 <H2 CLASS="title">Stampe</H2>
 
 <P>
-<FORM ACTION="/jobs/" METHDO="GET"><INPUT TYPE="SUBMIT" VALUE="Gestisci stampe"></FORM>
+<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Gestisci stampe"></FORM>
 </P>
 
 </TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">

templates/ru/class.tmpl

@@ -17,7 +17,7 @@
 <INPUT TYPE="SUBMIT" VALUE="Сохранить" STYLE="display: none;">
 </FORM>
 
-<FORM METHOD="POST" ACTION="{admin_uri}" NAME="Администрирование">
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
 <INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="1">