New upstream realease 4.52

- Updated local patches
This commit is contained in:
Avesh Agarwal 2012-03-05 19:03:54 -05:00
parent 7b2e0cc9ba
commit 79d4b425fc
5 changed files with 31 additions and 24 deletions

3
.gitignore vendored
View File

@ -19,3 +19,6 @@ stunnel-4.33.tar.gz.asc
/stunnel-4.50.tar.gz /stunnel-4.50.tar.gz
/stunnel-4.50.tar.gz.asc /stunnel-4.50.tar.gz.asc
/stunnel-4.50.tar.gz.sha256 /stunnel-4.50.tar.gz.sha256
/stunnel-4.52.tar.gz
/stunnel-4.52.tar.gz.asc
/stunnel-4.52.tar.gz.sha256

View File

@ -1,3 +1,3 @@
d68b4565294496a8bdf23c728a679f53 stunnel-4.50.tar.gz f5e713dda0e8efa659f372832ecd0c2c stunnel-4.52.tar.gz
ea9e85daef0cc96ce21649901b3514f7 stunnel-4.50.tar.gz.asc 3e84d222525e724788d3c2b29b899610 stunnel-4.52.tar.gz.asc
0b901f3d914ba59f76333e70a282a993 stunnel-4.50.tar.gz.sha256 7780ed80ba6d6f16b806290747ff195a stunnel-4.52.tar.gz.sha256

View File

@ -1,7 +1,7 @@
diff -urNp stunnel-4.50/doc/stunnel.8 stunnel-4.50-patched/doc/stunnel.8 diff -urNp stunnel-4.52/doc/stunnel.8 stunnel-4.52-patched/doc/stunnel.8
--- stunnel-4.50/doc/stunnel.8 2011-11-28 16:04:45.000000000 -0500 --- stunnel-4.52/doc/stunnel.8 2012-01-09 18:09:55.000000000 -0500
+++ stunnel-4.50-patched/doc/stunnel.8 2012-01-03 10:41:22.532321571 -0500 +++ stunnel-4.52-patched/doc/stunnel.8 2012-03-05 18:29:08.910298860 -0500
@@ -176,7 +176,7 @@ info (6), or debug (7). All logs for th @@ -178,7 +178,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.50/doc/stunnel.8 stunnel-4.50-patched/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.50/doc/stunnel.html stunnel-4.50-patched/doc/stunnel.html diff -urNp stunnel-4.52/doc/stunnel.html stunnel-4.52-patched/doc/stunnel.html
--- stunnel-4.50/doc/stunnel.html 2011-11-28 16:04:47.000000000 -0500 --- stunnel-4.52/doc/stunnel.html 2012-01-09 18:09:56.000000000 -0500
+++ stunnel-4.50-patched/doc/stunnel.html 2012-01-03 10:41:22.532321571 -0500 +++ stunnel-4.52-patched/doc/stunnel.html 2012-03-05 18:29:50.890228103 -0500
@@ -211,7 +211,7 @@ emerg (0), alert (1), crit (2), err (3), @@ -212,7 +212,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.50/doc/stunnel.html stunnel-4.50-patched/doc/stunnel.html
(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.50/doc/stunnel.pod stunnel-4.50-patched/doc/stunnel.pod diff -urNp stunnel-4.52/doc/stunnel.pod stunnel-4.52-patched/doc/stunnel.pod
--- stunnel-4.50/doc/stunnel.pod 2011-11-28 16:04:26.000000000 -0500 --- stunnel-4.52/doc/stunnel.pod 2012-01-09 18:09:38.000000000 -0500
+++ stunnel-4.50-patched/doc/stunnel.pod 2012-01-03 10:41:22.533321572 -0500 +++ stunnel-4.52-patched/doc/stunnel.pod 2012-03-05 18:30:27.118167249 -0500
@@ -150,7 +150,7 @@ info (6), or debug (7). All logs for th @@ -152,7 +152,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,10 +34,10 @@ diff -urNp stunnel-4.50/doc/stunnel.pod stunnel-4.50-patched/doc/stunnel.pod
(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.50/src/options.c stunnel-4.50-patched/src/options.c diff -urNp stunnel-4.52/src/options.c stunnel-4.52-patched/src/options.c
--- stunnel-4.50/src/options.c 2011-11-24 05:54:49.000000000 -0500 --- stunnel-4.52/src/options.c 2012-01-01 16:41:58.000000000 -0500
+++ stunnel-4.50-patched/src/options.c 2012-01-03 10:41:22.535321572 -0500 +++ stunnel-4.52-patched/src/options.c 2012-03-05 18:33:23.820872899 -0500
@@ -157,8 +157,12 @@ static char *parse_global_option(CMD cmd @@ -175,8 +175,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;
#if !defined (USE_WIN32) && !defined (__vms) #if !defined (USE_WIN32) && !defined (__vms)

View File

@ -1,6 +1,6 @@
diff -urNp stunnel-4.50/tools/stunnel.conf-sample.in stunnel-4.50-patched/tools/stunnel.conf-sample.in diff -urNp stunnel-4.52/tools/stunnel.conf-sample.in stunnel-4.52-patched/tools/stunnel.conf-sample.in
--- stunnel-4.50/tools/stunnel.conf-sample.in 2011-11-22 17:20:37.000000000 -0500 --- stunnel-4.52/tools/stunnel.conf-sample.in 2012-01-01 16:46:46.000000000 -0500
+++ stunnel-4.50-patched/tools/stunnel.conf-sample.in 2012-01-03 10:41:32.344325275 -0500 +++ stunnel-4.52-patched/tools/stunnel.conf-sample.in 2012-03-05 18:36:03.793609849 -0500
@@ -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.50 Version: 4.52
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 Mar 6 2012 Avesh Agarwal <avagarwa@redhat.com> - 4.52-1
- New upstream realease 4.52
- Updated local patches
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.50-2 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.50-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild