diff -r dc566ca73390 -r 138732f62341 components/stunnel/patches/stunnel-4.29-sample.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/stunnel/patches/stunnel-4.29-sample.patch Fri Aug 09 12:58:20 2013 -0700 @@ -0,0 +1,42 @@ +# the sample config file should point to the right places on Solaris +# +# +diff -u -r stunnel-4.55.orig/tools/stunnel.conf-sample.in stunnel-4.55/tools/stunnel.conf-sample.in +--- stunnel-4.55.orig/tools/stunnel.conf-sample.in 2012-01-01 13:46:46.000000000 -0800 ++++ stunnel-4.55/tools/stunnel.conf-sample.in 2013-03-21 22:38:08.025113934 -0700 +@@ -9,7 +9,7 @@ + + ; A copy of some devices and system files is needed within the chroot jail + ; Chroot conflicts with configuration file reload and many other features +-chroot = @prefix@/var/lib/stunnel/ ++chroot = @localstatedir@/run/stunnel/ + ; Chroot jail can be escaped if setuid option is not used + setuid = nobody + setgid = @DEFAULT_GROUP@ +@@ -26,8 +26,8 @@ + ; ************************************************************************** + + ; 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 + + ; Authentication stuff needs to be configured to prevent MITM attacks + ; It is not enabled by default! +@@ -36,12 +36,13 @@ + ; CApath is located inside chroot jail + ;CApath = /certs + ; It's often easier to use CAfile +-;CAfile = @prefix@/etc/stunnel/certs.pem ++;CAfile = @sysconfdir@/stunnel/certs.pem ++;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt + ; Don't forget to c_rehash CRLpath + ; CRLpath is located inside chroot jail + ;CRLpath = /crls + ; Alternatively CRLfile can be used +-;CRLfile = @prefix@/etc/stunnel/crls.pem ++;CRLfile = @sysconfdir@/stunnel/crls.pem + + ; Disable support for insecure SSLv2 protocol + options = NO_SSLv2