pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/graphics/inkscape update to 0.48.4



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf84741ae4fc
branches:  trunk
changeset: 612342:cf84741ae4fc
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Dec 18 14:01:06 2012 +0000

description:
update to 0.48.4
changes:
-bugfixes
-patches to allow build against newer png and poppler were included
-security fix for "XXE" vulneralility: inkscape could be used
 to put contents of other files into SVG output

diffstat:

 graphics/inkscape/Makefile         |    5 +-
 graphics/inkscape/distinfo         |   14 +-
 graphics/inkscape/patches/patch-ah |   28 +-
 graphics/inkscape/patches/patch-ak |   13 -
 graphics/inkscape/patches/patch-al |   13 -
 graphics/inkscape/patches/patch-am |   27 -
 graphics/inkscape/patches/patch-ar |  538 -------------------------------------
 7 files changed, 30 insertions(+), 608 deletions(-)

diffs (truncated from 693 to 300 lines):

diff -r 04eca6c82466 -r cf84741ae4fc graphics/inkscape/Makefile
--- a/graphics/inkscape/Makefile        Tue Dec 18 13:54:04 2012 +0000
+++ b/graphics/inkscape/Makefile        Tue Dec 18 14:01:06 2012 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2012/10/08 23:01:45 adam Exp $
+# $NetBSD: Makefile,v 1.81 2012/12/18 14:01:06 drochner Exp $
 
-DISTNAME=      inkscape-0.48.3.1
-PKGREVISION=   9
+DISTNAME=      inkscape-0.48.4
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=inkscape/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 04eca6c82466 -r cf84741ae4fc graphics/inkscape/distinfo
--- a/graphics/inkscape/distinfo        Tue Dec 18 13:54:04 2012 +0000
+++ b/graphics/inkscape/distinfo        Tue Dec 18 14:01:06 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.43 2012/11/18 15:40:55 adam Exp $
+$NetBSD: distinfo,v 1.44 2012/12/18 14:01:06 drochner Exp $
 
-SHA1 (inkscape-0.48.3.1.tar.bz2) = 23344555a1b5cc7909ad01d926cfaddb67bfbde9
-RMD160 (inkscape-0.48.3.1.tar.bz2) = 139720f01b987001b558226ec2de60b36fb1123c
-Size (inkscape-0.48.3.1.tar.bz2) = 19688778 bytes
+SHA1 (inkscape-0.48.4.tar.bz2) = 5f26f6ad191d1e7c2a9fb69a438722beb172224c
+RMD160 (inkscape-0.48.4.tar.bz2) = b089ced7694a9803fac8588d93e7e6239c71d3e8
+Size (inkscape-0.48.4.tar.bz2) = 19712522 bytes
 SHA1 (patch-aa) = d946236902fc6cf0d2ddcbb9dd667b4d9c6f99d4
 SHA1 (patch-ab) = b70ffa613c054c26185d4728da4133aed6d88e63
 SHA1 (patch-ac) = 01caeac029e0ce7e4c4e2b6a9a80b76d9f9b495e
@@ -10,15 +10,11 @@
 SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758
 SHA1 (patch-af) = 5f9317fcb7a798afc569aada9683fb1c7f6ba4c7
 SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b
-SHA1 (patch-ah) = ac8c6b1783b4982c3c65cb2bc5c0445a3af6fb44
+SHA1 (patch-ah) = 6da5e0651b583f925debed97faaf6800f88463da
 SHA1 (patch-ai) = 1cd8e744848d6b52ffb4f07922e09689b5e43f61
 SHA1 (patch-aj) = 8564ee2d4e884dc31e4ad4232267f6fad09f71ee
-SHA1 (patch-ak) = ec222b8d964b9b297d5284eef771411dd100f04e
-SHA1 (patch-al) = 1ab7727a232001e9962dd34f125b220cb0ea889c
-SHA1 (patch-am) = 2307f1ab4bb628d9babaeadb5783073f62eedaca
 SHA1 (patch-ap) = cd29bd178dc2c6c9456bc09d6663d6a25acc7da1
 SHA1 (patch-aq) = dd307f598741cd5f0ff35eb06dff7c685752a979
-SHA1 (patch-ar) = 424a0b143564e693ccafc1d4c29071f1061a29e6
 SHA1 (patch-src_2geom_basic-intersection.cpp) = 743b13293191a74d4c0c22231e5ed7866219dfee
 SHA1 (patch-src_2geom_solve-bezier-parametric.cpp) = 71cca994451b1e7d5aba625600089d1e4a47888e
 SHA1 (patch-src_color-profile.cpp) = 14932b25ed333925518d5140b3691a29e155cd9a
