From e97a2aa68516a6460bbb9907c60f6c66781f6cb1 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Tue, 3 Jan 2012 10:52:20 -0500 Subject: [PATCH] New upstream realease 4.50 Updated local patches --- .gitignore | 3 +++ sources | 6 +++--- stunnel-4-authpriv.patch | 32 ++++++++++++++++---------------- stunnel-4-sample.patch | 14 +++++++------- stunnel.spec | 6 +++++- 5 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index c3941d1..d7e1845 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ stunnel-4.33.tar.gz.asc /stunnel-4.44.tar.gz /stunnel-4.44.tar.gz.asc /stunnel-4.44.tar.gz.sha256 +/stunnel-4.50.tar.gz +/stunnel-4.50.tar.gz.asc +/stunnel-4.50.tar.gz.sha256 diff --git a/sources b/sources index 1e148c3..a4ec4e0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -c9dd51fc02b913ce5bf7b3fc12f9cb4a stunnel-4.44.tar.gz -e86fc2578e5304ae5a7b586ce170f843 stunnel-4.44.tar.gz.asc -66997c52850f47f0f2bc8a40a228799b stunnel-4.44.tar.gz.sha256 +d68b4565294496a8bdf23c728a679f53 stunnel-4.50.tar.gz +ea9e85daef0cc96ce21649901b3514f7 stunnel-4.50.tar.gz.asc +0b901f3d914ba59f76333e70a282a993 stunnel-4.50.tar.gz.sha256 diff --git a/stunnel-4-authpriv.patch b/stunnel-4-authpriv.patch index ef1aad0..2070b90 100644 --- a/stunnel-4-authpriv.patch +++ b/stunnel-4-authpriv.patch @@ -1,7 +1,7 @@ -diff -urNp stunnel-4.44/doc/stunnel.8 stunnel-4.44-patched/doc/stunnel.8 ---- stunnel-4.44/doc/stunnel.8 2011-09-07 16:21:06.000000000 -0400 -+++ stunnel-4.44-patched/doc/stunnel.8 2011-09-20 16:36:06.839020567 -0400 -@@ -168,7 +168,7 @@ info (6), or debug (7). All logs for th +diff -urNp stunnel-4.50/doc/stunnel.8 stunnel-4.50-patched/doc/stunnel.8 +--- stunnel-4.50/doc/stunnel.8 2011-11-28 16:04:45.000000000 -0500 ++++ stunnel-4.50-patched/doc/stunnel.8 2012-01-03 10:41:22.532321571 -0500 +@@ -176,7 +176,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). .Sp @@ -10,10 +10,10 @@ diff -urNp stunnel-4.44/doc/stunnel.8 stunnel-4.44-patched/doc/stunnel.8 (Facilities are not supported on Win32.) .Sp Case is ignored for both facilities and levels. -diff -urNp stunnel-4.44/doc/stunnel.html stunnel-4.44-patched/doc/stunnel.html ---- stunnel-4.44/doc/stunnel.html 2011-09-07 16:21:07.000000000 -0400 -+++ stunnel-4.44-patched/doc/stunnel.html 2011-09-20 16:36:06.840020566 -0400 -@@ -196,7 +196,7 @@ emerg (0), alert (1), crit (2), err (3), +diff -urNp stunnel-4.50/doc/stunnel.html stunnel-4.50-patched/doc/stunnel.html +--- stunnel-4.50/doc/stunnel.html 2011-11-28 16:04:47.000000000 -0500 ++++ stunnel-4.50-patched/doc/stunnel.html 2012-01-03 10:41:22.532321571 -0500 +@@ -211,7 +211,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 debug = 7 for greatest debugging output. The default is notice (5).

@@ -22,10 +22,10 @@ diff -urNp stunnel-4.44/doc/stunnel.html stunnel-4.44-patched/doc/stunnel.html (Facilities are not supported on Win32.)

Case is ignored for both facilities and levels.

