From 60e7956c85002f1374658a16e0a902938c4acecc Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Mon, 14 May 2012 14:27:04 -0400 Subject: [PATCH] New upstream realease 4.53 - Updated local patches --- .gitignore | 3 +++ sources | 6 +++--- stunnel-4-authpriv.patch | 26 +++++++++++++------------- stunnel-4-sample.patch | 6 +++--- stunnel.spec | 6 +++++- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 64a8601..d02a0d8 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ stunnel-4.33.tar.gz.asc /stunnel-4.52.tar.gz /stunnel-4.52.tar.gz.asc /stunnel-4.52.tar.gz.sha256 +/stunnel-4.53.tar.gz +/stunnel-4.53.tar.gz.asc +/stunnel-4.53.tar.gz.sha256 diff --git a/sources b/sources index bd05c99..e92b168 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -f5e713dda0e8efa659f372832ecd0c2c stunnel-4.52.tar.gz -3e84d222525e724788d3c2b29b899610 stunnel-4.52.tar.gz.asc -7780ed80ba6d6f16b806290747ff195a stunnel-4.52.tar.gz.sha256 +ab3bfc915357d67da18c73f73610d593 stunnel-4.53.tar.gz +ea8d7637e072fa1bb8706c85e6ea0152 stunnel-4.53.tar.gz.asc +cfd8076691a2fc20c604531e1791ea81 stunnel-4.53.tar.gz.sha256 diff --git a/stunnel-4-authpriv.patch b/stunnel-4-authpriv.patch index 6cbd478..2f679c3 100644 --- a/stunnel-4-authpriv.patch +++ b/stunnel-4-authpriv.patch @@ -1,6 +1,6 @@ -diff -urNp stunnel-4.52/doc/stunnel.8 stunnel-4.52-patched/doc/stunnel.8 ---- stunnel-4.52/doc/stunnel.8 2012-01-09 18:09:55.000000000 -0500 -+++ stunnel-4.52-patched/doc/stunnel.8 2012-03-05 18:29:08.910298860 -0500 +diff -urNp stunnel-4.53-patched/doc/stunnel.8 stunnel-4.53-current/doc/stunnel.8 +--- stunnel-4.53-patched/doc/stunnel.8 2012-05-14 14:12:33.009094961 -0400 ++++ stunnel-4.53-current/doc/stunnel.8 2012-05-14 14:14:00.417045185 -0400 @@ -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 \&\fIdebug = 7\fR for greatest debugging output. The default is notice (5). @@ -10,9 +10,9 @@ diff -urNp stunnel-4.52/doc/stunnel.8 stunnel-4.52-patched/doc/stunnel.8 (Facilities are not supported on Win32.) .Sp Case is ignored for both facilities and levels. -diff -urNp stunnel-4.52/doc/stunnel.html stunnel-4.52-patched/doc/stunnel.html ---- stunnel-4.52/doc/stunnel.html 2012-01-09 18:09:56.000000000 -0500 -+++ stunnel-4.52-patched/doc/stunnel.html 2012-03-05 18:29:50.890228103 -0500 +diff -urNp stunnel-4.53-patched/doc/stunnel.html stunnel-4.53-current/doc/stunnel.html +--- stunnel-4.53-patched/doc/stunnel.html 2012-05-14 14:12:33.010094960 -0400 ++++ stunnel-4.53-current/doc/stunnel.html 2012-05-14 14:14:00.417045185 -0400 @@ -212,7 +212,7 @@ emerg (0), alert (1), crit (2), err (3), info (6), or debug (7). All logs for the specified level and all levels numerically less than it will be shown. Use debug = debug or @@ -22,9 +22,9 @@ diff -urNp stunnel-4.52/doc/stunnel.html stunnel-4.52-patched/doc/stunnel.html (Facilities are not supported on Win32.)

Case is ignored for both facilities and levels.

-diff -urNp stunnel-4.52/doc/stunnel.pod stunnel-4.52-patched/doc/stunnel.pod ---- stunnel-4.52/doc/stunnel.pod 2012-01-09 18:09:38.000000000 -0500 -+++ stunnel-4.52-patched/doc/stunnel.pod 2012-03-05 18:30:27.118167249 -0500 +diff -urNp stunnel-4.53-patched/doc/stunnel.pod stunnel-4.53-current/doc/stunnel.pod +--- stunnel-4.53-patched/doc/stunnel.pod 2012-05-14 14:12:33.009094961 -0400 ++++ stunnel-4.53-current/doc/stunnel.pod 2012-05-14 14:14:00.427045191 -0400 @@ -152,7 +152,7 @@ info (6), or debug (7). All logs for th all levels numerically less than it will be shown. Use I or I for greatest debugging output. The default is notice (5). @@ -34,10 +34,10 @@ diff -urNp stunnel-4.52/doc/stunnel.pod stunnel-4.52-patched/doc/stunnel.pod (Facilities are not supported on Win32.) Case is ignored for both facilities and levels. -diff -urNp stunnel-4.52/src/options.c stunnel-4.52-patched/src/options.c ---- stunnel-4.52/src/options.c 2012-01-01 16:41:58.000000000 -0500 -+++ stunnel-4.52-patched/src/options.c 2012-03-05 18:33:23.820872899 -0500 -@@ -175,8 +175,12 @@ static char *parse_global_option(CMD cmd +diff -urNp stunnel-4.53-patched/src/options.c stunnel-4.53-current/src/options.c +--- stunnel-4.53-patched/src/options.c 2012-05-14 14:12:33.012094958 -0400 ++++ stunnel-4.53-current/src/options.c 2012-05-14 14:14:00.427045191 -0400 +@@ -179,8 +179,12 @@ static char *parse_global_option(CMD cmd case CMD_INIT: new_global_options.debug_level=LOG_NOTICE; #if !defined (USE_WIN32) && !defined (__vms) diff --git a/stunnel-4-sample.patch b/stunnel-4-sample.patch index 2d3fff9..4add9c6 100644 --- a/stunnel-4-sample.patch +++ b/stunnel-4-sample.patch @@ -1,6 +1,6 @@ -diff -urNp stunnel-4.52/tools/stunnel.conf-sample.in stunnel-4.52-patched/tools/stunnel.conf-sample.in ---- stunnel-4.52/tools/stunnel.conf-sample.in 2012-01-01 16:46:46.000000000 -0500 -+++ stunnel-4.52-patched/tools/stunnel.conf-sample.in 2012-03-05 18:36:03.793609849 -0500 +diff -urNp stunnel-4.53-patched/tools/stunnel.conf-sample.in stunnel-4.53-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.53-current/tools/stunnel.conf-sample.in 2012-05-14 14:16:53.065953605 -0400 @@ -9,7 +9,7 @@ ; A copy of some devices and system files is needed within the chroot jail diff --git a/stunnel.spec b/stunnel.spec index 195eab0..f46063c 100644 --- a/stunnel.spec +++ b/stunnel.spec @@ -1,6 +1,6 @@ Summary: An SSL-encrypting socket wrapper Name: stunnel -Version: 4.52 +Version: 4.53 Release: 1%{?dist} License: GPLv2 Group: Applications/Internet @@ -79,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_sysconfdir}/stunnel/* %changelog +* Mon May 14 2012 Avesh Agarwal - 4.53-1 +- New upstream realease 4.53 +- Updated local patches + * Tue Mar 6 2012 Avesh Agarwal - 4.52-1 - New upstream realease 4.52 - Updated local patches