pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/poppler update to 0.10.6



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9120617229c
branches:  trunk
changeset: 557533:f9120617229c
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Apr 17 16:08:17 2009 +0000

description:
update to 0.10.6
changes:
* Fix problems that happen when parsing broken JBIG2 files.
  CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180
  CVE-2009-1181, CVE-2009-1182, CVE-2009-1183, CVE-2009-1187, CVE-2009-1188
* Fix parsing of incorrect border arrays. (was patched in pkgsrc)
* Fix clip test for fonts.
* Fix getGlyphAdvance to behave correctly on font size changes.
* Misc build fixes

diffstat:

 print/poppler/Makefile         |    4 +-
 print/poppler/Makefile.common  |    4 +-
 print/poppler/distinfo         |   11 +-
 print/poppler/patches/patch-ai |  254 +++++++++++++++-------------------------
 print/poppler/patches/patch-bc |   90 --------------
 5 files changed, 106 insertions(+), 257 deletions(-)

diffs (truncated from 568 to 300 lines):

diff -r 3d15cd41a644 -r f9120617229c print/poppler/Makefile
--- a/print/poppler/Makefile    Fri Apr 17 16:00:24 2009 +0000
+++ b/print/poppler/Makefile    Fri Apr 17 16:08:17 2009 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2009/04/06 09:29:27 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2009/04/17 16:08:17 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
-PKGREVISION=           1
-
 COMMENT=               PDF rendering library
 MAINTAINER=            reed%reedmedia.net@localhost
 
diff -r 3d15cd41a644 -r f9120617229c print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Fri Apr 17 16:00:24 2009 +0000
+++ b/print/poppler/Makefile.common     Fri Apr 17 16:08:17 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2009/03/19 12:12:24 drochner Exp $
+# $NetBSD: Makefile.common,v 1.29 2009/04/17 16:08:17 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.10.5
+POPPLER_VERS=          0.10.6
 DISTNAME=              poppler-${POPPLER_VERS}
 CATEGORIES=            print
 MASTER_SITES=          http://poppler.freedesktop.org/
diff -r 3d15cd41a644 -r f9120617229c print/poppler/distinfo
--- a/print/poppler/distinfo    Fri Apr 17 16:00:24 2009 +0000
+++ b/print/poppler/distinfo    Fri Apr 17 16:08:17 2009 +0000
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.42 2009/04/06 09:29:27 drochner Exp $
+$NetBSD: distinfo,v 1.43 2009/04/17 16:08:17 drochner Exp $
 
-SHA1 (poppler-0.10.5.tar.gz) = 720b79adbeb6e7b722d3f0f61e165b9310fe61fc
-RMD160 (poppler-0.10.5.tar.gz) = 73e2330c2c874fb58f95c39fcdb5421766b6742c
-Size (poppler-0.10.5.tar.gz) = 1516687 bytes
+SHA1 (poppler-0.10.6.tar.gz) = 0bab946444788ee9f21bdfeba6d3d635a618b809
+RMD160 (poppler-0.10.6.tar.gz) = e4faec8cc22f25a73c1dea054df1d43a364a5e1a
+Size (poppler-0.10.6.tar.gz) = 1527715 bytes
 SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
 SHA1 (patch-ab) = 5a2785bccd71990e20cd81a3cd2697804e31788d
 SHA1 (patch-ag) = 0bf1bc080cad55792fe6cc761bf22ecccba7d13a
-SHA1 (patch-ai) = 614a310e9dabbc52e47fb17b116e139ab8880995
+SHA1 (patch-ai) = b58704153418b5e3b5d65a2e02e5a9b306b00cf7
 SHA1 (patch-aj) = 8bb1fe169bddb76ecc72129cc1dbd32030073dfd
 SHA1 (patch-ak) = ab4d0c91a6f2806b405954f8dab6e3d61a03b054
 SHA1 (patch-al) = b1d76a92a5ffad01543f0072a1a00e74e751a56f
 SHA1 (patch-am) = 2ee61c446ea85acde8c1ee798a0201901e565d55
-SHA1 (patch-bc) = d2f51580ae122545a0f9139714d7a7ff94814698
 SHA1 (patch-ca) = 5bd31c497c8cbfb6c1d6cb5b9183088113bef6e3
 SHA1 (patch-cb) = e8cfb16a0641788759b13cf5fcf97d82f9485adc
diff -r 3d15cd41a644 -r f9120617229c print/poppler/patches/patch-ai
--- a/print/poppler/patches/patch-ai    Fri Apr 17 16:00:24 2009 +0000
+++ b/print/poppler/patches/patch-ai    Fri Apr 17 16:08:17 2009 +0000
@@ -1,17 +1,25 @@
-$NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $
+$NetBSD: patch-ai,v 1.8 2009/04/17 16:08:17 drochner Exp $
 
---- configure.orig     2009-03-12 00:15:52.000000000 +0100
+--- configure.orig     2009-04-16 22:21:56.000000000 +0200
 +++ configure
