summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/stunnel/Makefile7
-rw-r--r--security/stunnel/distinfo10
-rw-r--r--security/stunnel/patches/patch-ac14
3 files changed, 14 insertions, 17 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index cb2f37e0f9b..d78f3f49852 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.85 2013/10/31 15:58:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.85.2.1 2014/03/12 09:41:09 tron Exp $
-DISTNAME= stunnel-4.55
-PKGREVISION= 2
+DISTNAME= stunnel-5.00
CATEGORIES= security
MASTER_SITES= http://www.stunnel.org/downloads/
@@ -29,7 +28,7 @@ PKG_GECOS.${STUNNEL_USER}?= Stunnel
PKG_HOME.${STUNNEL_USER}?= ${VARBASE}/chroot/stunnel
PKG_SYSCONFSUBDIR= stunnel
-PKG_SYSCONFDIR_PERMS= ${ROOT_USER} ${STUNNEL_GROUP} 0750
+PKG_SYSCONFDIR_PERMS= ${REAL_ROOT_USER} ${STUNNEL_GROUP} 0750
OWN_DIRS= ${PKG_HOME.${STUNNEL_USER}}/certs ${PKG_HOME.${STUNNEL_USER}}/crls
OWN_DIRS_PERMS= ${PKG_HOME.${STUNNEL_USER}}/pid ${USER_GROUP} 0750
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index ae035efe6db..82cb317af8a 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.37 2013/03/06 22:50:31 jym Exp $
+$NetBSD: distinfo,v 1.37.8.1 2014/03/12 09:41:09 tron Exp $
-SHA1 (stunnel-4.55.tar.gz) = 9d29eb2f1880c7cf9ecbbd96dee8c0f8cc7e7f88
-RMD160 (stunnel-4.55.tar.gz) = 31fb1dd51046a34f902148a170cdc6c944ba5b63
-Size (stunnel-4.55.tar.gz) = 538408 bytes
+SHA1 (stunnel-5.00.tar.gz) = a048e24529e3b4cb787838ea6de5c6475746f197
+RMD160 (stunnel-5.00.tar.gz) = cd5efaec920529e65f5d233254110d5ae605535b
+Size (stunnel-5.00.tar.gz) = 586738 bytes
SHA1 (patch-aa) = 0e57d4fa383dad7891795073d1f6b5075715b346
-SHA1 (patch-ac) = 43521a88606981bc55dd94043d52b1a16f08e583
+SHA1 (patch-ac) = 63e80322e68efc7e6c5f0bab92e7260178a25109
diff --git a/security/stunnel/patches/patch-ac b/security/stunnel/patches/patch-ac
index 68dbbd4c4f5..dbd179c97ce 100644
--- a/security/stunnel/patches/patch-ac
+++ b/security/stunnel/patches/patch-ac
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.15 2011/11/10 21:01:39 ryoon Exp $
+$NetBSD: patch-ac,v 1.15.18.1 2014/03/12 09:41:09 tron Exp $
-Change pid file location.
-
---- src/Makefile.in.orig 2011-11-04 20:24:15.000000000 +0000
+--- src/Makefile.in.orig 2014-01-07 20:19:44.000000000 +0000
+++ src/Makefile.in
-@@ -271,7 +271,7 @@ libstunnel_la_LDFLAGS = -avoid-version
+@@ -310,7 +310,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)"' \
- -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
+- -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 \