summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/stunnel/Makefile4
-rw-r--r--security/stunnel/distinfo13
-rw-r--r--security/stunnel/patches/patch-aa10
-rw-r--r--security/stunnel/patches/patch-configure17
4 files changed, 31 insertions, 13 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 1252c09280b..3b4463b5fc1 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2015/07/25 03:11:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.97 2015/12/27 18:36:05 ryoon Exp $
-DISTNAME= stunnel-5.20
+DISTNAME= stunnel-5.28
CATEGORIES= security
MASTER_SITES= http://www.stunnel.org/downloads/
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 1a6702e5d37..5bfc25d26c3 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.45 2015/11/04 01:18:11 agc Exp $
+$NetBSD: distinfo,v 1.46 2015/12/27 18:36:06 ryoon Exp $
-SHA1 (stunnel-5.20.tar.gz) = 7506fd03cd04d7bc93b6253e63f0619b7b336053
-RMD160 (stunnel-5.20.tar.gz) = c38ba51fd06d23257c8edf1686cab5954a0cd5e8
-SHA512 (stunnel-5.20.tar.gz) = 59262aacf866cac25bac707b94c5a6185aa868b5fdfab38a9ef03a00b80f106d92e2872c0b0fecbc5d13adb7bdea7f922768fb78f38355dbf67eb34a148441e4
-Size (stunnel-5.20.tar.gz) = 625091 bytes
-SHA1 (patch-aa) = cd0f449f0672599472076794370f284b94152726
+SHA1 (stunnel-5.28.tar.gz) = 9162f0162638046ed559efe06337bf070ab96f1e
+RMD160 (stunnel-5.28.tar.gz) = 4edceb3a2587822fdb13aff9892c89d4c9e5b975
+SHA512 (stunnel-5.28.tar.gz) = a01b02afbc05aa7256f245b9142fb17990cd2026274da9358a52778dd0272379aec39e5794c0992e11e3f7584b69fee903742bba9e072bb32928d65bd3abe40a
+Size (stunnel-5.28.tar.gz) = 637471 bytes
+SHA1 (patch-aa) = c79d26b07a7e9d11f54bf2f61d17206b0c2951b0
SHA1 (patch-ac) = 91b09d39fb968ad76952acdff250150d3e372c36
+SHA1 (patch-configure) = a17310f9b1e6697320cb5316b9db360f1658142c
diff --git a/security/stunnel/patches/patch-aa b/security/stunnel/patches/patch-aa
index 1c9343d4e90..ef6094b224a 100644
--- a/security/stunnel/patches/patch-aa
+++ b/security/stunnel/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.27 2015/07/25 03:11:18 ryoon Exp $
+$NetBSD: patch-aa,v 1.28 2015/12/27 18:36:06 ryoon Exp $
Install configuration files into examples directory.
---- tools/Makefile.in.orig 2015-07-03 12:08:23.000000000 +0000
+--- tools/Makefile.in.orig 2015-12-08 15:59:03.000000000 +0000
+++ tools/Makefile.in
-@@ -273,7 +273,7 @@ EXTRA_DIST = ca.html ca.pl importCA.html
- stunnel.spec stunnel.cnf stunnel.nsi stunnel.license stunnel.conf \
+@@ -275,7 +275,7 @@ EXTRA_DIST = ca.html ca.pl importCA.html
+ stunnel.spec openssl.cnf stunnel.nsi stunnel.license stunnel.conf \
stunnel.conf-sample.in stunnel.init.in stunnel.service.in
-confdir = $(sysconfdir)/stunnel
@@ -13,7 +13,7 @@ Install configuration files into examples directory.
conf_DATA = stunnel.conf-sample
examplesdir = $(docdir)/examples
examples_DATA = stunnel.spec stunnel.init stunnel.service ca.html \
-@@ -463,7 +463,7 @@ info: info-am
+@@ -464,7 +464,7 @@ info: info-am
info-am:
diff --git a/security/stunnel/patches/patch-configure b/security/stunnel/patches/patch-configure
new file mode 100644
index 00000000000..383597433a4
--- /dev/null
+++ b/security/stunnel/patches/patch-configure
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1 2015/12/27 18:36:06 ryoon Exp $
+
+Fix NetBSD build, undefined u_short etc.
+
+--- configure.orig 2015-12-08 15:59:04.000000000 +0000
++++ configure
+@@ -3082,10 +3082,6 @@ $as_echo "#define _GNU_SOURCE 1" >>confd
+
+ $as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+-# OSX does not declare chroot() with newer _XOPEN_SOURCE versions
+-
+-$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+-
+ # Solaris does not declare IPv6 structures without __EXTENSIONS__
+
+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h