Fix the following vulnerabilities:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1788
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1789
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1790
by updating to the latest stable version.

Changes against 0.22.1:
 core:
  * Correct rendering of underline and strike out annotations (Bug #61518)
  * Workaround broken jpeg stream definitions (Bug #61994)
  * SplashOutputDev: Restore CTM on early exits (Bug #61413)
  * SplashOutputDev: Make sure we don't try to paint in x < 0 (KDE Bug #315432)
  * Fix latin page labels. (Bug #61034)
  * Fix compilation with jpeglib9
  * Fix minor valgrind warning

 utils:
  * pdfimages: Fix extraction of some images (Bug #61168)

 build system:
  * Fix the build with automake-1.13

Changes against 0.22.0:
core:
 * Fix crash in some pdf files when extracting text (Bug #59561)
 * Fix crashes in wrongly formed files
 * Fix wrong warning when opening some files (Bug #58966)

build system:
 * Improve autoconf jpeglib.h detection (Bug #59186)

Changes against 0.20 include

Release 0.22.0
core:
 * Fix crash in invalid files that define a <= 0 bits per image value
 * Fix a few issues in JPX decoding when not using OpenJPEG
 * TextOutputDev: Use page size for max value in TextPage::visitSelection
 * Fix typo in error message

utils:
 * Fix pdfunite regression (Bug #58569)
 * Demo fixes and improvements

misc:
 * pdf-inspector improvements

Release 0.21.4
core:
 * SplashOutputDev: Fix crash when rendering in monochrome mode
 * SplashOutputDev: Fix line widths in monochrome mode (Bug #57294)
 * PSOutputDev: Fix crop on EPS conversion (Bug #30692)
 * TextOutputDev: Fix minor logic mistake
 * Fix assert on some malformed files (Bug #58257)
 * Move #include "jpeglib.h" into .cc file (Bug #57687)
 * Filter text that may end up being written to the shell
 * Fix windows compile warnings

glib:
 * Add poppler_annot_set_flags (Bug #58015)
 * Demo fixes and improvements

qt4:
 * Fix check_lexer on 32-bit systems

Release 0.21.3
core:
 * Splash: Implement bilinear image scaling (Bug #22138)
 * CairoOutputDev: Update fill and stroke color in startPage (Bug #54526)
 * Fix GooString::insert()
 * Allow large chars in TextPage
 * Fix crash on ActualText::end
 * Don't use memcpy to copy classes
 * Fix warnings

glib:
 * Check if words end with spaces (Bug #54504)
 * Ensure text is only computed on first render
 * Fix warnings while generating introspection file
 * Fix returns tag in PopplerAttachmentSaveFunc api doc
 * Minor demo fixes

Release 0.21.2
core:
 * CairoOutputDev: make drawImage work with images > 32767 in width/height
(Bug #56858)
 * CairoOutputDev: Fix soft mask when image resolution != smask resolution
(Bug #57070)
 * CairoOutputDev: Fix crash in CairoImageOutputDev with
setSoftMaskFromImageMask (Bug #57067)
 * Remove a check on fonts that we don't need (Bug #56753)
 * Misc code cleanups

utils:
 * pdftocairo: Add tiff output support (Bug #57006)
 * pdfunite: Fix -v (Bug #56817)
 * Misc code cleanups

Release 0.21.1
core:
 * Annotation improvements
 * Form improvements
 * CairoImageOutputDev: Support parameterized Gouraud shading (Bug #56463)
 * UTF validation fixes
 * Do not call drawing routines if we don't need non text (Bug #54617)
 * Fix Memory leak in CharCodeToUnicode (Bug #54702)

qt4:
 * Make LinkRendition properties available (Bug #55378)
 * Accessors for FormWidgetChoice::editChoice
 * Implement overprint

Release 0.21.0
core:
 * Support the modification of files with Encrypt
 * Annotation improvements
 * Form improvements
 * Splash: Implement DeviceN support
 * Splash: Avoid bogus memory error for tilingPattern
 * TextOutputDev: Allow multiple fonts in a TextWord
 * Kill the concept of base dir
 * PSOutputDev: Always write HiResBoundingBox (Bug #53159)
 * Convert UTF-16 to UCS-4 when reading toUnicode cmap
 * GooString formatting: add support for uppercase hexadecimal
 * Use error() instead of fprintf(stderr, ...) in Annot::layoutText
 * poppler-config.h: remove WITH_FONTCONFIGURATION_* macros

glib:
 * Annotation improvements
 * Add poppler_page_remove_annot()
 * Add poppler_document_new_from_stream
 * Add poppler_document_new_from_gfile
 * Add poppler_page_find_text_with_options (Bug #2951)
 * Demo improvements
 * Port tests and demo to GTK+3

qt4:
 * Add accessor methods for movie poster information
 * Make 'additional actions' available in Annotation API (Bug #53589)
 * Add whole-page search method to Poppler::Page
 * Small changes in tests

utils:
 * pdftohtml: Make the output more xhtml compliant
 * pdftohtml: Add -fontfullname. (Bug #49872)
 * pdftohtml: Do not invoke gs anymore

build system:
 * Add the possibility of using lcms1 even if lcms2 is installed
 * Remove extra fontconfig CFLAGS and LIBS

2 files changed, 3 insertions, 3 deletions

diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index fda3dc4c20a..e85eead56cc 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2013/02/16 11:19:28 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2013/03/24 07:09:25 spz Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-glib-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF rendering library (GLib wrapper)
 MAINTAINER=		reed@reedmedia.net
diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST
index 3de7bc75514..05233552bcf 100644
--- a/print/poppler-glib/PLIST
+++ b/print/poppler-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2012/07/04 20:26:58 drochner Exp $
+@comment $NetBSD: PLIST,v 1.15 2013/03/24 07:09:26 spz Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-annot.h
 include/poppler/glib/poppler-attachment.h
@@ -29,6 +29,7 @@ share/gtk-doc/html/poppler/api-index-0-14.html
 share/gtk-doc/html/poppler/api-index-0-16.html
 share/gtk-doc/html/poppler/api-index-0-18.html
 share/gtk-doc/html/poppler/api-index-0-20.html
+share/gtk-doc/html/poppler/api-index-0-22.html
 share/gtk-doc/html/poppler/api-index-deprecated.html
 share/gtk-doc/html/poppler/api-index-full.html
 share/gtk-doc/html/poppler/ch01.html