From 79d4b425fc35c15a421caaf2d5b0a51b639d87b6 Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Mon, 5 Mar 2012 19:03:54 -0500
Subject: [PATCH] New upstream realease 4.52

- Updated local patches
---
 .gitignore               |  3 +++
 sources                  |  6 +++---
 stunnel-4-authpriv.patch | 32 ++++++++++++++++----------------
 stunnel-4-sample.patch   |  6 +++---
 stunnel.spec             |  8 ++++++--
 5 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7e1845..64a8601 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ stunnel-4.33.tar.gz.asc
 /stunnel-4.50.tar.gz
 /stunnel-4.50.tar.gz.asc
 /stunnel-4.50.tar.gz.sha256
+/stunnel-4.52.tar.gz
+/stunnel-4.52.tar.gz.asc
+/stunnel-4.52.tar.gz.sha256
diff --git a/sources b/sources
index a4ec4e0..bd05c99 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-d68b4565294496a8bdf23c728a679f53  stunnel-4.50.tar.gz
-ea9e85daef0cc96ce21649901b3514f7  stunnel-4.50.tar.gz.asc
-0b901f3d914ba59f76333e70a282a993  stunnel-4.50.tar.gz.sha256
+f5e713dda0e8efa659f372832ecd0c2c  stunnel-4.52.tar.gz
+3e84d222525e724788d3c2b29b899610  stunnel-4.52.tar.gz.asc
+7780ed80ba6d6f16b806290747ff195a  stunnel-4.52.tar.gz.sha256
diff --git a/stunnel-4-authpriv.patch b/stunnel-4-authpriv.patch
index 2070b90..6cbd478 100644
--- a/stunnel-4-authpriv.patch
+++ b/stunnel-4-authpriv.patch
@@ -1,7 +1,7 @@
-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
+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
+@@ -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).
  .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.)
  .Sp
  Case is ignored for both facilities and levels.
-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),
+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
+@@ -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 <em>debug = debug</em> or
  <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>
  <p>Case is ignored for both facilities and levels.</p>
  </dd>
-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
+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
+@@ -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
  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.)
  
  Case is ignored for both facilities and levels.
-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
+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
      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 aabc7cb..2d3fff9 100644
--- a/stunnel-4-sample.patch
+++ b/stunnel-4-sample.patch
@@ -1,6 +1,6 @@
-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
+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
 @@ -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 044e6e1..195eab0 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.50
-Release: 2%{?dist}
+Version: 4.52
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -79,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild