This commit is contained in:
parent
47276fb63f
commit
32275f8929
3
cups-1.2.10-source.tar.bz2
Normal file
3
cups-1.2.10-source.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36
|
||||
size 3618084
|
@ -1,61 +0,0 @@
|
||||
--- cups-1.2.7/pdftops/Catalog.cxx.orig 2005-09-17 16:52:15.000000000 +0200
|
||||
+++ cups-1.2.7/pdftops/Catalog.cxx 2007-01-16 11:15:23.000000000 +0100
|
||||
@@ -23,6 +23,12 @@
|
||||
#include "Link.h"
|
||||
#include "Catalog.h"
|
||||
|
||||
+// This define is used to limit the depth of recursive readPageTree calls
|
||||
+// This is needed because the page tree nodes can reference their parents
|
||||
+// leaving us in an infinite loop
|
||||
+// Most sane pdf documents don't have a call depth higher than 10
|
||||
+#define MAX_CALL_DEPTH 1000
|
||||
+
|
||||
//------------------------------------------------------------------------
|
||||
// Catalog
|
||||
//------------------------------------------------------------------------
|
||||
@@ -71,7 +77,7 @@
|
||||
pageRefs[i].num = -1;
|
||||
pageRefs[i].gen = -1;
|
||||
}
|
||||
- numPages = readPageTree(pagesDict.getDict(), NULL, 0);
|
||||
+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0);
|
||||
if (numPages != numPages0) {
|
||||
error(-1, "Page count in top-level pages object is incorrect");
|
||||
}
|
||||
@@ -169,7 +175,7 @@
|
||||
return s;
|
||||
}
|
||||
|
||||
-int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) {
|
||||
+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) {
|
||||
Object kids;
|
||||
Object kid;
|
||||
Object kidRef;
|
||||
@@ -214,9 +220,13 @@
|
||||
// This should really be isDict("Pages"), but I've seen at least one
|
||||
// PDF file where the /Type entry is missing.
|
||||
} else if (kid.isDict()) {
|
||||
- if ((start = readPageTree(kid.getDict(), attrs1, start))
|
||||
- < 0)
|
||||
- goto err2;
|
||||
+ if (callDepth > MAX_CALL_DEPTH) {
|
||||
+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH);
|
||||
+ } else {
|
||||
+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1))
|
||||
+ < 0)
|
||||
+ goto err2;
|
||||
+ }
|
||||
} else {
|
||||
error(-1, "Kid object (page %d) is wrong type (%s)",
|
||||
start+1, kid.getTypeName());
|
||||
--- cups-1.2.7/pdftops/Catalog.h.orig 2005-09-17 16:52:15.000000000 +0200
|
||||
+++ cups-1.2.7/pdftops/Catalog.h 2007-01-16 11:15:23.000000000 +0100
|
||||
@@ -85,7 +85,7 @@
|
||||
Object acroForm; // AcroForm dictionary
|
||||
GBool ok; // true if catalog is valid
|
||||
|
||||
- int readPageTree(Dict *pages, PageAttrs *attrs, int start);
|
||||
+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth);
|
||||
Object *findDestInTree(Object *tree, GString *name, Object *obj);
|
||||
};
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1fea71cc90dcb18fcc86f59821b91b6f78bb623ddb5998e17293b67d9dc67e16
|
||||
size 3632509
|
46
cups.changes
46
cups.changes
@ -1,3 +1,49 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 2 20:29:16 CEST 2007 - kssingvo@suse.de
|
||||
|
||||
- Upgrade to cups-1.2.10:
|
||||
* ppdLocalize() now supports localizing for Japanese using the
|
||||
"jp" locale name used by the ppdmerge program from the CUPS
|
||||
DDK 1.1.0
|
||||
* _cupsAdminSetServerSettings() did not support changing of
|
||||
top-level directives as designed.
|
||||
* The init script path check was broken.
|
||||
* CUPS incorrectly used the attribute "notify-recipient" instead
|
||||
of "notify-recicpient-uri" in several places
|
||||
* Fixed a configure script bug on MirBSD
|
||||
* The pdftops filter did not limit the amount of recursion of
|
||||
page sets
|
||||
* Custom page sizes with fractional point sizes did not work
|
||||
* The lpoptions command would crash when adding or removing
|
||||
options on a system with no printers
|
||||
* The scheduler did not use the default job-sheets (banners) for
|
||||
implicit classes
|
||||
* The scheduler could crash when listing complete jobs that had
|
||||
been unloaded from memory
|
||||
* The French localization was doubled up
|
||||
* Build system fixes for several platforms
|
||||
* The scheduler's openssl certificate generation code was broken
|
||||
on some platforms
|
||||
* The scheduler's log rotation check for devices was broken
|
||||
* The LPD mini-daemon did not handle the document-format option
|
||||
correctly
|
||||
* The pdftops filter ignored the "match" size option in the
|
||||
pdftops.conf file
|
||||
* cupstestppd now validates UTF-8 text strings in globalized PPD
|
||||
files
|
||||
* The outputorder=reverse option did not work with all printers
|
||||
* Classes containing other classes did not always work
|
||||
* Printer location and description information was lost if the
|
||||
corresponding string contained the "#" character
|
||||
* cupsRemoveOption() did not work properly
|
||||
* The USB backend did not work with some USB to parallel cables
|
||||
on Mac OS X.
|
||||
* The test page did not print the rulers properly on large media
|
||||
sizes
|
||||
* The text filter could crash when pretty printing certain types
|
||||
of files
|
||||
- removed already included security patch xpdf_CVE_2007_0104
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 20 10:55:46 CET 2007 - kssingvo@suse.de
|
||||
|
||||
|
49
cups.spec
49
cups.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package cups (Version 1.2.8)
|
||||
# spec file for package cups (Version 1.2.10)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -16,7 +16,7 @@ URL: http://www.cups.org/
|
||||
License: GNU General Public License (GPL)
|
||||
Group: Hardware/Printing
|
||||
Summary: The Common UNIX Printing System
|
||||
Version: 1.2.8
|
||||
Version: 1.2.10
|
||||
Release: 1
|
||||
Requires: cups-libs = %{version}, cups-client = %{version}
|
||||
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
|
||||
@ -51,7 +51,6 @@ Patch14: cups-1.1.21-testppd_duplex.patch
|
||||
Patch15: cups-1.2.2-testppd_filename.patch
|
||||
Patch16: cups-1.2.5-desktop_file.patch
|
||||
Patch17: cups-1.2.6-lppasswd_permission.patch
|
||||
Patch18: cups-1.2.6-xpdf_CVE_2007_0104.patch
|
||||
Patch100: cups-1.1.23-testpage.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if %suse_version >= 801
|
||||
@ -144,7 +143,6 @@ Authors:
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
if [ -f /.buildenv ]; then
|
||||
. /.buildenv
|
||||
else
|
||||
@ -373,6 +371,49 @@ rm -rf $RPM_BUILD_ROOT/%{_mandir}/cat?
|
||||
%{_datadir}/locale/*/cups_*
|
||||
|
||||
%changelog
|
||||
* Mon Apr 02 2007 - kssingvo@suse.de
|
||||
- Upgrade to cups-1.2.10:
|
||||
* ppdLocalize() now supports localizing for Japanese using the
|
||||
"jp" locale name used by the ppdmerge program from the CUPS
|
||||
DDK 1.1.0
|
||||
* _cupsAdminSetServerSettings() did not support changing of
|
||||
top-level directives as designed.
|
||||
* The init script path check was broken.
|
||||
* CUPS incorrectly used the attribute "notify-recipient" instead
|
||||
of "notify-recicpient-uri" in several places
|
||||
* Fixed a configure script bug on MirBSD
|
||||
* The pdftops filter did not limit the amount of recursion of
|
||||
page sets
|
||||
* Custom page sizes with fractional point sizes did not work
|
||||
* The lpoptions command would crash when adding or removing
|
||||
options on a system with no printers
|
||||
* The scheduler did not use the default job-sheets (banners) for
|
||||
implicit classes
|
||||
* The scheduler could crash when listing complete jobs that had
|
||||
been unloaded from memory
|
||||
* The French localization was doubled up
|
||||
* Build system fixes for several platforms
|
||||
* The scheduler's openssl certificate generation code was broken
|
||||
on some platforms
|
||||
* The scheduler's log rotation check for devices was broken
|
||||
* The LPD mini-daemon did not handle the document-format option
|
||||
correctly
|
||||
* The pdftops filter ignored the "match" size option in the
|
||||
pdftops.conf file
|
||||
* cupstestppd now validates UTF-8 text strings in globalized PPD
|
||||
files
|
||||
* The outputorder=reverse option did not work with all printers
|
||||
* Classes containing other classes did not always work
|
||||
* Printer location and description information was lost if the
|
||||
corresponding string contained the "#" character
|
||||
* cupsRemoveOption() did not work properly
|
||||
* The USB backend did not work with some USB to parallel cables
|
||||
on Mac OS X.
|
||||
* The test page did not print the rulers properly on large media
|
||||
sizes
|
||||
* The text filter could crash when pretty printing certain types
|
||||
of files
|
||||
- removed already included security patch xpdf_CVE_2007_0104
|
||||
* Tue Feb 20 2007 - kssingvo@suse.de
|
||||
- Upgrade to cups-1.2.8:
|
||||
* Documentation fixes
|
||||
|
Loading…
Reference in New Issue
Block a user