kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 3.03

Browse source 
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)
This commit is contained in:
tez 2011-10-27 02:35:41 +00:00
parent 353ae41787
commit e2a146b512
13 changed files with 199 additions and 381 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
print/xpdf/Makefile
View file

@ -1,15 +1,15 @@
# $NetBSD: Makefile,v 1.74 2010/12/23 04:44:41 obache Exp $ # $NetBSD: Makefile,v 1.75 2011/10/27 02:35:41 tez Exp $
DISTNAME= xpdf-3.02 DISTNAME= xpdf-3.03
PKGNAME= xpdf-3.02pl4 #PKGNAME= xpdf-3.02pl4
PKGREVISION= 4 #PKGREVISION= 4
CATEGORIES= print CATEGORIES= print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \ ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \
http://gd.tuwien.ac.at/publishing/xpdf/ http://gd.tuwien.ac.at/publishing/xpdf/
PATCH_SITES= ${MASTER_SITES} #PATCH_SITES= ${MASTER_SITES}
PATCHFILES= xpdf-3.02pl1.patch xpdf-3.02pl2.patch xpdf-3.02pl3.patch xpdf-3.02pl4.patch #PATCHFILES= xpdf-3.02pl1.patch xpdf-3.02pl2.patch xpdf-3.02pl3.patch xpdf-3.02pl4.patch
PATCH_DIST_STRIP= -p1 #PATCH_DIST_STRIP= -p1
MAINTAINER= pkgsrc-users@NetBSD.org MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.foolabs.com/xpdf/ HOMEPAGE= http://www.foolabs.com/xpdf/

38
print/xpdf/distinfo
View file

@ -1,37 +1,21 @@
$NetBSD: distinfo,v 1.39 2010/12/23 04:44:41 obache Exp $ $NetBSD: distinfo,v 1.40 2011/10/27 02:35:41 tez Exp $
SHA1 (xpdf-3.02.tar.gz) = f9940698840c8a8045677e8be68ab8580903e20a SHA1 (xpdf-3.03.tar.gz) = 499423e8a795e0efd76ca798239eb4d0d52fe248
RMD160 (xpdf-3.02.tar.gz) = e900cb8670b8c430beaa45895fb474411cb1958d RMD160 (xpdf-3.03.tar.gz) = ef1336c189026fb0ecd169e2b37b5a5aa22e04be
Size (xpdf-3.02.tar.gz) = 674912 bytes Size (xpdf-3.03.tar.gz) = 795537 bytes
SHA1 (xpdf-3.02pl1.patch) = cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d SHA1 (patch-aa) = ab41e35600d1e625b902076d947ec48a9c1bc59e
RMD160 (xpdf-3.02pl1.patch) = 5c310f96760f72e9c1062b00c57c2ed035ac6757
Size (xpdf-3.02pl1.patch) = 1050 bytes
SHA1 (xpdf-3.02pl2.patch) = d082ebe0d36cad0c04603950216f5c52de1c2593
RMD160 (xpdf-3.02pl2.patch) = 0024e3d203d69e073a458570cec5679e260ad204
Size (xpdf-3.02pl2.patch) = 20843 bytes
SHA1 (xpdf-3.02pl3.patch) = 23f496804802a3da530f1d0bab894bae3e938fc2
RMD160 (xpdf-3.02pl3.patch) = 859ec3131d3c4526a6075ee639c5eb704194211b
Size (xpdf-3.02pl3.patch) = 30727 bytes
SHA1 (xpdf-3.02pl4.patch) = 1aa3087a1c7882884ae7d3a502240a55acca65fd
RMD160 (xpdf-3.02pl4.patch) = 428065e8c9639b6799705b216be603f52efb8a22
Size (xpdf-3.02pl4.patch) = 6982 bytes
SHA1 (patch-aa) = d3694e51ec23026a3273d7a7acac1582b69f4810
SHA1 (patch-ab) = fd4205c477ee4ac7660b8c1a707ea7b528ac4f90
SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2 SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2
SHA1 (patch-ad) = 08202be663d819f033a7a5e6708b4158255bcf4a SHA1 (patch-ad) = 08202be663d819f033a7a5e6708b4158255bcf4a
SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143 SHA1 (patch-ae) = 4642345ed25231dae6753024a691bbd39f028143
SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c SHA1 (patch-af) = da53b226cd7a58979902f899c0ab9303a7f0b95c
SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac SHA1 (patch-ag) = a739f73612a4f02d50d97e242ccff2505a3a3fac
SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a SHA1 (patch-ah) = 61e44757c30800754fc4966acb218325fd1bd26a
SHA1 (patch-ai) = 23bdf2b177b2f189be2bb5834c1d0bbb1e5d2b70 SHA1 (patch-ai) = 2ef56341ee14cfb22c9d49e659cfa2955aa18ee6
SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860 SHA1 (patch-aj) = 36609d6ba7bc56be9b417558b90850fc19e62860
SHA1 (patch-ak) = 20d48739d074ffa729b99e9ceec62cb52d8d3f48 SHA1 (patch-ak) = a45747998f7c72f7db3f9199c244dc1d4962417d
SHA1 (patch-al) = c79b5865432ea0519c2124e177a1dbf5b9c09024 SHA1 (patch-al) = c210ca493be97cf5b7ba8469f5258b10667e8633
SHA1 (patch-am) = 1b498307ce7ffaa7a4e7c6c754c2ce373390ddd8 SHA1 (patch-am) = 1140a6030dfec7a737f5ac16c403225c88a046de
SHA1 (patch-an) = 94ea208c43f4df1ac3a9bf01cc874d488ae49a9a
SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58 SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58
SHA1 (patch-aq) = 1df0efb9fdde90df0597ba2a56c6030e7446e185 SHA1 (patch-aq) = 4cba560189d2977d1c5ea60acf2d50ca311efbe1
SHA1 (patch-ar) = 5e4719a30a0412d9d731dbef8179c38bba67db94 SHA1 (patch-ar) = 5e4719a30a0412d9d731dbef8179c38bba67db94
SHA1 (patch-bb) = d38757d5e4a331d49149acfff897cfe7bc0a5e3b SHA1 (patch-bc) = e3f8092c30325a3f7abf230daeadd4478a9db768
SHA1 (patch-bc) = 856c7012bf794135aecdb70f726ccec14aa0a7cc
SHA1 (patch-bd) = 8cd3fabac230fcda0d5db39d4b777802f5a75114

24
print/xpdf/patches/patch-aa
View file

@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.7 2009/11/13 23:12:02 christos Exp $ $NetBSD: patch-aa,v 1.8 2011/10/27 02:35:41 tez Exp $
--- Makefile.in.orig 2005-08-17 05:34:30.000000000 +0000 --- Makefile.in.orig 2011-08-15 16:08:52.000000000 -0500
+++ Makefile.in +++ Makefile.in 2011-10-26 19:45:47.941835500 -0500
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.7 2009/11/13 23:12:02 christos Exp $
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -37,69 +38,69 @@ @@ -37,77 +38,77 @@
cd @UP_DIR@splash; $(MAKE) cd @UP_DIR@splash; $(MAKE)
cd @UP_DIR@xpdf; $(MAKE) xpdf$(EXE) cd @UP_DIR@xpdf; $(MAKE) xpdf$(EXE)
@ -38,6 +38,12 @@ $NetBSD: patch-aa,v 1.7 2009/11/13 23:12:02 christos Exp $
- cd @UP_DIR@splash; $(MAKE) - cd @UP_DIR@splash; $(MAKE)
- cd @UP_DIR@xpdf; $(MAKE) pdffonts$(EXE) - cd @UP_DIR@xpdf; $(MAKE) pdffonts$(EXE)
- -
-pdfdetach:
- cd goo; $(MAKE)
- cd @UP_DIR@fofi; $(MAKE)
- cd @UP_DIR@splash; $(MAKE)
- cd @UP_DIR@xpdf; $(MAKE) pdfdetach$(EXE)
-
-pdftoppm: -pdftoppm:
- cd goo; $(MAKE) - cd goo; $(MAKE)
- cd @UP_DIR@fofi; $(MAKE) - cd @UP_DIR@fofi; $(MAKE)
@ -73,6 +79,12 @@ $NetBSD: patch-aa,v 1.7 2009/11/13 23:12:02 christos Exp $
+# cd @UP_DIR@splash; $(MAKE) +# cd @UP_DIR@splash; $(MAKE)
+# cd @UP_DIR@xpdf; $(MAKE) pdffonts$(EXE) +# cd @UP_DIR@xpdf; $(MAKE) pdffonts$(EXE)
+# +#
+#pdfdetach:
+# cd goo; $(MAKE)
+# cd @UP_DIR@fofi; $(MAKE)
+# cd @UP_DIR@splash; $(MAKE)
+# cd @UP_DIR@xpdf; $(MAKE) pdfdetach$(EXE)
+#
+#pdftoppm: +#pdftoppm:
+# cd goo; $(MAKE) +# cd goo; $(MAKE)
+# cd @UP_DIR@fofi; $(MAKE) +# cd @UP_DIR@fofi; $(MAKE)
@ -94,12 +106,14 @@ $NetBSD: patch-aa,v 1.7 2009/11/13 23:12:02 christos Exp $
- $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE) - $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE)
- $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE) - $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)
- $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE) - $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)
- $(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE)
-@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE) -@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
- $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE) - $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)
+# $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE) +# $(INSTALL_PROGRAM) xpdf/pdftops$(EXE) $(DESTDIR)@bindir@/pdftops$(EXE)
+# $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE) +# $(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE)
+# $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE) +# $(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)
+# $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE) +# $(INSTALL_PROGRAM) xpdf/pdffonts$(EXE) $(DESTDIR)@bindir@/pdffonts$(EXE)
+# $(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE)
+#@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE) +#@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
+# $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE) +# $(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)
-mkdir -p $(DESTDIR)@mandir@/man1 -mkdir -p $(DESTDIR)@mandir@/man1
@ -108,12 +122,14 @@ $NetBSD: patch-aa,v 1.7 2009/11/13 23:12:02 christos Exp $
- $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1 - $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1
- $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1 - $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1
- $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1 - $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1
- $(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1
-@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1 -@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
- $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1 - $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
+# $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1 +# $(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1
+# $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1 +# $(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)@mandir@/man1/pdftotext.1
+# $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1 +# $(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)@mandir@/man1/pdfinfo.1
+# $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1 +# $(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)@mandir@/man1/pdffonts.1
+# $(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1
+#@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1 +#@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
+# $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1 +# $(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
-mkdir -p $(DESTDIR)@mandir@/man5 -mkdir -p $(DESTDIR)@mandir@/man5

20
print/xpdf/patches/patch-ab
View file

@ -1,20 +0,0 @@
$NetBSD: patch-ab,v 1.5 2005/09/07 15:19:08 adam Exp $
--- xpdf/XPDFViewer.cc.orig 2005-08-17 05:34:31.000000000 +0000
+++ xpdf/XPDFViewer.cc
@@ -175,9 +175,12 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, GS
XPDFViewer::~XPDFViewer() {
delete core;
- XmFontListFree(aboutBigFont);
- XmFontListFree(aboutVersionFont);
- XmFontListFree(aboutFixedFont);
+ if(aboutBigFont)
+ XmFontListFree(aboutBigFont);
+ if(aboutVersionFont)
+ XmFontListFree(aboutVersionFont);
+ if(aboutFixedFont)
+ XmFontListFree(aboutFixedFont);
closeWindow();
#ifndef DISABLE_OUTLINE
if (outlineLabels) {

68
print/xpdf/patches/patch-ai
View file

@ -1,7 +1,7 @@
$NetBSD: patch-ai,v 1.3 2010/06/13 08:56:04 spz Exp $ $NetBSD: patch-ai,v 1.4 2011/10/27 02:35:41 tez Exp $
--- doc/sample-xpdfrc.orig 2005-08-17 05:34:30.000000000 +0000 --- doc/sample-xpdfrc.orig 2011-08-15 16:08:53.000000000 -0500
+++ doc/sample-xpdfrc +++ doc/sample-xpdfrc 2011-10-26 19:52:54.856951700 -0500
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
# #
# The Xpdf tools look for a config file in two places: # The Xpdf tools look for a config file in two places:
@ -15,43 +15,43 @@ $NetBSD: patch-ai,v 1.3 2010/06/13 08:56:04 spz Exp $
# installed in a "standard" location, xpdf will find them # installed in a "standard" location, xpdf will find them
# automatically.) # automatically.)
-#displayFontT1 Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb -#fontFile Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb
-#displayFontT1 Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb -#fontFile Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb
-#displayFontT1 Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb -#fontFile Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb
-#displayFontT1 Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb -#fontFile Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb
-#displayFontT1 Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb -#fontFile Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb
-#displayFontT1 Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb -#fontFile Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb
-#displayFontT1 Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb -#fontFile Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb
-#displayFontT1 Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb -#fontFile Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb
-#displayFontT1 Courier /usr/local/share/ghostscript/fonts/n022003l.pfb -#fontFile Courier /usr/local/share/ghostscript/fonts/n022003l.pfb
-#displayFontT1 Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb -#fontFile Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb
-#displayFontT1 Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb -#fontFile Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb
-#displayFontT1 Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb -#fontFile Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb
-#displayFontT1 Symbol /usr/local/share/ghostscript/fonts/s050000l.pfb -#fontFile Symbol /usr/local/share/ghostscript/fonts/s050000l.pfb
-#displayFontT1 ZapfDingbats /usr/local/share/ghostscript/fonts/d050000l.pfb -#fontFile ZapfDingbats /usr/local/share/ghostscript/fonts/d050000l.pfb
+#displayFontT1 Times-Roman @PREFIX@/share/fonts/urw/n021003l.pfb +#fontFile Times-Roman @PREFIX@/share/ghostscript/fonts/n021003l.pfb
+#displayFontT1 Times-Italic @PREFIX@/share/fonts/urw/n021023l.pfb +#fontFile Times-Italic @PREFIX@/share/ghostscript/fonts/n021023l.pfb
+#displayFontT1 Times-Bold @PREFIX@/share/fonts/urw/n021004l.pfb +#fontFile Times-Bold @PREFIX@/share/ghostscript/fonts/n021004l.pfb
+#displayFontT1 Times-BoldItalic @PREFIX@/share/fonts/urw/n021024l.pfb +#fontFile Times-BoldItalic @PREFIX@/share/ghostscript/fonts/n021024l.pfb
+#displayFontT1 Helvetica @PREFIX@/share/fonts/urw/n019003l.pfb +#fontFile Helvetica @PREFIX@/share/ghostscript/fonts/n019003l.pfb
+#displayFontT1 Helvetica-Oblique @PREFIX@/share/fonts/urw/n019023l.pfb +#fontFile Helvetica-Oblique @PREFIX@/share/ghostscript/fonts/n019023l.pfb
+#displayFontT1 Helvetica-Bold @PREFIX@/share/fonts/urw/n019004l.pfb +#fontFile Helvetica-Bold @PREFIX@/share/ghostscript/fonts/n019004l.pfb
+#displayFontT1 Helvetica-BoldOblique @PREFIX@/share/fonts/urw/n019024l.pfb +#fontFile Helvetica-BoldOblique @PREFIX@/share/ghostscript/fonts/n019024l.pfb
+#displayFontT1 Courier @PREFIX@/share/fonts/urw/n022003l.pfb +#fontFile Courier @PREFIX@/share/ghostscript/fonts/n022003l.pfb
+#displayFontT1 Courier-Oblique @PREFIX@/share/fonts/urw/n022023l.pfb +#fontFile Courier-Oblique @PREFIX@/share/ghostscript/fonts/n022023l.pfb
+#displayFontT1 Courier-Bold @PREFIX@/share/fonts/urw/n022004l.pfb +#fontFile Courier-Bold @PREFIX@/share/ghostscript/fonts/n022004l.pfb
+#displayFontT1 Courier-BoldOblique @PREFIX@/share/fonts/urw/n022024l.pfb +#fontFile Courier-BoldOblique @PREFIX@/share/ghostscript/fonts/n022024l.pfb
+#displayFontT1 Symbol @PREFIX@/share/fonts/urw/s050000l.pfb +#fontFile Symbol @PREFIX@/share/ghostscript/fonts/s050000l.pfb
+#displayFontT1 ZapfDingbats @PREFIX@/share/fonts/urw/d050000l.pfb +#fontFile ZapfDingbats @PREFIX@/share/ghostscript/fonts/d050000l.pfb
# If you need to display PDF files that refer to non-embedded fonts, # If you need to display PDF files that refer to non-embedded fonts,
# you should add one or more fontDir options to point to the # you should add one or more fontDir options to point to the
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
# .pfb, and .ttf files in those directories (other files will simply # .pfb, .ttf, and .ttc files in those directories (other files will
# be ignored). # simply be ignored).
-#fontDir /usr/local/fonts/bakoma -#fontDir /usr/local/fonts/bakoma
+#fontDir @PREFIX@/share/tex-contrib/BaKoMa +#fontDir @PREFIX@/fonts/bakoma
#----- PostScript output control #----- PostScript output control

87
print/xpdf/patches/patch-ak
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ak,v 1.5 2010/12/23 04:44:41 obache Exp $ $NetBSD: patch-ak,v 1.6 2011/10/27 02:35:41 tez Exp $
--- doc/xpdfrc.5.orig 2007-02-27 22:05:51.000000000 +0000 --- doc/xpdfrc.5.orig 2011-08-15 16:08:53.000000000 -0500
+++ doc/xpdfrc.5 +++ doc/xpdfrc.5 2011-10-26 19:56:33.796211600 -0500
@@ -7,7 +7,7 @@ All of the Xpdf tools read a single conf @@ -7,7 +7,7 @@
.I .xpdfrc .I .xpdfrc
file in your home directory, it will be read. Otherwise, a file in your home directory, it will be read. Otherwise, a
system-wide configuration file will be read from system-wide configuration file will be read from
@ -11,57 +11,60 @@ $NetBSD: patch-ak,v 1.5 2010/12/23 04:44:41 obache Exp $
if it exists. (This is its default location; depending on build if it exists. (This is its default location; depending on build
options, it may be placed elsewhere.) On Win32 systems, the options, it may be placed elsewhere.) On Win32 systems, the
.I xpdfrc .I xpdfrc
@@ -544,28 +544,31 @@ The following is a sample xpdfrc file. @@ -588,32 +588,32 @@
.nf .nf
# from the Thai support package # from the Thai support package
-nameToUnicode /usr/local/share/xpdf/Thai.nameToUnicode -nameToUnicode /usr/local/share/xpdf/Thai.nameToUnicode
+nameToUnicode @PREFIX@/share/xpdf/thai/Thai.nameToUnicode +nameToUnicode @PREFIX@/share/xpdf/Thai.nameToUnicode
+unicodeMap TIS-620 @PREFIX@/share/xpdf/thai/TIS-620.unicodeMap
# from the Japanese support package # from the Japanese support package
-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/Adobe-Japan1.cidToUnicode -cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/Adobe-Japan1.cidToUnicode
-unicodeMap JISX0208 /usr/local/share/xpdf/JISX0208.unicodeMap -unicodeMap JISX0208 /usr/local/share/xpdf/JISX0208.unicodeMap
-cMapDir Adobe-Japan1 /usr/local/share/xpdf/cmap/Adobe-Japan1 -cMapDir Adobe-Japan1 /usr/local/share/xpdf/cmap/Adobe-Japan1
+cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/japanese/Adobe-Japan1.cidToUnicode +cidToUnicode Adobe-Japan1 @PREFIX@/share/xpdf/Adobe-Japan1.cidToUnicode
+unicodeMap ISO-2022-JP @PREFIX@/share/xpdf/japanese/ISO-2022-JP.unicodeMap +unicodeMap JISX0208 @PREFIX@/share/xpdf/JISX0208.unicodeMap
+unicodeMap EUC-JP @PREFIX@/share/xpdf/japanese/EUC-JP.unicodeMap +cMapDir Adobe-Japan1 @PREFIX@/share/xpdf/cmap/Adobe-Japan1
+unicodeMap Shift-JIS @PREFIX@/share/xpdf/japanese/Shift-JIS.unicodeMap
+cMapDir Adobe-Japan1 @PREFIX@/share/xpdf/japanese/CMap/Adobe-Japan1
# use the Base-14 Type 1 fonts from ghostscript # use the Base-14 Type 1 fonts from ghostscript
-displayFontT1 Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb -fontFile Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb
-displayFontT1 Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb -fontFile Times-Italic /usr/local/share/ghostscript/fonts/n021023l.pfb
-displayFontT1 Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb -fontFile Times-Bold /usr/local/share/ghostscript/fonts/n021004l.pfb
-displayFontT1 Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb -fontFile Times-BoldItalic /usr/local/share/ghostscript/fonts/n021024l.pfb
-displayFontT1 Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb -fontFile Helvetica /usr/local/share/ghostscript/fonts/n019003l.pfb
-displayFontT1 Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb -fontFile Helvetica-Oblique /usr/local/share/ghostscript/fonts/n019023l.pfb
-displayFontT1 Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb -fontFile Helvetica-Bold /usr/local/share/ghostscript/fonts/n019004l.pfb
-displayFontT1 Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb -fontFile Helvetica-BoldOblique /usr/local/share/ghostscript/fonts/n019024l.pfb
-displayFontT1 Courier /usr/local/share/ghostscript/fonts/n022003l.pfb -fontFile Courier /usr/local/share/ghostscript/fonts/n022003l.pfb
-displayFontT1 Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb -fontFile Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb
-displayFontT1 Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb -fontFile Courier-Bold /usr/local/share/ghostscript/fonts/n022004l.pfb
-displayFontT1 Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb -fontFile Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb
-displayFontT1 Symbol /usr/local/share/ghostscript/fonts/s050000l.pfb -fontFile Symbol /usr/local/share/ghostscript/fonts/s050000l.pfb
-displayFontT1 ZapfDingbats /usr/local/share/ghostscript/fonts/d050000l.pfb -fontFile ZapfDingbats /usr/local/share/ghostscript/fonts/d050000l.pfb
+displayFontT1 Times-Roman @PREFIX@/share/fonts/urw/n021003l.pfb +fontFile Times-Roman @PREFIX@/share/ghostscript/fonts/n021003l.pfb
+displayFontT1 Times-Italic @PREFIX@/share/fonts/urw/n021023l.pfb +fontFile Times-Italic @PREFIX@/share/ghostscript/fonts/n021023l.pfb
+displayFontT1 Times-Bold @PREFIX@/share/fonts/urw/n021004l.pfb +fontFile Times-Bold @PREFIX@/share/ghostscript/fonts/n021004l.pfb
+displayFontT1 Times-BoldItalic @PREFIX@/share/fonts/urw/n021024l.pfb +fontFile Times-BoldItalic @PREFIX@/share/ghostscript/fonts/n021024l.pfb
+displayFontT1 Helvetica @PREFIX@/share/fonts/urw/n019003l.pfb +fontFile Helvetica @PREFIX@/share/ghostscript/fonts/n019003l.pfb
+displayFontT1 Helvetica-Oblique @PREFIX@/share/fonts/urw/n019023l.pfb +fontFile Helvetica-Oblique @PREFIX@/share/ghostscript/fonts/n019023l.pfb
+displayFontT1 Helvetica-Bold @PREFIX@/share/fonts/urw/n019004l.pfb +fontFile Helvetica-Bold @PREFIX@/share/ghostscript/fonts/n019004l.pfb
+displayFontT1 Helvetica-BoldOblique @PREFIX@/share/fonts/urw/n019024l.pfb +fontFile Helvetica-BoldOblique @PREFIX@/share/ghostscript/fonts/n019024l.pfb
+displayFontT1 Courier @PREFIX@/share/fonts/urw/n022003l.pfb +fontFile Courier @PREFIX@/share/ghostscript/fonts/n022003l.pfb
+displayFontT1 Courier-Oblique @PREFIX@/share/fonts/urw/n022023l.pfb +fontFile Courier-Oblique @PREFIX@/share/ghostscript/fonts/n022023l.pfb
+displayFontT1 Courier-Bold @PREFIX@/share/fonts/urw/n022004l.pfb +fontFile Courier-Bold @PREFIX@/share/ghostscript/fonts/n022004l.pfb
+displayFontT1 Courier-BoldOblique @PREFIX@/share/fonts/urw/n022024l.pfb +fontFile Courier-BoldOblique @PREFIX@/share/ghostscript/fonts/n022024l.pfb
+displayFontT1 Symbol @PREFIX@/share/fonts/urw/s050000l.pfb +fontFile Symbol @PREFIX@/share/ghostscript/fonts/s050000l.pfb
+displayFontT1 ZapfDingbats @PREFIX@/share/fonts/urw/d050000l.pfb +fontFile ZapfDingbats @PREFIX@/share/ghostscript/fonts/d050000l.pfb
# use the Bakoma Type 1 fonts # use the Bakoma Type 1 fonts
# (this assumes they happen to be installed in /usr/local/fonts/bakoma) -# (this assumes they happen to be installed in /usr/local/fonts/bakoma)
@@ -596,7 +599,7 @@ urlCommand "netscape -remote 'openU -fontDir /usr/local/fonts/bakoma
+# (this assumes they happen to be installed in @PREFIX@/fonts/bakoma)
+fontDir @PREFIX@/fonts/bakoma
# set some PostScript options
psPaperSize letter
@@ -641,7 +641,7 @@
.fi .fi
.SH FILES .SH FILES
.TP .TP

11
print/xpdf/patches/patch-al
View file

@ -1,17 +1,18 @@
$NetBSD: patch-al,v 1.3 2010/06/13 08:56:04 spz Exp $ $NetBSD: patch-al,v 1.4 2011/10/27 02:35:41 tez Exp $
--- xpdf/GlobalParams.cc.orig 2005-08-17 05:34:31.000000000 +0000 --- xpdf/GlobalParams.cc.orig 2011-08-15 16:08:53.000000000 -0500
+++ xpdf/GlobalParams.cc +++ xpdf/GlobalParams.cc 2011-10-26 20:15:39.959345400 -0500
@@ -106,11 +106,12 @@ static char *displayFontDirs[] = { @@ -110,11 +110,13 @@
}; };
#else #else
static char *displayFontDirs[] = { static const char *displayFontDirs[] = {
- "/usr/share/ghostscript/fonts", - "/usr/share/ghostscript/fonts",
+ PREFIX"/share/ghostscript/fonts", + PREFIX"/share/ghostscript/fonts",
"/usr/local/share/ghostscript/fonts", "/usr/local/share/ghostscript/fonts",
- "/usr/share/fonts/default/Type1", - "/usr/share/fonts/default/Type1",
- "/usr/share/fonts/default/ghostscript", - "/usr/share/fonts/default/ghostscript",
- "/usr/share/fonts/type1/gsfonts", - "/usr/share/fonts/type1/gsfonts",
+ PREFIX"/share/fonts/X11/Type1",
+ "/usr/X11R6/lib/X11/fonts/Type1", + "/usr/X11R6/lib/X11/fonts/Type1",
+ "/usr/X11R7/lib/X11/fonts/Type1", + "/usr/X11R7/lib/X11/fonts/Type1",
+ PREFIX"/xorg/lib/X11/fonts/Type1", + PREFIX"/xorg/lib/X11/fonts/Type1",

192
print/xpdf/patches/patch-am
View file

@ -1,7 +1,7 @@
$NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $ $NetBSD: patch-am,v 1.3 2011/10/27 02:35:41 tez Exp $
--- xpdf/Makefile.in.orig 2004-01-22 01:26:45.000000000 +0000 --- xpdf/Makefile.in.orig 2011-08-15 16:08:53.000000000 -0500
+++ xpdf/Makefile.in +++ xpdf/Makefile.in 2011-10-26 20:22:58.948064100 -0500
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
SPLASHSRCDIR = $(srcdir)/../splash SPLASHSRCDIR = $(srcdir)/../splash
SPLASHLIBDIR = ../splash SPLASHLIBDIR = ../splash
@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
@@ -96,21 +96,13 @@ @@ -97,22 +97,13 @@
$(srcdir)/XPDFViewer.cc \ $(srcdir)/XPDFViewer.cc \
$(srcdir)/XpdfPluginAPI.cc \ $(srcdir)/XpdfPluginAPI.cc \
$(srcdir)/XRef.cc \ $(srcdir)/XRef.cc \
@ -19,6 +19,7 @@ $NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $
- $(srcdir)/pdftotext.cc \ - $(srcdir)/pdftotext.cc \
- $(srcdir)/pdfinfo.cc \ - $(srcdir)/pdfinfo.cc \
- $(srcdir)/pdffonts.cc \ - $(srcdir)/pdffonts.cc \
- $(srcdir)/pdfdetach.cc \
- $(srcdir)/pdftoppm.cc \ - $(srcdir)/pdftoppm.cc \
- $(srcdir)/pdfimages.cc \ - $(srcdir)/pdfimages.cc \
$(srcdir)/xpdf.cc $(srcdir)/xpdf.cc
@ -26,16 +27,16 @@ $NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $
#------------------------------------------------------------------------ #------------------------------------------------------------------------
-all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) \ -all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) \
- pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE) - pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
+all: xpdf$(EXE) +all: xpdf$(EXE)
-all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \ -all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \
- pdfimages$(EXE) - pdfdetach$(EXE) pdfimages$(EXE)
+all-no-x: +all-no-x:
#------------------------------------------------------------------------ #------------------------------------------------------------------------
@@ -132,102 +124,102 @@ @@ -134,132 +125,8 @@
#------------------------------------------------------------------------ #------------------------------------------------------------------------
@ -43,11 +44,11 @@ $NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $
- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o \
- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ - GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
- JPXStream.o Lexer.o Link.o NameToCharCode.o Outline.o Object.o \ - JPXStream.o Lexer.o Link.o NameToCharCode.o OptionalContent.o \
- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ - Outline.o Object.o OutputDev.o Page.o Parser.o PDFDoc.o \
- PreScanOutputDev.o PSOutputDev.o PSTokenizer.o SecurityHandler.o \ - PDFDocEncoding.o PreScanOutputDev.o PSOutputDev.o PSTokenizer.o \
- SplashOutputDev.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ - SecurityHandler.o SplashOutputDev.o Stream.o UnicodeMap.o \
- pdftops.o - XpdfPluginAPI.o XRef.o pdftops.o
-PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ -PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \
- $(OTHERLIBS) -lm - $(OTHERLIBS) -lm
- -
@ -61,10 +62,11 @@ $NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $
- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o \
- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ - GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \
- SecurityHandler.o Stream.o TextOutputDev.o UnicodeMap.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \
- UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftotext.o - TextOutputDev.o UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o \
- XRef.o pdftotext.o
-PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm -PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
- -
-pdftotext$(EXE): $(PDFTOTEXT_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a -pdftotext$(EXE): $(PDFTOTEXT_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
@ -77,10 +79,10 @@ $NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $
- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o \
- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ - GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \
- SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \
- pdfinfo.o - UnicodeMap.o XpdfPluginAPI.o XRef.o pdfinfo.o
-PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm -PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
- -
-pdfinfo$(EXE): $(PDFINFO_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a -pdfinfo$(EXE): $(PDFINFO_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
@ -93,10 +95,10 @@ $NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $
- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
- FontEncodingTables.o Function.o Gfx.o GfxFont.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o \
- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ - GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
- OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \
- SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \
- pdffonts.o - UnicodeMap.o XpdfPluginAPI.o XRef.o pdffonts.o
-PDFFONTS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm -PDFFONTS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
- -
-pdffonts$(EXE): $(PDFFONTS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a -pdffonts$(EXE): $(PDFFONTS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
@ -105,14 +107,31 @@ $NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $
- -
-#------------------------------------------------------------------------ -#------------------------------------------------------------------------
- -
-PDFDETACH_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
- FontEncodingTables.o Function.o Gfx.o GfxFont.o \
- GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
- JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
- OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \
- PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \
- UnicodeMap.o XpdfPluginAPI.o XRef.o pdfdetach.o
-PDFDETACH_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
-
-pdfdetach$(EXE): $(PDFDETACH_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfdetach$(EXE) $(PDFDETACH_OBJS) \
- $(PDFDETACH_LIBS)
-
-#------------------------------------------------------------------------
-
-PDFTOPPM_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ -PDFTOPPM_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
- Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
- FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \
- GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o \ - GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o \
- Lexer.o Link.o NameToCharCode.o Object.o Outline.o OutputDev.o \ - Lexer.o Link.o NameToCharCode.o Object.o OptionalContent.o \
- Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ - Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \
- SecurityHandler.o SplashOutputDev.o Stream.o TextOutputDev.o \ - PSTokenizer.o SecurityHandler.o SplashOutputDev.o Stream.o \
- UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftoppm.o - TextOutputDev.o UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o \
- XRef.o pdftoppm.o
-PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ -PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \
- $(OTHERLIBS) -lm - $(OTHERLIBS) -lm
- -
@ -127,129 +146,26 @@ $NetBSD: patch-am,v 1.2 2009/11/13 23:12:02 christos Exp $
- FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \
- GlobalParams.o ImageOutputDev.o JArithmeticDecoder.o \ - GlobalParams.o ImageOutputDev.o JArithmeticDecoder.o \
- JBIG2Stream.o JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ - JBIG2Stream.o JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
- Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \
- PSTokenizer.o SecurityHandler.o Stream.o UnicodeMap.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \
- XpdfPluginAPI.o XRef.o pdfimages.o - UnicodeMap.o XpdfPluginAPI.o XRef.o pdfimages.o
-PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm -PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
- -
-pdfimages$(EXE): $(PDFIMAGES_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a -pdfimages$(EXE): $(PDFIMAGES_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfimages$(EXE) $(PDFIMAGES_OBJS) \ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfimages$(EXE) $(PDFIMAGES_OBJS) \
- $(PDFIMAGES_LIBS) - $(PDFIMAGES_LIBS)
+#PDFTOPS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ -
+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ -#------------------------------------------------------------------------
+# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ -
+# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
+# JPXStream.o Lexer.o Link.o NameToCharCode.o Outline.o Object.o \
+# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \
+# PreScanOutputDev.o PSOutputDev.o PSTokenizer.o SecurityHandler.o \
+# SplashOutputDev.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \
+# pdftops.o
+#PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \
+# $(OTHERLIBS) -lm
+#
+#pdftops$(EXE): $(PDFTOPS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftops$(EXE) $(PDFTOPS_OBJS) \
+# $(PDFTOPS_LIBS)
+
+#------------------------------------------------------------------------
+
+#PDFTOTEXT_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
+# FontEncodingTables.o Function.o Gfx.o GfxFont.o \
+# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
+# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \
+# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \
+# SecurityHandler.o Stream.o TextOutputDev.o UnicodeMap.o \
+# UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftotext.o
+#PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
+#
+#pdftotext$(EXE): $(PDFTOTEXT_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftotext$(EXE) $(PDFTOTEXT_OBJS) \
+# $(PDFTOTEXT_LIBS)
+
+#------------------------------------------------------------------------
+
+#PDFINFO_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
+# FontEncodingTables.o Function.o Gfx.o GfxFont.o \
+# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
+# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \
+# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \
+# SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \
+# pdfinfo.o
+#PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
+#
+#pdfinfo$(EXE): $(PDFINFO_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfinfo$(EXE) $(PDFINFO_OBJS) \
+# $(PDFINFO_LIBS)
+
+#------------------------------------------------------------------------
+
+#PDFFONTS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
+# FontEncodingTables.o Function.o Gfx.o GfxFont.o \
+# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \
+# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \
+# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \
+# SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \
+# pdffonts.o
+#PDFFONTS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
+#
+#pdffonts$(EXE): $(PDFFONTS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdffonts$(EXE) $(PDFFONTS_OBJS) \
+# $(PDFFONTS_LIBS)
+
+#------------------------------------------------------------------------
+
+#PDFTOPPM_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
+# FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \
+# GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o \
+# Lexer.o Link.o NameToCharCode.o Object.o Outline.o OutputDev.o \
+# Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \
+# SecurityHandler.o SplashOutputDev.o Stream.o TextOutputDev.o \
+# UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftoppm.o
+#PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \
+# $(OTHERLIBS) -lm
+#
+#pdftoppm$(EXE): $(PDFTOPPM_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftoppm$(EXE) $(PDFTOPPM_OBJS) \
+# $(PDFTOPPM_LIBS)
+
+#------------------------------------------------------------------------
+
+#PDFIMAGES_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \
+# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \
+# FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \
+# GlobalParams.o ImageOutputDev.o JArithmeticDecoder.o \
+# JBIG2Stream.o JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \
+# Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \
+# PSTokenizer.o SecurityHandler.o Stream.o UnicodeMap.o \
+# XpdfPluginAPI.o XRef.o pdfimages.o
+#PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
+#
+#pdfimages$(EXE): $(PDFIMAGES_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a
+# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfimages$(EXE) $(PDFIMAGES_OBJS) \
+# $(PDFIMAGES_LIBS)
#------------------------------------------------------------------------
@@ -239,12 +231,12 @@
clean: clean:
rm -f $(XPDF_OBJS) xpdf$(EXE) rm -f $(XPDF_OBJS) xpdf$(EXE)
- rm -f $(PDFTOPS_OBJS) pdftops$(EXE) - rm -f $(PDFTOPS_OBJS) pdftops$(EXE)
- rm -f $(PDFTOTEXT_OBJS) pdftotext$(EXE) - rm -f $(PDFTOTEXT_OBJS) pdftotext$(EXE)
- rm -f $(PDFINFO_OBJS) pdfinfo$(EXE) - rm -f $(PDFINFO_OBJS) pdfinfo$(EXE)
- rm -f $(PDFFONTS_OBJS) pdffonts$(EXE) - rm -f $(PDFFONTS_OBJS) pdffonts$(EXE)
- rm -f $(PDFDETACH_OBJS) pdfdetach$(EXE)
- rm -f $(PDFTOPPM_OBJS) pdftoppm$(EXE) - rm -f $(PDFTOPPM_OBJS) pdftoppm$(EXE)
- rm -f $(PDFIMAGES_OBJS) pdfimages$(EXE) - rm -f $(PDFIMAGES_OBJS) pdfimages$(EXE)
+# rm -f $(PDFTOPS_OBJS) pdftops$(EXE)
+# rm -f $(PDFTOTEXT_OBJS) pdftotext$(EXE)
+# rm -f $(PDFINFO_OBJS) pdfinfo$(EXE)
+# rm -f $(PDFFONTS_OBJS) pdffonts$(EXE)
+# rm -f $(PDFTOPPM_OBJS) pdftoppm$(EXE)
+# rm -f $(PDFIMAGES_OBJS) pdfimages$(EXE)
#------------------------------------------------------------------------ #------------------------------------------------------------------------

36
print/xpdf/patches/patch-an
View file

@ -1,36 +0,0 @@
$NetBSD: patch-an,v 1.2 2005/09/07 15:19:08 adam Exp $
--- configure.orig 2005-08-17 05:34:30.000000000 +0000
+++ configure
@@ -9128,6 +9128,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+#include <ft2build.h>
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -9163,6 +9164,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <ft2build.h>
#include <$ac_header>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
@@ -9495,6 +9497,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+#include <ft2build.h>
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -9530,6 +9533,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <ft2build.h>
#include <$ac_header>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

26
print/xpdf/patches/patch-aq
View file

@ -1,10 +1,10 @@
$NetBSD: patch-aq,v 1.3 2008/04/20 15:48:12 tonnerre Exp $ $NetBSD: patch-aq,v 1.4 2011/10/27 02:35:41 tez Exp $
Fix arbitrary code execution with embedded fonts (CVE-2008-1693). Fix arbitrary code execution with embedded fonts (CVE-2008-1693).
--- xpdf/Object.h.orig 2007-02-27 22:05:52.000000000 +0000 --- xpdf/Object.h.orig 2011-08-15 16:08:53.000000000 -0500
+++ xpdf/Object.h +++ xpdf/Object.h 2011-10-26 20:48:41.411023600 -0500
@@ -68,17 +68,18 @@ enum ObjType { @@ -68,17 +68,18 @@
//------------------------------------------------------------------------ //------------------------------------------------------------------------
#ifdef DEBUG_MEM #ifdef DEBUG_MEM
@ -27,7 +27,7 @@ Fix arbitrary code execution with embedded fonts (CVE-2008-1693).
// Initialize an object. // Initialize an object.
Object *initBool(GBool boolnA) Object *initBool(GBool boolnA)
@@ -220,16 +221,16 @@ private: @@ -220,16 +221,16 @@
#include "Array.h" #include "Array.h"
inline int Object::arrayGetLength() inline int Object::arrayGetLength()
@ -48,7 +48,7 @@ Fix arbitrary code execution with embedded fonts (CVE-2008-1693).
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// Dict accessors. // Dict accessors.
@@ -238,31 +239,31 @@ inline Object *Object::arrayGetNF(int i, @@ -238,31 +239,31 @@
#include "Dict.h" #include "Dict.h"
inline int Object::dictGetLength() inline int Object::dictGetLength()
@ -59,18 +59,18 @@ Fix arbitrary code execution with embedded fonts (CVE-2008-1693).
- { dict->add(key, val); } - { dict->add(key, val); }
+ { if (type == objDict) dict->add(key, val); } + { if (type == objDict) dict->add(key, val); }
inline GBool Object::dictIs(char *dictType) inline GBool Object::dictIs(const char *dictType)
- { return dict->is(dictType); } - { return dict->is(dictType); }
+ { return (type == objDict) && dict->is(dictType); } + { return (type == objDict) && dict->is(dictType); }
inline GBool Object::isDict(char *dictType) inline GBool Object::isDict(const char *dictType)
{ return type == objDict && dictIs(dictType); } { return type == objDict && dictIs(dictType); }
inline Object *Object::dictLookup(char *key, Object *obj) inline Object *Object::dictLookup(const char *key, Object *obj, int recursion)
- { return dict->lookup(key, obj); } - { return dict->lookup(key, obj, recursion); }
+ { if (type != objDict) return obj->initNull(); return dict->lookup(key, obj); } + { if (type != objDict) return obj->initNull(); return dict->lookup(key, obj, recursion); }
inline Object *Object::dictLookupNF(char *key, Object *obj) inline Object *Object::dictLookupNF(const char *key, Object *obj)
- { return dict->lookupNF(key, obj); } - { return dict->lookupNF(key, obj); }
+ { if (type != objDict) return obj->initNull(); return dict->lookupNF(key, obj); } + { if (type != objDict) return obj->initNull(); return dict->lookupNF(key, obj); }
@ -88,7 +88,7 @@ Fix arbitrary code execution with embedded fonts (CVE-2008-1693).
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// Stream accessors. // Stream accessors.
@@ -271,33 +272,33 @@ inline Object *Object::dictGetValNF(int @@ -271,33 +272,33 @@
#include "Stream.h" #include "Stream.h"
inline GBool Object::streamIs(char *dictType) inline GBool Object::streamIs(char *dictType)

15
print/xpdf/patches/patch-bb
View file

@ -1,15 +0,0 @@
$NetBSD: patch-bb,v 1.1 2008/01/13 22:59:42 rillig Exp $
Fixed ambiguity for sunpro.
--- goo/GString.cc.orgi Tue Feb 27 23:05:51 2007
+++ goo/GString.cc Wed Dec 5 10:31:57 2007
@@ -528,7 +528,7 @@
if ((neg = x < 0)) {
x = -x;
}
- x = floor(x * pow(10, prec) + 0.5);
+ x = floor(x * pow(10.0, prec) + 0.5);
i = bufSize;
started = !trim;
for (j = 0; j < prec && i > 1; ++j) {

16
print/xpdf/patches/patch-bc
View file

@ -3,19 +3,19 @@ $NetbBSD$
Fix for CVE-2010-3702 Fix for CVE-2010-3702
from http://www.openbsd.org/cgi-bin/cvsweb/ports/textproc/xpdf/patches/patch-xpdf_Gfx_cc.diff?r1=1.3;r2=1.4 from http://www.openbsd.org/cgi-bin/cvsweb/ports/textproc/xpdf/patches/patch-xpdf_Gfx_cc.diff?r1=1.3;r2=1.4
--- xpdf/Gfx.cc.orig 2010-10-13 14:50:46.467717900 -0500 --- xpdf/Gfx.cc.orig 2011-08-15 16:08:53.000000000 -0500
+++ xpdf/Gfx.cc 2010-10-13 15:01:30.882241300 -0500 +++ xpdf/Gfx.cc 2011-10-26 20:58:54.318613900 -0500
@@ -443,6 +443,7 @@ @@ -469,6 +469,7 @@
doc = docA;
xref = xrefA; xref = doc->getXRef();
subPage = gFalse; subPage = gFalse;
+ parser = NULL; + parser = NULL;
printCommands = globalParams->getPrintCommands(); printCommands = globalParams->getPrintCommands();
// start the resource stack // start the resource stack
@@ -485,6 +486,7 @@ @@ -516,6 +517,7 @@
doc = docA;
xref = xrefA; xref = doc->getXRef();
subPage = gTrue; subPage = gTrue;
+ parser = NULL; + parser = NULL;
printCommands = globalParams->getPrintCommands(); printCommands = globalParams->getPrintCommands();

31
print/xpdf/patches/patch-bd
View file

@ -1,31 +0,0 @@
$NetBSD: patch-bd,v 1.1 2010/10/13 21:29:43 tez Exp $
Fix for CVE-2010-3704
from http://www.openbsd.org/cgi-bin/cvsweb/ports/textproc/xpdf/patches/patch-fofi_FoFiType1_cc?rev=1.1
--- fofi/FoFiType1.cc.orig 2010-10-13 14:51:21.493696100 -0500
+++ fofi/FoFiType1.cc 2010-10-13 14:58:20.655403000 -0500
@@ -18,6 +18,14 @@
#include "FoFiEncodings.h"
#include "FoFiType1.h"
+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
+# define likely(x) __builtin_expect((x), 1)
+# define unlikely(x) __builtin_expect((x), 0)
+#else
+# define likely(x) (x)
+# define unlikely(x) (x)
+#endif
+
//------------------------------------------------------------------------
// FoFiType1
//------------------------------------------------------------------------
@@ -224,7 +232,7 @@
code = code * 8 + (*p2 - '0');
}
}
- if (code < 256) {
+ if (likely(code < 256 && code >= 0)) {
for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
if (*p == '/') {
++p;