Update stunnel to 4.15.

Patch provided by Shaun Amott via PR 34436, take maintainership.
And define USE_LIBTOOL, regen patch with mkpatches.

5 files changed, 50 insertions, 53 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index c28be601c62..4046552c47d 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.55 2006/06/16 09:23:22 rillig Exp $
+# $NetBSD: Makefile,v 1.56 2006/10/14 11:12:19 obache Exp $
 
-DISTNAME=		stunnel-4.07
-PKGREVISION=		3
+DISTNAME=		stunnel-4.15
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.fu-berlin.de/unix/security/stunnel/ \
 			ftp://stunnel.mirt.net/stunnel/ \
 			http://www.stunnel.org/download/stunnel/src/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		shaun@inerd.com
 HOMEPAGE=		http://www.stunnel.org/
 COMMENT=		Universal SSL tunnel
 
+USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q} \
 			--with-cert-dir=${SSLCERTS:Q} \
@@ -19,6 +19,8 @@ CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q} \
 			--sysconfdir=${PKG_SYSCONFDIR:Q} \
 			--localstatedir=${VARBASE:Q}
 
+PTHREAD_OPTS?=		optional
+
 PKG_SYSCONFSUBDIR=	stunnel
 
 RCD_SCRIPTS=		stunnel
@@ -28,6 +30,16 @@ USE_TOOLS+=		perl:run
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
+CONFIGURE_ARGS+=	--with-threads=fork
+.else
+CONFIGURE_ARGS+=	--with-threads=pthread
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
+			LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+.endif
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/stunnel/PLIST b/security/stunnel/PLIST
index 7d1377e548f..217814aaf0f 100644
--- a/security/stunnel/PLIST
+++ b/security/stunnel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/05/02 20:34:05 reed Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/10/14 11:12:19 obache Exp $
 lib/libstunnel.la
 man/man8/stunnel.8
 man/man8/stunnel.fr.8
@@ -12,7 +12,6 @@ share/doc/stunnel/COPYRIGHT.GPL
 share/doc/stunnel/CREDITS
 share/doc/stunnel/ChangeLog
 share/doc/stunnel/INSTALL
-share/doc/stunnel/INSTALL.W32
 share/doc/stunnel/NEWS
 share/doc/stunnel/PORTS
 share/doc/stunnel/README
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 6f7488be2d0..9a942791c97 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2005/02/24 13:10:13 agc Exp $
+$NetBSD: distinfo,v 1.20 2006/10/14 11:12:19 obache Exp $
 
-SHA1 (stunnel-4.07.tar.gz) = fe9661148bda73ce5a48cd21baf99ecbdc477e1d
-RMD160 (stunnel-4.07.tar.gz) = b70ea096e922c6521555869fa59509d4608d3ee2
-Size (stunnel-4.07.tar.gz) = 486230 bytes
-SHA1 (patch-aa) = a470942ef4f37a1783068f2f1fdde9ea4bac451f
-SHA1 (patch-ab) = ddd342c25a818390a731ec84a472bdf2f2395e31
+SHA1 (stunnel-4.15.tar.gz) = 735406c1ca94904581158a434214e1f6568539d0
+RMD160 (stunnel-4.15.tar.gz) = a8d5c9d3fb24d0518975cbb347729f5eba3d3f12
+Size (stunnel-4.15.tar.gz) = 497103 bytes
+SHA1 (patch-aa) = e54eed598bb069b9131ed42721df8f49069b15b8
+SHA1 (patch-ab) = 947f8ee20b28fa782786976ac19d0f7ef895f254
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index b3006707a65..3bcc039cb3f 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,24 +1,22 @@
-$NetBSD: patch-aa,v 1.17 2005/01/09 13:09:12 schmonz Exp $
+$NetBSD: patch-aa,v 1.18 2006/10/14 11:12:19 obache Exp $
 
---- tools/Makefile.in.orig	2004-12-30 06:57:40.000000000 -0500
+--- tools/Makefile.in.orig	2006-03-06 21:02:39.000000000 +0000
 +++ tools/Makefile.in
-@@ -162,8 +162,8 @@ DISTCLEANFILES = stunnel.pem
+@@ -160,7 +160,7 @@ target_alias = @target_alias@
  EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \
- 	stunnel.spec stunnel.mak stunnel.cnf
+ 	stunnel.spec stunnel.mak stunnel.cnf stunnel.nsi stunnel.conf
  
 -confdir = $(sysconfdir)/stunnel
--conf_DATA = stunnel.conf-sample stunnel.pem
 +confdir = $(datadir)/examples/stunnel
-+conf_DATA = stunnel.conf-sample
+ conf_DATA = stunnel.conf-sample
  docdir = $(datadir)/doc/stunnel
  examplesdir = $(docdir)/examples
- examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \
-@@ -399,7 +399,7 @@ stunnel.pem: stunnel.cnf
- 		-in stunnel.pem
+@@ -331,7 +331,7 @@ info: info-am
  
- install-data-hook:
--	chmod 0600 $(DESTDIR)$(confdir)/stunnel.pem
-+	true
+ info-am:
  
- clean-local:
- 	-rm -f stunnel.rnd
+-install-data-am: install-confDATA install-data-local \
++install-data-am: install-confDATA \
+ 	install-examplesDATA
+ 
+ install-exec-am:
diff --git a/security/stunnel/patches/patch-ab b/security/stunnel/patches/patch-ab
index eb2b6f6f9cd..2c904828c89 100644
--- a/security/stunnel/patches/patch-ab
+++ b/security/stunnel/patches/patch-ab
@@ -1,29 +1,17 @@
-$NetBSD: patch-ab,v 1.16 2005/01/09 13:09:12 schmonz Exp $
+$NetBSD: patch-ab,v 1.17 2006/10/14 11:12:19 obache Exp $
 
---- configure.orig	2004-12-30 06:57:47.000000000 -0500
-+++ configure
-@@ -21495,6 +21495,7 @@ _ACEOF
- fi
+--- Makefile.in.orig	2006-03-06 20:52:41.000000000 +0000
++++ Makefile.in
+@@ -180,10 +180,10 @@ ssldir = @ssldir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = src doc tools
+-EXTRA_DIST = PORTS BUGS COPYRIGHT.GPL CREDITS INSTALL.W32 INSTALL.WCE
++EXTRA_DIST = PORTS BUGS COPYRIGHT.GPL CREDITS
+ docdir = $(datadir)/doc/stunnel
+ doc_DATA = AUTHORS BUGS ChangeLog COPYING COPYRIGHT.GPL CREDITS \
+-	INSTALL INSTALL.W32 INSTALL.WCE NEWS PORTS README TODO
++	INSTALL NEWS PORTS README TODO
  
- 
-+if false; then
- # OSF hack instead of simple AC_CHECK_LIB here
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
- echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-@@ -21622,6 +21623,7 @@ _ACEOF
- 
- 
- fi
-+fi
- 
- 
- # Check for libwrap library
-@@ -22166,7 +22168,7 @@ fi;
- { echo "$as_me:$LINENO: **************************************** write the results" >&5
- echo "$as_me: **************************************** write the results" >&6;}
- LIBS="$LIBS $wrap_LIB"
--CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir/stunnel\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\""
-+CPPFLAGS="$CPPFLAGS -DLIBDIR=\\\"$libdir\\\" -DCONFDIR=\\\"$sysconfdir\\\" -DPIDFILE=\\\"$localstatedir/run/stunnel.pid\\\""
-                                                                       ac_config_files="$ac_config_files Makefile src/Makefile src/stunnel3 doc/Makefile tools/Makefile tools/stunnel.conf-sample tools/stunnel.init"
- 
- cat >confcache <<\_ACEOF
+ distcleancheck_listfiles = \
+ 	find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'