Wed Mar 12 09:41:10 2014 UTC ()
Pullup ticket #4341 - requested by jym
security/stunnel: security update

Revisions pulled up:
- security/stunnel/Makefile                         1.86-1.87,1.89 via patch
- security/stunnel/distinfo                         1.38-1.39
- security/stunnel/patches/patch-ac                 1.16

---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sun Jan 26 15:51:54 UTC 2014

   Modified Files:
   	pkgsrc/security/stunnel: Makefile

   Log Message:
   Fix permissions so that "etc/stunnel" belongs to the actual "root" user
   and not to the user that build the package. Bump package revision
   because of this fix.

---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sun Jan 26 16:59:13 UTC 2014

   Modified Files:
   	pkgsrc/security/stunnel: Makefile distinfo

   Log Message:
   Update "stunnel" package to version 4.56. Changes since 4.55:
   - Fixed a regression bug introduced in version 4.55 causing random
     crashes on several platforms, including Windows 7.
   - Fixed incorrect "stunnel -exit" process synchronisation.
   - Fixed FIPS detection with new versions of the OpenSSL library.
   - Failure to open the log file at startup is no longer ignored.

---
   Module Name:	pkgsrc
   Committed By:	jym
   Date:		Wed Mar 12 00:24:35 UTC 2014

   Modified Files:
   	pkgsrc/security/stunnel: Makefile distinfo
   	pkgsrc/security/stunnel/patches: patch-ac

   Log Message:
   Update stunnel to 5.00.

   Of utmost importance: it fixes CVE 2014-0016.

   Thanks to jgw (Jeff W) _AT_ sdf.org for working on the same patch
   independently.

   In before the freeze! Changelog follows.

       Security bugfixes
           Added PRNG state update in fork threading (CVE-2014-0016).
       New global configuration file defaults
           Default "fips" option value is now "no", as FIPS mode is only helpful for compliance, and never for actual security.
           Default "pid" is now "", i.e. not to create a pid file at startup.
       New service-level configuration file defaults
           Default "ciphers" updated to "HIGH:MEDIUM:+3DES:+DH:!aNULL:!SSLv2" due to AlFBPPS attack and bad performance of DH ciphersuites.
           Default "libwrap" setting is now "no" to improve performance.
       New features
           OpenSSL DLLs updated to version 1.0.1f.
           zlib DLL updated to version 1.2.8.
           autoconf scripts upgraded to version 2.69.
           TLS 1.1 and TLS 1.2 are now allowed in the FIPS mode.
           New service-level option "redirect" to redirect SSL client connections on authentication failures instead of rejecting them.
           New global "engineDefault" configuration file option to control which OpenSSL tasks are delegated to the current engine. Available tasks: ALL, RSA, DSA, ECDH, ECDSA, DH, RAND, CIPHERS, DIGESTS, PKEY, PKEY_CRYPTO, PKEY_ASN1.
           New service-level configuration file option "engineId" to select the engine by identifier, e.g. "engineId = capi".
           New global configuration file option "log" to control whether to append (the default), or to overwrite log file while (re)opening.
           Different taskbar icon colors to indicate the service state.
           New global configuration file options "iconIdle", "iconActive", and "iconError" to select status icon on GUI taskbar.
           Removed the limit of 63 stunnel.conf sections on Win32 platform.
           Installation of a sample certificate was moved to a separate "cert" target in order to allow unattended (e.g. scripted) installations.
           Reduced length of the logged thread identifier. It is still based on the OS thread ID, and thus not unique over long periods of time.
           Improved readability of error messages printed when stunnel refuses to start due to a critical error.
       Bugfixes
           LD_PRELOAD Solaris compatibility bug fixed (thx to Norm Jacobs).
           CRYPTO_NUM_LOCKS replaced with CRYPTO_num_locks() to improve binary compatibility with diverse builds of OpenSSL (thx to Norm Jacobs).
           Corrected round-robin failover behavior under heavy load.
           Numerous fixes in the engine support code.
           On Win32 platform .rnd file moved from c:\ to the stunnel folder.


