diff options
author | drochner <drochner> | 2009-10-21 10:18:57 +0000 |
---|---|---|
committer | drochner <drochner> | 2009-10-21 10:18:57 +0000 |
commit | 6603604f12322b15994c06b7dd97575566d74b2a (patch) | |
tree | 87936cbb9c450021678c70055bafa012c37d9c4e /print | |
parent | a4e6acffbece5dceb0b7c15dc20205a1a4014036 (diff) | |
download | pkgsrc-6603604f12322b15994c06b7dd97575566d74b2a.tar.gz |
update to 0.12.1
changes:
-Security fixes from xpdf 3.02pl4
-bugfixes
-qt4 API improvements
pkgsrc change: add patch for CVE-2009-3607 (integer overflow
in create_surface_from_thumbnail_data)
Diffstat (limited to 'print')
-rw-r--r-- | print/poppler/Makefile.common | 4 | ||||
-rw-r--r-- | print/poppler/distinfo | 18 | ||||
-rw-r--r-- | print/poppler/patches/patch-ab | 22 | ||||
-rw-r--r-- | print/poppler/patches/patch-ag | 10 | ||||
-rw-r--r-- | print/poppler/patches/patch-ai | 8 | ||||
-rw-r--r-- | print/poppler/patches/patch-ao | 10 | ||||
-rw-r--r-- | print/poppler/patches/patch-ba | 12 | ||||
-rw-r--r-- | print/poppler/patches/patch-bb | 51 |
8 files changed, 101 insertions, 34 deletions
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index 4fe421ebfdc..376f766f80e 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2009/09/09 19:57:05 drochner Exp $ +# $NetBSD: Makefile.common,v 1.32 2009/10/21 10:18:57 drochner Exp $ # # used by print/poppler/Makefile # used by print/poppler-glib/Makefile @@ -7,7 +7,7 @@ # used by print/poppler-qt4/Makefile # used by print/poppler-utils/Makefile -POPPLER_VERS= 0.12.0 +POPPLER_VERS= 0.12.1 DISTNAME= poppler-${POPPLER_VERS} CATEGORIES= print MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/print/poppler/distinfo b/print/poppler/distinfo index bd31cdcae03..243ab542a4d 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.47 2009/09/11 10:09:13 drochner Exp $ +$NetBSD: distinfo,v 1.48 2009/10/21 10:18:57 drochner Exp $ -SHA1 (poppler-0.12.0.tar.gz) = 6165cfc46340644e8750ab8a37f3a3d634144106 -RMD160 (poppler-0.12.0.tar.gz) = c90a6a437fb7b5e5c9c9cdaf72782be16cd8ae07 -Size (poppler-0.12.0.tar.gz) = 1595424 bytes +SHA1 (poppler-0.12.1.tar.gz) = 0c8514f789eaab4e91ba1a841f58f8bee95e4a43 +RMD160 (poppler-0.12.1.tar.gz) = 92ea043b8b329e23d13068af5cfed8fd47eea5e8 +Size (poppler-0.12.1.tar.gz) = 1641986 bytes SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615 -SHA1 (patch-ab) = 6bde603d2934099631e057f022ab61b6ff965022 -SHA1 (patch-ag) = 89d4ca8d5325b703c953317f422501873d659ac6 -SHA1 (patch-ai) = 52376e12baaba63629156055d5254c29f6e89824 -SHA1 (patch-ao) = 747870dcdc8a09f191a0518f42a4dc0c011aa85a +SHA1 (patch-ab) = 441308aec73c66a34c00ee1fad30a38748c89a7d +SHA1 (patch-ag) = 58d01b019daec19de80867ce0941e5160591bf62 +SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53 +SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74 +SHA1 (patch-ba) = 9b98dcfae8d997f9250e161faf8cce7f168798b5 +SHA1 (patch-bb) = 23fe8bab6eaadc0c9701c0125f07afbf6bffcbaa diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab index fccc438af72..032d9c41651 100644 --- a/print/poppler/patches/patch-ab +++ b/print/poppler/patches/patch-ab @@ -1,24 +1,26 @@ -$NetBSD: patch-ab,v 1.11 2009/09/09 19:57:05 drochner Exp $ +$NetBSD: patch-ab,v 1.12 2009/10/21 10:18:57 drochner Exp $ ---- utils/Makefile.in.orig 2009-08-18 21:04:22.000000000 +0200 +--- utils/Makefile.in.orig 2009-10-18 01:28:49.000000000 +0200 +++ utils/Makefile.in -@@ -52,7 +52,7 @@ mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h \ +@@ -55,7 +55,7 @@ CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/poppler/poppler-config.h CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = -@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT) +am__EXEEXT_1 = pdftoppm$(EXEEXT) @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -@@ -62,25 +62,25 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) + PROGRAMS = $(bin_PROGRAMS) +@@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) pdffonts_LDADD = $(LDADD) am__DEPENDENCIES_1 = -pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ +pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la \ $(am__DEPENDENCIES_1) - am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +@@ -73,19 +73,19 @@ am_pdfimages_OBJECTS = pdfimages.$(OBJEX $(am__objects_1) pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) pdfimages_LDADD = $(LDADD) @@ -41,7 +43,7 @@ $NetBSD: patch-ab,v 1.11 2009/09/09 19:57:05 drochner Exp $ $(am__DEPENDENCIES_1) @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES = \ @BUILD_ABIWORD_OUTPUT_TRUE@ $(am__DEPENDENCIES_2) \ -@@ -89,25 +89,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX +@@ -94,25 +94,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1) pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) pdftohtml_LDADD = $(LDADD) @@ -73,7 +75,7 @@ $NetBSD: patch-ab,v 1.11 2009/09/09 19:57:05 drochner Exp $ $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -319,12 +319,12 @@ top_build_prefix = @top_build_prefix@ +@@ -366,12 +366,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ win32_libs = @win32_libs@ @@ -91,7 +93,7 @@ $NetBSD: patch-ab,v 1.11 2009/09/09 19:57:05 drochner Exp $ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/goo \ -@@ -335,9 +335,10 @@ INCLUDES = \ +@@ -382,9 +382,10 @@ INCLUDES = \ $(ABIWORD_CFLAGS) LDADD = \ diff --git a/print/poppler/patches/patch-ag b/print/poppler/patches/patch-ag index 57b9692a17e..0053ef4fd6c 100644 --- a/print/poppler/patches/patch-ag +++ b/print/poppler/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.5 2009/09/09 19:57:05 drochner Exp $ +$NetBSD: patch-ag,v 1.6 2009/10/21 10:18:57 drochner Exp $ ---- qt4/src/Makefile.in.orig 2009-09-09 19:22:37.000000000 +0200 +--- qt4/src/Makefile.in.orig 2009-10-18 01:28:48.000000000 +0200 +++ qt4/src/Makefile.in -@@ -65,7 +65,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL) +@@ -82,7 +82,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libpoppler_qt4_la_DEPENDENCIES = \ @@ -11,12 +11,12 @@ $NetBSD: patch-ag,v 1.5 2009/09/09 19:57:05 drochner Exp $ $(am__DEPENDENCIES_1) $(am__append_1) am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \ poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \ -@@ -332,7 +332,7 @@ libpoppler_qt4_la_SOURCES = \ +@@ -373,7 +373,7 @@ libpoppler_qt4_la_SOURCES = \ poppler-export.h \ poppler-private.h -libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \ +libpoppler_qt4_la_LIBADD = $(prefix)/lib/libpoppler.la \ $(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1) - libpoppler_qt4_la_LDFLAGS = -version-info 5:0:2 + libpoppler_qt4_la_LDFLAGS = -version-info 5:0:2 @create_shared_lib@ all: all-am diff --git a/print/poppler/patches/patch-ai b/print/poppler/patches/patch-ai index f441e7b70c4..a07dd344f06 100644 --- a/print/poppler/patches/patch-ai +++ b/print/poppler/patches/patch-ai @@ -1,10 +1,10 @@ -$NetBSD: patch-ai,v 1.9 2009/09/09 19:57:05 drochner Exp $ +$NetBSD: patch-ai,v 1.10 2009/10/21 10:18:57 drochner Exp $ ---- configure.orig 2009-08-01 17:19:11.000000000 +0200 +--- configure.orig 2009-10-18 01:28:46.000000000 +0200 +++ configure -@@ -25282,7 +25282,7 @@ fi +@@ -20647,7 +20647,7 @@ fi if test x$enable_poppler_qt4 = xyes; then - { $as_echo "$as_me:$LINENO: checking for Qt4 moc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc" >&5 $as_echo_n "checking for Qt4 moc... " >&6; } - MOCQT4=`which moc` + MOCQT4=${QTDIR}/bin/moc diff --git a/print/poppler/patches/patch-ao b/print/poppler/patches/patch-ao index bef996fb06f..188ff2f717e 100644 --- a/print/poppler/patches/patch-ao +++ b/print/poppler/patches/patch-ao @@ -1,9 +1,9 @@ -$NetBSD: patch-ao,v 1.1 2009/09/11 10:09:13 drochner Exp $ +$NetBSD: patch-ao,v 1.2 2009/10/21 10:18:57 drochner Exp $ ---- qt/Makefile.in.orig 2009-09-11 09:20:03.000000000 +0200 +--- qt/Makefile.in.orig 2009-10-18 01:28:47.000000000 +0200 +++ qt/Makefile.in -@@ -63,7 +63,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - libLTLIBRARIES_INSTALL = $(INSTALL) +@@ -80,7 +80,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" + "$(DESTDIR)$(poppler_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ @@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.1 2009/09/11 10:09:13 drochner Exp $ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \ -@@ -308,7 +308,7 @@ libpoppler_qt_la_SOURCES = \ +@@ -349,7 +349,7 @@ libpoppler_qt_la_SOURCES = \ poppler-private.h libpoppler_qt_la_LIBADD = \ diff --git a/print/poppler/patches/patch-ba b/print/poppler/patches/patch-ba new file mode 100644 index 00000000000..60aca098269 --- /dev/null +++ b/print/poppler/patches/patch-ba @@ -0,0 +1,12 @@ +$NetBSD: patch-ba,v 1.3 2009/10/21 10:18:57 drochner Exp $ + +--- poppler/PSOutputDev.cc.orig 2009-10-05 00:40:39.000000000 +0200 ++++ poppler/PSOutputDev.cc +@@ -3163,6 +3163,7 @@ void PSOutputDev::startPage(int pageNum, + } else { + writePSFmt("%%Page: {0:t} {1:d}\n", filteredString, seqPage); + } ++ delete filteredString; + } else { + writePSFmt("%%Page: {0:d} {1:d}\n", pageNum, seqPage); + } diff --git a/print/poppler/patches/patch-bb b/print/poppler/patches/patch-bb new file mode 100644 index 00000000000..421a5adc77f --- /dev/null +++ b/print/poppler/patches/patch-bb @@ -0,0 +1,51 @@ +$NetBSD: patch-bb,v 1.3 2009/10/21 10:18:57 drochner Exp $ + +--- glib/poppler-page.cc.orig 2009-09-09 23:22:31.000000000 +0200 ++++ glib/poppler-page.cc +@@ -609,28 +609,28 @@ create_surface_from_thumbnail_data (guch + gint rowstride) + { + guchar *cairo_pixels; ++ gint cairo_stride; + cairo_surface_t *surface; +- static cairo_user_data_key_t key; + int j; + +- cairo_pixels = (guchar *)g_malloc (4 * width * height); +- surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels, +- CAIRO_FORMAT_RGB24, +- width, height, 4 * width); +- cairo_surface_set_user_data (surface, &key, +- cairo_pixels, (cairo_destroy_func_t)g_free); ++ surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height); ++ if (cairo_surface_status (surface)) ++ return NULL; ++ ++ cairo_pixels = cairo_image_surface_get_data (surface); ++ cairo_stride = cairo_image_surface_get_stride (surface); + + for (j = height; j; j--) { + guchar *p = data; + guchar *q = cairo_pixels; + guchar *end = p + 3 * width; +- ++ + while (p < end) { + #if G_BYTE_ORDER == G_LITTLE_ENDIAN + q[0] = p[2]; + q[1] = p[1]; + q[2] = p[0]; +-#else ++#else + q[1] = p[0]; + q[2] = p[1]; + q[3] = p[2]; +@@ -640,7 +640,7 @@ create_surface_from_thumbnail_data (guch + } + + data += rowstride; +- cairo_pixels += 4 * width; ++ cairo_pixels += cairo_stride; + } + + return surface; |