diff -r 04eca6c82466 -r cf84741ae4fc graphics/inkscape/patches/patch-ah
--- a/graphics/inkscape/patches/patch-ah        Tue Dec 18 13:54:04 2012 +0000
+++ b/graphics/inkscape/patches/patch-ah        Tue Dec 18 14:01:06 2012 +0000
@@ -1,13 +1,31 @@
-$NetBSD: patch-ah,v 1.5 2011/02/05 07:57:15 adam Exp $
+$NetBSD: patch-ah,v 1.6 2012/12/18 14:01:06 drochner Exp $
 
---- packaging/macosx/Resources/bin/inkscape.orig       2009-11-16 18:29:06.000000000 +0100
+--- packaging/macosx/Resources/bin/inkscape.orig       2012-12-13 17:00:46.000000000 +0000
 +++ packaging/macosx/Resources/bin/inkscape
-@@ -113,7 +113,7 @@ fi
+@@ -114,7 +114,7 @@ fi
  # If the AppleCollationOrder preference doesn't exist, we fall back to using
  # the AppleLocale preference.
  LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
--if [ "x$LANGSTR" == "x" ]
-+if [ "x$LANGSTR" = "x" ]
+-if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ]
++if [ "x$LANGSTR" = "x" -o "x$LANGSTR" = "xroot" ]
  then
      echo "Warning: AppleCollationOrder setting not found, using AppleLocale." 1>&2
      LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \
+@@ -126,7 +126,7 @@ fi
+ 
+ # NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape
+ #       to crash on startup in locale_from_utf8().
+-if [ "x$LANGSTR" == "x" ]
++if [ "x$LANGSTR" = "x" ]
+ then 
+       # override broken script
+       echo "Overriding empty LANGSTR" 1>&2
+@@ -134,7 +134,7 @@ then 
+ else
+       tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
+               tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
+-      if [ "x$tmpLANG" == "x" ]
++      if [ "x$tmpLANG" = "x" ]
+       then
+               # override broken script
+               echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2
diff -r 04eca6c82466 -r cf84741ae4fc graphics/inkscape/patches/patch-ak
--- a/graphics/inkscape/patches/patch-ak        Tue Dec 18 13:54:04 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2011/01/16 18:18:19 tnn Exp $
-
---- src/sp-image.cpp.orig      2010-07-13 03:48:40.000000000 +0000
-+++ src/sp-image.cpp
-@@ -388,7 +388,7 @@ static bool readPngAndHeaders( PushPull 
-                 {
-                     char* name = 0;
-                     int compression_type = 0;
--                    char* profile = 0;
-+                    png_byte* profile = 0;
-                     png_uint_32 proflen = 0;
-                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff -r 04eca6c82466 -r cf84741ae4fc graphics/inkscape/patches/patch-al
--- a/graphics/inkscape/patches/patch-al        Tue Dec 18 13:54:04 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.3 2011/01/16 18:18:19 tnn Exp $
-
---- src/helper/png-write.cpp.orig      2010-07-13 03:48:40.000000000 +0000
-+++ src/helper/png-write.cpp
-@@ -165,7 +165,7 @@ sp_png_write_rgba_striped(SPDocument *do
-     /* Set error handling.  REQUIRED if you aren't supplying your own
-      * error hadnling functions in the png_create_write_struct() call.
-      */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         /* If we get here, we had a problem reading the file */
-         fclose(fp);
-         png_destroy_write_struct(&png_ptr, &info_ptr);
diff -r 04eca6c82466 -r cf84741ae4fc graphics/inkscape/patches/patch-am
--- a/graphics/inkscape/patches/patch-am        Tue Dec 18 13:54:04 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-am,v 1.6 2012/07/05 10:23:31 wiz Exp $
-
-First chunk: Fix build with poppler-0.20.
-Second chunk: Fix build with png-1.5.
-
---- src/extension/internal/pdfinput/svg-builder.cpp.orig       2011-07-08 18:25:09.000000000 +0000
-+++ src/extension/internal/pdfinput/svg-builder.cpp
-@@ -961,9 +961,7 @@ void SvgBuilder::updateFont(GfxState *st
-     _font_style = sp_repr_css_attr_new();
-     GfxFont *font = state->getFont();
-     // Store original name
--    if (font->getOrigName()) {
--        _font_specification = font->getOrigName()->getCString();
--    } else if (font->getName()) {
-+    if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-     } else {
-         _font_specification = (char*) "Arial";
-@@ -1443,7 +1441,7 @@ Inkscape::XML::Node *SvgBuilder::_create
-         return NULL;
-     }
-     // Set error handler
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return NULL;
-     }
diff -r 04eca6c82466 -r cf84741ae4fc graphics/inkscape/patches/patch-ar
--- a/graphics/inkscape/patches/patch-ar        Tue Dec 18 13:54:04 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,538 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2012/11/18 15:40:55 adam Exp $
-
-Fix build with poppler-0.20.
-
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig        2011-07-08 18:25:09.000000000 +0000
-+++ src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -11,6 +11,7 @@
- #ifdef HAVE_CONFIG_H
- # include <config.h>
- #endif
-+#define POPPLER_NEW_COLOR_SPACE_API 1
- 
- #ifdef HAVE_POPPLER
- 
-@@ -36,20 +37,20 @@ extern "C" {
- #include "goo/gmem.h"
- #include "goo/GooTimer.h"
- #include "goo/GooHash.h"
--#include "GlobalParams.h"
--#include "CharTypes.h"
--#include "Object.h"
--#include "Array.h"
--#include "Dict.h"
--#include "Stream.h"
--#include "Lexer.h"
--#include "Parser.h"
--#include "GfxFont.h"
--#include "GfxState.h"
--#include "OutputDev.h"
--#include "Page.h"
--#include "Annot.h"
--#include "Error.h"
-+#include "poppler/GlobalParams.h"
-+#include "poppler/CharTypes.h"
-+#include "poppler/Object.h"
-+#include "poppler/Array.h"
-+#include "poppler/Dict.h"
-+#include "poppler/Stream.h"
-+#include "poppler/Lexer.h"
-+#include "poppler/Parser.h"
-+#include "poppler/GfxFont.h"
-+#include "poppler/GfxState.h"
-+#include "poppler/OutputDev.h"
-+#include "poppler/Page.h"
-+#include "poppler/Annot.h"
-+#include "poppler/Error.h"
- 
- // the MSVC math.h doesn't define this
- #ifndef M_PI
-@@ -367,14 +368,14 @@ void PdfParser::parse(Object *obj, GBool
-     for (i = 0; i < obj->arrayGetLength(); ++i) {
-       obj->arrayGet(i, &obj2);
-       if (!obj2.isStream()) {
--      error(-1, const_cast<char*>("Weird page contents"));
-+      error(errInternal, -1, const_cast<char*>("Weird page contents"));
-       obj2.free();
-       return;
-       }
-       obj2.free();
-     }
-   } else if (!obj->isStream()) {
--    error(-1, const_cast<char*>("Weird page contents"));
-+    error(errInternal, -1, const_cast<char*>("Weird page contents"));
-     return;
-   }
-   parser = new Parser(xref, new Lexer(xref, obj), gFalse);
-@@ -419,7 +420,7 @@ void PdfParser::go(GBool topLevel) {
- 
-     // too many arguments - something is wrong
-     } else {
--      error(getPos(), const_cast<char*>("Too many args in content stream"));
-+      error(errInternal, getPos(), const_cast<char*>("Too many args in content stream"));
-       if (printCommands) {
-       printf("throwing away arg: ");
-       obj.print(stdout);
-@@ -436,7 +437,7 @@ void PdfParser::go(GBool topLevel) {
- 
-   // args at end with no command
-   if (numArgs > 0) {
--    error(getPos(), const_cast<char*>("Leftover args in content stream"));
-+    error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream"));
-     if (printCommands) {
-       printf("%d leftovers:", numArgs);
-       for (i = 0; i < numArgs; ++i) {
-@@ -502,7 +503,7 @@ void PdfParser::execOp(Object *cmd, Obje
-   name = cmd->getCmd();
-   if (!(op = findOp(name))) {
-     if (ignoreUndef == 0)
--      error(getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-+      error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-     return;
-   }
- 
-@@ -510,26 +511,26 @@ void PdfParser::execOp(Object *cmd, Obje
-   argPtr = args;
-   if (op->numArgs >= 0) {
-     if (numArgs < op->numArgs) {
--      error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-+      error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-       return;
-     }
-     if (numArgs > op->numArgs) {
- #if 0
--      error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
-+      error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
- #endif
-       argPtr += numArgs - op->numArgs;
-       numArgs = op->numArgs;
-     }
-   } else {
-     if (numArgs > -op->numArgs) {
--      error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
-+      error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
-           numArgs, name);
-       return;
-     }
-   }
-   for (i = 0; i < numArgs; ++i) {
-     if (!checkArg(&argPtr[i], op->tchk[i])) {
--      error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
-+      error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
-           i, name, argPtr[i].getTypeName());
-       return;
-     }
-@@ -690,7 +691,7 @@ void PdfParser::opSetExtGState(Object ar
-     return;
-   }
-   if (!obj1.isDict()) {
--    error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-+    error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-     obj1.free();
-     return;
-   }
-@@ -705,7 +706,7 @@ void PdfParser::opSetExtGState(Object ar
-     if (state->parseBlendMode(&obj2, &mode)) {
-       state->setBlendMode(mode);
-     } else {
--      error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -764,7 +765,7 @@ void PdfParser::opSetExtGState(Object ar
-       state->setTransfer(funcs);
-     }



Home | Main Index | Thread Index | Old Index