From turutani@scphys.kyoto-u.ac.jp  Wed Jan 13 08:26:19 2010
Return-Path: <turutani@scphys.kyoto-u.ac.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8514A106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Jan 2010 08:26:19 +0000 (UTC)
	(envelope-from turutani@scphys.kyoto-u.ac.jp)
Received: from smtp-auth.kuins.kyoto-u.ac.jp (smtp-auth.kuins.kyoto-u.ac.jp [133.3.248.237])
	by mx1.freebsd.org (Postfix) with ESMTP id 26BF68FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Jan 2010 08:26:18 +0000 (UTC)
Received: from smtp-auth.kuins.kyoto-u.ac.jp (smtp-auth.kuins.kyoto-u.ac.jp [127.0.0.1])
	by postfix.imss70 (Postfix) with ESMTP id AAE772EC005;
	Wed, 13 Jan 2010 17:26:17 +0900 (JST)
Received: from h120.65.226.10.32118.vlan.kuins.net (wd187.BFL38.vectant.ne.jp [210.131.171.187])
	by smtp-auth.kuins.kyoto-u.ac.jp (Postfix) with ESMTP id 831D82EC004;
	Wed, 13 Jan 2010 17:26:17 +0900 (JST)
Received: from h120.65.226.10.32118.vlan.kuins.net (localhost [127.0.0.1])
	by h120.65.226.10.32118.vlan.kuins.net (8.14.3/8.14.3/20071004-1) with ESMTP id o0D8PrYJ008723;
	Wed, 13 Jan 2010 17:25:53 +0900 (JST)
	(envelope-from turutani@h120.65.226.10.32118.vlan.kuins.net)
Received: (from turutani@localhost)
	by h120.65.226.10.32118.vlan.kuins.net (8.14.3/8.14.3/Submit) id o0D8Pp6D008720;
	Wed, 13 Jan 2010 17:25:51 +0900 (JST)
	(envelope-from turutani)
Message-Id: <201001130825.o0D8Pp6D008720@h120.65.226.10.32118.vlan.kuins.net>
Date: Wed, 13 Jan 2010 17:25:51 +0900 (JST)
From: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
Reply-To: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc: turutani@scphys.kyoto-u.ac.jp
Subject: update security/stunnel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142773
>Category:       ports
>Synopsis:       update security/stunnel
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 13 08:30:00 UTC 2010
>Closed-Date:    Thu Sep 02 05:34:09 UTC 2010
>Last-Modified:  Thu Sep 02 05:34:09 UTC 2010
>Originator:     Tsurutani Naoki
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD h120.65.226.10.32118.vlan.kuins.net 7.2-STABLE FreeBSD 7.2-STABLE #20: Thu Sep 10 08:32:10 JST 2009 turutani@h120.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386


	
>Description:
	stunnel 4.29 is now available.
	
>How-To-Repeat:
	
>Fix:
	here is a patch to the ports tree:

diff -urN stunnel/Makefile.orig stunnel/Makefile
--- stunnel/Makefile.orig	2009-11-20 06:19:12.000000000 +0900
+++ stunnel/Makefile	2010-01-13 13:23:51.000000000 +0900
@@ -6,17 +6,12 @@
 #
 
 PORTNAME=	stunnel
-PORTVERSION=	4.28
-PORTREVISION=	1
+PORTVERSION=	4.29
 CATEGORIES=	security
 MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
 		ftp://stunnel.mirt.net/stunnel/ \
 		ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \
 		ftp://opensores.thebunker.net/pub/mirrors/stunnel/download/stunnel/src/
 
-PATCH_SITES=	ftp://stunnel.mirt.net/stunnel/
-PATCHFILES=	execargs.patch
- 
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	SSL encryption wrapper for standard network daemons
 
