[csw-devel] SF.net SVN: gar:[10648] csw/mgar/pkg/stunnel/trunk

[skayser at users.sourceforge.net]

Revision: 10648
          http://gar.svn.sourceforge.net/gar/?rev=10648&view=rev
Author:   skayser
Date:     2010-07-28 22:38:35 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
stunnel: work towards 4.33 ... not 4.27

Modified Paths:
--------------
    csw/mgar/pkg/stunnel/trunk/Makefile
    csw/mgar/pkg/stunnel/trunk/checksums
    csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2010-07-28 22:31:13 UTC (rev 10647)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2010-07-28 22:38:35 UTC (rev 10648)
@@ -5,7 +5,7 @@
 #       to pthreads .. truss doesn't show /dev/zero usage on Solaris 10
 #       Test on Solaris 8 / 9 for comparison
 GARNAME = stunnel
-GARVERSION = 4.27
+GARVERSION = 4.33
 CATEGORIES = net
 
 DESCRIPTION = Universal SSL Wrapper
@@ -25,7 +25,7 @@
 RUNTIME_DEP_PKGS = CSWzlib CSWosslrt CSWtcpwrap CSWcswclassutils
 
 # Make stunnel.conf-sample.in honor $localstatedir adjustments
-PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
+#PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl=/opt/csw

Modified: csw/mgar/pkg/stunnel/trunk/checksums
===================================================================
--- csw/mgar/pkg/stunnel/trunk/checksums	2010-07-28 22:31:13 UTC (rev 10647)
+++ csw/mgar/pkg/stunnel/trunk/checksums	2010-07-28 22:38:35 UTC (rev 10648)
@@ -1,2 +1,2 @@
-8d6730bd87af222c3ff66547e82d8d7f  download/gar-base.diff
-3c655d815576f50046a1c28744b88681  download/stunnel-4.27.tar.gz
+c8d5c69008fef019b86d743207309524  0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
+559a864066d8cc4afd8a97682c90d41c  stunnel-4.33.tar.gz

Modified: csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
===================================================================
--- csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch	2010-07-28 22:31:13 UTC (rev 10647)
+++ csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch	2010-07-28 22:38:35 UTC (rev 10648)
@@ -1,6 +1,6 @@
-From afc5fc671d32cb128ef08bfb8b044b45d653e104 Mon Sep 17 00:00:00 2001
+From 9873796410fa51fdb686bd5ce72e906bc60280e2 Mon Sep 17 00:00:00 2001
 From: Sebastian Kayser <skayser at opencsw.org>
-Date: Tue, 20 Jul 2010 01:13:20 +0200
+Date: Thu, 29 Jul 2010 00:37:23 +0200
 Subject: [PATCH] Make stunnel.conf-sample.in honor --sysconfdir, --localstatedir
 
 In case someone ./configured with a --sysconfdir or --localstatedir
@@ -12,41 +12,42 @@
  1 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/tools/stunnel.conf-sample.in b/tools/stunnel.conf-sample.in
-index 29acdfc..8791f69 100644
+index c231eec..201c60f 100644
 --- a/tools/stunnel.conf-sample.in
 +++ b/tools/stunnel.conf-sample.in
-@@ -3,14 +3,14 @@
- ; Please make sure you understand them (especially the effect of the chroot jail)
+@@ -4,15 +4,15 @@
+ ; please read the manual and make sure you understand them
  
- ; Certificate/key is needed in server mode and optional in client mode
+ ; certificate/key is needed in server mode and optional in client mode
 -cert = @prefix@/etc/stunnel/mail.pem
 -;key = @prefix@/etc/stunnel/mail.pem
 +cert = @sysconfdir@/stunnel/mail.pem
 +;key = @sysconfdir@/stunnel/mail.pem
  
- ; Protocol version (all, SSLv2, SSLv3, TLSv1)
+ ; protocol version (all, SSLv2, SSLv3, TLSv1)
  sslVersion = SSLv3
  
- ; Some security enhancements for UNIX systems - comment them out on Win32
+ ; security enhancements for UNIX systems - comment them out on Win32
+ ; for chroot a copy of some devices and files is needed within the jail
 -chroot = @prefix@/var/lib/stunnel/
 +chroot = @localstatedir@/lib/stunnel/
  setuid = nobody
  setgid = @DEFAULT_GROUP@
  ; PID is created inside the chroot jail
-@@ -30,12 +30,12 @@ socket = r:TCP_NODELAY=1
+@@ -33,12 +33,12 @@ socket = r:TCP_NODELAY=1
  ; CApath is located inside chroot jail
  ;CApath = /certs
- ; It's often easier to use CAfile
+ ; it's often easier to use CAfile
 -;CAfile = @prefix@/etc/stunnel/certs.pem
 +;CAfile = @sysconfdir@/stunnel/certs.pem
- ; Don't forget to c_rehash CRLpath
+ ; don't forget to c_rehash CRLpath
  ; CRLpath is located inside chroot jail
  ;CRLpath = /crls
- ; Alternatively you can use CRLfile
+ ; alternatively CRLfile can be used
 -;CRLfile = @prefix@/etc/stunnel/crls.pem
 +;CRLfile = @sysconfdir@/stunnel/crls.pem
  
- ; Some debugging stuff useful for troubleshooting
+ ; debugging stuff (may useful for troubleshooting)
  ;debug = 7
 -- 
 1.7.1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.