pool/cups
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=59

Browse Source
This commit is contained in:
OBS User unknown 2009-07-08 18:00:22 +00:00 committed by Git OBS Bridge
parent 22e0bb0805
commit 8f122a86c4
16 changed files with 131 additions and 3129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cups-1.1.21-umlaut_printer.patch
View File

@ -1,42 +0,0 @@
--- cups-1.1.21/scheduler/client.c.orig 2004-09-14 17:00:56.102330657 +0200
+++ cups-1.1.21/scheduler/client.c 2004-09-14 18:32:04.648731933 +0200
@@ -1262,10 +1330,36 @@
* names are not case sensitive but filenames can be...
*/
- con->uri[strlen(con->uri) - 4] = '\0'; /* Drop ".ppd" */
+ int i;
+ char tmp_uri[HTTP_MAX_URI];
+ char *uri, *len;
+
+ memset(tmp_uri, 0, HTTP_MAX_URI);
+ uri = con->uri;
+ len = uri + strlen(uri) - 4;
+ i = 0;
- if ((p = FindPrinter(con->uri + 10)) != NULL)
- snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
+ while(uri < len)
+ {
+ if (uri[0] == '%' && isxdigit(uri[1]) && isxdigit(uri[2]))
+ {
+ tmp_uri[i] = (isdigit(uri[1])?uri[1]-'0':(toupper(uri[1])-'A'+10))*16
+ + (isdigit(uri[2])?uri[2]-'0':(toupper(uri[2])-'A'+10));
+ uri += 3;
+ }
+ else
+ {
+ tmp_uri[i] = uri[0];
+ uri++;
+ }
+ i++;
+ }
+ tmp_uri[i] = '\0';
+
+ // con->uri[strlen(con->uri) - 4] = '\0'; /* Drop ".ppd" */
+
+ if ((p = FindPrinter(tmp_uri + 10)) != NULL)
+ snprintf(con->uri, sizeof(con->uri), "/ppd/%s.ppd", p->name);
else
{
if (!SendError(con, HTTP_NOT_FOUND))

97
cups-1.1.21rc2-preauth_security.patch
View File

@ -1,97 +0,0 @@
--- cups-1.1.21rc2/scheduler/client.c.orig 2004-08-31 15:48:47.000000000 +0200
+++ cups-1.1.21rc2/scheduler/client.c 2004-08-31 15:52:54.755695050 +0200
@@ -293,6 +293,74 @@
}
}
+ /*
+ * Do ACL stuff...
+ */
+
+ if (BrowseACL && (BrowseACL->num_allow || BrowseACL->num_deny))
+ {
+ int hostlen = strlen(con->http.hostname);
+ int auth = AUTH_DENY;
+
+ if (address == 0x7f000001)
+ {
+ /*
+ * Access from localhost (127.0.0.1) is always allowed...
+ */
+
+ auth = AUTH_ALLOW;
+ }
+ else
+ {
+ /*
+ * Do authorization checks on the domain/address...
+ */
+
+ switch (BrowseACL->order_type)
+ {
+ default :
+ auth = AUTH_DENY; /* anti-compiler-warning-code */
+ break;
+
+ case AUTH_ALLOW : /* Order Deny,Allow */
+ auth = AUTH_ALLOW;
+
+ if (CheckAuth(address, con->http.hostname, hostlen,
+ BrowseACL->num_deny, BrowseACL->deny))
+ auth = AUTH_DENY;
+
+ if (CheckAuth(address, con->http.hostname, hostlen,
+ BrowseACL->num_allow, BrowseACL->allow))
+ auth = AUTH_ALLOW;
+ break;
+
+ case AUTH_DENY : /* Order Allow,Deny */
+ auth = AUTH_DENY;
+
+ if (CheckAuth(address, con->http.hostname, hostlen,
+ BrowseACL->num_allow, BrowseACL->allow))
+ auth = AUTH_ALLOW;
+
+ if (CheckAuth(address, con->http.hostname, hostlen,
+ BrowseACL->num_deny, BrowseACL->deny))
+ auth = AUTH_DENY;
+ break;
+ }
+ }
+
+ if (auth == AUTH_DENY)
+ {
+ LogMessage(L_DEBUG, "AcceptClient(): Refused connection from from %s; please check BrowseAllow/BrowseDeny settings",
+ con->http.hostname);
+#ifdef WIN32
+ closesocket(con->http.fd);
+#else
+ close(con->http.fd);
+#endif /* WIN32 */
+ return;
+ }
+ }
+
LogMessage(L_DEBUG, "AcceptClient: %d from %s:%d.", con->http.fd,
con->http.hostname, ntohs(con->http.hostaddr.sin_port));
--- cups-1.1.21rc2/conf/cupsd.conf.in.orig 2004-08-31 15:48:47.000000000 +0200
+++ cups-1.1.21rc2/conf/cupsd.conf.in 2004-08-31 15:55:01.452514988 +0200
@@ -575,6 +575,9 @@
#BrowseAllow address
#BrowseDeny address
+BrowseAllow @LOCAL
+BrowseDeny All
+
#
# BrowseInterval: the time between browsing updates in seconds. Default
# is 30 seconds.
@@ -769,6 +772,7 @@
Deny From All
Allow From 127.0.0.1
Allow From 127.0.0.2
+Allow From @LOCAL
</Location>
#<Location /classes>

32
cups-1.1.21rc2-usermode.patch
View File

@ -1,32 +0,0 @@
--- cups-1.1.21rc2/conf/cupsd.conf.in.orig 2004-08-31 15:55:01.000000000 +0200
+++ cups-1.1.21rc2/conf/cupsd.conf.in 2004-08-31 15:57:30.562005961 +0200
@@ -246,6 +246,7 @@
#
#Printcap /etc/printcap
+Printcap /etc/printcap
#
# PrintcapFormat: the format of the printcap file, currently either
@@ -366,6 +367,9 @@
#User @CUPS_USER@
#Group @CUPS_GROUP@
+User @CUPS_USER@
+Group @CUPS_GROUP@
+RunAsUser Yes
#
# RIPCache: the amount of memory that each RIP should use to cache
@@ -834,8 +838,9 @@
# the group name using the SystemGroup directive.
#
-AuthType Basic
-AuthClass System
+AuthType BasicDigest
+AuthClass Group
+AuthGroupName sys
## Restrict access to local domain
Order Deny,Allow

261
cups-1.1.23-testpage.patch
View File

@ -1,261 +0,0 @@
--- cups-1.1.23/data/testprint.ps.orig 2005-01-03 20:29:45.000000000 +0100
+++ cups-1.1.23/data/testprint.ps 2005-01-21 14:27:36.019127436 +0100
@@ -107,99 +107,99 @@
} ifelse
100 string cvs show % Convert to a string and show it...
} bind def
-/CUPSLOGO { % Draw the CUPS logo
- % height CUPSLOGO
- % Start with a big C...
- /Helvetica findfont 1 index scalefont setfont
- 0 setgray
- 0 0 moveto
- (C) show
-
- % Then "UNIX Printing System" much smaller...
- /Helvetica-Bold findfont 1 index 9 div scalefont setfont
- 0.25 mul
- dup dup 2.0 mul moveto
- (UNIX) show
- dup dup 1.6 mul moveto
- (Printing) show
- dup 1.2 mul moveto
- (System) show
-} bind def
-/ESPLOGO { % Draw the ESP logo
- % height ESPLOGO
- % Compute the size of the logo...
- 0 0
- 2 index 1.5 mul 3 index
-
- % Do the "metallic" fill from 10% black to 40% black...
- 1 -0.001 0 {
- dup % loopval
- -0.15 mul % loopval * -0.15
- 0.9 add % 0.9 - loopval * 0.15
- setgray % set gray shade
-
- 0 % x
- 1 index neg % loopval
- 1 add % 1 - loopval
- 3 index % height
- mul % height * (1 - loopval)
- moveto % starting point
-
- dup % loopval
- 3 index % width
- mul % loopval * width
- 2 index % height
- lineto % Next point
-
- 0 % x
- 2 index % height
- lineto % Next point
-
- closepath
- fill
-
- dup % loopval
- 0.15 mul % loopval * 0.15
- 0.6 add % 0.6 + loopval * 0.15
- setgray
-
- dup % loopval
- neg 1 add % 1 - loopval
- 3 index % width
- mul % (1 - loopval) * width
- 0 % y
- moveto % Starting point
-
- 2 index % width
- exch % loopval
- 2 index % height
- mul % loopval * height
- lineto % Next point
-
- 1 index % width
- 0 % y
- lineto % Next point
-
- closepath
- fill
- } for
-
- 0 setgray rectstroke
-
- /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
- dup 40 div
-
- dup 4 mul 1 index 25 mul moveto (E) show
- dup 10 mul 1 index 15 mul moveto (S) show
- dup 16 mul 1 index 5 mul moveto (P) show
-
- /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
- dup 14 mul 1 index 29 mul moveto (asy) show
- dup 20 mul 1 index 19 mul moveto (oftware) show
- dup 26 mul 1 index 9 mul moveto (roducts) show
-
- pop
-} bind def
+%/CUPSLOGO { % Draw the CUPS logo
+% % height CUPSLOGO
+% % Start with a big C...
+% /Helvetica findfont 1 index scalefont setfont
+% 0 setgray
+% 0 0 moveto
+% (C) show
+%
+% % Then "UNIX Printing System" much smaller...
+% /Helvetica-Bold findfont 1 index 9 div scalefont setfont
+% 0.25 mul
+% dup dup 2.0 mul moveto
+% (UNIX) show
+% dup dup 1.6 mul moveto
+% (Printing) show
+% dup 1.2 mul moveto
+% (System) show
+%} bind def
+%/ESPLOGO { % Draw the ESP logo
+% % height ESPLOGO
+% % Compute the size of the logo...
+% 0 0
+% 2 index 1.5 mul 3 index
+%
+% % Do the "metallic" fill from 10% black to 40% black...
+% 1 -0.001 0 {
+% dup % loopval
+% -0.15 mul % loopval * -0.15
+% 0.9 add % 0.9 - loopval * 0.15
+% setgray % set gray shade
+%
+% 0 % x
+% 1 index neg % loopval
+% 1 add % 1 - loopval
+% 3 index % height
+% mul % height * (1 - loopval)
+% moveto % starting point
+%
+% dup % loopval
+% 3 index % width
+% mul % loopval * width
+% 2 index % height
+% lineto % Next point
+%
+% 0 % x
+% 2 index % height
+% lineto % Next point
+%
+% closepath
+% fill
+%
+% dup % loopval
+% 0.15 mul % loopval * 0.15
+% 0.6 add % 0.6 + loopval * 0.15
+% setgray
+%
+% dup % loopval
+% neg 1 add % 1 - loopval
+% 3 index % width
+% mul % (1 - loopval) * width
+% 0 % y
+% moveto % Starting point
+%
+% 2 index % width
+% exch % loopval
+% 2 index % height
+% mul % loopval * height
+% lineto % Next point
+%
+% 1 index % width
+% 0 % y
+% lineto % Next point
+%
+% closepath
+% fill
+% } for
+%
+% 0 setgray rectstroke
+%
+% /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
+% dup 40 div
+%
+% dup 4 mul 1 index 25 mul moveto (E) show
+% dup 10 mul 1 index 15 mul moveto (S) show
+% dup 16 mul 1 index 5 mul moveto (P) show
+%
+% /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
+% dup 14 mul 1 index 29 mul moveto (asy) show
+% dup 20 mul 1 index 19 mul moveto (oftware) show
+% dup 26 mul 1 index 9 mul moveto (roducts) show
+%
+% pop
+%} bind def
%%EndResource
%%EndProlog
%%Page: 1 1
@@ -480,9 +480,13 @@
% Draw the copyright notice at the bottom...
pageWidth 36 mul % Center of page
- pageHeight 10 mul % Bottom of page
+ pageHeight 13 mul % Bottom of page
2 copy moveto % Position text
- (Printed Using CUPS v1.1.x) CENTER % Show text centered
+ (Printed Using CUPS 1.1.23) CENTER % Show text centered
+
+ pageHeight 4 mul sub % Move down...
+ 2 copy moveto % Position text
+ (and personal build CUPS version) CENTER % Show text centered
pageHeight 2 mul sub % Move down...
2 copy moveto % Position text
@@ -490,30 +494,30 @@
(Copyright 1993-2005 by Easy Software Products, All Rights Reserved.) CENTER
pageHeight sub % Move down...
2 copy moveto % Position text
- (CUPS, Easy Software Products and their logos are the trademark property of) CENTER
+ (NOVELL homepage: http://www.novell.com) CENTER
pageHeight sub % Move down...
2 copy moveto % Position text
- (Easy Software Products, 44141 Airport View Drive, Suite 204,) CENTER
+ (Test page derived from the CUPS test page.) CENTER
pageHeight sub % Move down...
2 copy moveto % Position text
- (Hollywood, Maryland, 20636, USA.) CENTER
+ (CUPS is a trademark property of Easy Software Products) CENTER
- % Then the CUPS logo....
- gsave
- pageWidth 4 mul
- pageHeight 4 mul
- translate
- pageWidth 9 mul CUPSLOGO
- grestore
-
- % And the ESP logo....
- gsave
- pageWidth 59 mul
- pageHeight 4 mul
- translate
- pageWidth 6 mul ESPLOGO
- grestore
-% Show the page...
+% % Then the CUPS logo....
+% gsave
+% pageWidth 4 mul
+% pageHeight 4 mul
+% translate
+% pageWidth 9 mul CUPSLOGO
+% grestore
+
+% % And the ESP logo....
+% gsave
+% pageWidth 59 mul
+% pageHeight 4 mul
+% translate
+% pageWidth 6 mul ESPLOGO
+% grestore
+%% Show the page...
grestore
showpage
%

13
cups-1.3.10-fix-DNS-rebinding-protection.patch Normal file
View File

@ -0,0 +1,13 @@
--- scheduler/client.c.orig 2009-04-16 21:32:04.000000000 +0200
+++ scheduler/client.c 2009-06-26 12:37:07.000000000 +0200
@@ -4879,7 +4879,9 @@ valid_host(cupsd_client_t *con) /* I -
!strcmp(host, "127.0.0.1") ||
!strncmp(host, "127.0.0.1:", 10) ||
!strcmp(host, "[::1]") ||
- !strncmp(host, "[::1]:", 6));
+ !strncmp(host, "[::1]:", 6) ||
+ !strcmp(host, "::1") ||
+ !strncmp(host, "::1:", 4));
}
#ifdef HAVE_DNSSD

3
cups-1.3.10-source.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9701a545a6a05a991beeb49b41fbb4d450c3bdbb4eb74b132b0d2988640bb566
size 3778970

15
cups-1.3.9-cupsImageReadTiff.patch
View File

@ -1,15 +0,0 @@
Index: filter/image-private.h
===================================================================
--- filter/image-private.h (revision 8153)
+++ filter/image-private.h (working copy)
@@ -40,8 +40,8 @@
# define CUPS_IMAGE_MAX_WIDTH 0x07ffffff
/* 2^27-1 to allow for 15-channel data */
-# define CUPS_IMAGE_MAX_HEIGHT 0x7fffffff
- /* 2^31-1 */
+# define CUPS_IMAGE_MAX_HEIGHT 0x3fffffff
+ /* 2^30-1 */
# define CUPS_TILE_SIZE 256 /* 256x256 pixel tiles */
# define CUPS_TILE_MINIMUM 10 /* Minimum number of tiles */

766
cups-1.3.9-cupstestppd.patch
View File

@ -1,766 +0,0 @@
--- cups-1.3.9/ppd/epson24.ppd.orig 2007-11-27 01:09:24.000000000 +0100
+++ cups-1.3.9/ppd/epson24.ppd 2008-10-23 15:03:56.000000000 +0200
@@ -78,7 +78,6 @@
*Resolution 120x60dpi: "<</HWResolution[120 60]/cupsBitsPerColor 1/cupsRowCount 8/cupsRowFeed 0/cupsRowStep 0/cupsColorSpace 3>>setpagedevice"
*Resolution 180dpi: "<</HWResolution[180 180]/cupsBitsPerColor 1/cupsRowCount 24/cupsRowFeed 0/cupsRowStep 0/cupsColorSpace 3>>setpagedevice"
*Resolution 360x180dpi: "<</HWResolution[360 180]/cupsBitsPerColor 1/cupsRowCount 24/cupsRowFeed 0/cupsRowStep 0/cupsColorSpace 3>>setpagedevice"
-*Resolution 360x180dpi: "<</HWResolution[360 180]/cupsBitsPerColor 1/cupsRowCount 48/cupsRowFeed 0/cupsRowStep 0/cupsColorSpace 3>>setpagedevice"
*CloseUI: *Resolution
*da.Translation Manufacturer/Epson: ""
*da.Translation ModelName/Epson 24-Pin Series: ""
--- cups-1.3.9/ppd/stcolor.ppd.orig 2007-11-27 01:09:24.000000000 +0100
+++ cups-1.3.9/ppd/stcolor.ppd 2008-10-23 15:07:20.000000000 +0200
@@ -42,9 +42,6 @@
*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*PageSize FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageSize Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*CloseUI: *PageSize
*OpenUI *PageRegion/Media Size: PickOne
*OrderDependency: 10 AnySetup *PageRegion
@@ -53,26 +50,17 @@
*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*PageRegion FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*CloseUI: *PageRegion
*DefaultImageableArea: Letter
*ImageableArea Letter/Letter - 8.5x11in: "18.00 18.00 594.00 774.00"
*ImageableArea Legal/Legal - 8.5x14in: "18.00 18.00 594.00 990.00"
*ImageableArea A4/A4 - 210x297mm: "18.00 18.00 577.00 824.00"
*ImageableArea FanFoldUS/Fanfold - 14.875x11in: "18.00 18.00 1053.00 774.00"
-*ImageableArea Letter/Letter - 8.5x11in: "8.60 39.60 603.40 766.49"
-*ImageableArea Legal/Legal - 8.5x14in: "8.60 39.60 603.40 982.49"
-*ImageableArea A4/A4 - 210x297mm: "8.60 39.60 586.40 816.49"
*DefaultPaperDimension: Letter
*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
*PaperDimension FanFoldUS/Fanfold - 14.875x11in: "1071.00 792.00"
-*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
-*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
-*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
*MaxMediaWidth: "1080.00"
*MaxMediaHeight: "86400.00"
*HWMargins: 8.60 39.60 8.60 25.51
@@ -105,9 +93,6 @@
*da.PageSize Legal/Legal - 8.5x14in: ""
*da.PageSize A4/A4 - 210x297mm: ""
*da.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*da.PageSize Letter/Letter - 8.5x11in: ""
-*da.PageSize Legal/Legal - 8.5x14in: ""
-*da.PageSize A4/A4 - 210x297mm: ""
*da.Translation Resolution/Resolution: ""
*da.Resolution 180dpi/180dpi: ""
*da.Resolution 360dpi/360dpi: ""
@@ -124,9 +109,6 @@
*de.PageSize Legal/Legal - 8.5x14in: ""
*de.PageSize A4/A4 - 210x297mm: ""
*de.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*de.PageSize Letter/Letter - 8.5x11in: ""
-*de.PageSize Legal/Legal - 8.5x14in: ""
-*de.PageSize A4/A4 - 210x297mm: ""
*de.Translation Resolution/Resolution: ""
*de.Resolution 180dpi/180dpi: ""
*de.Resolution 360dpi/360dpi: ""
@@ -143,9 +125,6 @@
*es.PageSize Legal/Legal - 8.5x14in: ""
*es.PageSize A4/A4 - 210x297mm: ""
*es.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*es.PageSize Letter/Letter - 8.5x11in: ""
-*es.PageSize Legal/Legal - 8.5x14in: ""
-*es.PageSize A4/A4 - 210x297mm: ""
*es.Translation Resolution/Resolution: ""
*es.Resolution 180dpi/180dpi: ""
*es.Resolution 360dpi/360dpi: ""
@@ -162,9 +141,6 @@
*fi.PageSize Legal/Legal - 8.5x14in: ""
*fi.PageSize A4/A4 - 210x297mm: ""
*fi.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fi.PageSize Letter/Letter - 8.5x11in: ""
-*fi.PageSize Legal/Legal - 8.5x14in: ""
-*fi.PageSize A4/A4 - 210x297mm: ""
*fi.Translation Resolution/Resolution: ""
*fi.Resolution 180dpi/180dpi: ""
*fi.Resolution 360dpi/360dpi: ""
@@ -181,9 +157,6 @@
*fr.PageSize Legal/Legal - 8.5x14in: ""
*fr.PageSize A4/A4 - 210x297mm: ""
*fr.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fr.PageSize Letter/Letter - 8.5x11in: ""
-*fr.PageSize Legal/Legal - 8.5x14in: ""
-*fr.PageSize A4/A4 - 210x297mm: ""
*fr.Translation Resolution/Resolution: ""
*fr.Resolution 180dpi/180dpi: ""
*fr.Resolution 360dpi/360dpi: ""
@@ -200,9 +173,6 @@
*it.PageSize Legal/Legal - 8.5x14in: ""
*it.PageSize A4/A4 - 210x297mm: ""
*it.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*it.PageSize Letter/Letter - 8.5x11in: ""
-*it.PageSize Legal/Legal - 8.5x14in: ""
-*it.PageSize A4/A4 - 210x297mm: ""
*it.Translation Resolution/Resolution: ""
*it.Resolution 180dpi/180dpi: ""
*it.Resolution 360dpi/360dpi: ""
@@ -219,9 +189,6 @@
*ja.PageSize Legal/Legal - 8.5x14in: ""
*ja.PageSize A4/A4 - 210x297mm: ""
*ja.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ja.PageSize Letter/Letter - 8.5x11in: ""
-*ja.PageSize Legal/Legal - 8.5x14in: ""
-*ja.PageSize A4/A4 - 210x297mm: ""
*ja.Translation Resolution/Resolution: ""
*ja.Resolution 180dpi/180dpi: ""
*ja.Resolution 360dpi/360dpi: ""
@@ -238,9 +205,6 @@
*ko.PageSize Legal/Legal - 8.5x14in: ""
*ko.PageSize A4/A4 - 210x297mm: ""
*ko.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ko.PageSize Letter/Letter - 8.5x11in: ""
-*ko.PageSize Legal/Legal - 8.5x14in: ""
-*ko.PageSize A4/A4 - 210x297mm: ""
*ko.Translation Resolution/Resolution: ""
*ko.Resolution 180dpi/180dpi: ""
*ko.Resolution 360dpi/360dpi: ""
@@ -257,9 +221,6 @@
*nl.PageSize Legal/Legal - 8.5x14in: ""
*nl.PageSize A4/A4 - 210x297mm: ""
*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
*nl.Translation Resolution/Resolution: ""
*nl.Resolution 180dpi/180dpi: ""
*nl.Resolution 360dpi/360dpi: ""
@@ -276,9 +237,6 @@
*no.PageSize Legal/Legal - 8.5x14in: ""
*no.PageSize A4/A4 - 210x297mm: ""
*no.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*no.PageSize Letter/Letter - 8.5x11in: ""
-*no.PageSize Legal/Legal - 8.5x14in: ""
-*no.PageSize A4/A4 - 210x297mm: ""
*no.Translation Resolution/Resolution: ""
*no.Resolution 180dpi/180dpi: ""
*no.Resolution 360dpi/360dpi: ""
@@ -295,9 +253,6 @@
*pt.PageSize Legal/Legal - 8.5x14in: ""
*pt.PageSize A4/A4 - 210x297mm: ""
*pt.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt.PageSize Letter/Letter - 8.5x11in: ""
-*pt.PageSize Legal/Legal - 8.5x14in: ""
-*pt.PageSize A4/A4 - 210x297mm: ""
*pt.Translation Resolution/Resolution: ""
*pt.Resolution 180dpi/180dpi: ""
*pt.Resolution 360dpi/360dpi: ""
@@ -314,9 +269,6 @@
*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
*pt_BR.PageSize A4/A4 - 210x297mm: ""
*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
*pt_BR.Translation Resolution/Resolution: ""
*pt_BR.Resolution 180dpi/180dpi: ""
*pt_BR.Resolution 360dpi/360dpi: ""
@@ -333,9 +285,6 @@
*sv.PageSize Legal/Legal - 8.5x14in: ""
*sv.PageSize A4/A4 - 210x297mm: ""
*sv.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*sv.PageSize Letter/Letter - 8.5x11in: ""
-*sv.PageSize Legal/Legal - 8.5x14in: ""
-*sv.PageSize A4/A4 - 210x297mm: ""
*sv.Translation Resolution/Resolution: ""
*sv.Resolution 180dpi/180dpi: ""
*sv.Resolution 360dpi/360dpi: ""
@@ -352,9 +301,6 @@
*zh.PageSize Legal/Legal - 8.5x14in: ""
*zh.PageSize A4/A4 - 210x297mm: ""
*zh.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh.PageSize Letter/Letter - 8.5x11in: ""
-*zh.PageSize Legal/Legal - 8.5x14in: ""
-*zh.PageSize A4/A4 - 210x297mm: ""
*zh.Translation Resolution/Resolution: ""
*zh.Resolution 180dpi/180dpi: ""
*zh.Resolution 360dpi/360dpi: ""
@@ -371,9 +317,6 @@
*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
*zh_TW.PageSize A4/A4 - 210x297mm: ""
*zh_TW.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh_TW.PageSize Letter/Letter - 8.5x11in: ""
-*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
-*zh_TW.PageSize A4/A4 - 210x297mm: ""
*zh_TW.Translation Resolution/Resolution: ""
*zh_TW.Resolution 180dpi/180dpi: ""
*zh_TW.Resolution 360dpi/360dpi: ""
--- cups-1.3.9/ppd/stphoto.ppd.orig 2007-11-27 01:09:24.000000000 +0100
+++ cups-1.3.9/ppd/stphoto.ppd 2008-10-23 15:09:11.000000000 +0200
@@ -42,9 +42,6 @@
*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*PageSize FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageSize Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*CloseUI: *PageSize
*OpenUI *PageRegion/Media Size: PickOne
*OrderDependency: 10 AnySetup *PageRegion
@@ -53,26 +50,17 @@
*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*PageRegion FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*CloseUI: *PageRegion
*DefaultImageableArea: Letter
*ImageableArea Letter/Letter - 8.5x11in: "18.00 18.00 594.00 774.00"
*ImageableArea Legal/Legal - 8.5x14in: "18.00 18.00 594.00 990.00"
*ImageableArea A4/A4 - 210x297mm: "18.00 18.00 577.00 824.00"
*ImageableArea FanFoldUS/Fanfold - 14.875x11in: "18.00 18.00 1053.00 774.00"
-*ImageableArea Letter/Letter - 8.5x11in: "8.60 39.60 603.40 766.49"
-*ImageableArea Legal/Legal - 8.5x14in: "8.60 39.60 603.40 982.49"
-*ImageableArea A4/A4 - 210x297mm: "8.60 39.60 586.40 816.49"
*DefaultPaperDimension: Letter
*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
*PaperDimension FanFoldUS/Fanfold - 14.875x11in: "1071.00 792.00"
-*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
-*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
-*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
*MaxMediaWidth: "1080.00"
*MaxMediaHeight: "86400.00"
*HWMargins: 8.60 39.60 8.60 25.51
@@ -105,9 +93,6 @@
*da.PageSize Legal/Legal - 8.5x14in: ""
*da.PageSize A4/A4 - 210x297mm: ""
*da.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*da.PageSize Letter/Letter - 8.5x11in: ""
-*da.PageSize Legal/Legal - 8.5x14in: ""
-*da.PageSize A4/A4 - 210x297mm: ""
*da.Translation Resolution/Resolution: ""
*da.Resolution 180dpi/180dpi: ""
*da.Resolution 360dpi/360dpi: ""
@@ -124,9 +109,6 @@
*de.PageSize Legal/Legal - 8.5x14in: ""
*de.PageSize A4/A4 - 210x297mm: ""
*de.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*de.PageSize Letter/Letter - 8.5x11in: ""
-*de.PageSize Legal/Legal - 8.5x14in: ""
-*de.PageSize A4/A4 - 210x297mm: ""
*de.Translation Resolution/Resolution: ""
*de.Resolution 180dpi/180dpi: ""
*de.Resolution 360dpi/360dpi: ""
@@ -143,9 +125,6 @@
*es.PageSize Legal/Legal - 8.5x14in: ""
*es.PageSize A4/A4 - 210x297mm: ""
*es.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*es.PageSize Letter/Letter - 8.5x11in: ""
-*es.PageSize Legal/Legal - 8.5x14in: ""
-*es.PageSize A4/A4 - 210x297mm: ""
*es.Translation Resolution/Resolution: ""
*es.Resolution 180dpi/180dpi: ""
*es.Resolution 360dpi/360dpi: ""
@@ -162,9 +141,6 @@
*fi.PageSize Legal/Legal - 8.5x14in: ""
*fi.PageSize A4/A4 - 210x297mm: ""
*fi.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fi.PageSize Letter/Letter - 8.5x11in: ""
-*fi.PageSize Legal/Legal - 8.5x14in: ""
-*fi.PageSize A4/A4 - 210x297mm: ""
*fi.Translation Resolution/Resolution: ""
*fi.Resolution 180dpi/180dpi: ""
*fi.Resolution 360dpi/360dpi: ""
@@ -181,9 +157,6 @@
*fr.PageSize Legal/Legal - 8.5x14in: ""
*fr.PageSize A4/A4 - 210x297mm: ""
*fr.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fr.PageSize Letter/Letter - 8.5x11in: ""
-*fr.PageSize Legal/Legal - 8.5x14in: ""
-*fr.PageSize A4/A4 - 210x297mm: ""
*fr.Translation Resolution/Resolution: ""
*fr.Resolution 180dpi/180dpi: ""
*fr.Resolution 360dpi/360dpi: ""
@@ -200,9 +173,6 @@
*it.PageSize Legal/Legal - 8.5x14in: ""
*it.PageSize A4/A4 - 210x297mm: ""
*it.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*it.PageSize Letter/Letter - 8.5x11in: ""
-*it.PageSize Legal/Legal - 8.5x14in: ""
-*it.PageSize A4/A4 - 210x297mm: ""
*it.Translation Resolution/Resolution: ""
*it.Resolution 180dpi/180dpi: ""
*it.Resolution 360dpi/360dpi: ""
@@ -219,9 +189,6 @@
*ja.PageSize Legal/Legal - 8.5x14in: ""
*ja.PageSize A4/A4 - 210x297mm: ""
*ja.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ja.PageSize Letter/Letter - 8.5x11in: ""
-*ja.PageSize Legal/Legal - 8.5x14in: ""
-*ja.PageSize A4/A4 - 210x297mm: ""
*ja.Translation Resolution/Resolution: ""
*ja.Resolution 180dpi/180dpi: ""
*ja.Resolution 360dpi/360dpi: ""
@@ -238,9 +205,6 @@
*ko.PageSize Legal/Legal - 8.5x14in: ""
*ko.PageSize A4/A4 - 210x297mm: ""
*ko.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ko.PageSize Letter/Letter - 8.5x11in: ""
-*ko.PageSize Legal/Legal - 8.5x14in: ""
-*ko.PageSize A4/A4 - 210x297mm: ""
*ko.Translation Resolution/Resolution: ""
*ko.Resolution 180dpi/180dpi: ""
*ko.Resolution 360dpi/360dpi: ""
@@ -257,9 +221,6 @@
*nl.PageSize Legal/Legal - 8.5x14in: ""
*nl.PageSize A4/A4 - 210x297mm: ""
*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
*nl.Translation Resolution/Resolution: ""
*nl.Resolution 180dpi/180dpi: ""
*nl.Resolution 360dpi/360dpi: ""
@@ -276,9 +237,6 @@
*no.PageSize Legal/Legal - 8.5x14in: ""
*no.PageSize A4/A4 - 210x297mm: ""
*no.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*no.PageSize Letter/Letter - 8.5x11in: ""
-*no.PageSize Legal/Legal - 8.5x14in: ""
-*no.PageSize A4/A4 - 210x297mm: ""
*no.Translation Resolution/Resolution: ""
*no.Resolution 180dpi/180dpi: ""
*no.Resolution 360dpi/360dpi: ""
@@ -295,9 +253,6 @@
*pt.PageSize Legal/Legal - 8.5x14in: ""
*pt.PageSize A4/A4 - 210x297mm: ""
*pt.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt.PageSize Letter/Letter - 8.5x11in: ""
-*pt.PageSize Legal/Legal - 8.5x14in: ""
-*pt.PageSize A4/A4 - 210x297mm: ""
*pt.Translation Resolution/Resolution: ""
*pt.Resolution 180dpi/180dpi: ""
*pt.Resolution 360dpi/360dpi: ""
@@ -314,9 +269,6 @@
*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
*pt_BR.PageSize A4/A4 - 210x297mm: ""
*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
*pt_BR.Translation Resolution/Resolution: ""
*pt_BR.Resolution 180dpi/180dpi: ""
*pt_BR.Resolution 360dpi/360dpi: ""
@@ -333,9 +285,6 @@
*sv.PageSize Legal/Legal - 8.5x14in: ""
*sv.PageSize A4/A4 - 210x297mm: ""
*sv.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*sv.PageSize Letter/Letter - 8.5x11in: ""
-*sv.PageSize Legal/Legal - 8.5x14in: ""
-*sv.PageSize A4/A4 - 210x297mm: ""
*sv.Translation Resolution/Resolution: ""
*sv.Resolution 180dpi/180dpi: ""
*sv.Resolution 360dpi/360dpi: ""
@@ -352,9 +301,6 @@
*zh.PageSize Legal/Legal - 8.5x14in: ""
*zh.PageSize A4/A4 - 210x297mm: ""
*zh.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh.PageSize Letter/Letter - 8.5x11in: ""
-*zh.PageSize Legal/Legal - 8.5x14in: ""
-*zh.PageSize A4/A4 - 210x297mm: ""
*zh.Translation Resolution/Resolution: ""
*zh.Resolution 180dpi/180dpi: ""
*zh.Resolution 360dpi/360dpi: ""
@@ -371,9 +317,6 @@
*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
*zh_TW.PageSize A4/A4 - 210x297mm: ""
*zh_TW.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh_TW.PageSize Letter/Letter - 8.5x11in: ""
-*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
-*zh_TW.PageSize A4/A4 - 210x297mm: ""
*zh_TW.Translation Resolution/Resolution: ""
*zh_TW.Resolution 180dpi/180dpi: ""
*zh_TW.Resolution 360dpi/360dpi: ""
--- cups-1.3.9/ppd/stphoto2.ppd.orig 2007-11-27 01:09:24.000000000 +0100
+++ cups-1.3.9/ppd/stphoto2.ppd 2008-10-23 15:10:16.000000000 +0200
@@ -42,9 +42,6 @@
*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*PageSize FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageSize Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*CloseUI: *PageSize
*OpenUI *PageRegion/Media Size: PickOne
*OrderDependency: 10 AnySetup *PageRegion
@@ -53,26 +50,17 @@
*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*PageRegion FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*CloseUI: *PageRegion
*DefaultImageableArea: Letter
*ImageableArea Letter/Letter - 8.5x11in: "18.00 18.00 594.00 774.00"
*ImageableArea Legal/Legal - 8.5x14in: "18.00 18.00 594.00 990.00"
*ImageableArea A4/A4 - 210x297mm: "18.00 18.00 577.00 824.00"
*ImageableArea FanFoldUS/Fanfold - 14.875x11in: "18.00 18.00 1053.00 774.00"
-*ImageableArea Letter/Letter - 8.5x11in: "8.60 39.60 603.40 766.49"
-*ImageableArea Legal/Legal - 8.5x14in: "8.60 39.60 603.40 982.49"
-*ImageableArea A4/A4 - 210x297mm: "8.60 39.60 586.40 816.49"
*DefaultPaperDimension: Letter
*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
*PaperDimension FanFoldUS/Fanfold - 14.875x11in: "1071.00 792.00"
-*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
-*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
-*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
*MaxMediaWidth: "1080.00"
*MaxMediaHeight: "86400.00"
*HWMargins: 8.60 39.60 8.60 25.51
@@ -105,9 +93,6 @@
*da.PageSize Legal/Legal - 8.5x14in: ""
*da.PageSize A4/A4 - 210x297mm: ""
*da.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*da.PageSize Letter/Letter - 8.5x11in: ""
-*da.PageSize Legal/Legal - 8.5x14in: ""
-*da.PageSize A4/A4 - 210x297mm: ""
*da.Translation Resolution/Resolution: ""
*da.Resolution 180dpi/180dpi: ""
*da.Resolution 360dpi/360dpi: ""
@@ -124,9 +109,6 @@
*de.PageSize Legal/Legal - 8.5x14in: ""
*de.PageSize A4/A4 - 210x297mm: ""
*de.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*de.PageSize Letter/Letter - 8.5x11in: ""
-*de.PageSize Legal/Legal - 8.5x14in: ""
-*de.PageSize A4/A4 - 210x297mm: ""
*de.Translation Resolution/Resolution: ""
*de.Resolution 180dpi/180dpi: ""
*de.Resolution 360dpi/360dpi: ""
@@ -143,9 +125,6 @@
*es.PageSize Legal/Legal - 8.5x14in: ""
*es.PageSize A4/A4 - 210x297mm: ""
*es.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*es.PageSize Letter/Letter - 8.5x11in: ""
-*es.PageSize Legal/Legal - 8.5x14in: ""
-*es.PageSize A4/A4 - 210x297mm: ""
*es.Translation Resolution/Resolution: ""
*es.Resolution 180dpi/180dpi: ""
*es.Resolution 360dpi/360dpi: ""
@@ -162,9 +141,6 @@
*fi.PageSize Legal/Legal - 8.5x14in: ""
*fi.PageSize A4/A4 - 210x297mm: ""
*fi.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fi.PageSize Letter/Letter - 8.5x11in: ""
-*fi.PageSize Legal/Legal - 8.5x14in: ""
-*fi.PageSize A4/A4 - 210x297mm: ""
*fi.Translation Resolution/Resolution: ""
*fi.Resolution 180dpi/180dpi: ""
*fi.Resolution 360dpi/360dpi: ""
@@ -181,9 +157,6 @@
*fr.PageSize Legal/Legal - 8.5x14in: ""
*fr.PageSize A4/A4 - 210x297mm: ""
*fr.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fr.PageSize Letter/Letter - 8.5x11in: ""
-*fr.PageSize Legal/Legal - 8.5x14in: ""
-*fr.PageSize A4/A4 - 210x297mm: ""
*fr.Translation Resolution/Resolution: ""
*fr.Resolution 180dpi/180dpi: ""
*fr.Resolution 360dpi/360dpi: ""
@@ -200,9 +173,6 @@
*it.PageSize Legal/Legal - 8.5x14in: ""
*it.PageSize A4/A4 - 210x297mm: ""
*it.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*it.PageSize Letter/Letter - 8.5x11in: ""
-*it.PageSize Legal/Legal - 8.5x14in: ""
-*it.PageSize A4/A4 - 210x297mm: ""
*it.Translation Resolution/Resolution: ""
*it.Resolution 180dpi/180dpi: ""
*it.Resolution 360dpi/360dpi: ""
@@ -219,9 +189,6 @@
*ja.PageSize Legal/Legal - 8.5x14in: ""
*ja.PageSize A4/A4 - 210x297mm: ""
*ja.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ja.PageSize Letter/Letter - 8.5x11in: ""
-*ja.PageSize Legal/Legal - 8.5x14in: ""
-*ja.PageSize A4/A4 - 210x297mm: ""
*ja.Translation Resolution/Resolution: ""
*ja.Resolution 180dpi/180dpi: ""
*ja.Resolution 360dpi/360dpi: ""
@@ -238,9 +205,6 @@
*ko.PageSize Legal/Legal - 8.5x14in: ""
*ko.PageSize A4/A4 - 210x297mm: ""
*ko.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ko.PageSize Letter/Letter - 8.5x11in: ""
-*ko.PageSize Legal/Legal - 8.5x14in: ""
-*ko.PageSize A4/A4 - 210x297mm: ""
*ko.Translation Resolution/Resolution: ""
*ko.Resolution 180dpi/180dpi: ""
*ko.Resolution 360dpi/360dpi: ""
@@ -257,9 +221,6 @@
*nl.PageSize Legal/Legal - 8.5x14in: ""
*nl.PageSize A4/A4 - 210x297mm: ""
*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
*nl.Translation Resolution/Resolution: ""
*nl.Resolution 180dpi/180dpi: ""
*nl.Resolution 360dpi/360dpi: ""
@@ -276,9 +237,6 @@
*no.PageSize Legal/Legal - 8.5x14in: ""
*no.PageSize A4/A4 - 210x297mm: ""
*no.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*no.PageSize Letter/Letter - 8.5x11in: ""
-*no.PageSize Legal/Legal - 8.5x14in: ""
-*no.PageSize A4/A4 - 210x297mm: ""
*no.Translation Resolution/Resolution: ""
*no.Resolution 180dpi/180dpi: ""
*no.Resolution 360dpi/360dpi: ""
@@ -295,9 +253,6 @@
*pt.PageSize Legal/Legal - 8.5x14in: ""
*pt.PageSize A4/A4 - 210x297mm: ""
*pt.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt.PageSize Letter/Letter - 8.5x11in: ""
-*pt.PageSize Legal/Legal - 8.5x14in: ""
-*pt.PageSize A4/A4 - 210x297mm: ""
*pt.Translation Resolution/Resolution: ""
*pt.Resolution 180dpi/180dpi: ""
*pt.Resolution 360dpi/360dpi: ""
@@ -314,9 +269,6 @@
*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
*pt_BR.PageSize A4/A4 - 210x297mm: ""
*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
*pt_BR.Translation Resolution/Resolution: ""
*pt_BR.Resolution 180dpi/180dpi: ""
*pt_BR.Resolution 360dpi/360dpi: ""
@@ -333,9 +285,6 @@
*sv.PageSize Legal/Legal - 8.5x14in: ""
*sv.PageSize A4/A4 - 210x297mm: ""
*sv.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*sv.PageSize Letter/Letter - 8.5x11in: ""
-*sv.PageSize Legal/Legal - 8.5x14in: ""
-*sv.PageSize A4/A4 - 210x297mm: ""
*sv.Translation Resolution/Resolution: ""
*sv.Resolution 180dpi/180dpi: ""
*sv.Resolution 360dpi/360dpi: ""
@@ -352,9 +301,6 @@
*zh.PageSize Legal/Legal - 8.5x14in: ""
*zh.PageSize A4/A4 - 210x297mm: ""
*zh.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh.PageSize Letter/Letter - 8.5x11in: ""
-*zh.PageSize Legal/Legal - 8.5x14in: ""
-*zh.PageSize A4/A4 - 210x297mm: ""
*zh.Translation Resolution/Resolution: ""
*zh.Resolution 180dpi/180dpi: ""
*zh.Resolution 360dpi/360dpi: ""
@@ -371,9 +317,6 @@
*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
*zh_TW.PageSize A4/A4 - 210x297mm: ""
*zh_TW.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh_TW.PageSize Letter/Letter - 8.5x11in: ""
-*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
-*zh_TW.PageSize A4/A4 - 210x297mm: ""
*zh_TW.Translation Resolution/Resolution: ""
*zh_TW.Resolution 180dpi/180dpi: ""
*zh_TW.Resolution 360dpi/360dpi: ""
--- cups-1.3.9/ppd/stcolor2.ppd.orig 2007-11-27 01:09:24.000000000 +0100
+++ cups-1.3.9/ppd/stcolor2.ppd 2008-11-04 13:38:11.000000000 +0100
@@ -42,9 +42,6 @@
*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*PageSize FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageSize Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*CloseUI: *PageSize
*OpenUI *PageRegion/Media Size: PickOne
*OrderDependency: 10 AnySetup *PageRegion
@@ -53,26 +50,17 @@
*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*PageRegion FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
*CloseUI: *PageRegion
*DefaultImageableArea: Letter
*ImageableArea Letter/Letter - 8.5x11in: "18.00 18.00 594.00 774.00"
*ImageableArea Legal/Legal - 8.5x14in: "18.00 18.00 594.00 990.00"
*ImageableArea A4/A4 - 210x297mm: "18.00 18.00 577.00 824.00"
*ImageableArea FanFoldUS/Fanfold - 14.875x11in: "18.00 18.00 1053.00 774.00"
-*ImageableArea Letter/Letter - 8.5x11in: "8.60 39.60 603.40 766.49"
-*ImageableArea Legal/Legal - 8.5x14in: "8.60 39.60 603.40 982.49"
-*ImageableArea A4/A4 - 210x297mm: "8.60 39.60 586.40 816.49"
*DefaultPaperDimension: Letter
*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
*PaperDimension FanFoldUS/Fanfold - 14.875x11in: "1071.00 792.00"
-*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
-*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
-*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
*MaxMediaWidth: "1080.00"
*MaxMediaHeight: "86400.00"
*HWMargins: 8.60 39.60 8.60 25.51
@@ -105,9 +93,6 @@
*da.PageSize Legal/Legal - 8.5x14in: ""
*da.PageSize A4/A4 - 210x297mm: ""
*da.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*da.PageSize Letter/Letter - 8.5x11in: ""
-*da.PageSize Legal/Legal - 8.5x14in: ""
-*da.PageSize A4/A4 - 210x297mm: ""
*da.Translation Resolution/Resolution: ""
*da.Resolution 180dpi/180dpi: ""
*da.Resolution 360dpi/360dpi: ""
@@ -124,9 +109,6 @@
*de.PageSize Legal/Legal - 8.5x14in: ""
*de.PageSize A4/A4 - 210x297mm: ""
*de.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*de.PageSize Letter/Letter - 8.5x11in: ""
-*de.PageSize Legal/Legal - 8.5x14in: ""
-*de.PageSize A4/A4 - 210x297mm: ""
*de.Translation Resolution/Resolution: ""
*de.Resolution 180dpi/180dpi: ""
*de.Resolution 360dpi/360dpi: ""
@@ -143,9 +125,6 @@
*es.PageSize Legal/Legal - 8.5x14in: ""
*es.PageSize A4/A4 - 210x297mm: ""
*es.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*es.PageSize Letter/Letter - 8.5x11in: ""
-*es.PageSize Legal/Legal - 8.5x14in: ""
-*es.PageSize A4/A4 - 210x297mm: ""
*es.Translation Resolution/Resolution: ""
*es.Resolution 180dpi/180dpi: ""
*es.Resolution 360dpi/360dpi: ""
@@ -162,9 +141,6 @@
*fi.PageSize Legal/Legal - 8.5x14in: ""
*fi.PageSize A4/A4 - 210x297mm: ""
*fi.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fi.PageSize Letter/Letter - 8.5x11in: ""
-*fi.PageSize Legal/Legal - 8.5x14in: ""
-*fi.PageSize A4/A4 - 210x297mm: ""
*fi.Translation Resolution/Resolution: ""
*fi.Resolution 180dpi/180dpi: ""
*fi.Resolution 360dpi/360dpi: ""
@@ -181,9 +157,6 @@
*fr.PageSize Legal/Legal - 8.5x14in: ""
*fr.PageSize A4/A4 - 210x297mm: ""
*fr.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fr.PageSize Letter/Letter - 8.5x11in: ""
-*fr.PageSize Legal/Legal - 8.5x14in: ""
-*fr.PageSize A4/A4 - 210x297mm: ""
*fr.Translation Resolution/Resolution: ""
*fr.Resolution 180dpi/180dpi: ""
*fr.Resolution 360dpi/360dpi: ""
@@ -200,9 +173,6 @@
*it.PageSize Legal/Legal - 8.5x14in: ""
*it.PageSize A4/A4 - 210x297mm: ""
*it.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*it.PageSize Letter/Letter - 8.5x11in: ""
-*it.PageSize Legal/Legal - 8.5x14in: ""
-*it.PageSize A4/A4 - 210x297mm: ""
*it.Translation Resolution/Resolution: ""
*it.Resolution 180dpi/180dpi: ""
*it.Resolution 360dpi/360dpi: ""
@@ -219,9 +189,6 @@
*ja.PageSize Legal/Legal - 8.5x14in: ""
*ja.PageSize A4/A4 - 210x297mm: ""
*ja.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ja.PageSize Letter/Letter - 8.5x11in: ""
-*ja.PageSize Legal/Legal - 8.5x14in: ""
-*ja.PageSize A4/A4 - 210x297mm: ""
*ja.Translation Resolution/Resolution: ""
*ja.Resolution 180dpi/180dpi: ""
*ja.Resolution 360dpi/360dpi: ""
@@ -238,9 +205,6 @@
*ko.PageSize Legal/Legal - 8.5x14in: ""
*ko.PageSize A4/A4 - 210x297mm: ""
*ko.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ko.PageSize Letter/Letter - 8.5x11in: ""
-*ko.PageSize Legal/Legal - 8.5x14in: ""
-*ko.PageSize A4/A4 - 210x297mm: ""
*ko.Translation Resolution/Resolution: ""
*ko.Resolution 180dpi/180dpi: ""
*ko.Resolution 360dpi/360dpi: ""
@@ -257,9 +221,6 @@
*nl.PageSize Legal/Legal - 8.5x14in: ""
*nl.PageSize A4/A4 - 210x297mm: ""
*nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
*nl.Translation Resolution/Resolution: ""
*nl.Resolution 180dpi/180dpi: ""
*nl.Resolution 360dpi/360dpi: ""
@@ -276,9 +237,6 @@
*no.PageSize Legal/Legal - 8.5x14in: ""
*no.PageSize A4/A4 - 210x297mm: ""
*no.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*no.PageSize Letter/Letter - 8.5x11in: ""
-*no.PageSize Legal/Legal - 8.5x14in: ""
-*no.PageSize A4/A4 - 210x297mm: ""
*no.Translation Resolution/Resolution: ""
*no.Resolution 180dpi/180dpi: ""
*no.Resolution 360dpi/360dpi: ""
@@ -295,9 +253,6 @@
*pt.PageSize Legal/Legal - 8.5x14in: ""
*pt.PageSize A4/A4 - 210x297mm: ""
*pt.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt.PageSize Letter/Letter - 8.5x11in: ""
-*pt.PageSize Legal/Legal - 8.5x14in: ""
-*pt.PageSize A4/A4 - 210x297mm: ""
*pt.Translation Resolution/Resolution: ""
*pt.Resolution 180dpi/180dpi: ""
*pt.Resolution 360dpi/360dpi: ""
@@ -314,9 +269,6 @@
*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
*pt_BR.PageSize A4/A4 - 210x297mm: ""
*pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
*pt_BR.Translation Resolution/Resolution: ""
*pt_BR.Resolution 180dpi/180dpi: ""
*pt_BR.Resolution 360dpi/360dpi: ""
@@ -333,9 +285,6 @@
*sv.PageSize Legal/Legal - 8.5x14in: ""
*sv.PageSize A4/A4 - 210x297mm: ""
*sv.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*sv.PageSize Letter/Letter - 8.5x11in: ""
-*sv.PageSize Legal/Legal - 8.5x14in: ""
-*sv.PageSize A4/A4 - 210x297mm: ""
*sv.Translation Resolution/Resolution: ""
*sv.Resolution 180dpi/180dpi: ""
*sv.Resolution 360dpi/360dpi: ""
@@ -352,9 +301,6 @@
*zh.PageSize Legal/Legal - 8.5x14in: ""
*zh.PageSize A4/A4 - 210x297mm: ""
*zh.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh.PageSize Letter/Letter - 8.5x11in: ""
-*zh.PageSize Legal/Legal - 8.5x14in: ""
-*zh.PageSize A4/A4 - 210x297mm: ""
*zh.Translation Resolution/Resolution: ""
*zh.Resolution 180dpi/180dpi: ""
*zh.Resolution 360dpi/360dpi: ""
@@ -371,9 +317,6 @@
*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
*zh_TW.PageSize A4/A4 - 210x297mm: ""
*zh_TW.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh_TW.PageSize Letter/Letter - 8.5x11in: ""
-*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
-*zh_TW.PageSize A4/A4 - 210x297mm: ""
*zh_TW.Translation Resolution/Resolution: ""
*zh_TW.Resolution 180dpi/180dpi: ""
*zh_TW.Resolution 360dpi/360dpi: ""

20
cups-1.3.9-filter_png_overflow2.patch
View File

@ -1,20 +0,0 @@
--- cups-1.3.9/filter/image-png.c.orig 2008-07-12 00:48:49.000000000 +0200
+++ cups-1.3.9/filter/image-png.c 2008-11-25 16:38:13.000000000 +0100
@@ -178,7 +178,7 @@ _cupsImageReadPNG(
{
bufsize = img->xsize * img->ysize;
- if ((bufsize / img->ysize) != img->xsize)
+ if ((bufsize / img->xsize) != img->ysize)
{
fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
(unsigned)width, (unsigned)height);
@@ -190,7 +190,7 @@ _cupsImageReadPNG(
{
bufsize = img->xsize * img->ysize * 3;
- if ((bufsize / (img->ysize * 3)) != img->xsize)
+ if ((bufsize / (img->xsize * 3)) != img->ysize)
{
fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
(unsigned)width, (unsigned)height);

54
cups-1.3.9-hpgltops2.patch
View File

@ -1,54 +0,0 @@
--- cups-1.3.9/filter/hpgl-attr.c.orig 2008-10-09 22:12:03.000000000 +0200
+++ cups-1.3.9/filter/hpgl-attr.c 2008-11-25 16:40:42.000000000 +0100
@@ -214,7 +214,7 @@ NP_number_pens(int num_params, /* I
"DEBUG: HP-GL/2 \'NP\' command with invalid number of "
"parameters (%d)!\n", num_params);
- for (i = 0; i <= PenCount; i ++)
+ for (i = 0; i < PenCount; i ++)
Pens[i].width = PenWidth;
PC_pen_color(0, NULL);
@@ -232,14 +232,14 @@ PC_pen_color(int num_params, /* I -
int i; /* Looping var */
static float standard_colors[8][3] = /* Standard colors for first 8 pens */
{
- { 1.0, 1.0, 1.0 }, /* White */
{ 0.0, 0.0, 0.0 }, /* Black */
{ 1.0, 0.0, 0.0 }, /* Red */
{ 0.0, 1.0, 0.0 }, /* Green */
{ 1.0, 1.0, 0.0 }, /* Yellow */
{ 0.0, 0.0, 1.0 }, /* Blue */
{ 1.0, 0.0, 1.0 }, /* Magenta */
- { 0.0, 1.0, 1.0 } /* Cyan */
+ { 0.0, 1.0, 1.0 }, /* Cyan */
+ { 1.0, 1.0, 1.0 } /* White */
};
--- cups-1.3.9/filter/hpgl-vector.c.orig 2008-07-12 00:48:49.000000000 +0200
+++ cups-1.3.9/filter/hpgl-vector.c 2008-11-25 16:40:42.000000000 +0100
@@ -393,13 +393,20 @@ PE_polyline_encoded(int num_params,
break;
case ':' : /* Select pen */
s ++;
- PenNumber = (int)decode_number(&s, base_bits, 1.0);
+ temp = (int)decode_number(&s, base_bits, 1.0) - 1;
+ if (temp < 0 || temp >= PenCount)
+ {
+ fprintf(stderr, "DEBUG: Bad pen number %d in PE\n", temp + 1);
+ return;
+ }
+
+ PenNumber = temp;
#ifdef DEBUG
- fprintf(stderr, "DEBUG: set pen #%d\n", PenNumber);
+ fprintf(stderr, "DEBUG: set pen #%d\n", PenNumber + 1);
#endif /* DEBUG */
- Outputf("%% PE: set pen #%d\n", PenNumber);
+ Outputf("%% PE: set pen #%d\n", PenNumber + 1);
if (PageDirty)
printf("%.3f %.3f %.3f %.2f SP\n", Pens[PenNumber].rgb[0],

166
cups-1.3.9-max_subscription.patch
View File

@ -1,166 +0,0 @@
--- cups-1.3.9/test/run-stp-tests.sh.orig 2008-11-20 15:02:22.000000000 +0100
+++ cups-1.3.9/test/run-stp-tests.sh 2008-11-20 15:02:49.000000000 +0100
@@ -307,6 +307,7 @@ FontPath /tmp/cups-$user/share/fonts
DocumentRoot $root/doc
RequestRoot /tmp/cups-$user/spool
TempDir /tmp/cups-$user/spool/temp
+MaxSubscriptions 3
MaxLogSize 0
AccessLog /tmp/cups-$user/log/access_log
ErrorLog /tmp/cups-$user/log/error_log
--- cups-1.3.9/test/4.4-subscription-ops.test.orig 2007-07-09 22:34:48.000000000 +0200
+++ cups-1.3.9/test/4.4-subscription-ops.test 2008-11-20 15:02:49.000000000 +0100
@@ -116,6 +116,32 @@
EXPECT notify-events
DISPLAY notify-events
}
+{
+ # The name of the test...
+ NAME "Check MaxSubscriptions limits"
+
+ # The operation to use
+ OPERATION Create-Printer-Subscription
+ RESOURCE /
+
+ # The attributes to send
+ GROUP operation
+ ATTR charset attributes-charset utf-8
+ ATTR language attributes-natural-language en
+ ATTR uri printer-uri $method://$hostname:$port/printers/Test1
+
+ GROUP subscription
+ ATTR uri notify-recipient-uri testnotify://
+ ATTR keyword notify-events printer-state-changed
+ ATTR integer notify-lease-duration 5
+
+ # What statuses are OK?
+ STATUS client-error-too-many-subscriptions
+
+ # What attributes do we expect?
+ EXPECT attributes-charset
+ EXPECT attributes-natural-language
+}
#
# End of "$Id: 4.4-subscription-ops.test 6635 2007-07-09 20:34:48Z mike $"
--- cups-1.3.9/scheduler/subscriptions.c.orig 2008-01-23 23:23:42.000000000 +0100
+++ cups-1.3.9/scheduler/subscriptions.c 2008-11-20 15:02:49.000000000 +0100
@@ -341,8 +341,54 @@ cupsdAddSubscription(
* Limit the number of subscriptions...
*/
- if (cupsArrayCount(Subscriptions) >= MaxSubscriptions)
+ if (MaxSubscriptions > 0 && cupsArrayCount(Subscriptions) >= MaxSubscriptions)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "cupsdAddSubscription: Reached MaxSubscriptions %d",
+ MaxSubscriptions);
return (NULL);
+ }
+
+ if (MaxSubscriptionsPerJob > 0 && job)
+ {
+ int count; /* Number of job subscriptions */
+
+ for (temp = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions),
+ count = 0;
+ temp;
+ temp = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
+ if (temp->job == job)
+ count ++;
+
+ if (count >= MaxSubscriptionsPerJob)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "cupsdAddSubscription: Reached MaxSubscriptionsPerJob %d "
+ "for job #%d", MaxSubscriptionsPerJob, job->id);
+ return (NULL);
+ }
+ }
+
+ if (MaxSubscriptionsPerPrinter > 0 && dest)
+ {
+ int count; /* Number of printer subscriptions */
+
+ for (temp = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions),
+ count = 0;
+ temp;
+ temp = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
+ if (temp->dest == dest)
+ count ++;
+
+ if (count >= MaxSubscriptionsPerPrinter)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "cupsdAddSubscription: Reached "
+ "MaxSubscriptionsPerPrinter %d for %s",
+ MaxSubscriptionsPerPrinter, dest->name);
+ return (NULL);
+ }
+ }
/*
* Allocate memory for this subscription...
@@ -758,7 +804,6 @@ cupsdLoadAllSubscriptions(void)
cupsdLogMessage(CUPSD_LOG_ERROR,
"Syntax error on line %d of subscriptions.conf.",
linenum);
- break;
}
else if (!strcasecmp(line, "Events"))
{
--- cups-1.3.9/scheduler/ipp.c.orig 2008-09-17 00:39:44.000000000 +0200
+++ cups-1.3.9/scheduler/ipp.c 2008-11-20 15:02:49.000000000 +0100
@@ -2119,24 +2119,25 @@ add_job_subscriptions(
if (mask == CUPSD_EVENT_NONE)
mask = CUPSD_EVENT_JOB_COMPLETED;
- sub = cupsdAddSubscription(mask, cupsdFindDest(job->dest), job, recipient,
- 0);
+ if ((sub = cupsdAddSubscription(mask, cupsdFindDest(job->dest), job,
+ recipient, 0)) != NULL)
+ {
+ sub->interval = interval;
- sub->interval = interval;
+ cupsdSetString(&sub->owner, job->username);
- cupsdSetString(&sub->owner, job->username);
+ if (user_data)
+ {
+ sub->user_data_len = user_data->values[0].unknown.length;
+ memcpy(sub->user_data, user_data->values[0].unknown.data,
+ sub->user_data_len);
+ }
- if (user_data)
- {
- sub->user_data_len = user_data->values[0].unknown.length;
- memcpy(sub->user_data, user_data->values[0].unknown.data,
- sub->user_data_len);
+ ippAddSeparator(con->response);
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-subscription-id", sub->id);
}
- ippAddSeparator(con->response);
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-subscription-id", sub->id);
-
if (attr)
attr = attr->next;
}
@@ -5590,7 +5591,12 @@ create_subscription(
else
job = NULL;
- sub = cupsdAddSubscription(mask, printer, job, recipient, 0);
+ if ((sub = cupsdAddSubscription(mask, printer, job, recipient, 0)) == NULL)
+ {
+ send_ipp_status(con, IPP_TOO_MANY_SUBSCRIPTIONS,
+ _("There are too many subscriptions."));
+ return;
+ }
if (job)
cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription %d for job %d",

3
cups-1.3.9-source.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38856ab4b8bcf51be2bed1f554cd8089c1f2448a6979c055762b49eda82a6b6b
size 3993875

172
cups-1.4svn-pdftops_as_filter.patch
View File

@ -1,172 +0,0 @@
--- ./test/run-stp-tests.sh.orig 2008-04-01 23:30:44.000000000 +0200
+++ ./test/run-stp-tests.sh 2008-04-09 18:05:52.000000000 +0200
@@ -273,7 +273,7 @@
else
ln -s $root/filter/imagetops /tmp/cups-$user/bin/filter
ln -s $root/filter/imagetoraster /tmp/cups-$user/bin/filter
- ln -s $root/pdftops/pdftops /tmp/cups-$user/bin/filter
+ ln -s $root/filter/pdftops /tmp/cups-$user/bin/filter
fi
#
--- ./packaging/cups.list.in.orig 2008-02-15 22:32:52.000000000 +0100
+++ ./packaging/cups.list.in 2008-04-09 18:06:28.000000000 +0200
@@ -265,7 +265,7 @@
f 0755 root sys $SERVERBIN/filter/imagetoraster filter/imagetoraster
%endif
%if PDFTOPS
-f 0755 root sys $SERVERBIN/filter/pdftops pdftops/pdftops
+f 0755 root sys $SERVERBIN/filter/pdftops filter/pdftops
%endif
f 0755 root sys $SERVERBIN/filter/pstops filter/pstops
f 0755 root sys $SERVERBIN/filter/rastertolabel filter/rastertolabel
--- ./filter/Makefile.orig 2007-07-20 01:27:49.000000000 +0200
+++ ./filter/Makefile 2008-04-09 18:05:26.000000000 +0200
@@ -19,7 +19,7 @@
FILTERS = gziptoany hpgltops texttops pstops $(IMGFILTERS) \
- rastertolabel rastertoepson rastertohp
+ rastertolabel rastertoepson rastertohp pdftops
TARGETS = $(FILTERS) \
$(LIBCUPSIMAGE) \
libcupsimage.a \
@@ -41,7 +41,7 @@
OBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
gziptoany.o imagetops.o imagetoraster.o common.o pstops.o \
rasterbench.o rastertoepson.o rastertohp.o rastertolabel.o \
- testimage.o testraster.o textcommon.o texttops.o
+ testimage.o testraster.o textcommon.o texttops.o pdftops.o
#
@@ -322,6 +322,14 @@
echo Linking $@...
$(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS) -lm
+#
+# pdftops
+#
+
+pdftops: pdftops.o common.o ../cups/$(LIBCUPS)
+ echo Linking $@...
+ $(CC) $(LDFLAGS) -o $@ pdftops.o common.o $(LIBS)
+
#
# rastertolabel
--- cups-1.3.7/config.h.in.orig 2008-01-07 19:26:57.000000000 +0100
+++ cups-1.3.7/config.h.in 2008-04-09 18:22:50.000000000 +0200
@@ -420,6 +420,12 @@
#undef HAVE_PYTHON
#define CUPS_PYTHON "/usr/bin/python"
+/*
+ * Location of the poppler/Xpdf pdftops program...
+ */
+
+#define HAVE_PDFTOPS "/usr/bin/pdftops"
+
/*
* Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
--- cups-1.3.7/Makefile.orig 2008-02-16 00:26:51.000000000 +0100
+++ cups-1.3.7/Makefile 2008-04-09 19:08:39.000000000 +0200
@@ -20,7 +20,7 @@
#
DIRS = cups backend berkeley cgi-bin filter locale man monitor \
- notifier $(PDFTOPS) scheduler systemv test \
+ notifier scheduler systemv test \
$(PHPDIR) \
conf data doc $(FONTS) ppd templates
--- cups-1.3.7/filter/pdftops.c.orig 2008-04-22 20:18:35.000000000 +0200
+++ cups-1.3.7/filter/pdftops.c 2008-04-22 20:22:09.000000000 +0200
@@ -126,7 +126,7 @@ main(int argc, /* I - Number of comm
if ((fd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
{
- _cupsLangPrintError(_("ERROR: Unable to copy PDF file"));
+ perror(_("ERROR: Unable to copy PDF file"));
return (1);
}
@@ -299,10 +299,10 @@ main(int argc, /* I - Number of comm
#ifdef HAVE_PDFTOPS
execv(HAVE_PDFTOPS, pdfargv);
- _cupsLangPrintError(_("ERROR: Unable to execute pdftops program"));
+ perror("ERROR: Unable to execute pdftops program");
#else
execv(CUPS_GHOSTSCRIPT, pdfargv);
- _cupsLangPrintError(_("ERROR: Unable to execute gs program"));
+ perror("ERROR: Unable to execute gs program");
#endif /* HAVE_PDFTOPS */
exit(1);
@@ -314,9 +314,9 @@ main(int argc, /* I - Number of comm
*/
#ifdef HAVE_PDFTOPS
- _cupsLangPrintError(_("ERROR: Unable to execute pdftops program"));
+ perror("ERROR: Unable to execute pdftops program");
#else
- _cupsLangPrintError(_("ERROR: Unable to execute gs program"));
+ perror("ERROR: Unable to execute gs program");
#endif /* HAVE_PDFTOPS */
pdfstatus = 1;
--- cups-1.3.7/filter/pdftops.c.orig 2008-04-22 20:24:15.000000000 +0200
+++ cups-1.3.7/filter/pdftops.c 2008-04-22 20:26:20.000000000 +0200
@@ -301,7 +301,7 @@ main(int argc, /* I - Number of comm
execv(HAVE_PDFTOPS, pdfargv);
perror("ERROR: Unable to execute pdftops program");
#else
- execv(CUPS_GHOSTSCRIPT, pdfargv);
+ execv("/bin/sgs", pdfargv);
perror("ERROR: Unable to execute gs program");
#endif /* HAVE_PDFTOPS */
--- cups-1.3.7/config-scripts/cups-pdf.m4.orig 2007-07-11 23:46:42.000000000 +0200
+++ cups-1.3.7/config-scripts/cups-pdf.m4 2008-05-07 13:34:07.000000000 +0200
@@ -13,18 +13,31 @@
dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
-AC_ARG_ENABLE(pdftops, [ --enable-pdftops build pdftops filter, default=auto ])
+AC_ARG_WITH(pdftops, [ --with-pdftops build pdftops filter, default=auto ],[],with_pdftops=auto)
PDFTOPS=""
-if test "x$enable_pdftops" != xno; then
- AC_MSG_CHECKING(whether to build pdftops filter)
- if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
- PDFTOPS="pdftops"
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
+if test "x$with_pdftops" != xno; then
+ if test "x$with_pdftops" != xyes -a "x$with_pdftops" != xauto ; then
+ HAVE_PDFTOPS=$with_pdftops
+ AC_DEFINE_UNQUOTED(HAVE_PDFTOPS, "$HAVE_PDFTOPS")
+ else
+ AC_PATH_PROG(HAVE_PDFTOPS, pdftops)
+ AC_DEFINE_UNQUOTED(HAVE_PDFTOPS, "$HAVE_PDFTOPS")
+
+ if test "x$HAVE_PDFTOPS" != x; then
+ AC_MSG_CHECKING(whether to build pdftops filter)
+ if test "x$with_pdftops" = xyes -o $uname != Darwin; then
+ PDFTOPS="pdftops"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ elif test x$with_pdftops = xyes; then
+ AC_MSG_ERROR(Unable to find pdftops program!)
+ exit 1
fi
+ fi
fi
AC_SUBST(PDFTOPS)

34
cups-1.4svn-pdftops_dont_fail_on_cancel.patch
View File

@ -1,34 +0,0 @@
Index: pdftops.c
===================================================================
--- cups-1.4svn/filter/pdftops.c (revision 7480)
+++ cups-1.4svn/filter/pdftops.c (revision 7481)
@@ -327,23 +327,21 @@
* Parent comes here...
*/
- while ((pdfwaitpid = wait(&pdfstatus)) < 0 && errno == EINTR)
+ while ((pdfwaitpid = wait(&pdfstatus)) != pdfpid && errno == EINTR)
{
/*
* Wait until we get a valid process ID or the job is canceled...
*/
if (job_canceled)
- break;
+ {
+ kill(pdfpid, SIGTERM);
+ job_canceled = 0;
+ }
}
- if (pdfwaitpid != pdfpid)
+ if (pdfstatus)
{
- kill(pdfpid, SIGTERM);
- pdfstatus = 1;
- }
- else if (pdfstatus)
- {
if (WIFEXITED(pdfstatus))
{
pdfstatus = WEXITSTATUS(pdfstatus);

74
cups.changes
View File

@ -1,7 +1,67 @@
-------------------------------------------------------------------
Fri Jun 26 12:50:22 CEST 2009 - jsmeix@suse.de
- cups-1.3.10-fix-DNS-rebinding-protection.patch fixes
a regression of the CUPS 1.3.10 DNS rebinding protection which
lets e.g. "lpoptions -h localhost -p <queue> -l" fail with
"lpoptions: Unable to get PPD file for <queue>: Bad Request"
and in /var/log/cups/error_log there is the warning
W ... Request from "localhost" using invalid Host: field "::1"
but "::1" is the IPv6 loopback IP address for "localhost"
(Novell/Suse Bugzilla bnc#489624 comment#19 and bnc#516511).
-------------------------------------------------------------------
Wed Jun 24 14:02:29 CEST 2009 - jsmeix@suse.de
- Upgraded to CUPS 1.3.10:
* Use a wrapper program filter/pdftops.c which only calls
/usr/bin/pdftops (via configure --with-pdftops=/usr/bin/pdftops)
instead of our fork of the Xpdf source code which was in
the pdftops directory (CUPS STR #3129). Because of this
cups-1.4svn-pdftops_as_filter.patch and
cups-1.4svn-pdftops_dont_fail_on_cancel.patch are obsolete
since CUPS 1.3.10 (the latter was fixed via CUPS STR #2808).
* The scheduler now protects against DNS rebinding attacks
(CUPS STR #3118 and Novell/Suse Bugzilla bnc#489624).
* cups-1.3.9-cupstestppd.patch is obsolete since CUPS 1.3.10
because it is fixed in the source (CUPS STR #2979).
* cups-1.3.9-max_subscription.patch is obsolete
since CUPS 1.3.10 because it is fixed in the source
(no CUPS STR but mentioned in CHANGES.txt "The scheduler
would crash if you exceeded the MaxSubscriptions limit").
* cups-1.3.9-filter_png_overflow2.patch is obsolete
since CUPS 1.3.10 because it is fixed in the source
(CUPS STR #2974 and Novell/Suse Bugzilla bnc#448631).
* cups-1.3.9-hpgltops2.patch is obsolete since CUPS 1.3.10
because it is fixed in the source (CUPS STR #2966 which is the
successor of CUPS STR #2911 and Novell/Suse Bugzilla bnc#430543).
* cups-1.3.9-cupsImageReadTiff.patch is obsolete
since CUPS 1.3.10 because it is fixed in the source
(CUPS STR #3031 and Novell/Suse Bugzilla bnc#485895).
* For a complete list see the CHANGES.txt file.
- cups-1.1.21rc2-preauth_security.patch and
cups-1.1.21rc2-usermode.patch and
cups-1.1.21-umlaut_printer.patch and
cups-1.1.23-testpage.patch are finally removed
since CUPS 1.3.10 because they were made for CUPS 1.1 and
were no longer applied since CUPS 1.2 in Suse Linux 10.3.
In particular cups-1.1.21-umlaut_printer.patch can no longer
apply since CUPS 1.2 because RunAsUser in cupsd.conf is
no longer supported since CUPS 1.2, for more info see e.g. the
"RunAsUser removed; reassurance wanted" mails on cups@easysw.com.
Furthermore we neither got any Suse Linux/openSUSE user request
nor any SLE11 beta-tester/customer request for them.
-------------------------------------------------------------------
Mon Jun 8 15:09:10 CEST 2009 - crrodriguez@suse.de
remove static libraries, see also bnc#509945
- Replaced "--enable-static" by "--disable-static" in configure
so that the static libraries /usr/lib[64]/libcups.a and
/usr/lib[64]/libcupsimage.a are no longer built and included
in the cups-devel package to enforce detection of other software
which might be built with static CUPS libraries so that those
other software could be fixed to use the dynamic libraries
(see also Novell/Suse Bugzilla bnc#509945).
-------------------------------------------------------------------
Wed Jun 3 14:20:36 CEST 2009 - jsmeix@suse.de
@ -22,7 +82,8 @@ Thu Mar 26 12:59:36 CET 2009 - jsmeix@suse.de
-------------------------------------------------------------------
Wed Jan 21 14:17:25 CET 2009 - kssingvo@suse.de
- added directory %{libdir}/cups/driver to %files of cups (bnc#465794)
- added directory %{libdir}/cups/driver to %files of cups
(bnc#465794)
-------------------------------------------------------------------
Wed Jan 14 10:32:13 CET 2009 - olh@suse.de
@ -32,8 +93,8 @@ Wed Jan 14 10:32:13 CET 2009 - olh@suse.de
-------------------------------------------------------------------
Wed Dec 10 12:34:56 CET 2008 - olh@suse.de
- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade
(bnc#437293)
- use Obsoletes: -XXbit only for ppc64 to help solver during
distupgrade (bnc#437293)
-------------------------------------------------------------------
Fri Nov 28 16:09:12 CET 2008 - kssingvo@suse.de
@ -77,7 +138,6 @@ Mon Oct 13 11:04:21 CEST 2008 - kssingvo@suse.de
- update to 1.3.9, which is mainly a bugfix version. For a complete
list see included CHANGES.txt file, but important changes were
already included via patches before.
Deleted patches:
cups-1.3.8-custom_ppd_fix.patch (CUPS STR #2889)
cups-1.3.8-ssl_firefox.patch (CUPS STR #2892)
@ -92,7 +152,6 @@ Mon Oct 13 11:04:21 CEST 2008 - kssingvo@suse.de
cups-1.3.8-hostlookup.patch (CUPS STR #2946)
cups-1.3.8-ipp_stop_after_pause.patch
cups-1.3.8-lose_printers_on_allowed_users.patch
Updated patches:
cups-1.2.5-desktop_file.patch
@ -147,7 +206,8 @@ Wed Jul 23 11:14:05 CEST 2008 - kssingvo@suse.de
Mon Jul 14 17:30:57 CEST 2008 - kssingvo@suse.de
- removed deprecated use of %run_ldconfig
- added avahi-compat-mDNSResponder-devel to BuildRequieres (bnc#398700)
- added avahi-compat-mDNSResponder-devel to BuildRequieres
(bnc#398700)
- fixed typo in Policy "easy"
-------------------------------------------------------------------

1508
cups.spec
View File

File diff suppressed because it is too large Load Diff