summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authoryouri <youri@pkgsrc.org>2015-06-05 20:41:03 +0000
committeryouri <youri@pkgsrc.org>2015-06-05 20:41:03 +0000
commit89d8f80d31fdfc0782793a90d0178a1049434c58 (patch)
tree06ad971503e674f9cb2a05d80047e88a03c0bb52 /security
parent8ff5d71cd32424bb42a1c927e4f81c53567807ef (diff)
downloadpkgsrc-89d8f80d31fdfc0782793a90d0178a1049434c58.tar.gz
Update stunnel to 5.17. Thanks Ben Gergely for the patch!
distfile was signed with: pub 4096R/DD3AAAA3 2015-02-06 Key fingerprint = AC91 5EA3 0645 D9D3 D4DA E4FE B104 8932 DD3A AAA3 uid [ unknown] MichaƂ Trojnara <Michal.Trojnara@stunnel.org>
Diffstat (limited to 'security')
-rw-r--r--security/stunnel/Makefile4
-rw-r--r--security/stunnel/PLIST4
-rw-r--r--security/stunnel/distinfo10
-rw-r--r--security/stunnel/patches/patch-ac10
4 files changed, 13 insertions, 15 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index b529353692a..fdca91ff8fc 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2014/11/07 11:30:47 schmonz Exp $
+# $NetBSD: Makefile,v 1.94 2015/06/05 20:41:03 youri Exp $
-DISTNAME= stunnel-5.07
+DISTNAME= stunnel-5.17
CATEGORIES= security
MASTER_SITES= http://www.stunnel.org/downloads/
diff --git a/security/stunnel/PLIST b/security/stunnel/PLIST
index 836aa081661..5737d9f05c6 100644
--- a/security/stunnel/PLIST
+++ b/security/stunnel/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.13 2014/03/11 14:05:14 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.14 2015/06/05 20:41:03 youri Exp $
bin/stunnel
bin/stunnel3
lib/stunnel/libstunnel.la
man/man8/stunnel.8
-man/man8/stunnel.fr.8
man/man8/stunnel.pl.8
share/doc/stunnel/AUTHORS
share/doc/stunnel/BUGS
@@ -26,7 +25,6 @@ share/doc/stunnel/examples/script.sh
share/doc/stunnel/examples/stunnel.init
share/doc/stunnel/examples/stunnel.service
share/doc/stunnel/examples/stunnel.spec
-share/doc/stunnel/stunnel.fr.html
share/doc/stunnel/stunnel.html
share/doc/stunnel/stunnel.pl.html
share/examples/stunnel/stunnel.conf-sample
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 3d41ee6d73d..8fb1b5d5b70 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.42 2014/11/07 11:30:47 schmonz Exp $
+$NetBSD: distinfo,v 1.43 2015/06/05 20:41:03 youri Exp $
-SHA1 (stunnel-5.07.tar.gz) = 006002eec15881214257e50a967422318720c501
-RMD160 (stunnel-5.07.tar.gz) = dee4871b98082d0baa9d5527dc4770ef20f096f6
-Size (stunnel-5.07.tar.gz) = 599111 bytes
+SHA1 (stunnel-5.17.tar.gz) = 62c1be914934a09e9ac0b9ef34f7aacc8f34838f
+RMD160 (stunnel-5.17.tar.gz) = 91da4b9d56806b273757216d1ec52842f64e4e15
+Size (stunnel-5.17.tar.gz) = 613840 bytes
SHA1 (patch-aa) = 6e64233183a9ca19a5f86c7152a21f3d8e146268
-SHA1 (patch-ac) = fadcc1e2a1c36acc44cb90bd7160540990dd1983
+SHA1 (patch-ac) = 52d2d1ee392ceecb31b1cafa6fd3c42d4e9e0694
diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac
index 5daea90b2ff..35df537ffa0 100644
--- a/security/stunnel/patches/patch-ac
+++ b/security/stunnel/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.17 2014/11/07 11:30:47 schmonz Exp $
+$NetBSD: patch-ac,v 1.18 2015/06/05 20:41:04 youri Exp $
We'll take care of PKG_SYSCONFSUBDIR ourselves, thanks.
---- src/Makefile.in.orig 2014-10-23 15:09:25.000000000 +0000
+--- src/Makefile.in.orig 2015-04-29 18:17:24.000000000 +0000
+++ src/Makefile.in
-@@ -310,7 +310,7 @@ libstunnel_la_LDFLAGS = -avoid-version
+@@ -388,7 +388,7 @@ libstunnel_la_LDFLAGS = -avoid-version
# Additional preprocesor definitions
stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \
- -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"'
+ -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"'
- # Win32 executable
- EXTRA_DIST = make.bat makece.bat makew32.bat mingw.mak evc.mak vc.mak \
+ # SSL library
+ stunnel_LDFLAGS = -L$(SSLDIR)/lib64 -L$(SSLDIR)/lib -lssl -lcrypto