Fri Aug 11 01:30:23 2017 UTC ()
Update to 5.42. From the changelog:

* New features
  - "redirect" also supports "exec" and not only "connect".
  - PKCS#11 engine DLL updated to version 0.4.7.
* Bugfixes
  - Fixed premature cron thread initialization causing hangs.
  - Fixed "verifyPeer = yes" on OpenSSL <= 1.0.1.
  - Fixed pthreads support on OpenSolaris.


(schmonz)
diff -r1.107 -r1.108 pkgsrc/security/stunnel/Makefile
diff -r1.54 -r1.55 pkgsrc/security/stunnel/distinfo
diff -r1.1 -r1.2 pkgsrc/security/stunnel/patches/patch-stunnel.conf-sample.in
cvs diff -r1.107 -r1.108 pkgsrc/security/stunnel/Makefile (switch to unified diff)

--- pkgsrc/security/stunnel/Makefile 2017/06/23 03:45:18 1.107
+++ pkgsrc/security/stunnel/Makefile 2017/08/11 01:30:23 1.108
@@ -1,53 +1,53 @@ @@ -1,53 +1,53 @@
1# $NetBSD: Makefile,v 1.107 2017/06/23 03:45:18 schmonz Exp $ 1# $NetBSD: Makefile,v 1.108 2017/08/11 01:30:23 schmonz Exp $
2 2
3DISTNAME= stunnel-5.41 3DISTNAME= stunnel-5.42
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= http://www.stunnel.org/downloads/ 5MASTER_SITES= http://www.stunnel.org/downloads/
6 6
7MAINTAINER= jym@NetBSD.org 7MAINTAINER= jym@NetBSD.org
8HOMEPAGE= http://www.stunnel.org/ 8HOMEPAGE= http://www.stunnel.org/
9COMMENT= Universal SSL tunnel 9COMMENT= Universal SSL tunnel
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12BUILD_DEFS+= VARBASE 12BUILD_DEFS+= VARBASE
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15CONFIGURE_ARGS+= --localstatedir=${VARBASE} 15CONFIGURE_ARGS+= --localstatedir=${VARBASE}
16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
17CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 17CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21STUNNEL_USER?= stunnel 21STUNNEL_USER?= stunnel
22STUNNEL_GROUP?= stunnel 22STUNNEL_GROUP?= stunnel
23PKG_USERS= ${STUNNEL_USER}:${STUNNEL_GROUP} 23PKG_USERS= ${STUNNEL_USER}:${STUNNEL_GROUP}
24PKG_GROUPS= ${STUNNEL_GROUP} 24PKG_GROUPS= ${STUNNEL_GROUP}
25USER_GROUP= ${STUNNEL_USER} ${STUNNEL_GROUP} 25USER_GROUP= ${STUNNEL_USER} ${STUNNEL_GROUP}
26 26
27PKG_GECOS.${STUNNEL_USER}?= Stunnel 27PKG_GECOS.${STUNNEL_USER}?= Stunnel
28PKG_HOME.${STUNNEL_USER}?= ${VARBASE}/chroot/stunnel 28PKG_HOME.${STUNNEL_USER}?= ${VARBASE}/chroot/stunnel
29 29
30PKG_SYSCONFSUBDIR= stunnel 30PKG_SYSCONFSUBDIR= stunnel
31PKG_SYSCONFDIR_PERMS= ${REAL_ROOT_USER} ${STUNNEL_GROUP} 0750 31PKG_SYSCONFDIR_PERMS= ${REAL_ROOT_USER} ${STUNNEL_GROUP} 0750
32 32
33OWN_DIRS= ${PKG_HOME.${STUNNEL_USER}}/certs ${PKG_HOME.${STUNNEL_USER}}/crls 33OWN_DIRS= ${PKG_HOME.${STUNNEL_USER}}/certs ${PKG_HOME.${STUNNEL_USER}}/crls
34OWN_DIRS_PERMS= ${PKG_HOME.${STUNNEL_USER}}/pid ${USER_GROUP} 0750 34OWN_DIRS_PERMS= ${PKG_HOME.${STUNNEL_USER}}/pid ${USER_GROUP} 0750
35CONF_FILES+= ${PREFIX}/share/examples/stunnel/stunnel.conf-sample \ 35CONF_FILES+= ${PREFIX}/share/examples/stunnel/stunnel.conf-sample \
36 ${PKG_SYSCONFDIR}/stunnel.conf 36 ${PKG_SYSCONFDIR}/stunnel.conf
37 37
38RCD_SCRIPTS= stunnel 38RCD_SCRIPTS= stunnel
39 39
40REPLACE_PERL+= src/stunnel3.in 40REPLACE_PERL+= src/stunnel3.in
41USE_TOOLS+= perl:run 41USE_TOOLS+= perl:run
42 42
43SUBST_CLASSES+= stunnel 43SUBST_CLASSES+= stunnel
44SUBST_MESSAGE.stunnel= Fix user and group 44SUBST_MESSAGE.stunnel= Fix user and group
45SUBST_STAGE.stunnel= pre-configure 45SUBST_STAGE.stunnel= pre-configure
46SUBST_FILES.stunnel= tools/stunnel.conf-sample.in 46SUBST_FILES.stunnel= tools/stunnel.conf-sample.in
47SUBST_VARS.stunnel= STUNNEL_USER STUNNEL_GROUP 47SUBST_VARS.stunnel= STUNNEL_USER STUNNEL_GROUP
48 48
49.include "options.mk" 49.include "options.mk"
50 50
51.include "../../devel/zlib/buildlink3.mk" 51.include "../../devel/zlib/buildlink3.mk"
52.include "../../security/openssl/buildlink3.mk" 52.include "../../security/openssl/buildlink3.mk"
53.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.54 -r1.55 pkgsrc/security/stunnel/distinfo (switch to unified diff)

