summaryrefslogtreecommitdiff
path: root/print/dvipsk
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2010-09-13 04:40:12 +0000
committerminskim <minskim@pkgsrc.org>2010-09-13 04:40:12 +0000
commit24a66747f777f2658c6a3e47136703b2db30e2e2 (patch)
tree3193faa468f4c2825cf36594d59e4f07b6724e7e /print/dvipsk
parent6b09edf8706638f523e883a889ce2230301eb0d8 (diff)
downloadpkgsrc-24a66747f777f2658c6a3e47136703b2db30e2e2.tar.gz
Update dvipsk to 5.99.
Changes: * config.ps: include cid-base.map. * bug fixes.
Diffstat (limited to 'print/dvipsk')
-rw-r--r--print/dvipsk/Makefile7
-rw-r--r--print/dvipsk/distinfo11
-rw-r--r--print/dvipsk/patches/patch-aa8
-rw-r--r--print/dvipsk/patches/patch-ab33
4 files changed, 12 insertions, 47 deletions
diff --git a/print/dvipsk/Makefile b/print/dvipsk/Makefile
index 4c59b28be66..fee73b54063 100644
--- a/print/dvipsk/Makefile
+++ b/print/dvipsk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/06/08 15:17:04 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2010/09/13 04:40:12 minskim Exp $
-DISTNAME= texlive-20091011-source
-PKGNAME= dvipsk-5.98
-PKGREVISION= 2
+DISTNAME= texlive-20100720-source
+PKGNAME= dvipsk-5.99
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
EXTRACT_SUFX= .tar.xz
diff --git a/print/dvipsk/distinfo b/print/dvipsk/distinfo
index 7d084bbe045..f87ffdaa5e1 100644
--- a/print/dvipsk/distinfo
+++ b/print/dvipsk/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/06/08 15:17:05 minskim Exp $
+$NetBSD: distinfo,v 1.6 2010/09/13 04:40:12 minskim Exp $
-SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
-RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
-Size (texlive-20091011-source.tar.xz) = 29683728 bytes
-SHA1 (patch-aa) = 825b091fecb17e8cc9135a0341b90e49ffd56baf
-SHA1 (patch-ab) = 0ecb16e2073813d23a8d13809de58a01bfe38e8a
+SHA1 (texlive-20100720-source.tar.xz) = 713b861123e3d9e073e2c93d7ed3e13262d82c34
+RMD160 (texlive-20100720-source.tar.xz) = b1120f3377ca45b4d86911b99a95c2e6e45927b5
+Size (texlive-20100720-source.tar.xz) = 33484212 bytes
+SHA1 (patch-aa) = bd05b7fd357431cad89614081793c4d75131c5f5
diff --git a/print/dvipsk/patches/patch-aa b/print/dvipsk/patches/patch-aa
index 2d18fe14958..f1f090789c0 100644
--- a/print/dvipsk/patches/patch-aa
+++ b/print/dvipsk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2010/01/16 03:47:31 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2010/09/13 04:40:12 minskim Exp $
---- Makefile.in.orig 2009-06-23 02:46:14.000000000 -0700
+--- Makefile.in.orig 2010-04-13 11:34:01.000000000 +0000
+++ Makefile.in
-@@ -376,7 +376,7 @@ dist_prologues = \
+@@ -378,7 +378,7 @@ dist_prologues = \
tex.lpro \
texps.lpro
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.2 2010/01/16 03:47:31 minskim Exp $
+prologdir = ${prefix}/share/texmf/dvips/base
prologues = $(dist_prologues:.lpro=.pro) texc.pro
SUFFIXES = .pro .lpro
- EXTRA_DIST = $(dist_prologues) texc.script dvips.test pfbincl.test \
+ EXTRA_DIST = $(dist_prologues) texc.script NEWS TODO afm2tfm-test.pl \
diff --git a/print/dvipsk/patches/patch-ab b/print/dvipsk/patches/patch-ab
deleted file mode 100644
index f1b3d73c971..00000000000
--- a/print/dvipsk/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2010/06/08 15:17:05 minskim Exp $
-
-- CVE-2010-0739
-- CVE-2010-1440
-
---- dospecial.c.orig 2009-06-23 09:46:14.000000000 +0000
-+++ dospecial.c
-@@ -333,7 +333,11 @@ predospecial(integer numbytes, Boolean s
- int j ;
- static int omega_specials = 0;
-
-- if (nextstring + numbytes > maxstring) {
-+ if (numbytes < 0 || numbytes > maxstring - nextstring) {
-+ if (numbytes < 0 || numbytes > (INT_MAX - 1000) / 2 ) {
-+ error("! Integer overflow in predospecial");
-+ exit(1);
-+ }
- p = nextstring = mymalloc(1000 + 2 * numbytes) ;
- maxstring = nextstring + 2 * numbytes + 700 ;
- }
-@@ -918,7 +922,11 @@ bbdospecial(int nbytes)
- char seen[NKEYS] ;
- float valseen[NKEYS] ;
-
-- if (nextstring + nbytes > maxstring) {
-+ if (nbytes < 0 || nbytes > maxstring - nextstring) {
-+ if (nbytes < 0 || nbytes > (INT_MAX - 1000) / 2 ) {
-+ error("! Integer overflow in bbdospecial");
-+ exit(1);
-+ }
- p = nextstring = mymalloc(1000 + 2 * nbytes) ;
- maxstring = nextstring + 2 * nbytes + 700 ;
- }