-diff -urNp stunnel-4.44/doc/stunnel.pod stunnel-4.44-patched/doc/stunnel.pod ---- stunnel-4.44/doc/stunnel.pod 2011-09-07 16:19:39.000000000 -0400 -+++ stunnel-4.44-patched/doc/stunnel.pod 2011-09-20 16:36:06.845020561 -0400 -@@ -136,7 +136,7 @@ info (6), or debug (7). All logs for th +diff -urNp stunnel-4.50/doc/stunnel.pod stunnel-4.50-patched/doc/stunnel.pod +--- stunnel-4.50/doc/stunnel.pod 2011-11-28 16:04:26.000000000 -0500 ++++ stunnel-4.50-patched/doc/stunnel.pod 2012-01-03 10:41:22.533321572 -0500 +@@ -150,7 +150,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.44/doc/stunnel.pod stunnel-4.44-patched/doc/stunnel.pod (Facilities are not supported on Win32.) Case is ignored for both facilities and levels. -diff -urNp stunnel-4.44/src/options.c stunnel-4.44-patched/src/options.c ---- stunnel-4.44/src/options.c 2011-09-10 12:44:16.000000000 -0400 -+++ stunnel-4.44-patched/src/options.c 2011-09-20 16:36:06.846020561 -0400 -@@ -142,8 +142,12 @@ static char *parse_global_option(CMD cmd +diff -urNp stunnel-4.50/src/options.c stunnel-4.50-patched/src/options.c +--- stunnel-4.50/src/options.c 2011-11-24 05:54:49.000000000 -0500 ++++ stunnel-4.50-patched/src/options.c 2012-01-03 10:41:22.535321572 -0500 +@@ -157,8 +157,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 77260db..aabc7cb 100644 --- a/stunnel-4-sample.patch +++ b/stunnel-4-sample.patch @@ -1,7 +1,7 @@ -diff -urNp stunnel-4.44/tools/stunnel.conf-sample.in stunnel-4.44-patched/tools/stunnel.conf-sample.in ---- stunnel-4.44/tools/stunnel.conf-sample.in 2011-07-24 01:51:56.000000000 -0400 -+++ stunnel-4.44-patched/tools/stunnel.conf-sample.in 2011-09-20 16:39:07.580888462 -0400 -@@ -8,7 +8,7 @@ +diff -urNp stunnel-4.50/tools/stunnel.conf-sample.in stunnel-4.50-patched/tools/stunnel.conf-sample.in +--- stunnel-4.50/tools/stunnel.conf-sample.in 2011-11-22 17:20:37.000000000 -0500 ++++ stunnel-4.50-patched/tools/stunnel.conf-sample.in 2012-01-03 10:41:32.344325275 -0500 +@@ -9,7 +9,7 @@ ; A copy of some devices and system files is needed within the chroot jail ; Chroot conflicts with configuration file reload and many other features @@ -10,8 +10,8 @@ diff -urNp stunnel-4.44/tools/stunnel.conf-sample.in stunnel-4.44-patched/tools/ ; Chroot jail can be escaped if setuid option is not used setuid = nobody setgid = @DEFAULT_GROUP@ -@@ -25,8 +25,8 @@ pid = /stunnel.pid - ; ***************************************************************************** +@@ -26,8 +26,8 @@ pid = /stunnel.pid + ; ************************************************************************** ; Certificate/key is needed in server mode and optional in client mode -cert = @prefix@/etc/stunnel/mail.pem @@ -21,7 +21,7 @@ diff -urNp stunnel-4.44/tools/stunnel.conf-sample.in stunnel-4.44-patched/tools/ ; Authentication stuff needs to be configured to prevent MITM attacks ; It is not enabled by default! -@@ -35,12 +35,13 @@ cert = @prefix@/etc/stunnel/mail.pem +@@ -36,12 +36,13 @@ cert = @prefix@/etc/stunnel/mail.pem ; CApath is located inside chroot jail ;CApath = /certs ; It's often easier to use CAfile diff --git a/stunnel.spec b/stunnel.spec index 33bef42..e74b5d9 100644 --- a/stunnel.spec +++ b/stunnel.spec @@ -1,6 +1,6 @@ Summary: An SSL-encrypting socket wrapper Name: stunnel -Version: 4.44 +Version: 4.50 Release: 1%{?dist} License: GPLv2 Group: Applications/Internet @@ -79,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_sysconfdir}/stunnel/* %changelog +* Tue Jan 3 2012 Avesh Agarwal - 4.50-1 +- New upstream realease 4.50 +- Updated local patches + * Tue Sep 20 2011 Avesh Agarwal - 4.44-1 - New upstream realease 4.44 - Updated local patches