diff -urN stunnel/distinfo.orig stunnel/distinfo
--- stunnel/distinfo.orig	2009-11-20 06:19:12.000000000 +0900
+++ stunnel/distinfo	2010-01-13 13:23:55.000000000 +0900
@@ -1,6 +1,3 @@
-MD5 (stunnel-4.28.tar.gz) = 5bf753a042047f40a938e82ec7ece569
-SHA256 (stunnel-4.28.tar.gz) = 9be98fb1aa5e96e44095df267d89b776aa539e6dce90dd0d54db675e9a95cd80
-SIZE (stunnel-4.28.tar.gz) = 543008
-MD5 (execargs.patch) = c893028f869f6d1f527373334605d639
-SHA256 (execargs.patch) = 88e682c0deee13d9768c8cbdd3e71f90dd26d92621d2e64542d5379a3939ac4c
-SIZE (execargs.patch) = 756
+MD5 (stunnel-4.29.tar.gz) = 14dc3f8412947f0548975cbce74d6863
+SHA256 (stunnel-4.29.tar.gz) = 018064e852a2a125bcfb4b81baa77b5701ccf6aabe6a47564bfc046b18d11f9b
+SIZE (stunnel-4.29.tar.gz) = 544292
diff -urN stunnel/files/patch-src::options.c.orig stunnel/files/patch-src::options.c
--- stunnel/files/patch-src::options.c.orig	2009-11-19 20:06:25.000000000 +0900
+++ stunnel/files/patch-src::options.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,42 +0,0 @@
-Description: Build on older OpenSSL versions without some options.
-Forwarded: https://stunnel.mirt.net/cgi-bin/bugzilla3/show_bug.cgi?id=3
-Author: Michal Trojnara <Michal.Trojnara@mirt.net>
-	Peter Pentchev <roam@ringlet.net>
-Last-Update: 2009-11-19
-
---- src/options.c.orig
-+++ src/options.c
-@@ -1136,7 +1136,9 @@
-         if(strcasecmp(opt, "sessiond"))
-             break;
-         section->option.sessiond=1;
-+#ifdef SSL_OP_NO_TICKET
-         section->ssl_options|=SSL_OP_NO_TICKET;
-+#endif
-         if(!name2addrlist(&section->sessiond_addr, arg, DEFAULT_LOOPBACK))
-             return "Failed to resolve sessiond server address";
-         return NULL; /* OK */
-@@ -1704,15 +1706,23 @@
-         {"TLS_D5_BUG", SSL_OP_TLS_D5_BUG},
-         {"TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG},
-         {"DONT_INSERT_EMPTY_FRAGMENTS", SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS},
-+#ifdef SSL_OP_NO_QUERY_MTU
-         {"NO_QUERY_MTU", SSL_OP_NO_QUERY_MTU},
-+#endif
-+#ifdef SSL_OP_COOKIE_EXCHANGE
-         {"COOKIE_EXCHANGE", SSL_OP_COOKIE_EXCHANGE},
-+#endif
-+#ifdef SSL_OP_NO_TICKET
-         {"NO_TICKET", SSL_OP_NO_TICKET},
-+#endif
-         {"NO_SESSION_RESUMPTION_ON_RENEGOTIATION",
-             SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION},
- #ifdef SSL_OP_NO_COMPRESSION
-         {"NO_COMPRESSION", SSL_OP_NO_COMPRESSION},
- #endif
-+#ifdef SSL_OP_SINGLE_ECDH_USE
-         {"SINGLE_ECDH_USE", SSL_OP_SINGLE_ECDH_USE},
-+#endif
-         {"SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE},
-         {"EPHEMERAL_RSA", SSL_OP_EPHEMERAL_RSA},
-         {"CIPHER_SERVER_PREFERENCE", SSL_OP_CIPHER_SERVER_PREFERENCE},
	


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->roam 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jan 13 08:30:13 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142773 
State-Changed-From-To: open->analyzed 
State-Changed-By: roam 
State-Changed-When: Mon Jan 18 09:39:00 UTC 2010 
State-Changed-Why:  
Yep, I've been looking at that version for some time, and checking out 
the new sessiond code. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142773 

From: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
To: bug-followup@FreeBSD.org, roam@FreeBSD.org,
	turutani@scphys.kyoto-u.ac.jp
Cc:  
Subject: Re: ports/142773: update security/stunnel
Date: Fri, 22 Jan 2010 12:04:11 +0900

 Hi,
 
 stunnel-4.30 is released.
 
 here is a patch:
 
 diff -urN stunnel/Makefile.orig stunnel/Makefile
 --- stunnel/Makefile.orig	2009-11-20 06:19:12.000000000 +0900
 +++ stunnel/Makefile	2010-01-22 11:54:21.000000000 +0900
 @@ -6,16 +6,15 @@
  #
  
  PORTNAME=	stunnel
 -PORTVERSION=	4.28
 -PORTREVISION=	1
 +PORTVERSION=	4.30
  CATEGORIES=	security
  MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
  		ftp://stunnel.mirt.net/stunnel/ \
  		ftp://stunnel.mirt.net/stunnel/OBSOLETE/ \
  		ftp://opensores.thebunker.net/pub/mirrors/stunnel/download/stunnel/src/
  
 -PATCH_SITES=	ftp://stunnel.mirt.net/stunnel/
 -PATCHFILES=	execargs.patch
 +#PATCH_SITES=	ftp://stunnel.mirt.net/stunnel/
 +#PATCHFILES=	execargs.patch
  
  MAINTAINER=	roam@FreeBSD.org
  COMMENT=	SSL encryption wrapper for standard network daemons
 diff -urN stunnel/distinfo.orig stunnel/distinfo
 --- stunnel/distinfo.orig	2009-11-20 06:19:12.000000000 +0900
 +++ stunnel/distinfo	2010-01-22 10:05:14.000000000 +0900
 @@ -1,6 +1,6 @@
 -MD5 (stunnel-4.28.tar.gz) = 5bf753a042047f40a938e82ec7ece569
 -SHA256 (stunnel-4.28.tar.gz) = 
 9be98fb1aa5e96e44095df267d89b776aa539e6dce90dd0d54db675e9a95cd80
 -SIZE (stunnel-4.28.tar.gz) = 543008
 +MD5 (stunnel-4.30.tar.gz) = 3b171b8d3ac24a45c06cd280fe649bce
 +SHA256 (stunnel-4.30.tar.gz) = 
 169ddeabb009a8a2fc3fcceb098733cfca49b1f42de64026eadc6c2bda730391
 +SIZE (stunnel-4.30.tar.gz) = 545833
  MD5 (execargs.patch) = c893028f869f6d1f527373334605d639
  SHA256 (execargs.patch) = 88e682c0deee13d9768c8cbdd3e71f90dd26d92621d2e64542d5379a3939ac4c
  SIZE (execargs.patch) = 756
 diff -urN stunnel/files/patch-src::options.c.orig stunnel/files/patch-src::options.c
 --- stunnel/files/patch-src::options.c.orig	2009-11-19 20:06:25.000000000 +0900
 +++ stunnel/files/patch-src::options.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,42 +0,0 @@
 -Description: Build on older OpenSSL versions without some options.
 -Forwarded: https://stunnel.mirt.net/cgi-bin/bugzilla3/show_bug.cgi?id=3
 -Author: Michal Trojnara <Michal.Trojnara@mirt.net>
 -	Peter Pentchev <roam@ringlet.net>
 -Last-Update: 2009-11-19
 -
 ---- src/options.c.orig
 -+++ src/options.c
 -@@ -1136,7 +1136,9 @@
 -         if(strcasecmp(opt, "sessiond"))
 -             break;
 -         section->option.sessiond=1;
 -+#ifdef SSL_OP_NO_TICKET
 -         section->ssl_options|=SSL_OP_NO_TICKET;
 -+#endif
 -         if(!name2addrlist(&section->sessiond_addr, arg, DEFAULT_LOOPBACK))
 -             return "Failed to resolve sessiond server address";
 -         return NULL; /* OK */
 -@@ -1704,15 +1706,23 @@
 -         {"TLS_D5_BUG", SSL_OP_TLS_D5_BUG},
 -         {"TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG},
 -         {"DONT_INSERT_EMPTY_FRAGMENTS", SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS},
 -+#ifdef SSL_OP_NO_QUERY_MTU
 -         {"NO_QUERY_MTU", SSL_OP_NO_QUERY_MTU},
 -+#endif
 -+#ifdef SSL_OP_COOKIE_EXCHANGE
 -         {"COOKIE_EXCHANGE", SSL_OP_COOKIE_EXCHANGE},
 -+#endif
 -+#ifdef SSL_OP_NO_TICKET
 -         {"NO_TICKET", SSL_OP_NO_TICKET},
 -+#endif
 -         {"NO_SESSION_RESUMPTION_ON_RENEGOTIATION",
 -             SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION},
 - #ifdef SSL_OP_NO_COMPRESSION
 -         {"NO_COMPRESSION", SSL_OP_NO_COMPRESSION},
 - #endif
 -+#ifdef SSL_OP_SINGLE_ECDH_USE
 -         {"SINGLE_ECDH_USE", SSL_OP_SINGLE_ECDH_USE},
 -+#endif
 -         {"SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE},
 -         {"EPHEMERAL_RSA", SSL_OP_EPHEMERAL_RSA},
 -         {"CIPHER_SERVER_PREFERENCE", SSL_OP_CIPHER_SERVER_PREFERENCE},
 diff -urN stunnel/files/ssl-noengine.patch.orig stunnel/files/ssl-noengine.patch
 --- stunnel/files/ssl-noengine.patch.orig	2009-11-20 06:19:12.000000000 +0900
 +++ stunnel/files/ssl-noengine.patch	2010-01-22 10:03:23.000000000 +0900
 @@ -5,12 +5,12 @@
  
  --- src/ssl.c.orig
  +++ src/ssl.c
 -@@ -276,6 +276,8 @@
 +@@ -279,6 +279,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@FreeBSD.org> for 
 details.");
  +    exit(1);
       if(engine_initialized)
 -         return;
 +         return NULL; /* OK */
       engine_initialized=1;

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142773: commit references a PR
Date: Wed,  3 Feb 2010 09:33:33 +0000 (UTC)

 roam        2010-02-03 09:33:25 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/stunnel     Makefile distinfo 
     security/stunnel/files patch-src::common.h 
   Removed files:
     security/stunnel/files patch-src::options.c 
   Log:
   Update to stunnel-4.29.  I'm holding off on the 4.30 update for
   a couple of days until the chroot/SIGHUP/pid file problem discussed
   on the stunnel-users mailing list is sorted out upstream.
   
   PR:             142773
   Reported by:    Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
   
   Revision  Changes    Path
   1.95      +1 -5      ports/security/stunnel/Makefile
   1.53      +3 -3      ports/security/stunnel/distinfo
   1.5       +2 -2      ports/security/stunnel/files/patch-src::common.h
   1.2       +0 -42     ports/security/stunnel/files/patch-src::options.c (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: Peter Pentchev <roam@ringlet.net>
To: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/142773: update security/stunnel
Date: Wed, 3 Feb 2010 11:37:25 +0200

 --h31gzZEtNLTqOjlF
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Fri, Jan 22, 2010 at 12:04:11PM +0900, Tsurutani Naoki wrote:
 > Hi,
 >=20
 > stunnel-4.30 is released.
 
 Yep, I know.  I just updated the port to 4.29; I'm holding off a bit
 on the 4.30 update because of the chroot/SIGHUP/pid file issue that
 has been discussed on the stunnel-users mailing list for the last
 several days.  If there is a resolution in time for the ports freeze,
 I'll commit the 4.30 update with a suitable patch; otherwise, I guess
 I just might ask for a freeze exception later.
 
 Thanks for your time and your work on this :)
 
 G'luck,
 Peter
 
 --=20
 Peter Pentchev	roam@ringlet.net    roam@space.bg    roam@FreeBSD.org
 PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
 Key fingerprint	2EE7 A7A5 17FC 124C F115  C354 651E EFB0 2527 DF13
 If the meanings of 'true' and 'false' were switched, then this sentence wou=
 ldn't be false.
 
 --h31gzZEtNLTqOjlF
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (FreeBSD)
 
 iQIcBAEBCgAGBQJLaUPVAAoJEGUe77AlJ98TmVYP/1NZKV/9W8GWLh+PL3k+/YSf
 YbmyEAaz5MukVohqyT+1278mnddBf7qK13W2mtCvowtHOULjVHuJSpDfgeUB+cYX
 bdOAbJ4cltD4xb6x8yFrcpzK3Xsfssm/qa/U3EhtaQ8FNkbQnWxWCoJThzCr/GhG
 DQsm6oz71AWUWtU4J8P+wwzC0hEwHJGF1kiSQvihR5y8TjX6N98gGNy9e6YJ4QeO
 HZb3zs5+yT3mJFUyThMvIPvZn4K+H5w9A/D2reCncHVccdaMjcvPT3rUZhewiZI9
 OUMHkLqJpf69QGF3MUslGDORbXQIzIfqoOtvlCMzFdJgkexpoxYD0YxyDAiwSzfl
 YlnVChcuQ3PfzXQwW1eUGwRs19klIeB3fJdUWmyt1DoROOK78Fs0eXD8BuBPaus/
 qS0fhpn6e6toW8hWRtv8LKBlkbD8JlJb9MTkCX5bDMeu1VNWQSLLIxY1Y7L6sc77
 u23NQJILf4Ooqb2r5czh0tiNurh212qAU5UlAgI5OH2b9+lTBN8z4mNQHd6geFVn
 2vMTzT6AegoX7mAGwPaiGtmRMA4gThQcd4PLLhzSBDWj9TklbdOgiDREyQ/PZKta
 hOkRlJLA+JP3Ljv4isL/UvNSCOuobjetprbSM3RM+RBaed6naqpTMcTI2qjUr34M
 vS0xVFt4EQFBkWrk4aWk
 =qKCF
 -----END PGP SIGNATURE-----
 
 --h31gzZEtNLTqOjlF--
State-Changed-From-To: analyzed->closed 
State-Changed-By: pgollucci 
State-Changed-When: Thu Sep 2 05:33:59 UTC 2010 
State-Changed-Why:  
port now at 4.33 


Responsible-Changed-From-To: roam->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Thu Sep 2 05:33:59 UTC 2010 
Responsible-Changed-Why:  
port now at 4.33 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142773 
>Unformatted:
