Thu Oct 27 02:35:41 2011 UTC ()
Update to 3.03

Fixes multiple vulnerabilites

Change list too long to include here, see http://www.foolabs.com/xpdf/CHANGES
(file does not note what changes were included in 3.02pl1 - 3.02pl4 and which
 are new for 3.03)


(tez)
diff -r1.74 -r1.75 pkgsrc/print/xpdf/Makefile
diff -r1.39 -r1.40 pkgsrc/print/xpdf/distinfo
diff -r1.7 -r1.8 pkgsrc/print/xpdf/patches/patch-aa
diff -r1.5 -r0 pkgsrc/print/xpdf/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/print/xpdf/patches/patch-ai
diff -r1.3 -r1.4 pkgsrc/print/xpdf/patches/patch-al
diff -r1.3 -r1.4 pkgsrc/print/xpdf/patches/patch-aq
diff -r1.5 -r1.6 pkgsrc/print/xpdf/patches/patch-ak
diff -r1.2 -r1.3 pkgsrc/print/xpdf/patches/patch-am
diff -r1.2 -r0 pkgsrc/print/xpdf/patches/patch-an
diff -r1.1 -r0 pkgsrc/print/xpdf/patches/patch-bb
diff -r1.1 -r0 pkgsrc/print/xpdf/patches/patch-bd
diff -r1.1 -r1.2 pkgsrc/print/xpdf/patches/patch-bc
cvs diff -r1.74 -r1.75 pkgsrc/print/xpdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/xpdf/Makefile 2010/12/23 04:44:41 1.74
+++ pkgsrc/print/xpdf/Makefile 2011/10/27 02:35:41 1.75
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.74 2010/12/23 04:44:41 obache Exp $ 1# $NetBSD: Makefile,v 1.75 2011/10/27 02:35:41 tez Exp $
2 2
3DISTNAME= xpdf-3.02 3DISTNAME= xpdf-3.03
4PKGNAME= xpdf-3.02pl4 4#PKGNAME= xpdf-3.02pl4
5PKGREVISION= 4 5#PKGREVISION= 4
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ 7MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
8 ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \ 8 ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \
9 http://gd.tuwien.ac.at/publishing/xpdf/ 9 http://gd.tuwien.ac.at/publishing/xpdf/
10PATCH_SITES= ${MASTER_SITES} 10#PATCH_SITES= ${MASTER_SITES}
11PATCHFILES= xpdf-3.02pl1.patch xpdf-3.02pl2.patch xpdf-3.02pl3.patch xpdf-3.02pl4.patch 11#PATCHFILES= xpdf-3.02pl1.patch xpdf-3.02pl2.patch xpdf-3.02pl3.patch xpdf-3.02pl4.patch
12PATCH_DIST_STRIP= -p1 12#PATCH_DIST_STRIP= -p1
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= http://www.foolabs.com/xpdf/ 15HOMEPAGE= http://www.foolabs.com/xpdf/
16COMMENT= Display tool for PDF files 16COMMENT= Display tool for PDF files
17LICENSE= gnu-gpl-v2 17LICENSE= gnu-gpl-v2
18 18
19PKG_DESTDIR_SUPPORT= user-destdir 19PKG_DESTDIR_SUPPORT= user-destdir
20 20
21MAKE_JOBS_SAFE= no 21MAKE_JOBS_SAFE= no
22 22
23DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts 23DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
24DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils 24DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
25 25
cvs diff -r1.39 -r1.40 pkgsrc/print/xpdf/distinfo (expand / switch to unified diff)

--- pkgsrc/print/xpdf/distinfo 2010/12/23 04:44:41 1.39
+++ pkgsrc/print/xpdf/distinfo 2011/10/27 02:35:41 1.40
@@ -1,37 +1,21 @@ @@ -1,37 +1,21 @@
1$NetBSD: distinfo,v 1.39 2010/12/23 04:44:41 obache Exp $ 1$NetBSD: distinfo,v 1.40 2011/10/27 02:35:41 tez Exp $
2 2
3SHA1 (xpdf-3.02.tar.gz) = f9940698840c8a8045677e8be68ab8580903e20a 3SHA1 (xpdf-3.03.tar.gz) = 499423e8a795e0efd76ca798239eb4d0d52fe248
4RMD160 (xpdf-3.02.tar.gz) = e900cb8670b8c430beaa45895fb474411cb1958d 4RMD160 (xpdf-3.03.tar.gz) = ef1336c189026fb0ecd169e2b37b5a5aa22e04be
5Size (xpdf-3.02.tar.gz) = 674912 bytes 5Size (xpdf-3.03.tar.gz) = 795537 bytes
6SHA1 (xpdf-3.02pl1.patch) = cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d 6SHA1 (patch-aa) = ab41e35600d1e625b902076d947ec48a9c1bc59e
7RMD160 (xpdf-3.02pl1.patch) = 5c310f96760f72e9c1062b00c57c2ed035ac6757 
8Size (xpdf-3.02pl1.patch) = 1050 bytes 
9SHA1 (xpdf-3.02pl2.patch) = d082ebe0d36cad0c04603950216f5c52de1c2593 
10RMD160 (xpdf-3.02pl2.patch) = 0024e3d203d69e073a458570cec5679e260ad204 
11Size (xpdf-3.02pl2.patch) = 20843 bytes 
12SHA1 (xpdf-3.02pl3.patch) = 23f496804802a3da530f1d0bab894bae3e938fc2 
13RMD160 (xpdf-3.02pl3.patch) = 859ec3131d3c4526a6075ee639c5eb704194211b 
14Size (xpdf-3.02pl3.patch) = 30727 bytes 
15SHA1 (xpdf-3.02pl4.patch) = 1aa3087a1c7882884ae7d3a502240a55acca65fd 
16RMD160 (xpdf-3.02pl4.patch) = 428065e8c9639b6799705b216be603f52efb8a22 
17Size (xpdf-3.02pl4.patch) = 6982 bytes 
18SHA1 (patch-aa) = d3694e51ec23026a3273d7a7acac1582b69f4810 
19SHA1 (patch-ab) = fd4205c477ee4ac7660b8c1a707ea7b528ac4f90 
20SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2 7SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2
21SHA1 (patch-ad) = 08202be663d819f033a7a5e6708b4158255bcf4a 8SHA1 (patch-ad) = 08202be663d819f033a7a5e6708b4158255bcf4a
22SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143 9SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143
23SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c 10SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c
24SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac 11SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac
25SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a 12SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a
26SHA1 (patch-ai) = 23bdf2b177b2f189be2bb5834c1d0bbb1e5d2b70 13SHA1 (patch-ai) = 2ef56341ee14cfb22c9d49e659cfa2955aa18ee6
27SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860 14SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860
28SHA1 (patch-ak) = 20d48739d074ffa729b99e9ceec62cb52d8d3f48 15SHA1 (patch-ak) = a45747998f7c72f7db3f9199c244dc1d4962417d
29SHA1 (patch-al) = c79b5865432ea0519c2124e177a1dbf5b9c09024 16SHA1 (patch-al) = c210ca493be97cf5b7ba8469f5258b10667e8633
30SHA1 (patch-am) = 1b498307ce7ffaa7a4e7c6c754c2ce373390ddd8 17SHA1 (patch-am) = 1140a6030dfec7a737f5ac16c403225c88a046de
31SHA1 (patch-an) = 94ea208c43f4df1ac3a9bf01cc874d488ae49a9a 
32SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58 18SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58
33SHA1 (patch-aq) = 1df0efb9fdde90df0597ba2a56c6030e7446e185 19SHA1 (patch-aq) = 4cba560189d2977d1c5ea60acf2d50ca311efbe1
34SHA1 (patch-ar) = 5e4719a30a0412d9d731dbef8179c38bba67db94 20SHA1 (patch-ar) = 5e4719a30a0412d9d731dbef8179c38bba67db94
35SHA1 (patch-bb) = d38757d5e4a331d49149acfff897cfe7bc0a5e3b 21SHA1 (patch-bc) = e3f8092c30325a3f7abf230daeadd4478a9db768
36SHA1 (patch-bc) = 856c7012bf794135aecdb70f726ccec14aa0a7cc 
37SHA1 (patch-bd) = 8cd3fabac230fcda0d5db39d4b777802f5a75114 
cvs diff -r1.7 -r1.8 pkgsrc/print/xpdf/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/xpdf/patches/patch-aa 2009/11/13 23:12:02 1.7
+++ pkgsrc/print/xpdf/patches/patch-aa 2011/10/27 02:35:41 1.8
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-aa,v 1.7 2009/11/13 23:12:02 christos Exp $ 1$NetBSD: patch-aa,v 1.8 2011/10/27 02:35:41 tez Exp $
2 2
3--- Makefile.in.orig 2005-08-17 05:34:30.000000000 +0000 3--- Makefile.in.orig 2011-08-15 16:08:52.000000000 -0500
4+++ Makefile.in 4+++ Makefile.in 2011-10-26 19:45:47.941835500 -0500
5@@ -13,6 +13,7 @@ 5@@ -13,6 +13,7 @@
6 prefix = @prefix@ 6 prefix = @prefix@
7 exec_prefix = @exec_prefix@ 7 exec_prefix = @exec_prefix@
8 srcdir = @srcdir@ 8 srcdir = @srcdir@
9+exampledir = @prefix@/share/examples/xpdf 9+exampledir = @prefix@/share/examples/xpdf
10  10
11 INSTALL = @INSTALL@ 11 INSTALL = @INSTALL@
12 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 12 INSTALL_PROGRAM = @INSTALL_PROGRAM@
13@@ -37,69 +38,69 @@ 13@@ -37,77 +38,77 @@
14 cd @UP_DIR@splash; $(MAKE) 14 cd @UP_DIR@splash; $(MAKE)
15 cd @UP_DIR@xpdf; $(MAKE) xpdf$(EXE) 15 cd @UP_DIR@xpdf; $(MAKE) xpdf$(EXE)
16  16
17-pdftops: dummy 17-pdftops: dummy
18- cd goo; $(MAKE) 18- cd goo; $(MAKE)
19- cd @UP_DIR@fofi; $(MAKE) 19- cd @UP_DIR@fofi; $(MAKE)
20- cd @UP_DIR@splash; $(MAKE) 20- cd @UP_DIR@splash; $(MAKE)
21- cd @UP_DIR@xpdf; $(MAKE) pdftops$(EXE) 21- cd @UP_DIR@xpdf; $(MAKE) pdftops$(EXE)
22- 22-
23-pdftotext: dummy 23-pdftotext: dummy
24- cd goo; $(MAKE) 24- cd goo; $(MAKE)
25- cd @UP_DIR@fofi; $(MAKE) 25- cd @UP_DIR@fofi; $(MAKE)
26- cd @UP_DIR@splash; $(MAKE) 26- cd @UP_DIR@splash; $(MAKE)
@@ -28,26 +28,32 @@ $NetBSD: patch-aa,v 1.7 2009/11/13 23:12 @@ -28,26 +28,32 @@ $NetBSD: patch-aa,v 1.7 2009/11/13 23:12
28- 28-
29-pdfinfo: 29-pdfinfo:
30- cd goo; $(MAKE) 30- cd goo; $(MAKE)
31- cd @UP_DIR@fofi; $(MAKE) 31- cd @UP_DIR@fofi; $(MAKE)
32- cd @UP_DIR@splash; $(MAKE) 32- cd @UP_DIR@splash; $(MAKE)
33- cd @UP_DIR@xpdf; $(MAKE) pdfinfo$(EXE) 33- cd @UP_DIR@xpdf; $(MAKE) pdfinfo$(EXE)
34- 34-
35-pdffonts: 35-pdffonts:
36- cd goo; $(MAKE) 36- cd goo; $(MAKE)
37- cd @UP_DIR@fofi; $(MAKE) 37- cd @UP_DIR@fofi; $(MAKE)
38- cd @UP_DIR@splash; $(MAKE) 38- cd @UP_DIR@splash; $(MAKE)
39- cd @UP_DIR@xpdf; $(MAKE) pdffonts$(EXE) 39- cd @UP_DIR@xpdf; $(MAKE) pdffonts$(EXE)
40- 40-
 41-pdfdetach:
 42- cd goo; $(MAKE)
 43- cd @UP_DIR@fofi; $(MAKE)
 44- cd @UP_DIR@splash; $(MAKE)
 45- cd @UP_DIR@xpdf; $(MAKE) pdfdetach$(EXE)
 46-
