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.

5 files changed, 32 insertions, 26 deletions

diff --git a/graphics/potrace/Makefile b/graphics/potrace/Makefile
index a4623f96daf..023871d5f7d 100644
--- a/graphics/potrace/Makefile
+++ b/graphics/potrace/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2017/01/19 18:52:12 agc Exp $
+# $NetBSD: Makefile,v 1.11 2017/02/08 17:53:51 adam Exp $
 
-DISTNAME=	potrace-1.11
+DISTNAME=	potrace-1.13
 CATEGORIES=	graphics
 MASTER_SITES=	http://potrace.sourceforge.net/download/
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=potrace/}
diff --git a/graphics/potrace/buildlink3.mk b/graphics/potrace/buildlink3.mk
new file mode 100644
index 00000000000..b6b1c9fa7c9
--- /dev/null
+++ b/graphics/potrace/buildlink3.mk
@@ -0,0 +1,13 @@
+# $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
diff --git a/graphics/potrace/distinfo b/graphics/potrace/distinfo
index 5bd0116ca1e..cac20292526 100644
--- a/graphics/potrace/distinfo
+++ b/graphics/potrace/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 21:34:15 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/02/08 17:53:51 adam Exp $
 
-SHA1 (potrace-1.11.tar.gz) = 7296baf27bf35298263cb3ed3df34a38fed0b441
-RMD160 (potrace-1.11.tar.gz) = ea03b188e93d02766ff3b546a199fd76bc72271a
-SHA512 (potrace-1.11.tar.gz) = d0ff037ed989a1742a099bb9d120c5f10cf1eae6ed9adb20d1d37eee713e569925eff6235825dfbdd7b1649dc46ad4507982ae001d6d3d49cc281ed16ddf1843
-Size (potrace-1.11.tar.gz) = 662085 bytes
-SHA1 (patch-src_Makefile.am) = e26b4395a7d1b79fe85346a926c348216c870ef3
-SHA1 (patch-src_Makefile.in) = 2bcf24c3104879c12feba6402b9850e11976166a
+SHA1 (potrace-1.13.tar.gz) = fe8e42e0b5f7d3130b494818d6b1872e29097cd5
+RMD160 (potrace-1.13.tar.gz) = ff51f938641bfc81236dd4daba54c00915e883c0
+SHA512 (potrace-1.13.tar.gz) = d7b1e72bee388aa309a5fbf3944b9409d912f2ed8a089a44dfca597b55d88bdf08778d40fc487e6689a873631c24cd393894ff353442dc778dfd0d3068121484
+Size (potrace-1.13.tar.gz) = 605931 bytes
+SHA1 (patch-src_Makefile.am) = 4476e3719269afd1d8455eca89baba8feeaaa18d
+SHA1 (patch-src_Makefile.in) = a4eae96751dc22a75594e91347bff6c4e6aff45c
diff --git a/graphics/potrace/patches/patch-src_Makefile.am b/graphics/potrace/patches/patch-src_Makefile.am
index f9068a456d9..a1d54c1867d 100644
--- a/graphics/potrace/patches/patch-src_Makefile.am
+++ b/graphics/potrace/patches/patch-src_Makefile.am
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_Makefile.am,v 1.1 2013/03/15 23:21:39 wiz Exp $
+$NetBSD: patch-src_Makefile.am,v 1.2 2017/02/08 17:53:52 adam Exp $
 
 The result of replacing EXTRA_LIBRARIES with lib_LTLIBRARIES
 and rerunning automake-1.11.3 to make it install the needed libpotrace.
 
---- src/Makefile.am.orig	2013-02-20 00:43:08.000000000 +0000
+--- src/Makefile.am.orig	2015-10-23 01:25:37.000000000 +0000
 +++ src/Makefile.am
 @@ -39,8 +39,7 @@ libsources = curve.c curve.h trace.c tra
   decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h	\
@@ -13,5 +13,5 @@ and rerunning automake-1.11.3 to make it install the needed libpotrace.
 -EXTRA_LTLIBRARIES = libpotrace.la
 +lib_LTLIBRARIES = libpotrace.la
  libpotrace_la_SOURCES = $(libsources)
- libpotrace_la_LDFLAGS = -version-info 0:1:0 -rpath '$(libdir)' \
+ libpotrace_la_LDFLAGS = -version-info 0:3:0 -rpath '$(libdir)' \
   -export-symbols $(srcdir)/libpotrace-export.sym -no-undefined
diff --git a/graphics/potrace/patches/patch-src_Makefile.in b/graphics/potrace/patches/patch-src_Makefile.in
index 3492f5b5a25..db2e4ae0155 100644
--- a/graphics/potrace/patches/patch-src_Makefile.in
+++ b/graphics/potrace/patches/patch-src_Makefile.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_Makefile.in,v 1.2 2013/03/15 23:21:39 wiz Exp $
+$NetBSD: patch-src_Makefile.in,v 1.3 2017/02/08 17:53:52 adam Exp $
 
 The result of replacing EXTRA_LIBRARIES with lib_LTLIBRARIES
 and rerunning automake-1.11.3 to make it install the needed libpotrace.
 
---- src/Makefile.in.orig	2013-02-20 00:49:08.000000000 +0000
+--- src/Makefile.in.orig	2015-10-23 01:42:02.000000000 +0000
 +++ src/Makefile.in
-@@ -296,8 +339,7 @@ libsources = curve.c curve.h trace.c tra
+@@ -378,8 +378,7 @@ libsources = curve.c curve.h trace.c tra
   decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h	\
   progress.h
  
@@ -13,20 +13,13 @@ and rerunning automake-1.11.3 to make it install the needed libpotrace.
 -EXTRA_LTLIBRARIES = libpotrace.la
 +lib_LTLIBRARIES = libpotrace.la
  libpotrace_la_SOURCES = $(libsources)
- libpotrace_la_LDFLAGS = -version-info 0:1:0 -rpath '$(libdir)' \
+ libpotrace_la_LDFLAGS = -version-info 0:3:0 -rpath '$(libdir)' \
   -export-symbols $(srcdir)/libpotrace-export.sym -no-undefined
-@@ -372,14 +415,14 @@ uninstall-libLTLIBRARIES:
+@@ -464,7 +463,7 @@ clean-libLTLIBRARIES:
+ 	}
  
- clean-libLTLIBRARIES:
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- 	  test "$$dir" != "$$p" || dir=.; \
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
  libpotrace.la: $(libpotrace_la_OBJECTS) $(libpotrace_la_DEPENDENCIES) $(EXTRA_libpotrace_la_DEPENDENCIES) 
--	$(libpotrace_la_LINK)  $(libpotrace_la_OBJECTS) $(libpotrace_la_LIBADD) $(LIBS)
+-	$(AM_V_CCLD)$(libpotrace_la_LINK)  $(libpotrace_la_OBJECTS) $(libpotrace_la_LIBADD) $(LIBS)
 +	$(AM_V_CCLD)$(libpotrace_la_LINK) -rpath $(libdir) $(libpotrace_la_OBJECTS) $(libpotrace_la_LIBADD) $(LIBS)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)