[CFT] security/stunnel update to 4.33

[Peter Pentchev]

Hi,

It's been a long time and four upstream releases since stunnel-4.29
which is in the Ports Collection now.  The reason I've not updated
the port is that there were user reports of various instabilities
and regressions in the logging, chroot support, and some other newly
introduced features.

Now, with stunnel-4.33, it seems all of those are resolved, and
the new features are worth upgrading.  So here's the patch to
update the security/stunnel port; if anybody is willing to test it,
it'd be great.  If no problems should arise, I intend to commit it
in a couple of days.

The patch is also available at
http://people.FreeBSD.org/~roam/patches/stunnel/stunnel-4.33-01.patch

G'luck,
Peter

Description: Update the security/stunnel port to version 4.33.
Author: Peter Pentchev <roam at FreeBSD.org>
Last-Update: 2010-04-07

--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stunnel
-PORTVERSION=	4.29
+PORTVERSION=	4.33
 CATEGORIES=	security
 MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
 		ftp://stunnel.mirt.net/stunnel/ \
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,6 +1,3 @@
-MD5 (stunnel-4.29.tar.gz) = 14dc3f8412947f0548975cbce74d6863
-SHA256 (stunnel-4.29.tar.gz) = 018064e852a2a125bcfb4b81baa77b5701ccf6aabe6a47564bfc046b18d11f9b
-SIZE (stunnel-4.29.tar.gz) = 544292
-MD5 (execargs.patch) = c893028f869f6d1f527373334605d639
-SHA256 (execargs.patch) = 88e682c0deee13d9768c8cbdd3e71f90dd26d92621d2e64542d5379a3939ac4c
-SIZE (execargs.patch) = 756
+MD5 (stunnel-4.33.tar.gz) = 559a864066d8cc4afd8a97682c90d41c
+SHA256 (stunnel-4.33.tar.gz) = 240763140000dea6ab76b30f5f5571a8ef4d22ba0712176a9c31c221bb9a48fc
+SIZE (stunnel-4.33.tar.gz) = 560103
--- a/security/stunnel/files/patch-Makefile.in
+++ b/security/stunnel/files/patch-Makefile.in
@@ -2,11 +2,11 @@
  This is handled by the FreeBSD port's Makefile.
 Forwarded: not-needed
 Author: Peter Pentchev <roam at FreeBSD.org>
-Last-Update: 2009-11-13
+Last-Update: 2010-04-07
 
 --- tools/Makefile.in.orig
 +++ tools/Makefile.in
-@@ -339,7 +339,7 @@
+@@ -334,7 +334,7 @@
  
  info-am:
  
@@ -14,4 +14,4 @@
 +install-data-am: install-confDATA \
  	install-examplesDATA
  
- install-exec-am:
+ install-dvi: install-dvi-am
--- a/security/stunnel/files/patch-src::common.h
+++ b/security/stunnel/files/patch-src::common.h
@@ -1,11 +1,11 @@
 Description: Build on FreeBSD versions of OpenSSL < 0.9.8b.
 Forwarded: not-needed
 Author: Peter Pentchev <roam at FreeBSD.org>
-Last-Update: 2010-02-01
+Last-Update: 2010-04-07
 
 --- src/common.h.orig
 +++ src/common.h
-@@ -344,9 +344,6 @@
+@@ -350,9 +350,6 @@
  
  #define OPENSSL_THREAD_DEFINES
  #include <openssl/opensslconf.h>
--- a/security/stunnel/files/ssl-noengine.patch
+++ b/security/stunnel/files/ssl-noengine.patch
@@ -1,16 +1,16 @@
 Description: Disable the OpenSSL engine support for the FreeBSD port.
 Forwaded: not-needed
 Author: Peter Pentchev <roam at FreeBSD.org>
-Last-Update: 2009-11-13
+Last-Update: 2010-04-07
 
 --- src/ssl.c.orig
 +++ src/ssl.c
-@@ -276,6 +276,8 @@
+@@ -288,6 +288,8 @@
  }
  
- static void init_engine() {
+ static char *init_engine(void) {
 +    s_log(LOG_ERR, "This version of stunnel was compiled WITHOUT support for OpenSSL hardware engines!  If you need this functionality, rebuild the FreeBSD port with the WITH_STUNNEL_SSL_ENGINE option set to 'yes'; contact Peter Pentchev <roam at FreeBSD.org> for details.");
 +    exit(1);
      if(engine_initialized)
-         return;
+         return NULL; /* OK */
      engine_initialized=1;

-- 
Peter Pentchev	roam at ringlet.net    roam at space.bg    roam at FreeBSD.org
PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint	2EE7 A7A5 17FC 124C F115  C354 651E EFB0 2527 DF13
Do you think anybody has ever had *precisely this thought* before?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 834 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20100409/c2ce9bf4/attachment.pgp