41-pdftoppm: 47-pdftoppm:
42- cd goo; $(MAKE) 48- cd goo; $(MAKE)
43- cd @UP_DIR@fofi; $(MAKE) 49- cd @UP_DIR@fofi; $(MAKE)
44- cd @UP_DIR@splash; $(MAKE) 50- cd @UP_DIR@splash; $(MAKE)
45- cd @UP_DIR@xpdf; $(MAKE) pdftoppm$(EXE) 51- cd @UP_DIR@xpdf; $(MAKE) pdftoppm$(EXE)
46- 52-
47-pdfimages: 53-pdfimages:
48- cd goo; $(MAKE) 54- cd goo; $(MAKE)
49- cd @UP_DIR@fofi; $(MAKE) 55- cd @UP_DIR@fofi; $(MAKE)
50- cd @UP_DIR@splash; $(MAKE) 56- cd @UP_DIR@splash; $(MAKE)
51- cd @UP_DIR@xpdf; $(MAKE) pdfimages$(EXE) 57- cd @UP_DIR@xpdf; $(MAKE) pdfimages$(EXE)
52+#pdftops: dummy 58+#pdftops: dummy
53+# cd goo; $(MAKE) 59+# cd goo; $(MAKE)
@@ -63,67 +69,77 @@ $NetBSD: patch-aa,v 1.7 2009/11/13 23:12 @@ -63,67 +69,77 @@ $NetBSD: patch-aa,v 1.7 2009/11/13 23:12
63+# 69+#
64+#pdfinfo: 70+#pdfinfo:
65+# cd goo; $(MAKE) 71+# cd goo; $(MAKE)
66+# cd @UP_DIR@fofi; $(MAKE) 72+# cd @UP_DIR@fofi; $(MAKE)
67+# cd @UP_DIR@splash; $(MAKE) 73+# cd @UP_DIR@splash; $(MAKE)
68+# cd @UP_DIR@xpdf; $(MAKE) pdfinfo$(EXE) 74+# cd @UP_DIR@xpdf; $(MAKE) pdfinfo$(EXE)
69+# 75+#
70+#pdffonts: 76+#pdffonts:
71+# cd goo; $(MAKE) 77+# cd goo; $(MAKE)
72+# cd @UP_DIR@fofi; $(MAKE) 78+# cd @UP_DIR@fofi; $(MAKE)
73+# cd @UP_DIR@splash; $(MAKE) 79+# cd @UP_DIR@splash; $(MAKE)
74+# cd @UP_DIR@xpdf; $(MAKE) pdffonts$(EXE) 80+# cd @UP_DIR@xpdf; $(MAKE) pdffonts$(EXE)
75+# 81+#
 82+#pdfdetach:
 83+# cd goo; $(MAKE)
 84+# cd @UP_DIR@fofi; $(MAKE)
 85+# cd @UP_DIR@splash; $(MAKE)
 86+# cd @UP_DIR@xpdf; $(MAKE) pdfdetach$(EXE)
 87+#
76+#pdftoppm: 88+#pdftoppm:
77+# cd goo; $(MAKE) 89+# cd goo; $(MAKE)
78+# cd @UP_DIR@fofi; $(MAKE) 90+# cd @UP_DIR@fofi; $(MAKE)
79+# cd @UP_DIR@splash; $(MAKE) 91+# cd @UP_DIR@splash; $(MAKE)
80+# cd @UP_DIR@xpdf; $(MAKE) pdftoppm$(EXE) 92+# cd @UP_DIR@xpdf; $(MAKE) pdftoppm$(EXE)
81+# 93+#
82+#pdfimages: 94+#pdfimages:
83+# cd goo; $(MAKE) 95+# cd goo; $(MAKE)
84+# cd @UP_DIR@fofi; $(MAKE) 96+# cd @UP_DIR@fofi; $(MAKE)
85+# cd @UP_DIR@splash; $(MAKE) 97+# cd @UP_DIR@splash; $(MAKE)
86+# cd @UP_DIR@xpdf; $(MAKE) pdfimages$(EXE) 98+# cd @UP_DIR@xpdf; $(MAKE) pdfimages$(EXE)
87  99
88 dummy: 100 dummy:
89  101
90 install: dummy 102 install: dummy
91 -mkdir -p $(DESTDIR)@bindir@ 103 -mkdir -p $(DESTDIR)@bindir@
92 @X@ $(INSTALL_PROGRAM) xpdf/xpdf$(EXE) $(DESTDIR)@bindir@/xpdf$(EXE) 104 @X@ $(INSTALL_PROGRAM) xpdf/xpdf$(EXE) $(DESTDIR)@bindir@/xpdf$(EXE)
93- $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE) 105- $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE)
94- $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE) 106- $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE)
95- $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE) 107- $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)
96- $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE) 108- $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)
 109- $(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE)
