components/stunnel/patches/stunnel-4.29-sample.patch
author Swaroop M S <swaroop.sadare@oracle.com>
Wed, 09 Sep 2015 12:28:35 +0530
changeset 4845 c702a8e89152
parent 1252 86b53be32d7c
permissions -rw-r--r--
21269473 multi-user-desktop group package should include python2.7 packages
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1252
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
     1
# the sample config file should point to the right places on Solaris
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
     2
#
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
     3
#
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
     4
diff -u -r stunnel-4.55.orig/tools/stunnel.conf-sample.in stunnel-4.55/tools/stunnel.conf-sample.in
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
     5
--- stunnel-4.55.orig/tools/stunnel.conf-sample.in	2012-01-01 13:46:46.000000000 -0800
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
     6
+++ stunnel-4.55/tools/stunnel.conf-sample.in	2013-03-21 22:38:08.025113934 -0700
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
     7
@@ -9,7 +9,7 @@
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
     8
 
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
     9
 ; A copy of some devices and system files is needed within the chroot jail
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    10
 ; Chroot conflicts with configuration file reload and many other features
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    11
-chroot = @prefix@/var/lib/stunnel/
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    12
+chroot = @localstatedir@/run/stunnel/
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    13
 ; Chroot jail can be escaped if setuid option is not used
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    14
 setuid = nobody
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    15
 setgid = @DEFAULT_GROUP@
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    16
@@ -26,8 +26,8 @@
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    17
 ; **************************************************************************
1131
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
 
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
 ; Certificate/key is needed in server mode and optional in client mode
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
-cert = @prefix@/etc/stunnel/mail.pem
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
-;key = @prefix@/etc/stunnel/mail.pem
1252
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    22
+cert = @sysconfdir@/stunnel/mail.pem
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    23
+;key = @sysconfdir@/stunnel/mail.pem
1131
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
 
1252
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    25
 ; Authentication stuff needs to be configured to prevent MITM attacks
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    26
 ; It is not enabled by default!
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    27
@@ -36,12 +36,13 @@
1131
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    28
 ; CApath is located inside chroot jail
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    29
 ;CApath = /certs
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    30
 ; It's often easier to use CAfile
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    31
-;CAfile = @prefix@/etc/stunnel/certs.pem
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    32
+;CAfile = @sysconfdir@/stunnel/certs.pem
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    33
+;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    34
 ; Don't forget to c_rehash CRLpath
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    35
 ; CRLpath is located inside chroot jail
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    36
 ;CRLpath = /crls
1252
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    37
 ; Alternatively CRLfile can be used
1131
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    38
-;CRLfile = @prefix@/etc/stunnel/crls.pem
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    39
+;CRLfile = @sysconfdir@/stunnel/crls.pem
4c414ada49de 16133924 Move stunnel from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    40
 
1252
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    41
 ; Disable support for insecure SSLv2 protocol
86b53be32d7c 16533604 stunnel should upgrade to 4.56
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 1131
diff changeset
    42
 options = NO_SSLv2