rpms/cups/F-8 cups-undo-str2537.patch, 1.2, 1.3 cups.spec, 1.389, 1.390

Tim Waugh (twaugh) fedora-extras-commits at redhat.com
Thu Apr 10 10:13:47 UTC 2008


Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21955

Modified Files:
	cups-undo-str2537.patch cups.spec 
Log Message:
* Thu Apr 10 2008 Tim Waugh <twaugh at redhat.com>
- Log an error when a client requests a charset other than ASCII or UTF-8.


cups-undo-str2537.patch:

Index: cups-undo-str2537.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups-undo-str2537.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-undo-str2537.patch	27 Nov 2007 10:15:33 -0000	1.2
+++ cups-undo-str2537.patch	10 Apr 2008 10:13:40 -0000	1.3
@@ -1,4 +1,3 @@
-diff -up /dev/null cups-1.3.4/data/windows-874
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/windows-874	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,228 @@
@@ -230,7 +229,6 @@
 +F9 0E59
 +FA 0E5A
 +FB 0E5B
-diff -up cups-1.3.4/data/Makefile.undo-str2537 cups-1.3.4/data/Makefile
 --- cups-1.3.4/data/Makefile.undo-str2537	2007-11-12 18:41:10.000000000 +0000
 +++ cups-1.3.4/data/Makefile	2007-11-12 18:44:01.000000000 +0000
 @@ -70,6 +70,31 @@ CHARMAPS =	\
@@ -265,7 +263,6 @@
  		utf-8
  
  DATAFILES =	\
-diff -up /dev/null cups-1.3.4/data/iso-8859-10
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-10	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,251 @@
@@ -520,7 +517,6 @@
 +FD 00FD
 +FE 00FD
 +FF 0138
-diff -up /dev/null cups-1.3.4/data/iso-8859-13
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-13	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,251 @@
@@ -775,7 +771,6 @@
 +FD 017C
 +FE 017E
 +FF 2019
-diff -up /dev/null cups-1.3.4/data/iso-8859-14
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-14	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,251 @@
@@ -1030,7 +1025,6 @@
 +FD 00FD
 +FE 0177
 +FF 00FF
-diff -up /dev/null cups-1.3.4/data/iso-8859-15
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-15	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,251 @@
@@ -1285,7 +1279,6 @@
 +FD 00FD
 +FE 00FE
 +FF 00FF
-diff -up /dev/null cups-1.3.4/data/windows-1250
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/windows-1250	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,254 @@
@@ -1543,7 +1536,6 @@
 +FD 00FD
 +FE 0163
 +FF 02D9
-diff -up /dev/null cups-1.3.4/data/windows-1251
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/windows-1251	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,258 @@
@@ -1805,7 +1797,6 @@
 +FD 044D
 +FE 044E
 +FF 044F
-diff -up /dev/null cups-1.3.4/data/windows-1252
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/windows-1252	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,254 @@
@@ -2063,7 +2054,6 @@
 +FD 00FD
 +FE 00FE
 +FF 00FF
-diff -up /dev/null cups-1.3.4/data/windows-1253
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/windows-1253	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,243 @@
@@ -2310,7 +2300,6 @@
 +FC 03CC
 +FD 03CD
 +FE 03CE
-diff -up /dev/null cups-1.3.4/data/windows-1254
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/windows-1254	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,252 @@
@@ -2566,7 +2555,6 @@
 +FD 0131
 +FE 015F
 +FF 00FF
-diff -up /dev/null cups-1.3.4/data/windows-1255
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/windows-1255	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,236 @@
@@ -2806,7 +2794,6 @@
 +FA 05EA
 +FD 200E
 +FE 200F
-diff -up /dev/null cups-1.3.4/data/windows-1256
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/windows-1256	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,259 @@
@@ -3069,7 +3056,6 @@
 +FD 200E
 +FE 200F
 +FF 06D2
-diff -up /dev/null cups-1.3.4/data/windows-1257
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/windows-1257	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,247 @@
@@ -3320,7 +3306,6 @@
 +FD 017C
 +FE 017E
 +FF 02D9
-diff -up /dev/null cups-1.3.4/data/windows-1258
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/windows-1258	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,250 @@
@@ -3574,7 +3559,6 @@
 +FD 01B0
 +FE 20AB
 +FF 00FF
-diff -up /dev/null cups-1.3.4/data/iso-8859-1
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-1	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,251 @@
@@ -3829,7 +3813,6 @@
 +FD 00FD
 +FE 00FE
 +FF 00FF
-diff -up /dev/null cups-1.3.4/data/iso-8859-2
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-2	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,253 @@
@@ -4086,7 +4069,6 @@
 +FD 00FD
 +FE 0163
 +FF 02D9
-diff -up /dev/null cups-1.3.4/data/iso-8859-3
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-3	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,244 @@
@@ -4334,7 +4316,6 @@
 +FD 016D
 +FE 015D
 +FF 02D9
-diff -up /dev/null cups-1.3.4/data/iso-8859-4
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-4	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,251 @@
@@ -4589,7 +4570,6 @@
 +FD 0169
 +FE 016B
 +FF 02D9
-diff -up /dev/null cups-1.3.4/data/iso-8859-5
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-5	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,251 @@
@@ -4844,7 +4824,6 @@
 +FD 00A7
 +FE 045E
 +FF 045F
-diff -up /dev/null cups-1.3.4/data/iso-8859-6
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-6	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,206 @@
@@ -5054,7 +5033,6 @@
 +F0 0650
 +F1 0651
 +F2 0652
-diff -up /dev/null cups-1.3.4/data/koi8-r
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/koi8-r	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,261 @@
@@ -5319,7 +5297,6 @@
 +FF 042A             
 +
 +
-diff -up /dev/null cups-1.3.4/data/iso-8859-7
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-7	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,246 @@
@@ -5569,7 +5546,6 @@
 +FC 03CC
 +FD 03CD
 +FE 03CE
-diff -up /dev/null cups-1.3.4/data/iso-8859-8
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-8	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,214 @@
@@ -5787,7 +5763,6 @@
 +F8 05E8
 +F9 05E9
 +FA 05EA
-diff -up /dev/null cups-1.3.4/data/iso-8859-9
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/iso-8859-9	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,251 @@
@@ -6042,7 +6017,6 @@
 +FD 0131
 +FE 015F
 +FF 00FF
-diff -up /dev/null cups-1.3.4/data/koi8-u
 --- /dev/null	2007-11-12 09:01:55.571160569 +0000
 +++ cups-1.3.4/data/koi8-u	2007-11-12 18:44:01.000000000 +0000
 @@ -0,0 +1,259 @@
@@ -6305,7 +6279,6 @@
 +FD 0429             
 +FE 0427             
 +FF 042A             
-diff -up cups-1.3.4/packaging/cups.list.in.undo-str2537 cups-1.3.4/packaging/cups.list.in
 --- cups-1.3.4/packaging/cups.list.in.undo-str2537	2007-10-10 23:00:43.000000000 +0100
 +++ cups-1.3.4/packaging/cups.list.in	2007-11-12 18:44:01.000000000 +0000
 @@ -432,6 +432,29 @@ d 0755 root sys $DATADIR/charmaps -
@@ -6338,10 +6311,9 @@
  f 0644 root sys $DATADIR/charsets/utf-8 data/utf-8
  
  d 0755 root sys $DATADIR/data -
-diff -up cups-1.3.4/scheduler/ipp.c.undo-str2537 cups-1.3.4/scheduler/ipp.c
---- cups-1.3.4/scheduler/ipp.c.undo-str2537	2007-11-12 18:41:10.000000000 +0000
-+++ cups-1.3.4/scheduler/ipp.c	2007-11-12 18:44:01.000000000 +0000
-@@ -375,31 +375,13 @@ cupsdProcessIPPRequest(
+--- cups-1.3.4/scheduler/ipp.c	2007-11-12 18:44:01.000000000 +0000
++++ cups-1.3.7/scheduler/ipp.c	2008-04-10 10:46:16.000000000 +0100
+@@ -375,31 +375,13 @@
  	ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
                       "attributes-natural-language", NULL, DefaultLanguage);
  
@@ -6380,3 +6352,17 @@
        {
         /*
  	* Return an error, since attributes-charset,
+@@ -438,6 +420,13 @@
+       }
+       else
+       {
++	if (strcasecmp (charset->values[0].string.text, "us-ascii") &&
++	    strcasecmp (charset->values[0].string.text, "utf-8"))
++	  cupsdLogMessage(CUPSD_LOG_ERROR, "Unsupported character set \"%s\"! "
++			  "Clients must use us-ascii or utf-8.  Future "
++			  "versions will reject this request.",
++			  charset->values[0].string.text);
++
+        /*
+ 	* OK, all the checks pass so far; make sure requesting-user-name is
+ 	* not "root" from a remote host...


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- cups.spec	3 Apr 2008 08:15:26 -0000	1.389
+++ cups.spec	10 Apr 2008 10:13:40 -0000	1.390
@@ -453,6 +453,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Apr 10 2008 Tim Waugh <twaugh at redhat.com>
+- Log an error when a client requests a charset other than ASCII or UTF-8.
+
 * Thu Apr  3 2008 Tim Waugh <twaugh at redhat.com>
 - Main package requires exactly-matching libs package.
 




More information about the fedora-extras-commits mailing list