diff --git a/cups-1.2.11-source.tar.bz2 b/cups-1.2.11-source.tar.bz2 deleted file mode 100644 index e0e0f1d..0000000 --- a/cups-1.2.11-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c313e34a79af84e92609428d31ab292c04a4db69596ad9b264dd0ea719e2ecb0 -size 3774113 diff --git a/cups-1.2rc3-mime.patch b/cups-1.2.12-mime.patch similarity index 57% rename from cups-1.2rc3-mime.patch rename to cups-1.2.12-mime.patch index 3a0b064..d3a57c0 100644 --- a/cups-1.2rc3-mime.patch +++ b/cups-1.2.12-mime.patch @@ -1,17 +1,17 @@ ---- cups-1.2rc3/conf/mime.types.orig 2006-04-14 21:21:03.000000000 +0200 -+++ cups-1.2rc3/conf/mime.types 2006-04-26 16:31:35.000000000 +0200 -@@ -80,6 +80,8 @@ - contains(0,1024,"LANGUAGE = POSTSCRIPT") \ - (contains(0,1024,<0a>%!) + \ - !contains(0,1024,"ENTER LANGUAGE"))) +--- cups-1.2.12/conf/mime.types.orig 2007-07-07 00:39:54.000000000 +0200 ++++ cups-1.2.12/conf/mime.types 2007-07-30 15:33:38.000000000 +0200 +@@ -84,6 +84,8 @@ + contains(0,4096,"LANGUAGE = POSTSCRIPT") \ + (contains(0,4096,<0a>%!) + \ + !contains(0,4096,"ENTER LANGUAGE"))) +#application/x-dvi dvi string(0,) +application/netscape-ps ps (string(0,%!) + contains(30,200,"Mozilla")) - application/vnd.hp-HPGL hpgl string(0,<1B>&)\ + application/vnd.hp-HPGL hpgl \ string(0,<1B>E<1B>%0B) \ string(0,<1B>%-1B) string(0,<201B>)\ ---- cups-1.2rc3/conf/mime.convs.orig 2006-04-14 21:21:03.000000000 +0200 -+++ cups-1.2rc3/conf/mime.convs 2006-04-26 16:31:04.000000000 +0200 -@@ -45,6 +45,8 @@ +--- cups-1.2.12/conf/mime.convs.orig 2007-03-27 18:11:27.000000000 +0200 ++++ cups-1.2.12/conf/mime.convs 2007-07-30 15:31:46.000000000 +0200 +@@ -49,6 +49,8 @@ application/pdf application/postscript 33 pdftops application/postscript application/vnd.cups-postscript 66 pstops diff --git a/cups-1.2rc3-pswrite.patch b/cups-1.2.12-pswrite.patch similarity index 63% rename from cups-1.2rc3-pswrite.patch rename to cups-1.2.12-pswrite.patch index 851fad3..af4e6bf 100644 --- a/cups-1.2rc3-pswrite.patch +++ b/cups-1.2.12-pswrite.patch @@ -1,6 +1,20 @@ ---- cups-1.2rc3/conf/mime.convs.orig 2006-04-26 17:24:57.000000000 +0200 -+++ cups-1.2rc3/conf/mime.convs 2006-04-26 17:32:16.000000000 +0200 -@@ -46,7 +46,9 @@ +--- cups-1.2.12/conf/mime.types.orig 2007-07-30 15:34:55.000000000 +0200 ++++ cups-1.2.12/conf/mime.types 2007-07-30 15:37:43.000000000 +0200 +@@ -85,7 +85,10 @@ + (contains(0,4096,<0a>%!) + \ + !contains(0,4096,"ENTER LANGUAGE"))) + #application/x-dvi dvi string(0,) +-application/netscape-ps ps (string(0,%!) + contains(30,200,"Mozilla")) ++application/mozilla-ps ps (string(0,%!) + \ ++ contains(30,200,"Creator: Mozilla PostScript")) ++application/netscape-ps ps (string(0,%!) + \ ++ contains(30,200,"Creator: Mozilla (NetScape)")) + application/vnd.hp-HPGL hpgl \ + string(0,<1B>E<1B>%0B) \ + string(0,<1B>%-1B) string(0,<201B>)\ +--- cups-1.2.12/conf/mime.convs.orig 2007-07-30 15:34:55.000000000 +0200 ++++ cups-1.2.12/conf/mime.convs 2007-07-30 15:34:55.000000000 +0200 +@@ -50,7 +50,9 @@ application/pdf application/postscript 33 pdftops application/postscript application/vnd.cups-postscript 66 pstops #application/x-dvi application/postscript 50 dvitops @@ -11,17 +25,3 @@ application/vnd.hp-HPGL application/postscript 66 hpgltops application/x-cshell application/postscript 33 texttops application/x-csource application/postscript 33 texttops ---- cups-1.2rc3/conf/mime.types.orig 2006-04-26 17:24:57.000000000 +0200 -+++ cups-1.2rc3/conf/mime.types 2006-04-26 17:30:33.000000000 +0200 -@@ -81,7 +81,10 @@ - (contains(0,1024,<0a>%!) + \ - !contains(0,1024,"ENTER LANGUAGE"))) - #application/x-dvi dvi string(0,) --application/netscape-ps ps (string(0,%!) + contains(30,200,"Mozilla")) -+application/mozilla-ps ps (string(0,%!) + \ -+ contains(30,200,"Creator: Mozilla PostScript")) -+application/netscape-ps ps (string(0,%!) + \ -+ contains(30,200,"Creator: Mozilla (NetScape)")) - application/vnd.hp-HPGL hpgl string(0,<1B>&)\ - string(0,<1B>E<1B>%0B) \ - string(0,<1B>%-1B) string(0,<201B>)\ diff --git a/cups-1.2.12-source.tar.bz2 b/cups-1.2.12-source.tar.bz2 new file mode 100644 index 0000000..ca77620 --- /dev/null +++ b/cups-1.2.12-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f +size 3788301 diff --git a/cups.changes b/cups.changes index 86e062f..7647148 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon Jul 30 15:41:27 CEST 2007 - kssingvo@suse.de + +- upgrade to cups-1.2.12: + * The PHP cups_print_file() function crashed if the options array + contained non-string option values + * The image/tiff file matching rule incorrectly identified some + text files as TIFF files + * The filter(7) man page incorrectly documented the "PAGE: total + #-pages" message + * PCL text files were mis-identified as HP-GL/2 and caused the + HP-GL/2 filter to hang + * When printing to a queue with user ACLs, the scheduler + incorrectly returned a quota error instead of a "not allowed to + print" error + * cupsaddsmb could get in a loop if no printer drivers were + installed + * cupsRasterReadHeader() did not byte-swap the header properly + when compiled with certain versions of GCC. + * The IPP backend did not send the document-format attribute for + filtered jobs + * Some PPD files could cause a crash in ppdOpen2 + * The web admin interface incorrectly handled the "share + printers" and "show remote printers" settings + * The scheduler's log messages about AuthClass and AuthGroupName + advised using a replacement directive but had the wrong syntax + * Updated the PostScript/PJL and HP-GL/2 MIME rules to look in + the first 4k of the file, not just the first 1k + * Updated the Italian localization +- updated the mime and the psrewrite patch + ------------------------------------------------------------------- Mon Jun 25 10:19:33 CEST 2007 - kssingvo@suse.de diff --git a/cups.spec b/cups.spec index ab44cb3..0cc51a6 100644 --- a/cups.spec +++ b/cups.spec @@ -1,5 +1,5 @@ # -# spec file for package cups (Version 1.2.11) +# spec file for package cups (Version 1.2.12) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,11 +13,11 @@ Name: cups BuildRequires: gcc-c++ libpng-devel libtiff-devel openldap2-devel openslp-devel openssl-devel pam-devel tcpd-devel update-desktop-files URL: http://www.cups.org/ -License: GNU General Public License (GPL), individual distribution permission. +License: GPL v2 or later, individual distribution permission. Group: Hardware/Printing Summary: The Common UNIX Printing System -Version: 1.2.11 -Release: 19 +Version: 1.2.12 +Release: 1 Requires: cups-libs = %{version}, cups-client = %{version} Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters Requires: util-linux @@ -38,7 +38,7 @@ Source14: cups.xinetd Source15: PSLEVEL1.PPD.bz2 Source16: PSLEVEL2.PPD.bz2 Source17: cups.SuSEfirewall2 -Patch1: cups-1.2rc3-mime.patch +Patch1: cups-1.2.12-mime.patch Patch2: cups-1.2.0-ppdsdat_generation.patch Patch3: cups-1.2rc1-template.patch Patch4: cups-1.2.7-libwrap.patch @@ -46,7 +46,7 @@ Patch5: cups-pam.diff Patch6: cups-1.2b2-access_conf.patch Patch9: cups-1.1.21rc2-preauth_security.patch Patch10: cups-1.1.21rc2-usermode.patch -Patch12: cups-1.2rc3-pswrite.patch +Patch12: cups-1.2.12-pswrite.patch Patch13: cups-1.1.21-umlaut_printer.patch Patch14: cups-1.1.21-testppd_duplex.patch Patch15: cups-1.2.11-testppd_filename.patch @@ -381,6 +381,34 @@ install -m 644 %{SOURCE17} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/service %{_datadir}/locale/*/cups_* %changelog +* Mon Jul 30 2007 - kssingvo@suse.de +- upgrade to cups-1.2.12: + * The PHP cups_print_file() function crashed if the options array + contained non-string option values + * The image/tiff file matching rule incorrectly identified some + text files as TIFF files + * The filter(7) man page incorrectly documented the "PAGE: total + [#]-pages" message + * PCL text files were mis-identified as HP-GL/2 and caused the + HP-GL/2 filter to hang + * When printing to a queue with user ACLs, the scheduler + incorrectly returned a quota error instead of a "not allowed to + print" error + * cupsaddsmb could get in a loop if no printer drivers were + installed + * cupsRasterReadHeader() did not byte-swap the header properly + when compiled with certain versions of GCC. + * The IPP backend did not send the document-format attribute for + filtered jobs + * Some PPD files could cause a crash in ppdOpen2 + * The web admin interface incorrectly handled the "share + printers" and "show remote printers" settings + * The scheduler's log messages about AuthClass and AuthGroupName + advised using a replacement directive but had the wrong syntax + * Updated the PostScript/PJL and HP-GL/2 MIME rules to look in + the first 4k of the file, not just the first 1k + * Updated the Italian localization +- updated the mime and the psrewrite patch * Mon Jun 25 2007 - kssingvo@suse.de - added quosnmp script to %%doc * Wed Jun 20 2007 - kssingvo@suse.de