rpms/stunnel
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream realease 4.37

Browse Source 
Updated local patches to match the new release
This commit is contained in:
Avesh Agarwal 2011-06-28 13:17:30 -04:00
parent 36720b6b7f
commit d4eb316169
5 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -4,3 +4,6 @@ stunnel-4.33.tar.gz.asc
/stunnel-4.34.tar.gz.asc /stunnel-4.34.tar.gz.asc
/stunnel-4.35.tar.gz /stunnel-4.35.tar.gz
/stunnel-4.35.tar.gz.asc /stunnel-4.35.tar.gz.asc
/stunnel-4.37.tar.gz
/stunnel-4.37.tar.gz.asc
/stunnel-4.37.tar.gz.sha256

5
sources
View File

@ -1,2 +1,3 @@
2c8e153caee9d954fb7d00980968b50d stunnel-4.35.tar.gz 8d4e2cefbef6638da95986a3d44c1b4a stunnel-4.37.tar.gz
d556ceb125e21ef19011db93484ae5a0 stunnel-4.35.tar.gz.asc b56c2f649e51e9aafa185efc5074aca5 stunnel-4.37.tar.gz.asc
b7d8cc0a8b8a5ec3b648c1cbcfc75eca stunnel-4.37.tar.gz.sha256

36
stunnel-4-authpriv.patch
View File

@ -1,42 +1,42 @@
diff -urNp stunnel-4.35-orig/doc/stunnel.8 stunnel-4.35-current/doc/stunnel.8 diff -urNp stunnel-4.37/doc/stunnel.8 stunnel-4.37-cvs-patched/doc/stunnel.8
--- stunnel-4.35-orig/doc/stunnel.8 2011-02-05 16:36:59.000000000 -0500 --- stunnel-4.37/doc/stunnel.8 2011-04-27 17:02:40.000000000 -0400
+++ stunnel-4.35-current/doc/stunnel.8 2011-04-04 13:44:09.715498378 -0400 +++ stunnel-4.37-cvs-patched/doc/stunnel.8 2011-06-28 12:51:26.382324071 -0400
@@ -165,7 +165,7 @@ info (6), or debug (7). All logs for th @@ -165,7 +165,7 @@ info (6), or debug (7). All logs for th
all levels numerically less than it will be shown. Use \fBdebug = debug\fR or all levels numerically less than it will be shown. Use \fIdebug = debug\fR or
\&\fBdebug = 7\fR for greatest debugging output. The default is notice (5). \&\fIdebug = 7\fR for greatest debugging output. The default is notice (5).
.Sp .Sp
-The syslog facility 'daemon' will be used unless a facility name is supplied. -The syslog facility 'daemon' will be used unless a facility name is supplied.
+The syslog facility 'authpriv' will be used unless a facility name is supplied. +The syslog facility 'authpriv' will be used unless a facility name is supplied.
(Facilities are not supported on Win32.) (Facilities are not supported on Win32.)
.Sp .Sp
Case is ignored for both facilities and levels. Case is ignored for both facilities and levels.
diff -urNp stunnel-4.35-orig/doc/stunnel.html stunnel-4.35-current/doc/stunnel.html diff -urNp stunnel-4.37/doc/stunnel.html stunnel-4.37-cvs-patched/doc/stunnel.html
--- stunnel-4.35-orig/doc/stunnel.html 2011-02-05 16:36:59.000000000 -0500 --- stunnel-4.37/doc/stunnel.html 2011-04-27 17:02:42.000000000 -0400
+++ stunnel-4.35-current/doc/stunnel.html 2011-04-04 13:44:09.717498254 -0400 +++ stunnel-4.37-cvs-patched/doc/stunnel.html 2011-06-28 12:53:04.719417049 -0400
@@ -190,7 +190,7 @@ emerg (0), alert (1), crit (2), err (3), @@ -190,7 +190,7 @@ emerg (0), alert (1), crit (2), err (3),
info (6), or debug (7). All logs for the specified level and info (6), or debug (7). All logs for the specified level and
all levels numerically less than it will be shown. Use <strong>debug = debug</strong> or all levels numerically less than it will be shown. Use <em>debug = debug</em> or
<strong>debug = 7</strong> for greatest debugging output. The default is notice (5).</p> <em>debug = 7</em> for greatest debugging output. The default is notice (5).</p>
-<p>The syslog facility 'daemon' will be used unless a facility name is supplied. -<p>The syslog facility 'daemon' will be used unless a facility name is supplied.
+<p>The syslog facility 'authpriv' will be used unless a facility name is supplied. +<p>The syslog facility 'authpriv' will be used unless a facility name is supplied.
(Facilities are not supported on Win32.)</p> (Facilities are not supported on Win32.)</p>
<p>Case is ignored for both facilities and levels.</p> <p>Case is ignored for both facilities and levels.</p>
</dd> </dd>
diff -urNp stunnel-4.35-orig/doc/stunnel.pod stunnel-4.35-current/doc/stunnel.pod diff -urNp stunnel-4.37/doc/stunnel.pod stunnel-4.37-cvs-patched/doc/stunnel.pod
--- stunnel-4.35-orig/doc/stunnel.pod 2011-02-05 16:36:31.000000000 -0500 --- stunnel-4.37/doc/stunnel.pod 2011-04-27 16:58:39.000000000 -0400
+++ stunnel-4.35-current/doc/stunnel.pod 2011-04-04 13:44:09.719498136 -0400 +++ stunnel-4.37-cvs-patched/doc/stunnel.pod 2011-06-28 12:53:19.461280748 -0400
@@ -132,7 +132,7 @@ info (6), or debug (7). All logs for th @@ -132,7 +132,7 @@ info (6), or debug (7). All logs for th
all levels numerically less than it will be shown. Use B<debug = debug> or all levels numerically less than it will be shown. Use I<debug = debug> or
B<debug = 7> for greatest debugging output. The default is notice (5). I<debug = 7> for greatest debugging output. The default is notice (5).
-The syslog facility 'daemon' will be used unless a facility name is supplied. -The syslog facility 'daemon' will be used unless a facility name is supplied.
+The syslog facility 'authpriv' will be used unless a facility name is supplied. +The syslog facility 'authpriv' will be used unless a facility name is supplied.
(Facilities are not supported on Win32.) (Facilities are not supported on Win32.)
Case is ignored for both facilities and levels. Case is ignored for both facilities and levels.
diff -urNp stunnel-4.35-orig/src/options.c stunnel-4.35-current/src/options.c diff -urNp stunnel-4.37/src/options.c stunnel-4.37-cvs-patched/src/options.c
--- stunnel-4.35-orig/src/options.c 2011-01-24 17:30:07.000000000 -0500 --- stunnel-4.37/src/options.c 2011-06-17 06:25:01.000000000 -0400
+++ stunnel-4.35-current/src/options.c 2011-04-04 13:44:09.720498079 -0400 +++ stunnel-4.37-cvs-patched/src/options.c 2011-06-28 12:54:18.351744191 -0400
@@ -140,8 +140,12 @@ static char *parse_global_option(CMD cmd @@ -140,8 +140,12 @@ static char *parse_global_option(CMD cmd
case CMD_INIT: case CMD_INIT:
new_global_options.debug_level=LOG_NOTICE; new_global_options.debug_level=LOG_NOTICE;

29
stunnel-4-sample.patch
View File

@ -1,38 +1,35 @@
diff -urNp stunnel-4.35-orig/tools/stunnel.conf-sample.in stunnel-4.35-current/tools/stunnel.conf-sample.in diff -urNp stunnel-4.37/tools/stunnel.conf-sample.in stunnel-4.37-cvs-patched/tools/stunnel.conf-sample.in
--- stunnel-4.35-orig/tools/stunnel.conf-sample.in 2011-01-24 16:45:36.000000000 -0500 --- stunnel-4.37/tools/stunnel.conf-sample.in 2011-06-04 14:46:00.000000000 -0400
+++ stunnel-4.35-current/tools/stunnel.conf-sample.in 2011-04-04 13:44:12.920429210 -0400 +++ stunnel-4.37-cvs-patched/tools/stunnel.conf-sample.in 2011-06-28 12:57:17.387114066 -0400
@@ -4,15 +4,15 @@ @@ -5,12 +5,12 @@
; please read the manual and make sure you understand them ; Certificate/key is needed in server mode and optional in client mode
; The default certificate is provided only for testing and should not
; certificate/key is needed in server mode and optional in client mode ; be used in a production environment
-cert = @prefix@/etc/stunnel/mail.pem -cert = @prefix@/etc/stunnel/mail.pem
-;key = @prefix@/etc/stunnel/mail.pem -;key = @prefix@/etc/stunnel/mail.pem
+cert = @sysconfdir@/stunnel/mail.crt +cert = @sysconfdir@/stunnel/mail.crt
+;key = @sysconfdir@/stunnel/mail.key +;key = @sysconfdir@/stunnel/mail.key
; protocol version (all, SSLv2, SSLv3, TLSv1) ; Security enhancements for UNIX systems - comment them out on Win32
sslVersion = SSLv3
; security enhancements for UNIX systems - comment them out on Win32
; for chroot a copy of some devices and files is needed within the jail ; for chroot a copy of some devices and files is needed within the jail
-chroot = @prefix@/var/lib/stunnel/ -chroot = @prefix@/var/lib/stunnel/
+chroot = @localstatedir@/run/stunnel/ +chroot = @localstatedir@/run/stunnel/
setuid = nobody setuid = nobody
setgid = @DEFAULT_GROUP@ setgid = @DEFAULT_GROUP@
; PID is created inside the chroot jail ; PID is created inside the chroot jail
@@ -33,12 +33,13 @@ socket = r:TCP_NODELAY=1 @@ -33,12 +33,13 @@ options = NO_SSLv2
; CApath is located inside chroot jail ; CApath is located inside chroot jail
;CApath = /certs ;CApath = /certs
; it's often easier to use CAfile ; It's often easier to use CAfile
-;CAfile = @prefix@/etc/stunnel/certs.pem -;CAfile = @prefix@/etc/stunnel/certs.pem
+;CAfile = @sysconfdir@/stunnel/certs.pem +;CAfile = @sysconfdir@/stunnel/certs.pem
+;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt +;CAfile = @sysconfdir@/pki/tls/certs/ca-bundle.crt
; don't forget to c_rehash CRLpath ; Don't forget to c_rehash CRLpath
; CRLpath is located inside chroot jail ; CRLpath is located inside chroot jail
;CRLpath = /crls ;CRLpath = /crls
; alternatively CRLfile can be used ; Alternatively CRLfile can be used
-;CRLfile = @prefix@/etc/stunnel/crls.pem -;CRLfile = @prefix@/etc/stunnel/crls.pem
+;CRLfile = @sysconfdir@/stunnel/crls.pem +;CRLfile = @sysconfdir@/stunnel/crls.pem
; debugging stuff (may useful for troubleshooting) ; Debugging stuff (may useful for troubleshooting)
;debug = 7 ;debug = 7

6
stunnel.spec
View File

@ -1,6 +1,6 @@
Summary: An SSL-encrypting socket wrapper Summary: An SSL-encrypting socket wrapper
Name: stunnel Name: stunnel
Version: 4.35 Version: 4.37
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/Internet Group: Applications/Internet
@ -79,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_sysconfdir}/stunnel/* %exclude %{_sysconfdir}/stunnel/*
%changelog %changelog
* Tue Jun 28 2011 Avesh Agarwal <avagarwa@redhat.com> - 4.37-1
- New upstream realease 4.37
- Updated local patches to match the new release
* Mon Apr 4 2011 Avesh Agarwal <avagarwa@redhat.com> - 4.35-1 * Mon Apr 4 2011 Avesh Agarwal <avagarwa@redhat.com> - 4.35-1
- New upstream realease 4.35 - New upstream realease 4.35
- Updated authpriv and sample patches to match the new release - Updated authpriv and sample patches to match the new release