97-@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE) 110-@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
98- $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE) 111- $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)
99+# $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE) 112+# $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE)
100+# $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE) 113+# $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE)
101+# $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE) 114+# $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)
102+# $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE) 115+# $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)
 116+# $(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE)
103+#@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE) 117+#@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
104+# $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE) 118+# $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)
105 -mkdir -p $(DESTDIR)@mandir@/man1 119 -mkdir -p $(DESTDIR)@mandir@/man1
106 @X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1 120 @X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1
107- $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1 121- $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1
108- $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1 122- $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1
109- $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1 123- $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1
110- $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1 124- $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1
 125- $(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1
111-@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1 126-@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
112- $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1 127- $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
113+# $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1 128+# $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1
114+# $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1 129+# $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1
115+# $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1 130+# $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1
116+# $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1 131+# $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1
 132+# $(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1
117+#@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1 133+#@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
118+# $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1 134+# $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
119 -mkdir -p $(DESTDIR)@mandir@/man5 135 -mkdir -p $(DESTDIR)@mandir@/man5
120 $(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5 136 $(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5
121- -mkdir -p $(DESTDIR)@sysconfdir@ 137- -mkdir -p $(DESTDIR)@sysconfdir@
122- @if test ! -f $(DESTDIR)@sysconfdir@/xpdfrc; then \ 138- @if test ! -f $(DESTDIR)@sysconfdir@/xpdfrc; then \
123- echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc"; \ 139- echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc"; \
124- $(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc; \ 140- $(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)@sysconfdir@/xpdfrc; \
125+ -mkdir -p $(DESTDIR)$(exampledir) 141+ -mkdir -p $(DESTDIR)$(exampledir)
126+ @if test ! -f $(DESTDIR)$(exampledir)/xpdfrc; then \ 142+ @if test ! -f $(DESTDIR)$(exampledir)/xpdfrc; then \
127+ echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)$(exampledir)/xpdfrc"; \ 143+ echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)$(exampledir)/xpdfrc"; \
128+ $(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)$(exampledir)/xpdfrc; \ 144+ $(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)$(exampledir)/xpdfrc; \
129 else \ 145 else \
File Deleted: pkgsrc/print/xpdf/patches/Attic/patch-ab
cvs diff -r1.3 -r1.4 pkgsrc/print/xpdf/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/print/xpdf/patches/patch-ai 2010/06/13 08:56:04 1.3
+++ pkgsrc/print/xpdf/patches/patch-ai 2011/10/27 02:35:41 1.4
@@ -1,57 +1,57 @@ @@ -1,57 +1,57 @@
1$NetBSD: patch-ai,v 1.3 2010/06/13 08:56:04 spz Exp $ 1$NetBSD: patch-ai,v 1.4 2011/10/27 02:35:41 tez Exp $
2 2
3--- doc/sample-xpdfrc.orig 2005-08-17 05:34:30.000000000 +0000 3--- doc/sample-xpdfrc.orig 2011-08-15 16:08:53.000000000 -0500
4+++ doc/sample-xpdfrc 4+++ doc/sample-xpdfrc 2011-10-26 19:52:54.856951700 -0500
5@@ -4,7 +4,7 @@ 5@@ -4,7 +4,7 @@
6 # 6 #
7 # The Xpdf tools look for a config file in two places: 7 # The Xpdf tools look for a config file in two places:
8 # 1. ~/.xpdfrc 8 # 1. ~/.xpdfrc
9-# 2. in a system-wide directory, typically /usr/local/etc/xpdfrc 9-# 2. in a system-wide directory, typically /usr/local/etc/xpdfrc
10+# 2. in a system-wide directory, typically @PKG_SYSCONFDIR@/xpdfrc 10+# 2. in a system-wide directory, typically @PKG_SYSCONFDIR@/xpdfrc
11 # 11 #
12 # This sample config file demonstrates some of the more common 12 # This sample config file demonstrates some of the more common
13 # configuration options. Everything here is commented out. You 13 # configuration options. Everything here is commented out. You
14@@ -29,20 +29,20 @@ 14@@ -29,20 +29,20 @@
15 # installed in a "standard" location, xpdf will find them 15 # installed in a "standard" location, xpdf will find them
16 # automatically.) 16 # automatically.)
17  17
18-#displayFontT1 Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb 18-#fontFile Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb
19-#displayFontT1 Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb 19-#fontFile Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb
20-#displayFontT1 Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb 20-#fontFile Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb
21-#displayFontT1 Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb 21-#fontFile Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb
22-#displayFontT1 Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb 22-#fontFile Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb
23-#displayFontT1 Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb 23-#fontFile Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb
24-#displayFontT1 Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb 24-#fontFile Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb
25-#displayFontT1 Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb 25-#fontFile Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb
26-#displayFontT1 Courier /usr/local/share/ghostscript/fonts/n022003l.pfb 26-#fontFile Courier /usr/local/share/ghostscript/fonts/n022003l.pfb
27-#displayFontT1 Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb 27-#fontFile Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb
28-#displayFontT1 Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb 28-#fontFile Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb
29-#displayFontT1 Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb 29-#fontFile Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb
30-#displayFontT1 Symbol /usr/local/share/ghostscript/fonts/s050000l.pfb 30-#fontFile Symbol /usr/local/share/ghostscript/fonts/s050000l.pfb
31-#displayFontT1 ZapfDingbats /usr/local/share/ghostscript/fonts/d050000l.pfb 31-#fontFile ZapfDingbats /usr/local/share/ghostscript/fonts/d050000l.pfb
32+#displayFontT1 Times-Roman @PREFIX@/share/fonts/urw/n021003l.pfb 32+#fontFile Times-Roman @PREFIX@/share/ghostscript/fonts/n021003l.pfb
33+#displayFontT1 Times-Italic @PREFIX@/share/fonts/urw/n021023l.pfb 33+#fontFile Times-Italic @PREFIX@/share/ghostscript/fonts/n021023l.pfb
34+#displayFontT1 Times-Bold @PREFIX@/share/fonts/urw/n021004l.pfb 34+#fontFile Times-Bold @PREFIX@/share/ghostscript/fonts/n021004l.pfb
35+#displayFontT1 Times-BoldItalic @PREFIX@/share/fonts/urw/n021024l.pfb 35+#fontFile Times-BoldItalic @PREFIX@/share/ghostscript/fonts/n021024l.pfb
36+#displayFontT1 Helvetica @PREFIX@/share/fonts/urw/n019003l.pfb 36+#fontFile Helvetica @PREFIX@/share/ghostscript/fonts/n019003l.pfb
37+#displayFontT1 Helvetica-Oblique @PREFIX@/share/fonts/urw/n019023l.pfb 37+#fontFile Helvetica-Oblique @PREFIX@/share/ghostscript/fonts/n019023l.pfb
38+#displayFontT1 Helvetica-Bold @PREFIX@/share/fonts/urw/n019004l.pfb 38+#fontFile Helvetica-Bold @PREFIX@/share/ghostscript/fonts/n019004l.pfb
39+#displayFontT1 Helvetica-BoldOblique @PREFIX@/share/fonts/urw/n019024l.pfb 39+#fontFile Helvetica-BoldOblique @PREFIX@/share/ghostscript/fonts/n019024l.pfb
40+#displayFontT1 Courier @PREFIX@/share/fonts/urw/n022003l.pfb 40+#fontFile Courier @PREFIX@/share/ghostscript/fonts/n022003l.pfb
41+#displayFontT1 Courier-Oblique @PREFIX@/share/fonts/urw/n022023l.pfb 41+#fontFile Courier-Oblique @PREFIX@/share/ghostscript/fonts/n022023l.pfb
42+#displayFontT1 Courier-Bold @PREFIX@/share/fonts/urw/n022004l.pfb 42+#fontFile Courier-Bold @PREFIX@/share/ghostscript/fonts/n022004l.pfb
43+#displayFontT1 Courier-BoldOblique @PREFIX@/share/fonts/urw/n022024l.pfb 43+#fontFile Courier-BoldOblique @PREFIX@/share/ghostscript/fonts/n022024l.pfb
44+#displayFontT1 Symbol @PREFIX@/share/fonts/urw/s050000l.pfb 44+#fontFile Symbol @PREFIX@/share/ghostscript/fonts/s050000l.pfb
45+#displayFontT1 ZapfDingbats @PREFIX@/share/fonts/urw/d050000l.pfb 45+#fontFile ZapfDingbats @PREFIX@/share/ghostscript/fonts/d050000l.pfb
46  46
47 # If you need to display PDF files that refer to non-embedded fonts, 47 # If you need to display PDF files that refer to non-embedded fonts,
48 # you should add one or more fontDir options to point to the 48 # you should add one or more fontDir options to point to the
49@@ -50,7 +50,7 @@ 49@@ -50,7 +50,7 @@
50 # .pfb, and .ttf files in those directories (other files will simply 50 # .pfb, .ttf, and .ttc files in those directories (other files will
51 # be ignored). 51 # simply be ignored).
52  52
53-#fontDir /usr/local/fonts/bakoma 53-#fontDir /usr/local/fonts/bakoma
54+#fontDir @PREFIX@/share/tex-contrib/BaKoMa 54+#fontDir @PREFIX@/fonts/bakoma
55  55
56 #----- PostScript output control 56 #----- PostScript output control
57  57
cvs diff -r1.3 -r1.4 pkgsrc/print/xpdf/patches/patch-al (expand / switch to unified diff)

--- pkgsrc/print/xpdf/patches/patch-al 2010/06/13 08:56:04 1.3
+++ pkgsrc/print/xpdf/patches/patch-al 2011/10/27 02:35:41 1.4
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1$NetBSD: patch-al,v 1.3 2010/06/13 08:56:04 spz Exp $ 1$NetBSD: patch-al,v 1.4 2011/10/27 02:35:41 tez Exp $
2 2
3--- xpdf/GlobalParams.cc.orig 2005-08-17 05:34:31.000000000 +0000 3--- xpdf/GlobalParams.cc.orig 2011-08-15 16:08:53.000000000 -0500
4+++ xpdf/GlobalParams.cc 4+++ xpdf/GlobalParams.cc 2011-10-26 20:15:39.959345400 -0500
5@@ -106,11 +106,12 @@ static char *displayFontDirs[] = { 5@@ -110,11 +110,13 @@
6 }; 6 };
7 #else 7 #else
8 static char *displayFontDirs[] = { 8 static const char *displayFontDirs[] = {
9- "/usr/share/ghostscript/fonts", 9- "/usr/share/ghostscript/fonts",
10+ PREFIX"/share/ghostscript/fonts", 10+ PREFIX"/share/ghostscript/fonts",
11 "/usr/local/share/ghostscript/fonts", 11 "/usr/local/share/ghostscript/fonts",
12- "/usr/share/fonts/default/Type1", 12- "/usr/share/fonts/default/Type1",
13- "/usr/share/fonts/default/ghostscript", 13- "/usr/share/fonts/default/ghostscript",
14- "/usr/share/fonts/type1/gsfonts", 14- "/usr/share/fonts/type1/gsfonts",
 15+ PREFIX"/share/fonts/X11/Type1",
15+ "/usr/X11R6/lib/X11/fonts/Type1", 16+ "/usr/X11R6/lib/X11/fonts/Type1",
16+ "/usr/X11R7/lib/X11/fonts/Type1", 17+ "/usr/X11R7/lib/X11/fonts/Type1",
17+ PREFIX"/xorg/lib/X11/fonts/Type1", 18+ PREFIX"/xorg/lib/X11/fonts/Type1",
18+ PREFIX"/share/fonts/urw", 19+ PREFIX"/share/fonts/urw",
19 NULL 20 NULL
20 }; 21 };
21 #endif 22 #endif
cvs diff -r1.3 -r1.4 pkgsrc/print/xpdf/patches/Attic/patch-aq (expand / switch to unified diff)

--- pkgsrc/print/xpdf/patches/Attic/patch-aq 2008/04/20 15:48:12 1.3
+++ pkgsrc/print/xpdf/patches/Attic/patch-aq 2011/10/27 02:35:41 1.4
@@ -1,104 +1,104 @@ @@ -1,104 +1,104 @@
1$NetBSD: patch-aq,v 1.3 2008/04/20 15:48:12 tonnerre Exp $ 1$NetBSD: patch-aq,v 1.4 2011/10/27 02:35:41 tez Exp $
2 2
3Fix arbitrary code execution with embedded fonts (CVE-2008-1693). 3Fix arbitrary code execution with embedded fonts (CVE-2008-1693).
4 4
5--- xpdf/Object.h.orig 2007-02-27 22:05:52.000000000 +0000 5--- xpdf/Object.h.orig 2011-08-15 16:08:53.000000000 -0500
6+++ xpdf/Object.h 6+++ xpdf/Object.h 2011-10-26 20:48:41.411023600 -0500
7@@ -68,17 +68,18 @@ enum ObjType { 7@@ -68,17 +68,18 @@
8 //------------------------------------------------------------------------ 8 //------------------------------------------------------------------------
9  9
10 #ifdef DEBUG_MEM 10 #ifdef DEBUG_MEM
11-#define initObj(t) ++numAlloc[type = t] 11-#define initObj(t) ++numAlloc[type = t]
12+#define initObj(t) zeroUnion(); ++numAlloc[type = t] 12+#define initObj(t) zeroUnion(); ++numAlloc[type = t]
13 #else 13 #else
14-#define initObj(t) type = t 14-#define initObj(t) type = t
15+#define initObj(t) zeroUnion(); type = t 15+#define initObj(t) zeroUnion(); type = t
16 #endif 16 #endif
17  17
18 class Object { 18 class Object {
19 public: 19 public:
20- 20-
21+ // attempt to clear the anonymous union 21+ // attempt to clear the anonymous union
22+ void zeroUnion() { this->name = NULL; } 22+ void zeroUnion() { this->name = NULL; }
23 // Default constructor. 23 // Default constructor.
24 Object(): 24 Object():
25- type(objNone) {} 25- type(objNone) {}
26+ type(objNone) { zeroUnion(); } 26+ type(objNone) { zeroUnion(); }
27  27
28 // Initialize an object. 28 // Initialize an object.
29 Object *initBool(GBool boolnA) 29 Object *initBool(GBool boolnA)
30@@ -220,16 +221,16 @@ private: 30@@ -220,16 +221,16 @@
31 #include "Array.h" 31 #include "Array.h"
32  32
33 inline int Object::arrayGetLength() 33 inline int Object::arrayGetLength()
34- { return array->getLength(); } 34- { return array->getLength(); }
35+ { if (type != objArray) return 0; return array->getLength(); } 35+ { if (type != objArray) return 0; return array->getLength(); }
36  36
37 inline void Object::arrayAdd(Object *elem) 37 inline void Object::arrayAdd(Object *elem)
38- { array->add(elem); } 38- { array->add(elem); }
39+ { if (type == objArray) array->add(elem); } 39+ { if (type == objArray) array->add(elem); }
40  40
41 inline Object *Object::arrayGet(int i, Object *obj) 41 inline Object *Object::arrayGet(int i, Object *obj)
42- { return array->get(i, obj); } 42- { return array->get(i, obj); }
43+ { if (type != objArray) return obj->initNull(); return array->get(i, obj); } 43+ { if (type != objArray) return obj->initNull(); return array->get(i, obj); }
44  44
45 inline Object *Object::arrayGetNF(int i, Object *obj) 45 inline Object *Object::arrayGetNF(int i, Object *obj)
46- { return array->getNF(i, obj); } 46- { return array->getNF(i, obj); }
47+ { if (type != objArray) return obj->initNull(); return array->getNF(i, obj); } 47+ { if (type != objArray) return obj->initNull(); return array->getNF(i, obj); }
48  48
49 //------------------------------------------------------------------------ 49 //------------------------------------------------------------------------
50 // Dict accessors. 50 // Dict accessors.
51@@ -238,31 +239,31 @@ inline Object *Object::arrayGetNF(int i, 51@@ -238,31 +239,31 @@
52 #include "Dict.h" 52 #include "Dict.h"
53  53
54 inline int Object::dictGetLength() 54 inline int Object::dictGetLength()
55- { return dict->getLength(); } 55- { return dict->getLength(); }
56+ { if (type != objDict) return 0; return dict->getLength(); } 56+ { if (type != objDict) return 0; return dict->getLength(); }
57  57
58 inline void Object::dictAdd(char *key, Object *val) 58 inline void Object::dictAdd(char *key, Object *val)
59- { dict->add(key, val); } 59- { dict->add(key, val); }
60+ { if (type == objDict) dict->add(key, val); } 60+ { if (type == objDict) dict->add(key, val); }
61  61
62 inline GBool Object::dictIs(char *dictType) 62 inline GBool Object::dictIs(const char *dictType)
63- { return dict->is(dictType); } 63- { return dict->is(dictType); }
64+ { return (type == objDict) && dict->is(dictType); } 64+ { return (type == objDict) && dict->is(dictType); }
65  65
66 inline GBool Object::isDict(char *dictType) 66 inline GBool Object::isDict(const char *dictType)
67 { return type == objDict && dictIs(dictType); } 67 { return type == objDict && dictIs(dictType); }
68  68
69 inline Object *Object::dictLookup(char *key, Object *obj) 69 inline Object *Object::dictLookup(const char *key, Object *obj, int recursion)
70- { return dict->lookup(key, obj); } 70- { return dict->lookup(key, obj, recursion); }
71+ { if (type != objDict) return obj->initNull(); return dict->lookup(key, obj); } 71+ { if (type != objDict) return obj->initNull(); return dict->lookup(key, obj, recursion); }
72  72
73 inline Object *Object::dictLookupNF(char *key, Object *obj) 73 inline Object *Object::dictLookupNF(const char *key, Object *obj)
74- { return dict->lookupNF(key, obj); } 74- { return dict->lookupNF(key, obj); }
75+ { if (type != objDict) return obj->initNull(); return dict->lookupNF(key, obj); } 75+ { if (type != objDict) return obj->initNull(); return dict->lookupNF(key, obj); }
76  76
77 inline char *Object::dictGetKey(int i) 77 inline char *Object::dictGetKey(int i)
78- { return dict->getKey(i); } 78- { return dict->getKey(i); }
79+ { if (type != objDict) return NULL; return dict->getKey(i); } 79+ { if (type != objDict) return NULL; return dict->getKey(i); }
80  80
81 inline Object *Object::dictGetVal(int i, Object *obj) 81 inline Object *Object::dictGetVal(int i, Object *obj)
82- { return dict->getVal(i, obj); } 82- { return dict->getVal(i, obj); }
83+ { if (type != objDict) return obj->initNull(); return dict->getVal(i, obj); } 83+ { if (type != objDict) return obj->initNull(); return dict->getVal(i, obj); }
84  84
85 inline Object *Object::dictGetValNF(int i, Object *obj) 85 inline Object *Object::dictGetValNF(int i, Object *obj)
86- { return dict->getValNF(i, obj); } 86- { return dict->getValNF(i, obj); }
87+ { if (type != objDict) return obj->initNull(); return dict->getValNF(i, obj); } 87+ { if (type != objDict) return obj->initNull(); return dict->getValNF(i, obj); }
88  88
89 //------------------------------------------------------------------------ 89 //------------------------------------------------------------------------
90 // Stream accessors. 90 // Stream accessors.
91@@ -271,33 +272,33 @@ inline Object *Object::dictGetValNF(int  91@@ -271,33 +272,33 @@
92 #include "Stream.h" 92 #include "Stream.h"
93  93
94 inline GBool Object::streamIs(char *dictType) 94 inline GBool Object::streamIs(char *dictType)
95- { return stream->getDict()->is(dictType); } 95- { return stream->getDict()->is(dictType); }
96+ { return (type == objStream) && stream->getDict()->is(dictType); } 96+ { return (type == objStream) && stream->getDict()->is(dictType); }
97  97
98 inline GBool Object::isStream(char *dictType) 98 inline GBool Object::isStream(char *dictType)
99- { return type == objStream && streamIs(dictType); } 99- { return type == objStream && streamIs(dictType); }
100+ { return (type == objStream) && streamIs(dictType); } 100+ { return (type == objStream) && streamIs(dictType); }
101  101
102 inline void Object::streamReset() 102 inline void Object::streamReset()
103- { stream->reset(); } 103- { stream->reset(); }
104+ { if (type == objStream) stream->reset(); } 104+ { if (type == objStream) stream->reset(); }
cvs diff -r1.5 -r1.6 pkgsrc/print/xpdf/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/print/xpdf/patches/patch-ak 2010/12/23 04:44:41 1.5
+++ pkgsrc/print/xpdf/patches/patch-ak 2011/10/27 02:35:41 1.6
@@ -1,72 +1,75 @@ @@ -1,72 +1,75 @@
1$NetBSD: patch-ak,v 1.5 2010/12/23 04:44:41 obache Exp $ 1$NetBSD: patch-ak,v 1.6 2011/10/27 02:35:41 tez Exp $
2 2
3--- doc/xpdfrc.5.orig 2007-02-27 22:05:51.000000000 +0000 3--- doc/xpdfrc.5.orig 2011-08-15 16:08:53.000000000 -0500
4+++ doc/xpdfrc.5 4+++ doc/xpdfrc.5 2011-10-26 19:56:33.796211600 -0500
5@@ -7,7 +7,7 @@ All of the Xpdf tools read a single conf 5@@ -7,7 +7,7 @@
6 .I .xpdfrc 6 .I .xpdfrc
7 file in your home directory, it will be read. Otherwise, a 7 file in your home directory, it will be read. Otherwise, a
8 system-wide configuration file will be read from 8 system-wide configuration file will be read from
9-.IR /usr/local/etc/xpdfrc , 9-.IR /usr/local/etc/xpdfrc ,
10+.IR @PKG_SYSCONFDIR@/xpdfrc , 10+.IR @PKG_SYSCONFDIR@/xpdfrc ,
11 if it exists. (This is its default location; depending on build 11 if it exists. (This is its default location; depending on build
12 options, it may be placed elsewhere.) On Win32 systems, the 12 options, it may be placed elsewhere.) On Win32 systems, the
13 .I xpdfrc 13 .I xpdfrc
14@@ -544,28 +544,31 @@ The following is a sample xpdfrc file. 14@@ -588,32 +588,32 @@
15 .nf 15 .nf
16  16
17 # from the Thai support package 17 # from the Thai support package
18-nameToUnicode /usr/local/share/xpdf/Thai.nameToUnicode 18-nameToUnicode /usr/local/share/xpdf/Thai.nameToUnicode
19+nameToUnicode @PREFIX@/share/xpdf/thai/Thai.nameToUnicode 19+nameToUnicode @PREFIX@/share/xpdf/Thai.nameToUnicode
20+unicodeMap TIS-620 @PREFIX@/share/xpdf/thai/TIS-620.unicodeMap 
21  20
22 # from the Japanese support package 21 # from the Japanese support package
23-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/Adobe-Japan1.cidToUnicode 22-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/Adobe-Japan1.cidToUnicode
24-unicodeMap JISX0208 /usr/local/share/xpdf/JISX0208.unicodeMap 23-unicodeMap JISX0208 /usr/local/share/xpdf/JISX0208.unicodeMap
25-cMapDir Adobe-Japan1 /usr/local/share/xpdf/cmap/Adobe-Japan1 24-cMapDir Adobe-Japan1 /usr/local/share/xpdf/cmap/Adobe-Japan1
26+cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/japanese/Adobe-Japan1.cidToUnicode 25+cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/Adobe-Japan1.cidToUnicode
27+unicodeMap ISO-2022-JP @PREFIX@/share/xpdf/japanese/ISO-2022-JP.unicodeMap 26+unicodeMap JISX0208 @PREFIX@/share/xpdf/JISX0208.unicodeMap
28+unicodeMap EUC-JP @PREFIX@/share/xpdf/japanese/EUC-JP.unicodeMap 27+cMapDir Adobe-Japan1 @PREFIX@/share/xpdf/cmap/Adobe-Japan1
29+unicodeMap Shift-JIS @PREFIX@/share/xpdf/japanese/Shift-JIS.unicodeMap 
30+cMapDir Adobe-Japan1 @PREFIX@/share/xpdf/japanese/CMap/Adobe-Japan1 
31  28
32 # use the Base-14 Type 1 fonts from ghostscript 29 # use the Base-14 Type 1 fonts from ghostscript
33-displayFontT1 Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb 30-fontFile Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb
34-displayFontT1 Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb 31-fontFile Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb
35-displayFontT1 Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb 32-fontFile Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb
36-displayFontT1 Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb 33-fontFile Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb
37-displayFontT1 Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb 34-fontFile Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb
38-displayFontT1 Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb 35-fontFile Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb
39-displayFontT1 Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb 36-fontFile Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb
40-displayFontT1 Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb 37-fontFile Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb
41-displayFontT1 Courier /usr/local/share/ghostscript/fonts/n022003l.pfb 38-fontFile Courier /usr/local/share/ghostscript/fonts/n022003l.pfb
42-displayFontT1 Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb 39-fontFile Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb
43-displayFontT1 Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb 40-fontFile Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb
44-displayFontT1 Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb 41-fontFile Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb
45-displayFontT1 Symbol /usr/local/share/ghostscript/fonts/s050000l.pfb 42-fontFile Symbol /usr/local/share/ghostscript/fonts/s050000l.pfb
46-displayFontT1 ZapfDingbats /usr/local/share/ghostscript/fonts/d050000l.pfb 43-fontFile ZapfDingbats /usr/local/share/ghostscript/fonts/d050000l.pfb
47+displayFontT1 Times-Roman @PREFIX@/share/fonts/urw/n021003l.pfb 44+fontFile Times-Roman @PREFIX@/share/ghostscript/fonts/n021003l.pfb
48+displayFontT1 Times-Italic @PREFIX@/share/fonts/urw/n021023l.pfb 45+fontFile Times-Italic @PREFIX@/share/ghostscript/fonts/n021023l.pfb
49+displayFontT1 Times-Bold @PREFIX@/share/fonts/urw/n021004l.pfb 46+fontFile Times-Bold @PREFIX@/share/ghostscript/fonts/n021004l.pfb
50+displayFontT1 Times-BoldItalic @PREFIX@/share/fonts/urw/n021024l.pfb 47+fontFile Times-BoldItalic @PREFIX@/share/ghostscript/fonts/n021024l.pfb
51+displayFontT1 Helvetica @PREFIX@/share/fonts/urw/n019003l.pfb 48+fontFile Helvetica @PREFIX@/share/ghostscript/fonts/n019003l.pfb
52+displayFontT1 Helvetica-Oblique @PREFIX@/share/fonts/urw/n019023l.pfb 49+fontFile Helvetica-Oblique @PREFIX@/share/ghostscript/fonts/n019023l.pfb
53+displayFontT1 Helvetica-Bold @PREFIX@/share/fonts/urw/n019004l.pfb 50+fontFile Helvetica-Bold @PREFIX@/share/ghostscript/fonts/n019004l.pfb
54+displayFontT1 Helvetica-BoldOblique @PREFIX@/share/fonts/urw/n019024l.pfb 51+fontFile Helvetica-BoldOblique @PREFIX@/share/ghostscript/fonts/n019024l.pfb
55+displayFontT1 Courier @PREFIX@/share/fonts/urw/n022003l.pfb 52+fontFile Courier @PREFIX@/share/ghostscript/fonts/n022003l.pfb
56+displayFontT1 Courier-Oblique @PREFIX@/share/fonts/urw/n022023l.pfb 53+fontFile Courier-Oblique @PREFIX@/share/ghostscript/fonts/n022023l.pfb
57+displayFontT1 Courier-Bold @PREFIX@/share/fonts/urw/n022004l.pfb 54+fontFile Courier-Bold @PREFIX@/share/ghostscript/fonts/n022004l.pfb
58+displayFontT1 Courier-BoldOblique @PREFIX@/share/fonts/urw/n022024l.pfb 55+fontFile Courier-BoldOblique @PREFIX@/share/ghostscript/fonts/n022024l.pfb
59+displayFontT1 Symbol @PREFIX@/share/fonts/urw/s050000l.pfb 56+fontFile Symbol @PREFIX@/share/ghostscript/fonts/s050000l.pfb
60+displayFontT1 ZapfDingbats @PREFIX@/share/fonts/urw/d050000l.pfb 57+fontFile ZapfDingbats @PREFIX@/share/ghostscript/fonts/d050000l.pfb
61  58
62 # use the Bakoma Type 1 fonts 59 # use the Bakoma Type 1 fonts
63 # (this assumes they happen to be installed in /usr/local/fonts/bakoma) 60-# (this assumes they happen to be installed in /usr/local/fonts/bakoma)
64@@ -596,7 +599,7 @@ urlCommand "netscape -remote 'openU 61-fontDir /usr/local/fonts/bakoma
 62+# (this assumes they happen to be installed in @PREFIX@/fonts/bakoma)
 63+fontDir @PREFIX@/fonts/bakoma
 64
 65 # set some PostScript options
 66 psPaperSize letter
 67@@ -641,7 +641,7 @@
65 .fi 68 .fi
66 .SH FILES 69 .SH FILES
67 .TP 70 .TP
68-.B /usr/local/etc/xpdfrc 71-.B /usr/local/etc/xpdfrc
69+.B @PKG_SYSCONFDIR@/xpdfrc 72+.B @PKG_SYSCONFDIR@/xpdfrc
70 This is the default location for the system-wide configuration file. 73 This is the default location for the system-wide configuration file.
71 Depending on build options, it may be placed elsewhere. 74 Depending on build options, it may be placed elsewhere.
72 .TP 75 .TP
cvs diff -r1.2 -r1.3 pkgsrc/print/xpdf/patches/patch-am (expand / switch to unified diff)

--- pkgsrc/print/xpdf/patches/patch-am 2009/11/13 23:12:02 1.2
+++ pkgsrc/print/xpdf/patches/patch-am 2011/10/27 02:35:41 1.3
@@ -1,255 +1,171 @@ @@ -1,255 +1,171 @@
1$NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $ 1$NetBSD: patch-am,v 1.3 2011/10/27 02:35:41 tez Exp $
2 2
3--- xpdf/Makefile.in.orig 2004-01-22 01:26:45.000000000 +0000 3--- xpdf/Makefile.in.orig 2011-08-15 16:08:53.000000000 -0500
4+++ xpdf/Makefile.in 4+++ xpdf/Makefile.in 2011-10-26 20:22:58.948064100 -0500
5@@ -19,7 +19,7 @@ 5@@ -19,7 +19,7 @@
6 SPLASHSRCDIR = $(srcdir)/../splash 6 SPLASHSRCDIR = $(srcdir)/../splash
7 SPLASHLIBDIR = ../splash 7 SPLASHLIBDIR = ../splash
8  8
9-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@ 9-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
10+CXXFLAGS = @CXXFLAGS@ @DEFS@ -DPREFIX="\"@prefix@\"" -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@ 10+CXXFLAGS = @CXXFLAGS@ @DEFS@ -DPREFIX="\"@prefix@\"" -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
11  11
12 LDFLAGS = @LDFLAGS@ 12 LDFLAGS = @LDFLAGS@
13  13
14@@ -96,21 +96,13 @@ 14@@ -97,22 +97,13 @@
15 $(srcdir)/XPDFViewer.cc \ 15 $(srcdir)/XPDFViewer.cc \
16 $(srcdir)/XpdfPluginAPI.cc \ 16 $(srcdir)/XpdfPluginAPI.cc \
17 $(srcdir)/XRef.cc \ 17 $(srcdir)/XRef.cc \
18- $(srcdir)/pdftops.cc \ 18- $(srcdir)/pdftops.cc \
19- $(srcdir)/pdftotext.cc \ 19- $(srcdir)/pdftotext.cc \
20- $(srcdir)/pdfinfo.cc \ 20- $(srcdir)/pdfinfo.cc \
21- $(srcdir)/pdffonts.cc \ 21- $(srcdir)/pdffonts.cc \
 22- $(srcdir)/pdfdetach.cc \
22- $(srcdir)/pdftoppm.cc \ 23- $(srcdir)/pdftoppm.cc \
23- $(srcdir)/pdfimages.cc \ 24- $(srcdir)/pdfimages.cc \
24 $(srcdir)/xpdf.cc 25 $(srcdir)/xpdf.cc
25  26
26 #------------------------------------------------------------------------ 27 #------------------------------------------------------------------------
27  28
28-all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) \ 29-all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) \
29- pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE) 30- pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
30+all: xpdf$(EXE)  31+all: xpdf$(EXE)
31  32
32-all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \ 33-all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \
33- pdfimages$(EXE) 34- pdfdetach$(EXE) pdfimages$(EXE)
34+all-no-x: 35+all-no-x:
35  36
36 #------------------------------------------------------------------------ 37 #------------------------------------------------------------------------
37  38
38@@ -132,102 +124,102 @@ 39@@ -134,132 +125,8 @@
39  40
40 #------------------------------------------------------------------------ 41 #------------------------------------------------------------------------
41  42
42-PDFTOPS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 43-PDFTOPS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
43- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 44- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
44- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ 45- FontEncodingTables.o Function.o Gfx.o GfxFont.o \
45- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ 46- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
46- JPXStream.o Lexer.o Link.o NameToCharCode.o Outline.o Object.o \ 47- JPXStream.o Lexer.o Link.o NameToCharCode.o OptionalContent.o \
47- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ 48- Outline.o Object.o OutputDev.o Page.o Parser.o PDFDoc.o \
48- PreScanOutputDev.o PSOutputDev.o PSTokenizer.o SecurityHandler.o \ 49- PDFDocEncoding.o PreScanOutputDev.o PSOutputDev.o PSTokenizer.o \
49- SplashOutputDev.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ 50- SecurityHandler.o SplashOutputDev.o Stream.o UnicodeMap.o \
50- pdftops.o 51- XpdfPluginAPI.o XRef.o pdftops.o
51-PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ 52-PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \
52- $(OTHERLIBS) -lm 53- $(OTHERLIBS) -lm
53- 54-
54-pdftops$(EXE): $(PDFTOPS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 55-pdftops$(EXE): $(PDFTOPS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
55- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftops$(EXE) $(PDFTOPS_OBJS) \ 56- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftops$(EXE) $(PDFTOPS_OBJS) \
56- $(PDFTOPS_LIBS) 57- $(PDFTOPS_LIBS)
57- 58-
58-#------------------------------------------------------------------------ 59-#------------------------------------------------------------------------
59- 60-
60-PDFTOTEXT_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 61-PDFTOTEXT_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
61- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 62- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
62- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ 63- FontEncodingTables.o Function.o Gfx.o GfxFont.o \
63- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ 64- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
64- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ 65- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
65- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ 66- OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \
66- SecurityHandler.o Stream.o TextOutputDev.o UnicodeMap.o \ 67- PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \
67- UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftotext.o 68- TextOutputDev.o UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o \
 69- XRef.o pdftotext.o
68-PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm 70-PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
69- 71-
70-pdftotext$(EXE): $(PDFTOTEXT_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 72-pdftotext$(EXE): $(PDFTOTEXT_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
71- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftotext$(EXE) $(PDFTOTEXT_OBJS) \ 73- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftotext$(EXE) $(PDFTOTEXT_OBJS) \
72- $(PDFTOTEXT_LIBS) 74- $(PDFTOTEXT_LIBS)
73- 75-
74-#------------------------------------------------------------------------ 76-#------------------------------------------------------------------------
75- 77-
76-PDFINFO_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 78-PDFINFO_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
77- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 79- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
78- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ 80- FontEncodingTables.o Function.o Gfx.o GfxFont.o \
79- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ 81- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
80- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ 82- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
81- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ 83- OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \
82- SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ 84- PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \
83- pdfinfo.o 85- UnicodeMap.o XpdfPluginAPI.o XRef.o pdfinfo.o
84-PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm 86-PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
85- 87-
86-pdfinfo$(EXE): $(PDFINFO_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 88-pdfinfo$(EXE): $(PDFINFO_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
87- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfinfo$(EXE) $(PDFINFO_OBJS) \ 89- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfinfo$(EXE) $(PDFINFO_OBJS) \
88- $(PDFINFO_LIBS) 90- $(PDFINFO_LIBS)
89- 91-
90-#------------------------------------------------------------------------ 92-#------------------------------------------------------------------------
91- 93-
92-PDFFONTS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 94-PDFFONTS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
93- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 95- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
94- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ 96- FontEncodingTables.o Function.o Gfx.o GfxFont.o \
95- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ 97- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
96- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ 98- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
97- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ 99- OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \
98- SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ 100- PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \
99- pdffonts.o 101- UnicodeMap.o XpdfPluginAPI.o XRef.o pdffonts.o
100-PDFFONTS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm 102-PDFFONTS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
101- 103-
102-pdffonts$(EXE): $(PDFFONTS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 104-pdffonts$(EXE): $(PDFFONTS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
103- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdffonts$(EXE) $(PDFFONTS_OBJS) \ 105- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdffonts$(EXE) $(PDFFONTS_OBJS) \
104- $(PDFFONTS_LIBS) 106- $(PDFFONTS_LIBS)
105- 107-
106-#------------------------------------------------------------------------ 108-#------------------------------------------------------------------------
107- 109-
 110-PDFDETACH_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
 111- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
 112- FontEncodingTables.o Function.o Gfx.o GfxFont.o \
 113- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
 114- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
 115- OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \
 116- PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \
 117- UnicodeMap.o XpdfPluginAPI.o XRef.o pdfdetach.o
 118-PDFDETACH_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
 119-
 120-pdfdetach$(EXE): $(PDFDETACH_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
 121- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfdetach$(EXE) $(PDFDETACH_OBJS) \
 122- $(PDFDETACH_LIBS)
 123-
 124-#------------------------------------------------------------------------
 125-
108-PDFTOPPM_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 126-PDFTOPPM_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
109- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 127- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
110- FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ 128- FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \
111- GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o \ 129- GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o \
112- Lexer.o Link.o NameToCharCode.o Object.o Outline.o OutputDev.o \ 130- Lexer.o Link.o NameToCharCode.o Object.o OptionalContent.o \
113- Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ 131- Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \
114- SecurityHandler.o SplashOutputDev.o Stream.o TextOutputDev.o \ 132- PSTokenizer.o SecurityHandler.o SplashOutputDev.o Stream.o \
115- UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftoppm.o 133- TextOutputDev.o UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o \
 134- XRef.o pdftoppm.o
116-PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ 135-PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \
117- $(OTHERLIBS) -lm 136- $(OTHERLIBS) -lm
118- 137-
119-pdftoppm$(EXE): $(PDFTOPPM_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 138-pdftoppm$(EXE): $(PDFTOPPM_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
120- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftoppm$(EXE) $(PDFTOPPM_OBJS) \ 139- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftoppm$(EXE) $(PDFTOPPM_OBJS) \
121- $(PDFTOPPM_LIBS) 140- $(PDFTOPPM_LIBS)
122- 141-
123-#------------------------------------------------------------------------ 142-#------------------------------------------------------------------------
124- 143-
125-PDFIMAGES_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 144-PDFIMAGES_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
126- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 145- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
127- FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ 146- FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \
128- GlobalParams.o ImageOutputDev.o JArithmeticDecoder.o \ 147- GlobalParams.o ImageOutputDev.o JArithmeticDecoder.o \
129- JBIG2Stream.o JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ 148- JBIG2Stream.o JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
130- Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ 149- OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \
131- PSTokenizer.o SecurityHandler.o Stream.o UnicodeMap.o \ 150- PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \
132- XpdfPluginAPI.o XRef.o pdfimages.o 151- UnicodeMap.o XpdfPluginAPI.o XRef.o pdfimages.o
133-PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm 152-PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
134- 153-
135-pdfimages$(EXE): $(PDFIMAGES_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 154-pdfimages$(EXE): $(PDFIMAGES_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
136- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfimages$(EXE) $(PDFIMAGES_OBJS) \ 155- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfimages$(EXE) $(PDFIMAGES_OBJS) \
137- $(PDFIMAGES_LIBS) 156- $(PDFIMAGES_LIBS)
138+#PDFTOPS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 157-
139+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 158-#------------------------------------------------------------------------
140+# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ 159-
141+# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ 
142+# JPXStream.o Lexer.o Link.o NameToCharCode.o Outline.o Object.o \ 
143+# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ 
144+# PreScanOutputDev.o PSOutputDev.o PSTokenizer.o SecurityHandler.o \ 
145+# SplashOutputDev.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ 
146+# pdftops.o 
147+#PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ 
148+# $(OTHERLIBS) -lm 
149+# 
150+#pdftops$(EXE): $(PDFTOPS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 
151+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftops$(EXE) $(PDFTOPS_OBJS) \ 
152+# $(PDFTOPS_LIBS) 
153+ 
154+#------------------------------------------------------------------------ 
155+ 
156+#PDFTOTEXT_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 
157+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 
158+# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ 
159+# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ 
160+# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ 
161+# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ 
162+# SecurityHandler.o Stream.o TextOutputDev.o UnicodeMap.o \ 
163+# UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftotext.o 
164+#PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm 
165+# 
166+#pdftotext$(EXE): $(PDFTOTEXT_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 
167+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftotext$(EXE) $(PDFTOTEXT_OBJS) \ 
168+# $(PDFTOTEXT_LIBS) 
169+ 
170+#------------------------------------------------------------------------ 
171+ 
172+#PDFINFO_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 
173+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 
174+# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ 
175+# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ 
176+# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ 
177+# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ 
178+# SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ 
179+# pdfinfo.o 
180+#PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm 
181+# 
182+#pdfinfo$(EXE): $(PDFINFO_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 
183+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfinfo$(EXE) $(PDFINFO_OBJS) \ 
184+# $(PDFINFO_LIBS) 
185+ 
186+#------------------------------------------------------------------------ 
187+ 
188+#PDFFONTS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 
189+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 
190+# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ 
191+# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ 
192+# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ 
193+# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ 
194+# SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ 
195+# pdffonts.o 
196+#PDFFONTS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm 
197+# 
198+#pdffonts$(EXE): $(PDFFONTS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 
199+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdffonts$(EXE) $(PDFFONTS_OBJS) \ 
200+# $(PDFFONTS_LIBS) 
201+ 
202+#------------------------------------------------------------------------ 
203+ 
204+#PDFTOPPM_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 
205+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 
206+# FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ 
207+# GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o \ 
208+# Lexer.o Link.o NameToCharCode.o Object.o Outline.o OutputDev.o \ 
209+# Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ 
210+# SecurityHandler.o SplashOutputDev.o Stream.o TextOutputDev.o \ 
211+# UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftoppm.o 
212+#PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ 
213+# $(OTHERLIBS) -lm 
214+# 
215+#pdftoppm$(EXE): $(PDFTOPPM_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 
216+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftoppm$(EXE) $(PDFTOPPM_OBJS) \ 
217+# $(PDFTOPPM_LIBS) 
218+ 
219+#------------------------------------------------------------------------ 
220+ 
221+#PDFIMAGES_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ 
222+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ 
223+# FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ 
224+# GlobalParams.o ImageOutputDev.o JArithmeticDecoder.o \ 
225+# JBIG2Stream.o JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ 
226+# Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ 
227+# PSTokenizer.o SecurityHandler.o Stream.o UnicodeMap.o \ 
228+# XpdfPluginAPI.o XRef.o pdfimages.o 
229+#PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm 
230+# 
231+#pdfimages$(EXE): $(PDFIMAGES_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a 
232+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfimages$(EXE) $(PDFIMAGES_OBJS) \ 
233+# $(PDFIMAGES_LIBS) 
234  
235 #------------------------------------------------------------------------ 
236  
237@@ -239,12 +231,12 @@ 
238  
239 clean: 160 clean:
240 rm -f $(XPDF_OBJS) xpdf$(EXE) 161 rm -f $(XPDF_OBJS) xpdf$(EXE)
241- rm -f $(PDFTOPS_OBJS) pdftops$(EXE) 162- rm -f $(PDFTOPS_OBJS) pdftops$(EXE)
242- rm -f $(PDFTOTEXT_OBJS) pdftotext$(EXE) 163- rm -f $(PDFTOTEXT_OBJS) pdftotext$(EXE)
243- rm -f $(PDFINFO_OBJS) pdfinfo$(EXE) 164- rm -f $(PDFINFO_OBJS) pdfinfo$(EXE)
244- rm -f $(PDFFONTS_OBJS) pdffonts$(EXE) 165- rm -f $(PDFFONTS_OBJS) pdffonts$(EXE)
 166- rm -f $(PDFDETACH_OBJS) pdfdetach$(EXE)
245- rm -f $(PDFTOPPM_OBJS) pdftoppm$(EXE) 167- rm -f $(PDFTOPPM_OBJS) pdftoppm$(EXE)
246- rm -f $(PDFIMAGES_OBJS) pdfimages$(EXE) 168- rm -f $(PDFIMAGES_OBJS) pdfimages$(EXE)
247+# rm -f $(PDFTOPS_OBJS) pdftops$(EXE) 
248+# rm -f $(PDFTOTEXT_OBJS) pdftotext$(EXE) 
249+# rm -f $(PDFINFO_OBJS) pdfinfo$(EXE) 
250+# rm -f $(PDFFONTS_OBJS) pdffonts$(EXE) 
251+# rm -f $(PDFTOPPM_OBJS) pdftoppm$(EXE) 
252+# rm -f $(PDFIMAGES_OBJS) pdfimages$(EXE) 
253  169
254 #------------------------------------------------------------------------ 170 #------------------------------------------------------------------------
255  171
File Deleted: pkgsrc/print/xpdf/patches/Attic/patch-an
File Deleted: pkgsrc/print/xpdf/patches/Attic/patch-bb
File Deleted: pkgsrc/print/xpdf/patches/Attic/patch-bd
cvs diff -r1.1 -r1.2 pkgsrc/print/xpdf/patches/patch-bc (expand / switch to unified diff)

--- pkgsrc/print/xpdf/patches/patch-bc 2010/10/13 21:29:43 1.1
+++ pkgsrc/print/xpdf/patches/patch-bc 2011/10/27 02:35:41 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetbBSD$ 1$NetbBSD$
2 2
3Fix for CVE-2010-3702 3Fix for CVE-2010-3702
4from http://www.openbsd.org/cgi-bin/cvsweb/ports/textproc/xpdf/patches/patch-xpdf_Gfx_cc.diff?r1=1.3;r2=1.4 4from http://www.openbsd.org/cgi-bin/cvsweb/ports/textproc/xpdf/patches/patch-xpdf_Gfx_cc.diff?r1=1.3;r2=1.4
5 5
6--- xpdf/Gfx.cc.orig 2010-10-13 14:50:46.467717900 -0500 6--- xpdf/Gfx.cc.orig 2011-08-15 16:08:53.000000000 -0500
7+++ xpdf/Gfx.cc 2010-10-13 15:01:30.882241300 -0500 7+++ xpdf/Gfx.cc 2011-10-26 20:58:54.318613900 -0500
8@@ -443,6 +443,7 @@ 8@@ -469,6 +469,7 @@
9  9 doc = docA;
10 xref = xrefA; 10 xref = doc->getXRef();
11 subPage = gFalse; 11 subPage = gFalse;
12+ parser = NULL; 12+ parser = NULL;
13 printCommands = globalParams->getPrintCommands(); 13 printCommands = globalParams->getPrintCommands();
14  14
15 // start the resource stack 15 // start the resource stack
16@@ -485,6 +486,7 @@ 16@@ -516,6 +517,7 @@
17  17 doc = docA;
18 xref = xrefA; 18 xref = doc->getXRef();
19 subPage = gTrue; 19 subPage = gTrue;
20+ parser = NULL; 20+ parser = NULL;
21 printCommands = globalParams->getPrintCommands(); 21 printCommands = globalParams->getPrintCommands();
22  22
23 // start the resource stack 23 // start the resource stack