Thu Nov 10 21:01:40 2011 UTC ()
Update to 4.46

Changelog:
Version 4.46, 2011.11.04, urgency: LOW:
* New features
  - Added Unix socket support (e.g. "connect = /var/run/stunnel/socket").
  - Added "verify = 4" mode to ignore CA chain and only verify peer certificate.
  - Removed the limit of 16 IP addresses for a single 'connect' option.
  - Removed the limit of 256 stunnel.conf sections in PTHREAD threading model.
    It is still not possible have more than 63 sections on WIN32 platform.
    http://msdn.microsoft.com/en-us/library/windows/desktop/ms740141(v=vs.85).aspx
* Optimizations
  - Reduced per-connection memory usage.
  - Performed a major refactoring of internal data structures.  Extensive
    internal testing was performed, but some regression bugs are expected.
* Bugfixes
  - Fixed WIN32 compilation with Mingw32.
  - Fixed non-blocking API emulation layer in UCONTEXT threading model.
  - Fixed signal handling in UCONTEXT threading model.


(ryoon)
diff -r1.73 -r1.74 pkgsrc/security/stunnel/Makefile
diff -r1.32 -r1.33 pkgsrc/security/stunnel/distinfo
diff -r1.24 -r1.25 pkgsrc/security/stunnel/patches/patch-aa
diff -r1.14 -r1.15 pkgsrc/security/stunnel/patches/patch-ac
cvs diff -r1.73 -r1.74 pkgsrc/security/stunnel/Makefile (expand / switch to unified diff)

--- pkgsrc/security/stunnel/Makefile 2011/08/25 07:20:44 1.73
+++ pkgsrc/security/stunnel/Makefile 2011/11/10 21:01:39 1.74
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: Makefile,v 1.73 2011/08/25 07:20:44 tron Exp $ 1# $NetBSD: Makefile,v 1.74 2011/11/10 21:01:39 ryoon Exp $
2 2
3DISTNAME= stunnel-4.42 3DISTNAME= stunnel-4.46
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= ftp://ftp.stunnel.org/stunnel/ 5MASTER_SITES= ftp://ftp.stunnel.org/stunnel/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@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
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14BUILD_DEFS+= VARBASE 14BUILD_DEFS+= VARBASE
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --localstatedir=${VARBASE} 17CONFIGURE_ARGS+= --localstatedir=${VARBASE}
18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
19CONFIGURE_ARGS+= --with-cert-dir=${SSLCERTS:Q} 19CONFIGURE_ARGS+= --with-cert-dir=${SSLCERTS:Q}
20CONFIGURE_ARGS+= --with-pem-dir=${SSLCERTS:Q} 20CONFIGURE_ARGS+= --with-pem-dir=${SSLCERTS:Q}
21CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 21CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
22 22
 23.include "../../mk/bsd.prefs.mk"
 24
23STUNNEL_USER?= stunnel 25STUNNEL_USER?= stunnel
24STUNNEL_GROUP?= stunnel 26STUNNEL_GROUP?= stunnel
25PKG_HOME?= ${VARBASE}/chroot/stunnel 27PKG_HOME?= ${VARBASE}/chroot/stunnel
26PKG_USERS= ${STUNNEL_USER}:${STUNNEL_GROUP}::Stunnel:${PKG_HOME} 28PKG_USERS= ${STUNNEL_USER}:${STUNNEL_GROUP}::Stunnel:${PKG_HOME}
27PKG_GROUPS= ${STUNNEL_GROUP} 29PKG_GROUPS= ${STUNNEL_GROUP}
28USER_GROUP= ${STUNNEL_USER} ${STUNNEL_GROUP} 30USER_GROUP= ${STUNNEL_USER} ${STUNNEL_GROUP}
29 31
30PKG_SYSCONFSUBDIR= stunnel 32PKG_SYSCONFSUBDIR= stunnel
31PKG_SYSCONFDIR_PERMS= ${USER_GROUP} 0700 33PKG_SYSCONFDIR_PERMS= ${USER_GROUP} 0700
32 34
33OWN_DIRS_PERMS= ${PKG_HOME} ${USER_GROUP} 0700 35OWN_DIRS_PERMS= ${PKG_HOME} ${USER_GROUP} 0700
34CONF_FILES_PERMS+= ${PREFIX}/share/examples/stunnel/stunnel.conf-sample \ 36CONF_FILES_PERMS+= ${PREFIX}/share/examples/stunnel/stunnel.conf-sample \
35 ${PKG_SYSCONFDIR}/stunnel.conf ${USER_GROUP} 0644 37 ${PKG_SYSCONFDIR}/stunnel.conf ${USER_GROUP} 0644
cvs diff -r1.32 -r1.33 pkgsrc/security/stunnel/distinfo (expand / switch to unified diff)

--- pkgsrc/security/stunnel/distinfo 2011/08/31 08:26:15 1.32
+++ pkgsrc/security/stunnel/distinfo 2011/11/10 21:01:39 1.33
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.32 2011/08/31 08:26:15 jym Exp $ 1$NetBSD: distinfo,v 1.33 2011/11/10 21:01:39 ryoon Exp $
2 2
3SHA1 (stunnel-4.42.tar.gz) = 2bfe693f95d79e964c51fd5e9bf0762663338c9d 3SHA1 (stunnel-4.46.tar.gz) = 0c4430426c741e0e22874b4f9ae2f37cbc07f5a5
4RMD160 (stunnel-4.42.tar.gz) = beecf4e8b4bfa538473e983910fa3ee7acedeafa 4RMD160 (stunnel-4.46.tar.gz) = 85151366aa2373dc4ffbe0df56d72a0b8c17d65d
5Size (stunnel-4.42.tar.gz) = 558391 bytes 5Size (stunnel-4.46.tar.gz) = 522125 bytes
6SHA1 (patch-aa) = 1337b81c8b9a77dc18c052e3f7301d62c68a8b8f 6SHA1 (patch-aa) = 0e57d4fa383dad7891795073d1f6b5075715b346
7SHA1 (patch-ac) = 65097bf1d0dab0f876a500426fe260b6166b1c85 7SHA1 (patch-ac) = 43521a88606981bc55dd94043d52b1a16f08e583
cvs diff -r1.24 -r1.25 pkgsrc/security/stunnel/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/stunnel/patches/patch-aa 2011/08/24 17:56:50 1.24
+++ pkgsrc/security/stunnel/patches/patch-aa 2011/11/10 21:01:39 1.25
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-aa,v 1.24 2011/08/24 17:56:50 tron Exp $ 1$NetBSD: patch-aa,v 1.25 2011/11/10 21:01:39 ryoon Exp $
2 2
3Install configuration files into examples directory. 3Install configuration files into examples directory.
4 4
5--- tools/Makefile.in.orig 2011-08-17 12:15:27.000000000 +0100 5--- tools/Makefile.in.orig 2011-10-27 14:53:32.000000000 +0000
6+++ tools/Makefile.in 2011-08-24 18:46:44.000000000 +0100 6+++ tools/Makefile.in
7@@ -192,7 +192,7 @@ 7@@ -196,7 +196,7 @@ top_srcdir = @top_srcdir@
8 EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \ 8 EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \
9 stunnel.spec stunnel.cnf stunnel.nsi stunnel.license stunnel.conf 9 stunnel.spec stunnel.cnf stunnel.nsi stunnel.license stunnel.conf
10  10
11-confdir = $(sysconfdir)/stunnel 11-confdir = $(sysconfdir)/stunnel
12+confdir = $(datadir)/examples/stunnel 12+confdir = $(datadir)/examples/stunnel
13 conf_DATA = stunnel.conf-sample 13 conf_DATA = stunnel.conf-sample
14 examplesdir = $(docdir)/examples 14 examplesdir = $(docdir)/examples
15 examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \ 15 examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \
16@@ -373,7 +373,7 @@ 16@@ -377,7 +377,7 @@ info: info-am
17  17
18 info-am: 18 info-am:
19  19
20-install-data-am: install-confDATA install-data-local \ 20-install-data-am: install-confDATA install-data-local \
21+install-data-am: install-confDATA \ 21+install-data-am: install-confDATA \
22 install-examplesDATA 22 install-examplesDATA
23  23
24 install-dvi: install-dvi-am 24 install-dvi: install-dvi-am
cvs diff -r1.14 -r1.15 pkgsrc/security/stunnel/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/security/stunnel/patches/Attic/patch-ac 2011/08/31 08:26:16 1.14
+++ pkgsrc/security/stunnel/patches/Attic/patch-ac 2011/11/10 21:01:39 1.15
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ac,v 1.14 2011/08/31 08:26:16 jym Exp $ 1$NetBSD: patch-ac,v 1.15 2011/11/10 21:01:39 ryoon Exp $
2 2
3Change pid file location. 3Change pid file location.
4 4
5--- src/Makefile.in.orig 2011-08-17 12:15:27.000000000 +0100 5--- src/Makefile.in.orig 2011-11-04 20:24:15.000000000 +0000
6+++ src/Makefile.in 2011-08-24 18:49:46.000000000 +0100 6+++ src/Makefile.in
7@@ -254,7 +254,7 @@ 7@@ -271,7 +271,7 @@ libstunnel_la_LDFLAGS = -avoid-version
8 INCLUDES = -I/usr/kerberos/include 
9  8
10 # Additional compiler flags 9 # Additional preprocesor definitions
11-AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"' 10 stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \
12+AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"$(localstatedir)/run/stunnel.pid"' 11- -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' \
 12+ -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' \
 13 -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
13  14
14 # Win32 executable 15 # Win32 executable
15 EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak makew32.bat nogui.c os2.mak