Update exiv2 to 0.25, fixing a security issue. Patch from

Timo Buhrmester via mail.

5 files changed, 80 insertions, 15 deletions

diff --git a/graphics/exiv2/patches/patch-aa b/graphics/exiv2/patches/patch-aa
index ea5cc533853..f98bcd5fc86 100644
--- a/graphics/exiv2/patches/patch-aa
+++ b/graphics/exiv2/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2014/06/05 06:43:54 adam Exp $
+$NetBSD: patch-aa,v 1.5 2015/10/03 12:08:37 bsiegert Exp $
 
 Fix build on Solaris, from PR 37720.
 
---- config/config.mk.in.orig	2013-12-01 12:13:42.000000000 +0000
-+++ config/config.mk.in
-@@ -133,7 +133,7 @@ ifdef DEP_TRACKING
+--- config/config.mk.in.orig	2015-06-21 16:19:25.000000000 +0200
++++ config/config.mk.in	2015-10-02 05:22:11.000000000 +0200
+@@ -148,7 +148,7 @@
  
-     # Dependency files post-process commands
-     POSTDEPEND = if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \
--                 if test -e $*.d; then cp $*.d $(DEPDIR)/$*.d; \
-+                 if test -f $*.d; then cp $*.d $(DEPDIR)/$*.d; \
-                    sed -e 's/^\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+         # Dependency files post-process commands
+         POSTDEPEND = if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \
+-	        if test -e $*.d; then cp $*.d $(DEPDIR)/$*.d; \
++	        if test -f $*.d; then cp $*.d $(DEPDIR)/$*.d; \
+ 	        sed -e 's/^\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
                      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $(DEPDIR)/$*.d; \
-                    $(RM) $*.d; fi
+                 $(RM) $*.d; fi
diff --git a/graphics/exiv2/patches/patch-configure b/graphics/exiv2/patches/patch-configure
index e57f16dd4db..e5018889abb 100644
--- a/graphics/exiv2/patches/patch-configure
+++ b/graphics/exiv2/patches/patch-configure
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.1 2014/06/05 07:12:53 adam Exp $
+$NetBSD: patch-configure,v 1.2 2015/10/03 12:08:37 bsiegert Exp $
 
 Don't add -ldl for all OS; this gets auto-detected somewhere else.
 
---- configure.orig	2014-06-05 06:53:10.000000000 +0000
-+++ configure
-@@ -17069,8 +17069,6 @@ fi
+--- configure.orig	2015-10-02 05:19:31.000000000 +0200
++++ configure	2015-10-02 05:19:34.000000000 +0200
+@@ -17321,8 +17321,6 @@
  case "$host_os" in
  *mingw* | *cygwin*)
-     LDFLAGS="$LDFLAGS -no-undefined -lpsapi" ;;
+     LDFLAGS="$LDFLAGS -no-undefined -lpsapi -lwldap32 -lws2_32" ;;
 -*)
 -    LDFLAGS="$LDFLAGS -ldl" ;;
  esac
diff --git a/graphics/exiv2/patches/patch-src_Makefile b/graphics/exiv2/patches/patch-src_Makefile
new file mode 100644
index 00000000000..b9809612719
--- /dev/null
+++ b/graphics/exiv2/patches/patch-src_Makefile
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_Makefile,v 1.1 2015/10/03 12:08:37 bsiegert Exp $
+
+Do not rely on bash being in /bin, especially when sh will do just fin...
+Remove needless use of -v with mkdir; It's not POSIX and NetBSD doesn't have it.
+
+
+--- src/Makefile.orig	2015-06-21 16:20:11.000000000 +0200
++++ src/Makefile	2015-10-02 05:40:26.000000000 +0200
+@@ -150,7 +150,7 @@
+ 
+ # ******************************************************************************
+ # Initialisations
+-SHELL = /bin/bash
++SHELL = /bin/sh
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .cpp .o .so
+@@ -252,7 +252,7 @@
+ 	@$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $@.o -rpath $(libdir)
+ 
+ $(EXIV2BIN): lib $(EXIV2OBJ) $(EXIV2COBJ)
+-	mkdir -pv ../bin 2>&1 > /dev/null
++	mkdir -p ../bin 2>&1 > /dev/null
+ 	@$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
+ 
+ install-header:
diff --git a/graphics/exiv2/patches/patch-src_http.cpp b/graphics/exiv2/patches/patch-src_http.cpp
new file mode 100644
index 00000000000..745ff922f53
--- /dev/null
+++ b/graphics/exiv2/patches/patch-src_http.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_http.cpp,v 1.1 2015/10/03 12:08:37 bsiegert Exp $
+
+Include <errno.h> rather than <sys/errno.h> because the latter doesn't
+actually make `errno` available on NetBSD; while the former is required
+to by the C standard
+
+
+--- src/http.cpp.orig	2015-10-02 05:47:47.000000000 +0200
++++ src/http.cpp	2015-10-02 05:47:52.000000000 +0200
+@@ -70,7 +70,7 @@
+ 
+ #include <unistd.h>
+ #include <strings.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/uio.h>
diff --git a/graphics/exiv2/patches/patch-src_svn_version.sh b/graphics/exiv2/patches/patch-src_svn_version.sh
new file mode 100644
index 00000000000..99098de90c9
--- /dev/null
+++ b/graphics/exiv2/patches/patch-src_svn_version.sh
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_svn_version.sh,v 1.1 2015/10/03 12:08:37 bsiegert Exp $
+
+Replace an unneeded dependency on bash; do not use == with test(1)
+
+--- src/svn_version.sh.orig	2015-10-02 05:32:33.000000000 +0200
++++ src/svn_version.sh	2015-10-02 05:32:19.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ ## 
+ # update svn_version_h when revision changes
+@@ -11,7 +11,7 @@
+ ##
+ # from Jenkins, svn is almost always a disaster because
+ # Jenkins SVN Plugin is 1.7 and the build machine is normally at least 1.8
+-if [ "$s" == "0" ]; then
++if [ "$s" = "0" ]; then
+ 	svn_version=$(svn info .. | grep ^Revision | cut -f 2 -d' ')
+     if [ -z "$svn_version"   ]; then svn_version=0 ; fi
+ else