diff options
| author | salo <salo@pkgsrc.org> | 2005-02-05 17:47:19 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2005-02-05 17:47:19 +0000 |
| commit | 599759ed5f204a3518ccdb13764985a1d5029675 (patch) | |
| tree | 8206433fce444c4f82ecf0bf726b5bb49f1e6aba | |
| parent | 190593b37b4c1e91221d3036c0c24403fcd28541 (diff) | |
| download | pkgsrc-599759ed5f204a3518ccdb13764985a1d5029675.tar.gz | |
Pullup ticket 269 - requested by Johnny C. Lam
security fix for cups
Revisions pulled up:
- pkgsrc/print/cups/Makefile 1.88
- pkgsrc/print/cups/distinfo 1.29
- pkgsrc/print/cups/patches/patch-au 1.3
Module Name: pkgsrc
Committed By: drochner
Date: Wed Jan 19 11:03:23 UTC 2005
Modified Files:
pkgsrc/print/cups: Makefile distinfo
Added Files:
pkgsrc/print/cups/patches: patch-au
Log Message:
apply the last xpdf security patch to the embedded pdftops filter
which is based on xpdf, bump PKGREVISION
| -rw-r--r-- | print/cups/Makefile | 3 | ||||
| -rw-r--r-- | print/cups/distinfo | 3 | ||||
| -rw-r--r-- | print/cups/patches/patch-au | 14 |
3 files changed, 18 insertions, 2 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 5f1d10aa090..e0f8e1b46d0 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82.2.1 2005/01/11 17:13:43 salo Exp $ +# $NetBSD: Makefile,v 1.82.2.2 2005/02/05 17:47:19 salo Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -6,6 +6,7 @@ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} +PKGREVISION= 1 BASE_VERS= 1.1.23 DIST_VERS= ${BASE_VERS} VERS= ${DIST_VERS:S/-/./g} diff --git a/print/cups/distinfo b/print/cups/distinfo index d440993ceea..c484e60cf68 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26.2.1 2005/01/11 17:13:43 salo Exp $ +$NetBSD: distinfo,v 1.26.2.2 2005/02/05 17:47:19 salo Exp $ SHA1 (cups-1.1.23-source.tar.bz2) = 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c Size (cups-1.1.23-source.tar.bz2) = 8705521 bytes @@ -8,3 +8,4 @@ SHA1 (patch-ad) = 166749eb9fc7b4b20e123d81cd3b2cf96db27677 SHA1 (patch-an) = de699800471069b1521ab2ba7194df445fb75892 SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef SHA1 (patch-at) = aa36ec591164675b889d2cf32e4d754e9b6db94f +SHA1 (patch-au) = 48d63140a54ff4b5af4216cfe6454adef4b66781 diff --git a/print/cups/patches/patch-au b/print/cups/patches/patch-au new file mode 100644 index 00000000000..5c7a23aba71 --- /dev/null +++ b/print/cups/patches/patch-au @@ -0,0 +1,14 @@ +$NetBSD: patch-au,v 1.2.10.1 2005/02/05 17:47:19 salo Exp $ + +--- pdftops/XRef.cxx.orig 2004-10-13 22:55:53.000000000 +0200 ++++ pdftops/XRef.cxx +@@ -527,6 +527,9 @@ GBool XRef::checkEncrypted(GString *owne + } else { + keyLength = 5; + } ++ if (keyLength > 16) { ++ keyLength = 16; ++ } + permFlags = permissions.getInt(); + if (encVersion >= 1 && encVersion <= 2 && + encRevision >= 2 && encRevision <= 3) { |