--- pkgsrc/security/stunnel/distinfo 2017/06/23 03:45:18 1.54
+++ pkgsrc/security/stunnel/distinfo 2017/08/11 01:30:23 1.55
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.54 2017/06/23 03:45:18 schmonz Exp $ 1$NetBSD: distinfo,v 1.55 2017/08/11 01:30:23 schmonz Exp $
2 2
3SHA1 (stunnel-5.41.tar.gz) = 9aa8335e0f9571480b0d62b4b58d9d510447b732 3SHA1 (stunnel-5.42.tar.gz) = c9228cb94750bfa4a8f6594d544280002fd43345
4RMD160 (stunnel-5.41.tar.gz) = fdab09cd74f94a09c9b407e7cec58868a5e86cc2 4RMD160 (stunnel-5.42.tar.gz) = c40db532d1121681b9ddecfe56bff3e5b8152f54
5SHA512 (stunnel-5.41.tar.gz) = cfe414330905d133d4ec698b0d3e40e376a29b70376d88695fbf928c78c8ede36a9d80fca3644f9219a7d4f17fea17cb8bc42e80d788848756bd863bf5eb7ff9 5SHA512 (stunnel-5.42.tar.gz) = 875af19e8a4fa8e983e98d3e6bea198b789bea9b18933ed74aa1f9ce6922e4c4dd3a4ccae3b74c12de30c39b68c3210c9adb7cd228c7fefc28dff258dcdb4968
6Size (stunnel-5.41.tar.gz) = 649807 bytes 6Size (stunnel-5.42.tar.gz) = 649496 bytes
7SHA1 (patch-aa) = b247aca629197887fb720f7a02d9b73d60bb0d37 7SHA1 (patch-aa) = b247aca629197887fb720f7a02d9b73d60bb0d37
8SHA1 (patch-ac) = 4e5e0a3cfe95b3952741814a1f26bcb99d002fdc 8SHA1 (patch-ac) = 4e5e0a3cfe95b3952741814a1f26bcb99d002fdc
9SHA1 (patch-stunnel.conf-sample.in) = 86d195963e5ad2db381ac89ae0fca13a7f641fa5 9SHA1 (patch-stunnel.conf-sample.in) = 9edaabd1bc15d3ff8524178f4a6aba4a7963b015
cvs diff -r1.1 -r1.2 pkgsrc/security/stunnel/patches/patch-stunnel.conf-sample.in (switch to unified diff)

--- pkgsrc/security/stunnel/patches/patch-stunnel.conf-sample.in 2016/08/29 19:21:24 1.1
+++ pkgsrc/security/stunnel/patches/patch-stunnel.conf-sample.in 2017/08/11 01:30:23 1.2
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1$NetBSD: patch-stunnel.conf-sample.in,v 1.1 2016/08/29 19:21:24 jym Exp $ 1$NetBSD: patch-stunnel.conf-sample.in,v 1.2 2017/08/11 01:30:23 schmonz Exp $
 2
 3Set pkgsrc defaults: uid, gid, chroot, pidfile.
2 4
3--- tools/stunnel.conf-sample.in.orig 2016-07-05 21:27:57.000000000 +0000 5--- tools/stunnel.conf-sample.in.orig 2016-07-05 21:27:57.000000000 +0000
4+++ tools/stunnel.conf-sample.in 6+++ tools/stunnel.conf-sample.in
5@@ -8,11 +8,14 @@ 7@@ -8,11 +8,14 @@
6 ; ************************************************************************** 8 ; **************************************************************************
7  9
8 ; It is recommended to drop root privileges if stunnel is started by root 10 ; It is recommended to drop root privileges if stunnel is started by root
9-;setuid = nobody 11-;setuid = nobody
10-;setgid = @DEFAULT_GROUP@ 12-;setgid = @DEFAULT_GROUP@
11+setuid = @STUNNEL_USER@ 13+setuid = @STUNNEL_USER@
12+setgid = @STUNNEL_GROUP@ 14+setgid = @STUNNEL_GROUP@
13+ 15+
14+; Default chroot path 16+; Default chroot path
15+chroot = @localstatedir@/chroot/stunnel/ 17+chroot = @localstatedir@/chroot/stunnel/
16  18
17 ; PID file is created inside the chroot jail (if enabled) 19 ; PID file is created inside the chroot jail (if enabled)
18-;pid = @localstatedir@/run/stunnel.pid 20-;pid = @localstatedir@/run/stunnel.pid
19+pid = /pid/stunnel.pid 21+pid = /pid/stunnel.pid
20  22
21 ; Debugging stuff (may be useful for troubleshooting) 23 ; Debugging stuff (may be useful for troubleshooting)
22 ;foreground = yes 24 ;foreground = yes