New upstream realease 4.54

- Updated local patches
This commit is contained in:
Avesh Agarwal 2012-10-16 14:42:04 -04:00
parent 41d07b5033
commit 487ae9248e
5 changed files with 32 additions and 25 deletions

3
.gitignore vendored
View File

@ -25,3 +25,6 @@ stunnel-4.33.tar.gz.asc
/stunnel-4.53.tar.gz /stunnel-4.53.tar.gz
/stunnel-4.53.tar.gz.asc /stunnel-4.53.tar.gz.asc
/stunnel-4.53.tar.gz.sha256 /stunnel-4.53.tar.gz.sha256
/stunnel-4.54.tar.gz
/stunnel-4.54.tar.gz.asc
/stunnel-4.54.tar.gz.sha256

View File

@ -1,3 +1,3 @@
ab3bfc915357d67da18c73f73610d593 stunnel-4.53.tar.gz c2b1db99e3ed547214568959a8ed18ac stunnel-4.54.tar.gz
ea8d7637e072fa1bb8706c85e6ea0152 stunnel-4.53.tar.gz.asc b7cd936bae7b56dae6fe1f06d90c4db1 stunnel-4.54.tar.gz.asc
cfd8076691a2fc20c604531e1791ea81 stunnel-4.53.tar.gz.sha256 4da789296deb1544f48a3d3a11f0599f stunnel-4.54.tar.gz.sha256

View File

@ -1,7 +1,7 @@
diff -urNp stunnel-4.53-patched/doc/stunnel.8 stunnel-4.53-current/doc/stunnel.8 diff -urNp stunnel-4.54-patched/doc/stunnel.8 stunnel-4.54-current/doc/stunnel.8
--- stunnel-4.53-patched/doc/stunnel.8 2012-05-14 14:12:33.009094961 -0400 --- stunnel-4.54-patched/doc/stunnel.8 2012-10-16 14:31:16.728962756 -0400
+++ stunnel-4.53-current/doc/stunnel.8 2012-05-14 14:14:00.417045185 -0400 +++ stunnel-4.54-current/doc/stunnel.8 2012-10-16 14:32:10.604908059 -0400
@@ -178,7 +178,7 @@ info (6), or debug (7). All logs for th @@ -190,7 +190,7 @@ info (6), or debug (7). All logs for th
all levels numerically less than it will be shown. Use \fIdebug = debug\fR or all levels numerically less than it will be shown. Use \fIdebug = debug\fR or
\&\fIdebug = 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
@ -10,10 +10,10 @@ diff -urNp stunnel-4.53-patched/doc/stunnel.8 stunnel-4.53-current/doc/stunnel.8
(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.53-patched/doc/stunnel.html stunnel-4.53-current/doc/stunnel.html diff -urNp stunnel-4.54-patched/doc/stunnel.html stunnel-4.54-current/doc/stunnel.html
--- stunnel-4.53-patched/doc/stunnel.html 2012-05-14 14:12:33.010094960 -0400 --- stunnel-4.54-patched/doc/stunnel.html 2012-10-16 14:31:16.729962755 -0400
+++ stunnel-4.53-current/doc/stunnel.html 2012-05-14 14:14:00.417045185 -0400 +++ stunnel-4.54-current/doc/stunnel.html 2012-10-16 14:32:10.606908057 -0400
@@ -212,7 +212,7 @@ emerg (0), alert (1), crit (2), err (3), @@ -224,7 +224,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 <em>debug = debug</em> or all levels numerically less than it will be shown. Use <em>debug = debug</em> or
<em>debug = 7</em> for greatest debugging output. The default is notice (5).</p> <em>debug = 7</em> for greatest debugging output. The default is notice (5).</p>
@ -22,10 +22,10 @@ diff -urNp stunnel-4.53-patched/doc/stunnel.html stunnel-4.53-current/doc/stunne
(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.53-patched/doc/stunnel.pod stunnel-4.53-current/doc/stunnel.pod diff -urNp stunnel-4.54-patched/doc/stunnel.pod stunnel-4.54-current/doc/stunnel.pod
--- stunnel-4.53-patched/doc/stunnel.pod 2012-05-14 14:12:33.009094961 -0400 --- stunnel-4.54-patched/doc/stunnel.pod 2012-10-16 14:31:16.728962756 -0400
+++ stunnel-4.53-current/doc/stunnel.pod 2012-05-14 14:14:00.427045191 -0400 +++ stunnel-4.54-current/doc/stunnel.pod 2012-10-16 14:32:10.610908053 -0400
@@ -152,7 +152,7 @@ info (6), or debug (7). All logs for th @@ -184,7 +184,7 @@ info (6), or debug (7). All logs for th
all levels numerically less than it will be shown. Use I<debug = debug> or all levels numerically less than it will be shown. Use I<debug = debug> or
I<debug = 7> for greatest debugging output. The default is notice (5). I<debug = 7> for greatest debugging output. The default is notice (5).
@ -34,11 +34,11 @@ diff -urNp stunnel-4.53-patched/doc/stunnel.pod stunnel-4.53-current/doc/stunnel
(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.53-patched/src/options.c stunnel-4.53-current/src/options.c diff -urNp stunnel-4.54-patched/src/options.c stunnel-4.54-current/src/options.c
--- stunnel-4.53-patched/src/options.c 2012-05-14 14:12:33.012094958 -0400 --- stunnel-4.54-patched/src/options.c 2012-10-16 14:31:16.733962751 -0400
+++ stunnel-4.53-current/src/options.c 2012-05-14 14:14:00.427045191 -0400 +++ stunnel-4.54-current/src/options.c 2012-10-16 14:32:10.634908024 -0400
@@ -179,8 +179,12 @@ static char *parse_global_option(CMD cmd @@ -185,8 +185,12 @@ static char *parse_global_option(CMD cmd
case CMD_INIT: case CMD_BEGIN:
new_global_options.debug_level=LOG_NOTICE; new_global_options.debug_level=LOG_NOTICE;
#if !defined (USE_WIN32) && !defined (__vms) #if !defined (USE_WIN32) && !defined (__vms)
+#if defined(LOG_AUTHPRIV) +#if defined(LOG_AUTHPRIV)

View File

@ -1,6 +1,6 @@
diff -urNp stunnel-4.53-patched/tools/stunnel.conf-sample.in stunnel-4.53-current/tools/stunnel.conf-sample.in diff -urNp stunnel-4.54-patched/tools/stunnel.conf-sample.in stunnel-4.54-current/tools/stunnel.conf-sample.in
--- stunnel-4.53-patched/tools/stunnel.conf-sample.in 2012-05-14 14:12:33.011094959 -0400 --- stunnel-4.54-patched/tools/stunnel.conf-sample.in 2012-10-16 14:31:16.732962752 -0400
+++ stunnel-4.53-current/tools/stunnel.conf-sample.in 2012-05-14 14:16:53.065953605 -0400 +++ stunnel-4.54-current/tools/stunnel.conf-sample.in 2012-10-16 14:33:50.162807909 -0400
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
; A copy of some devices and system files is needed within the chroot jail ; A copy of some devices and system files is needed within the chroot jail

View File

@ -1,7 +1,7 @@
Summary: An SSL-encrypting socket wrapper Summary: An SSL-encrypting socket wrapper
Name: stunnel Name: stunnel
Version: 4.53 Version: 4.54
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/Internet Group: Applications/Internet
URL: http://stunnel.mirt.net/ URL: http://stunnel.mirt.net/
@ -79,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_sysconfdir}/stunnel/* %exclude %{_sysconfdir}/stunnel/*
%changelog %changelog
*Tue Oct 16 2012 Avesh Agarwal <avagarwa@redhat.com> - 4.54-1
- New upstream realease 4.54
- Updated local patches
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.53-2 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.53-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild