From b34c494dcb173b3df608e04bd77c29ff8ef6aff395237013eb3a2926a3bcd59d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 4 Dec 2009 09:21:58 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=177 --- cups-1.1.21-testppd_duplex.patch | 16 +++++----- cups-1.2.0-ppdsdat_generation.patch | 48 +++++++++++++---------------- cups-1.2.11-testppd_filename.patch | 18 +++++------ cups-1.3.3-mime.patch | 16 ++++------ cups-1.3.3-pswrite.patch | 16 ++++------ cups.changes | 5 --- 6 files changed, 48 insertions(+), 71 deletions(-) diff --git a/cups-1.1.21-testppd_duplex.patch b/cups-1.1.21-testppd_duplex.patch index ef7c814..67f7dee 100644 --- a/cups-1.1.21-testppd_duplex.patch +++ b/cups-1.1.21-testppd_duplex.patch @@ -1,16 +1,14 @@ -Index: cups-1.3.11/systemv/cupstestppd.c -=================================================================== ---- cups-1.3.11.orig/systemv/cupstestppd.c -+++ cups-1.3.11/systemv/cupstestppd.c -@@ -931,6 +931,7 @@ main(int argc, /* I - Number of comm - if (size->left == 0.0 && size->bottom == 0.0 && - size->right == 0.0 && size->top == 0.0) +--- cups-1.1.21/systemv/cupstestppd.c.orig 2004-08-23 20:36:50.000000000 +0200 ++++ cups-1.1.21/systemv/cupstestppd.c 2004-09-20 16:19:12.427769515 +0200 +@@ -854,6 +854,7 @@ + strcmp(choice->choice, "DuplexTumble") && + strcmp(choice->choice, "SimplexTumble")) { +#if 0 if (verbose >= 0) { if (!errors && !verbose) -@@ -945,6 +946,10 @@ main(int argc, /* I - Number of comm +@@ -865,6 +866,10 @@ } errors ++; @@ -19,5 +17,5 @@ Index: cups-1.3.11/systemv/cupstestppd.c + option->keyword, choice->choice); +#endif } + } - /* diff --git a/cups-1.2.0-ppdsdat_generation.patch b/cups-1.2.0-ppdsdat_generation.patch index 3d8beb2..5a72223 100644 --- a/cups-1.2.0-ppdsdat_generation.patch +++ b/cups-1.2.0-ppdsdat_generation.patch @@ -1,17 +1,15 @@ -Index: cups-1.3.11/scheduler/main.c -=================================================================== ---- cups-1.3.11.orig/scheduler/main.c -+++ cups-1.3.11/scheduler/main.c -@@ -172,6 +172,7 @@ main(int argc, /* I - Number of comm +--- cups-1.2.0/scheduler/main.c.orig 2006-03-18 04:05:12.000000000 +0100 ++++ cups-1.2.0/scheduler/main.c 2006-03-29 19:02:22.000000000 +0200 +@@ -148,6 +148,7 @@ */ fg = 0; + ppds_generation = 0; - #ifdef HAVE_LAUNCHD - if (getenv("CUPSD_LAUNCHD")) -@@ -272,6 +273,10 @@ main(int argc, /* I - Number of comm - fg = 1; + for (i = 1; i < argc; i ++) + if (argv[i][0] == '-') +@@ -219,6 +220,10 @@ + #endif /* HAVE_LAUNCHD */ break; + case 'P' : /* generate ppds only */ @@ -21,7 +19,7 @@ Index: cups-1.3.11/scheduler/main.c default : /* Unknown option */ _cupsLangPrintf(stderr, _("cupsd: Unknown option \"%c\" - " "aborting!\n"), *opt); -@@ -340,17 +345,18 @@ main(int argc, /* I - Number of comm +@@ -287,17 +292,18 @@ perror("cupsd"); return (1); } @@ -41,9 +39,9 @@ Index: cups-1.3.11/scheduler/main.c + } else + return (0); } + } - #ifdef __OpenBSD__ -@@ -625,6 +631,9 @@ main(int argc, /* I - Number of comm +@@ -482,6 +488,9 @@ } #endif /* __sgi */ @@ -53,7 +51,7 @@ Index: cups-1.3.11/scheduler/main.c /* * Initialize authentication certificates... */ -@@ -2031,13 +2040,14 @@ static void +@@ -2260,13 +2269,14 @@ usage(int status) /* O - Exit status */ { _cupsLangPuts(status ? stderr : stdout, @@ -70,25 +68,21 @@ Index: cups-1.3.11/scheduler/main.c exit(status); } -Index: cups-1.3.11/scheduler/cupsd.h -=================================================================== ---- cups-1.3.11.orig/scheduler/cupsd.h -+++ cups-1.3.11/scheduler/cupsd.h -@@ -180,6 +180,8 @@ VAR PSQUpdateQuotaProcPtr PSQUpdateQuota - - +--- cups-1.2.0/scheduler/cupsd.h.orig 2006-03-18 04:05:12.000000000 +0100 ++++ cups-1.2.0/scheduler/cupsd.h 2006-03-29 17:30:47.000000000 +0200 +@@ -202,6 +202,8 @@ + char *envp[], int infd, int outfd, + int errfd, int backfd, int root, int *pid); +VAR int ppds_generation;/* Generate ppds.dat and exit() */ + /* - * Prototypes... -Index: cups-1.3.11/scheduler/conf.c -=================================================================== ---- cups-1.3.11.orig/scheduler/conf.c -+++ cups-1.3.11/scheduler/conf.c -@@ -941,6 +941,9 @@ cupsdReadConfiguration(void) - return (0); + * End of "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $". +--- cups-1.2.0/scheduler/conf.c.orig 2006-03-14 12:54:45.000000000 +0100 ++++ cups-1.2.0/scheduler/conf.c 2006-03-29 17:30:47.000000000 +0200 +@@ -716,6 +716,9 @@ + TempDir, strerror(errno)); } + if (ppds_generation > 0) diff --git a/cups-1.2.11-testppd_filename.patch b/cups-1.2.11-testppd_filename.patch index 0914244..a925ad2 100644 --- a/cups-1.2.11-testppd_filename.patch +++ b/cups-1.2.11-testppd_filename.patch @@ -1,8 +1,6 @@ -Index: cups-1.3.11/systemv/cupstestppd.c -=================================================================== ---- cups-1.3.11.orig/systemv/cupstestppd.c -+++ cups-1.3.11/systemv/cupstestppd.c -@@ -129,6 +129,7 @@ main(int argc, /* I - Number of comm +--- cups-1.2.11/systemv/cupstestppd.c.orig 2007-05-10 13:47:54.000000000 +0200 ++++ cups-1.2.11/systemv/cupstestppd.c 2007-05-10 13:53:56.000000000 +0200 +@@ -92,6 +92,7 @@ int i, j, k, m, n; /* Looping vars */ int len; /* Length of option name */ char *opt; /* Option character */ @@ -10,7 +8,7 @@ Index: cups-1.3.11/systemv/cupstestppd.c const char *ptr; /* Pointer into string */ int files; /* Number of files */ int verbose; /* Want verbose output? */ -@@ -375,6 +376,7 @@ main(int argc, /* I - Number of comm +@@ -315,6 +316,7 @@ errors = 0; ppdversion = 43; @@ -18,12 +16,12 @@ Index: cups-1.3.11/systemv/cupstestppd.c if (verbose > 0) _cupsLangPuts(stdout, -@@ -1171,7 +1173,7 @@ main(int argc, /* I - Number of comm - +@@ -1545,7 +1547,7 @@ + if (verbose >= 0) { - check_basics(argv[i]); + check_basics(ppdfilename); - if (warn & WARN_CONSTRAINTS) - errors = check_constraints(ppd, errors, verbose, 1); + /* + * Look for default keywords with no corresponding option... diff --git a/cups-1.3.3-mime.patch b/cups-1.3.3-mime.patch index 10d5869..550ecb7 100644 --- a/cups-1.3.3-mime.patch +++ b/cups-1.3.3-mime.patch @@ -1,8 +1,6 @@ -Index: cups-1.3.11/conf/mime.types -=================================================================== ---- cups-1.3.11.orig/conf/mime.types -+++ cups-1.3.11/conf/mime.types -@@ -75,6 +75,8 @@ application/postscript ai eps ps string +--- cups-1.3.3/conf/mime.types.orig 2007-07-11 23:46:42.000000000 +0200 ++++ cups-1.3.3/conf/mime.types 2007-10-15 18:39:02.000000000 +0200 +@@ -75,6 +75,8 @@ contains(0,4096,"LANGUAGE = POSTSCRIPT") \ (contains(0,4096,<0a>%!) + \ !contains(0,4096,"ENTER LANGUAGE"))) @@ -11,13 +9,11 @@ Index: cups-1.3.11/conf/mime.types application/vnd.hp-HPGL hpgl \ string(0,<1B>E<1B>%0B) \ string(0,<1B>%-1B) string(0,<201B>)\ -Index: cups-1.3.11/conf/mime.convs.in -=================================================================== ---- cups-1.3.11.orig/conf/mime.convs.in -+++ cups-1.3.11/conf/mime.convs.in +--- cups-1.3.3/conf/mime.convs.in.orig 2007-08-02 19:58:59.000000000 +0200 ++++ cups-1.3.3/conf/mime.convs.in 2007-10-15 18:40:15.000000000 +0200 @@ -40,6 +40,8 @@ - application/pdf application/vnd.cups-postscript 66 pdftops + application/pdf application/postscript 33 pdftops application/postscript application/vnd.cups-postscript 66 pstops +#application/x-dvi application/postscript 50 dvitops +application/netscape-ps application/vnd.cups-postscript 33 ogonki diff --git a/cups-1.3.3-pswrite.patch b/cups-1.3.3-pswrite.patch index 53f8c0b..804bb96 100644 --- a/cups-1.3.3-pswrite.patch +++ b/cups-1.3.3-pswrite.patch @@ -1,8 +1,6 @@ -Index: cups-1.3.11/conf/mime.types -=================================================================== ---- cups-1.3.11.orig/conf/mime.types -+++ cups-1.3.11/conf/mime.types -@@ -76,7 +76,10 @@ application/postscript ai eps ps string +--- cups-1.3.3/conf/mime.types.orig 2007-10-15 18:42:58.000000000 +0200 ++++ cups-1.3.3/conf/mime.types 2007-10-15 18:44:56.000000000 +0200 +@@ -76,7 +76,10 @@ (contains(0,4096,<0a>%!) + \ !contains(0,4096,"ENTER LANGUAGE"))) #application/x-dvi dvi string(0,) @@ -14,12 +12,10 @@ Index: cups-1.3.11/conf/mime.types application/vnd.hp-HPGL hpgl \ string(0,<1B>E<1B>%0B) \ string(0,<1B>%-1B) string(0,<201B>)\ -Index: cups-1.3.11/conf/mime.convs.in -=================================================================== ---- cups-1.3.11.orig/conf/mime.convs.in -+++ cups-1.3.11/conf/mime.convs.in +--- cups-1.3.3/conf/mime.convs.in.orig 2007-10-15 18:42:58.000000000 +0200 ++++ cups-1.3.3/conf/mime.convs.in 2007-10-15 18:46:39.000000000 +0200 @@ -41,7 +41,9 @@ - application/pdf application/vnd.cups-postscript 66 pdftops + application/pdf application/postscript 33 pdftops application/postscript application/vnd.cups-postscript 66 pstops #application/x-dvi application/postscript 50 dvitops -application/netscape-ps application/vnd.cups-postscript 33 ogonki diff --git a/cups.changes b/cups.changes index c689ca8..4587e43 100644 --- a/cups.changes +++ b/cups.changes @@ -13,11 +13,6 @@ Wed Nov 11 11:56:12 CET 2009 - jsmeix@suse.de (CVE-2009-2820 and CUPS STR #3367 and Novell/Suse Bugzilla bnc#548317). -------------------------------------------------------------------- -Tue Nov 3 19:09:12 UTC 2009 - coolo@novell.com - -- updated patches to apply with fuzz=0 - ------------------------------------------------------------------- Wed Aug 26 21:43:03 CEST 2009 - meissner@suse.de