Release 1.13 Some critical bugs in the processing of BMP files were fixed. These bugs allowed the program to be crashed, or potentially to be abused in other ways, by feeding it specially crafted BMP files. Thanks to Tomasz Buchert and Agostino Sarubbo for reporting these bugs. Portability was improved for C99 and for MSVC++. Thanks to Peter Breitenlohner, Nelson Beebe, and Martin Gieseking for reporting portability issues.diff -r1.10 -r1.11 pkgsrc/graphics/potrace/Makefile
(adam)
| @@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.10 2017/01/19 18:52:12 agc Exp $ | 1 | # $NetBSD: Makefile,v 1.11 2017/02/08 17:53:51 adam Exp $ | |
| 2 | 2 | |||
| 3 | DISTNAME= potrace-1.11 | 3 | DISTNAME= potrace-1.13 | |
| 4 | CATEGORIES= graphics | 4 | CATEGORIES= graphics | |
| 5 | MASTER_SITES= http://potrace.sourceforge.net/download/ | 5 | MASTER_SITES= http://potrace.sourceforge.net/download/ | |
| 6 | MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=potrace/} | 6 | MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=potrace/} | |
| 7 | 7 | |||
| 8 | MAINTAINER= adam@NetBSD.org | 8 | MAINTAINER= adam@NetBSD.org | |
| 9 | HOMEPAGE= http://potrace.sourceforge.net/ | 9 | HOMEPAGE= http://potrace.sourceforge.net/ | |
| 10 | COMMENT= Utility for transforming bitmaps into vector graphics | 10 | COMMENT= Utility for transforming bitmaps into vector graphics | |
| 11 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
| 12 | 12 | |||
| 13 | USE_LIBTOOL= yes | 13 | USE_LIBTOOL= yes | |
| 14 | GNU_CONFIGURE= yes | 14 | GNU_CONFIGURE= yes | |
| 15 | 15 | |||
| 16 | .include "../../devel/zlib/buildlink3.mk" | 16 | .include "../../devel/zlib/buildlink3.mk" |
# $NetBSD: buildlink3.mk,v 1.1 2017/02/08 17:53:51 adam Exp $
BUILDLINK_TREE+= potrace
.if !defined(POTRACE_BUILDLINK3_MK)
POTRACE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.potrace+= potrace>=1.13
BUILDLINK_PKGSRCDIR.potrace?= ../../graphics/potrace
.endif # POTRACE_BUILDLINK3_MK
BUILDLINK_TREE+= -potrace
| @@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
| 1 | $NetBSD: distinfo,v 1.8 2015/11/03 21:34:15 agc Exp $ | 1 | $NetBSD: distinfo,v 1.9 2017/02/08 17:53:51 adam Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (potrace-1.11.tar.gz) = 7296baf27bf35298263cb3ed3df34a38fed0b441 | 3 | SHA1 (potrace-1.13.tar.gz) = fe8e42e0b5f7d3130b494818d6b1872e29097cd5 | |
| 4 | RMD160 (potrace-1.11.tar.gz) = ea03b188e93d02766ff3b546a199fd76bc72271a | 4 | RMD160 (potrace-1.13.tar.gz) = ff51f938641bfc81236dd4daba54c00915e883c0 | |
| 5 | SHA512 (potrace-1.11.tar.gz) = d0ff037ed989a1742a099bb9d120c5f10cf1eae6ed9adb20d1d37eee713e569925eff6235825dfbdd7b1649dc46ad4507982ae001d6d3d49cc281ed16ddf1843 | 5 | SHA512 (potrace-1.13.tar.gz) = d7b1e72bee388aa309a5fbf3944b9409d912f2ed8a089a44dfca597b55d88bdf08778d40fc487e6689a873631c24cd393894ff353442dc778dfd0d3068121484 | |
| 6 | Size (potrace-1.11.tar.gz) = 662085 bytes | 6 | Size (potrace-1.13.tar.gz) = 605931 bytes | |
| 7 | SHA1 (patch-src_Makefile.am) = e26b4395a7d1b79fe85346a926c348216c870ef3 | 7 | SHA1 (patch-src_Makefile.am) = 4476e3719269afd1d8455eca89baba8feeaaa18d | |
| 8 | SHA1 (patch-src_Makefile.in) = 2bcf24c3104879c12feba6402b9850e11976166a | 8 | SHA1 (patch-src_Makefile.in) = a4eae96751dc22a75594e91347bff6c4e6aff45c |
| @@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
| 1 | $NetBSD: patch-src_Makefile.am,v 1.1 2013/03/15 23:21:39 wiz Exp $ | 1 | $NetBSD: patch-src_Makefile.am,v 1.2 2017/02/08 17:53:52 adam Exp $ | |
| 2 | 2 | |||
| 3 | The result of replacing EXTRA_LIBRARIES with lib_LTLIBRARIES | 3 | The result of replacing EXTRA_LIBRARIES with lib_LTLIBRARIES | |
| 4 | and rerunning automake-1.11.3 to make it install the needed libpotrace. | 4 | and rerunning automake-1.11.3 to make it install the needed libpotrace. | |
| 5 | 5 | |||
| 6 | --- src/Makefile.am.orig 2013-02-20 00:43:08.000000000 +0000 | 6 | --- src/Makefile.am.orig 2015-10-23 01:25:37.000000000 +0000 | |
| 7 | +++ src/Makefile.am | 7 | +++ src/Makefile.am | |
| 8 | @@ -39,8 +39,7 @@ libsources = curve.c curve.h trace.c tra | 8 | @@ -39,8 +39,7 @@ libsources = curve.c curve.h trace.c tra | |
| 9 | decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h \ | 9 | decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h \ | |
| 10 | progress.h | 10 | progress.h | |
| 11 | 11 | |||
| 12 | -lib_LTLIBRARIES = $(INSTLIBS) | 12 | -lib_LTLIBRARIES = $(INSTLIBS) | |
| 13 | -EXTRA_LTLIBRARIES = libpotrace.la | 13 | -EXTRA_LTLIBRARIES = libpotrace.la | |
| 14 | +lib_LTLIBRARIES = libpotrace.la | 14 | +lib_LTLIBRARIES = libpotrace.la | |
| 15 | libpotrace_la_SOURCES = $(libsources) | 15 | libpotrace_la_SOURCES = $(libsources) | |
| 16 | libpotrace_la_LDFLAGS = -version-info 0:1:0 -rpath '$(libdir)' \ | 16 | libpotrace_la_LDFLAGS = -version-info 0:3:0 -rpath '$(libdir)' \ | |
| 17 | -export-symbols $(srcdir)/libpotrace-export.sym -no-undefined | 17 | -export-symbols $(srcdir)/libpotrace-export.sym -no-undefined |
| @@ -1,33 +1,26 @@ | @@ -1,33 +1,26 @@ | |||
| 1 | $NetBSD: patch-src_Makefile.in,v 1.2 2013/03/15 23:21:39 wiz Exp $ | 1 | $NetBSD: patch-src_Makefile.in,v 1.3 2017/02/08 17:53:52 adam Exp $ | |
| 2 | 2 | |||
| 3 | The result of replacing EXTRA_LIBRARIES with lib_LTLIBRARIES | 3 | The result of replacing EXTRA_LIBRARIES with lib_LTLIBRARIES | |
| 4 | and rerunning automake-1.11.3 to make it install the needed libpotrace. | 4 | and rerunning automake-1.11.3 to make it install the needed libpotrace. | |
| 5 | 5 | |||
| 6 | --- src/Makefile.in.orig 2013-02-20 00:49:08.000000000 +0000 | 6 | --- src/Makefile.in.orig 2015-10-23 01:42:02.000000000 +0000 | |
| 7 | +++ src/Makefile.in | 7 | +++ src/Makefile.in | |
| 8 | @@ -296,8 +339,7 @@ libsources = curve.c curve.h trace.c tra | 8 | @@ -378,8 +378,7 @@ libsources = curve.c curve.h trace.c tra | |
| 9 | decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h \ | 9 | decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h \ | |
| 10 | progress.h | 10 | progress.h | |
| 11 | 11 | |||
| 12 | -lib_LTLIBRARIES = $(INSTLIBS) | 12 | -lib_LTLIBRARIES = $(INSTLIBS) | |
| 13 | -EXTRA_LTLIBRARIES = libpotrace.la | 13 | -EXTRA_LTLIBRARIES = libpotrace.la | |
| 14 | +lib_LTLIBRARIES = libpotrace.la | 14 | +lib_LTLIBRARIES = libpotrace.la | |
| 15 | libpotrace_la_SOURCES = $(libsources) | 15 | libpotrace_la_SOURCES = $(libsources) | |
| 16 | libpotrace_la_LDFLAGS = -version-info 0:1:0 -rpath '$(libdir)' \ | 16 | libpotrace_la_LDFLAGS = -version-info 0:3:0 -rpath '$(libdir)' \ | |
| 17 | -export-symbols $(srcdir)/libpotrace-export.sym -no-undefined | 17 | -export-symbols $(srcdir)/libpotrace-export.sym -no-undefined | |
| 18 | @@ -372,14 +415,14 @@ uninstall-libLTLIBRARIES: | 18 | @@ -464,7 +463,7 @@ clean-libLTLIBRARIES: | |
| 19 | } | |||
| 19 | 20 | |||
| 20 | clean-libLTLIBRARIES: | |||
| 21 | -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) | |||
| 22 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | |||
| 23 | dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ | |||
| 24 | test "$$dir" != "$$p" || dir=.; \ | |||
| 25 | echo "rm -f \"$${dir}/so_locations\""; \ | |||
| 26 | rm -f "$${dir}/so_locations"; \ | |||
| 27 | done | |||
| 28 | libpotrace.la: $(libpotrace_la_OBJECTS) $(libpotrace_la_DEPENDENCIES) $(EXTRA_libpotrace_la_DEPENDENCIES) | 21 | libpotrace.la: $(libpotrace_la_OBJECTS) $(libpotrace_la_DEPENDENCIES) $(EXTRA_libpotrace_la_DEPENDENCIES) | |
| 29 | - $(libpotrace_la_LINK) $(libpotrace_la_OBJECTS) $(libpotrace_la_LIBADD) $(LIBS) | 22 | - $(AM_V_CCLD)$(libpotrace_la_LINK) $(libpotrace_la_OBJECTS) $(libpotrace_la_LIBADD) $(LIBS) | |
| 30 | + $(AM_V_CCLD)$(libpotrace_la_LINK) -rpath $(libdir) $(libpotrace_la_OBJECTS) $(libpotrace_la_LIBADD) $(LIBS) | 23 | + $(AM_V_CCLD)$(libpotrace_la_LINK) -rpath $(libdir) $(libpotrace_la_OBJECTS) $(libpotrace_la_LIBADD) $(LIBS) | |
| 31 | install-binPROGRAMS: $(bin_PROGRAMS) | 24 | install-binPROGRAMS: $(bin_PROGRAMS) | |
| 32 | @$(NORMAL_INSTALL) | 25 | @$(NORMAL_INSTALL) | |
| 33 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ | 26 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |