From 115a5711d2c96f495f72198a588956438960a080 Mon Sep 17 00:00:00 2001
From: branch-fixup <branch-fixup>
Date: Fri, 17 Oct 2008 07:31:58 +0000
Subject: [PATCH] Add files from parent branch HEAD: 
 security/stunnel/Makefile 	security/stunnel/distinfo 
 security/stunnel/options.mk 	security/stunnel/patches/patch-aa

---
 security/stunnel/Makefile         | 32 +++++++++++++++++++++++
 security/stunnel/distinfo         |  7 +++++
 security/stunnel/options.mk       | 43 +++++++++++++++++++++++++++++++
 security/stunnel/patches/patch-aa | 22 ++++++++++++++++
 4 files changed, 104 insertions(+)
 create mode 100644 security/stunnel/Makefile
 create mode 100644 security/stunnel/distinfo
 create mode 100644 security/stunnel/options.mk
 create mode 100644 security/stunnel/patches/patch-aa

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
new file mode 100644
index 000000000000..f8b5d467070f
--- /dev/null
+++ b/security/stunnel/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.64 2008/10/01 14:34:32 obache Exp $
+
+DISTNAME=		stunnel-4.26
+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=		shaun@inerd.com
+HOMEPAGE=		http://www.stunnel.org/
+COMMENT=		Universal SSL tunnel
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-cert-dir=${SSLCERTS:Q}
+CONFIGURE_ARGS+=	--with-pem-dir=${SSLCERTS:Q}
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
+
+PKG_SYSCONFSUBDIR=	stunnel
+
+RCD_SCRIPTS=		stunnel
+REPLACE_PERL+=		src/stunnel3.in
+USE_TOOLS+=		perl:run
+
+.include "options.mk"
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
new file mode 100644
index 000000000000..a5651f1d20d0
--- /dev/null
+++ b/security/stunnel/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.25 2008/05/29 00:44:30 schmonz Exp $
+
+SHA1 (stunnel-4.26.tar.gz) = 1c9f5dd6b21f354c356cd9100899a90a83068c68
+RMD160 (stunnel-4.26.tar.gz) = 09e0f60357a90b66f66a1f4cda1b04872c087d0d
+Size (stunnel-4.26.tar.gz) = 531804 bytes
+SHA1 (patch-aa) = 322721b50487cd0eb795df2e3cd45beb86cd95e6
+SHA1 (patch-ac) = 7b4c4331e97f575b0bb82e6ce8a2b7d9a1483da6
diff --git a/security/stunnel/options.mk b/security/stunnel/options.mk
new file mode 100644
index 000000000000..144ba98b1b6e
--- /dev/null
+++ b/security/stunnel/options.mk
@@ -0,0 +1,43 @@
+# $NetBSD: options.mk,v 1.5 2008/10/01 14:34:32 obache Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.stunnel
+PKG_SUPPORTED_OPTIONS=	inet6 pthread libwrap
+PKG_SUGGESTED_OPTIONS=	libwrap
+CHECK_BUILTIN.pthread:=		yes
+.include "../../mk/pthread.builtin.mk"
+CHECK_BUILTIN.pthread:=		no
+
+.if !empty(BUILTIN_LIB_FOUND.pthread:M[yY][eE][sS])
+PKG_SUGGESTED_OPTIONS+=	pthread
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Support IPv6
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+###
+### Support pthreads
+###
+.if !empty(PKG_OPTIONS:Mpthread)
+PTHREAD_AUTO_VARS=	yes
+.include "../../mk/pthread.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-threads=pthread
+.else
+CONFIGURE_ARGS+=	--with-threads=fork
+.endif
+
+###
+### Support libwrap
+###
+.if !empty(PKG_OPTIONS:Mlibwrap)
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-libwrap
+.endif
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
new file mode 100644
index 000000000000..f1f98401b2e4
--- /dev/null
+++ b/security/stunnel/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- tools/Makefile.in.orig	2008-09-20 22:32:29.000000000 +0200
++++ tools/Makefile.in
+@@ -167,7 +167,7 @@ target_alias = @target_alias@
+ EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \
+ 	stunnel.spec stunnel.cnf stunnel.nsi stunnel.conf
+ 
+-confdir = $(sysconfdir)/stunnel
++confdir = $(datadir)/examples/stunnel
+ conf_DATA = stunnel.conf-sample
+ examplesdir = $(docdir)/examples
+ examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \
+@@ -337,7 +337,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-confDATA install-data-local \
++install-data-am: install-confDATA \
+ 	install-examplesDATA
+ 
+ install-exec-am:
-- 
2.41.0