-@@ -948,6 +948,8 @@ BUILD_ABIWORD_OUTPUT_TRUE
- BUILD_ABIWORD_OUTPUT_FALSE
+@@ -787,6 +787,8 @@ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ PC_REQUIRES_PRIVATE
+ PC_REQUIRES
++USE_CMS_FALSE
++USE_CMS_TRUE
+ BUILD_UTILS_FALSE
  BUILD_UTILS_TRUE
- BUILD_UTILS_FALSE
-+USE_CMS_TRUE
-+USE_CMS_FALSE
- PC_REQUIRES
- PC_REQUIRES_PRIVATE
- LIBOBJS
-@@ -1597,6 +1599,7 @@ Optional Features:
+ BUILD_ABIWORD_OUTPUT_FALSE
+@@ -1005,6 +1007,7 @@ enable_gtk_test
+ enable_abiword_output
+ enable_utils
+ enable_compile_warnings
++enable_cms
+ '
+       ac_precious_vars='build_alias
+ host_alias
+@@ -1701,6 +1704,7 @@ Optional Features:
    --enable-compile-warnings=[no/yes/kde]
                               Turn on compiler warnings.
  
@@ -19,48 +27,16 @@
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -20355,13 +20358,11 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <sys/types.h> /* for off_t */
--     #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
--     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-   ;
-   return 0;
- }
-@@ -20401,13 +20402,11 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #define _LARGEFILE_SOURCE 1
--#include <sys/types.h> /* for off_t */
--     #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
--     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-   ;
-   return 0;
- }
-@@ -24123,7 +24122,7 @@ fi
+@@ -24668,7 +24672,7 @@ fi
  if test x$enable_poppler_qt4 = xyes; then
-   { echo "$as_me:$LINENO: checking for Qt4 moc" >&5
- echo $ECHO_N "checking for Qt4 moc... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for Qt4 moc" >&5
+ $as_echo_n "checking for Qt4 moc... " >&6; }
 -  MOCQT4=`which moc`
 +  MOCQT4=${QTDIR}/bin/moc
    mocversion=`$MOCQT4 -v 2>&1`
    mocversiongrep=`echo $mocversion | grep "Qt 4"`
    if test x"$mocversiongrep" != x"$mocversion"; then
-@@ -24578,6 +24577,249 @@ else
+@@ -25127,6 +25131,259 @@ else
  fi
  
  
@@ -74,10 +50,10 @@
 +
 +if test x$enable_cms = xyes; then
 +
-+{ echo "$as_me:$LINENO: checking for cmsOpenProfileFromFile in -llcms" >&5
-+echo $ECHO_N "checking for cmsOpenProfileFromFile in -llcms... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for cmsOpenProfileFromFile in -llcms" >&5
++$as_echo_n "checking for cmsOpenProfileFromFile in -llcms... " >&6; }
 +if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-llcms  $LIBS"
@@ -109,33 +85,37 @@
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +       test -z "$ac_c_werror_flag" ||
 +       test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++       } && test -s conftest$ac_exeext && {
++       test "$cross_compiling" = yes ||
++       $as_test_x conftest$ac_exeext
++       }; then
 +  ac_cv_lib_lcms_cmsOpenProfileFromFile=yes
 +else
-+  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +      ac_cv_lib_lcms_cmsOpenProfileFromFile=no
 +fi
 +
++rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsOpenProfileFromFile" >&5
-+echo "${ECHO_T}$ac_cv_lib_lcms_cmsOpenProfileFromFile" >&6; }
-+if test $ac_cv_lib_lcms_cmsOpenProfileFromFile = yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsOpenProfileFromFile" >&5
++$as_echo "$ac_cv_lib_lcms_cmsOpenProfileFromFile" >&6; }
++if test "x$ac_cv_lib_lcms_cmsOpenProfileFromFile" = x""yes; then
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBLCMS 1
 +_ACEOF
@@ -143,28 +123,29 @@
 +  LIBS="-llcms $LIBS"
 +
 +else
-+  { { echo "$as_me:$LINENO: error: \"*** lcms library not found ***\"" >&5
-+echo "$as_me: error: \"*** lcms library not found ***\"" >&2;}
++  { { $as_echo "$as_me:$LINENO: error: \"*** lcms library not found ***\"" >&5
++$as_echo "$as_me: error: \"*** lcms library not found ***\"" >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
 +
 +
 +for ac_header in lcms.h
 +do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+             { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++               $as_echo "$as_val"'`
++             { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
 +else
 +  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
++$as_echo_n "checking $ac_header usability... " >&6; }
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -180,32 +161,33 @@
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +       test -z "$ac_c_werror_flag" ||
 +       test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
 +else
-+  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +      ac_header_compiler=no
 +fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
 +
 +# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
++$as_echo_n "checking $ac_header presence... " >&6; }
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -219,74 +201,78 @@
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5



Home | Main Index | Thread Index | Old Index