(tron)
diff -r1.85 -r1.85.2.1 pkgsrc/security/stunnel/Makefile
diff -r1.37 -r1.37.8.1 pkgsrc/security/stunnel/distinfo
diff -r1.15 -r1.15.18.1 pkgsrc/security/stunnel/patches/patch-ac

cvs diff -r1.85 -r1.85.2.1 pkgsrc/security/stunnel/Makefile (expand / switch to unified diff)

--- pkgsrc/security/stunnel/Makefile 2013/10/31 15:58:30 1.85
+++ pkgsrc/security/stunnel/Makefile 2014/03/12 09:41:09 1.85.2.1
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.85 2013/10/31 15:58:30 jperkin Exp $ 1# $NetBSD: Makefile,v 1.85.2.1 2014/03/12 09:41:09 tron Exp $
2 2
3DISTNAME= stunnel-4.55 3DISTNAME= stunnel-5.00
4PKGREVISION= 2 
5CATEGORIES= security 4CATEGORIES= security
6MASTER_SITES= http://www.stunnel.org/downloads/ 5MASTER_SITES= http://www.stunnel.org/downloads/
7 6
8MAINTAINER= jym@NetBSD.org 7MAINTAINER= jym@NetBSD.org
9HOMEPAGE= http://www.stunnel.org/ 8HOMEPAGE= http://www.stunnel.org/
10COMMENT= Universal SSL tunnel 9COMMENT= Universal SSL tunnel
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
12 11
13BUILD_DEFS+= VARBASE 12BUILD_DEFS+= VARBASE
14USE_LIBTOOL= yes 13USE_LIBTOOL= yes
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --localstatedir=${VARBASE} 15CONFIGURE_ARGS+= --localstatedir=${VARBASE}
17CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -19,27 +18,27 @@ CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} @@ -19,27 +18,27 @@ CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
19 18
20.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
21 20
22STUNNEL_USER?= stunnel 21STUNNEL_USER?= stunnel
23STUNNEL_GROUP?= stunnel 22STUNNEL_GROUP?= stunnel
24PKG_USERS= ${STUNNEL_USER}:${STUNNEL_GROUP} 23PKG_USERS= ${STUNNEL_USER}:${STUNNEL_GROUP}
25PKG_GROUPS= ${STUNNEL_GROUP} 24PKG_GROUPS= ${STUNNEL_GROUP}
26USER_GROUP= ${STUNNEL_USER} ${STUNNEL_GROUP} 25USER_GROUP= ${STUNNEL_USER} ${STUNNEL_GROUP}
27 26
28PKG_GECOS.${STUNNEL_USER}?= Stunnel 27PKG_GECOS.${STUNNEL_USER}?= Stunnel
29PKG_HOME.${STUNNEL_USER}?= ${VARBASE}/chroot/stunnel 28PKG_HOME.${STUNNEL_USER}?= ${VARBASE}/chroot/stunnel
30 29
31PKG_SYSCONFSUBDIR= stunnel 30PKG_SYSCONFSUBDIR= stunnel
32PKG_SYSCONFDIR_PERMS= ${ROOT_USER} ${STUNNEL_GROUP} 0750 31PKG_SYSCONFDIR_PERMS= ${REAL_ROOT_USER} ${STUNNEL_GROUP} 0750
33 32
34OWN_DIRS= ${PKG_HOME.${STUNNEL_USER}}/certs ${PKG_HOME.${STUNNEL_USER}}/crls 33OWN_DIRS= ${PKG_HOME.${STUNNEL_USER}}/certs ${PKG_HOME.${STUNNEL_USER}}/crls
35OWN_DIRS_PERMS= ${PKG_HOME.${STUNNEL_USER}}/pid ${USER_GROUP} 0750 34OWN_DIRS_PERMS= ${PKG_HOME.${STUNNEL_USER}}/pid ${USER_GROUP} 0750
36CONF_FILES+= ${PREFIX}/share/examples/stunnel/stunnel.conf-sample \ 35CONF_FILES+= ${PREFIX}/share/examples/stunnel/stunnel.conf-sample \
37 ${PKG_SYSCONFDIR}/stunnel.conf 36 ${PKG_SYSCONFDIR}/stunnel.conf
38 37
39RCD_SCRIPTS= stunnel 38RCD_SCRIPTS= stunnel
40 39
41REPLACE_PERL+= src/stunnel3.in 40REPLACE_PERL+= src/stunnel3.in
42USE_TOOLS+= perl:run 41USE_TOOLS+= perl:run
43 42
44SUBST_CLASSES+= chroot 43SUBST_CLASSES+= chroot
45SUBST_MESSAGE.chroot= Fix chroot path 44SUBST_MESSAGE.chroot= Fix chroot path

cvs diff -r1.37 -r1.37.8.1 pkgsrc/security/stunnel/distinfo (expand / switch to unified diff)

--- pkgsrc/security/stunnel/distinfo 2013/03/06 22:50:31 1.37
+++ pkgsrc/security/stunnel/distinfo 2014/03/12 09:41:09 1.37.8.1
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.37 2013/03/06 22:50:31 jym Exp $ 1$NetBSD: distinfo,v 1.37.8.1 2014/03/12 09:41:09 tron Exp $
2 2
3SHA1 (stunnel-4.55.tar.gz) = 9d29eb2f1880c7cf9ecbbd96dee8c0f8cc7e7f88 3SHA1 (stunnel-5.00.tar.gz) = a048e24529e3b4cb787838ea6de5c6475746f197
4RMD160 (stunnel-4.55.tar.gz) = 31fb1dd51046a34f902148a170cdc6c944ba5b63 4RMD160 (stunnel-5.00.tar.gz) = cd5efaec920529e65f5d233254110d5ae605535b
5Size (stunnel-4.55.tar.gz) = 538408 bytes 5Size (stunnel-5.00.tar.gz) = 586738 bytes
6SHA1 (patch-aa) = 0e57d4fa383dad7891795073d1f6b5075715b346 6SHA1 (patch-aa) = 0e57d4fa383dad7891795073d1f6b5075715b346
7SHA1 (patch-ac) = 43521a88606981bc55dd94043d52b1a16f08e583 7SHA1 (patch-ac) = 63e80322e68efc7e6c5f0bab92e7260178a25109

cvs diff -r1.15 -r1.15.18.1 pkgsrc/security/stunnel/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/security/stunnel/patches/Attic/patch-ac 2011/11/10 21:01:39 1.15
+++ pkgsrc/security/stunnel/patches/Attic/patch-ac 2014/03/12 09:41:09 1.15.18.1
@@ -1,15 +1,13 @@ @@ -1,15 +1,13 @@
1$NetBSD: patch-ac,v 1.15 2011/11/10 21:01:39 ryoon Exp $ 1$NetBSD: patch-ac,v 1.15.18.1 2014/03/12 09:41:09 tron Exp $
2 2
3Change pid file location. 3--- src/Makefile.in.orig 2014-01-07 20:19:44.000000000 +0000
4 
5--- src/Makefile.in.orig 2011-11-04 20:24:15.000000000 +0000 
6+++ src/Makefile.in 4+++ src/Makefile.in
7@@ -271,7 +271,7 @@ libstunnel_la_LDFLAGS = -avoid-version 5@@ -310,7 +310,7 @@ libstunnel_la_LDFLAGS = -avoid-version
8  6
9 # Additional preprocesor definitions 7 # Additional preprocesor definitions
10 stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \ 8 stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \
11- -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' \ 9- -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"'
12+ -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' \ 10+ -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"'
13 -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"' 
14  11
15 # Win32 executable 12 # Win32 executable
 13 EXTRA_DIST = make.bat makece.bat makew32.bat mingw.mak evc.mak vc.mak \