From 487ae9248e14b969133bd0e7f2de5e1c4a799309 Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Tue, 16 Oct 2012 14:42:04 -0400
Subject: [PATCH] New upstream realease 4.54

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

diff --git a/.gitignore b/.gitignore
index d02a0d8..7fa0525 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@ stunnel-4.33.tar.gz.asc
 /stunnel-4.53.tar.gz
 /stunnel-4.53.tar.gz.asc
 /stunnel-4.53.tar.gz.sha256
+/stunnel-4.54.tar.gz
+/stunnel-4.54.tar.gz.asc
+/stunnel-4.54.tar.gz.sha256
diff --git a/sources b/sources
index e92b168..bfff896 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ab3bfc915357d67da18c73f73610d593  stunnel-4.53.tar.gz
-ea8d7637e072fa1bb8706c85e6ea0152  stunnel-4.53.tar.gz.asc
-cfd8076691a2fc20c604531e1791ea81  stunnel-4.53.tar.gz.sha256
+c2b1db99e3ed547214568959a8ed18ac  stunnel-4.54.tar.gz
+b7cd936bae7b56dae6fe1f06d90c4db1  stunnel-4.54.tar.gz.asc
+4da789296deb1544f48a3d3a11f0599f  stunnel-4.54.tar.gz.sha256
diff --git a/stunnel-4-authpriv.patch b/stunnel-4-authpriv.patch
index 2f679c3..142eb8a 100644
--- a/stunnel-4-authpriv.patch
+++ b/stunnel-4-authpriv.patch
@@ -1,7 +1,7 @@
-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
+diff -urNp stunnel-4.54-patched/doc/stunnel.8 stunnel-4.54-current/doc/stunnel.8
+--- stunnel-4.54-patched/doc/stunnel.8	2012-10-16 14:31:16.728962756 -0400
++++ stunnel-4.54-current/doc/stunnel.8	2012-10-16 14:32:10.604908059 -0400
+@@ -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
  \&\fIdebug = 7\fR for greatest debugging output.  The default is notice (5).
  .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.)
  .Sp
  Case is ignored for both facilities and levels.
-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),
+diff -urNp stunnel-4.54-patched/doc/stunnel.html stunnel-4.54-current/doc/stunnel.html
+--- stunnel-4.54-patched/doc/stunnel.html	2012-10-16 14:31:16.729962755 -0400
++++ stunnel-4.54-current/doc/stunnel.html	2012-10-16 14:32:10.606908057 -0400
+@@ -224,7 +224,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.53-patched/doc/stunnel.html stunnel-4.53-current/doc/stunne
  (Facilities are not supported on Win32.)</p>
  <p>Case is ignored for both facilities and levels.</p>
  </dd>
-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
+diff -urNp stunnel-4.54-patched/doc/stunnel.pod stunnel-4.54-current/doc/stunnel.pod
+--- stunnel-4.54-patched/doc/stunnel.pod	2012-10-16 14:31:16.728962756 -0400
++++ stunnel-4.54-current/doc/stunnel.pod	2012-10-16 14:32:10.610908053 -0400
+@@ -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
  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.)
  
  Case is ignored for both facilities and levels.
-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:
+diff -urNp stunnel-4.54-patched/src/options.c stunnel-4.54-current/src/options.c
+--- stunnel-4.54-patched/src/options.c	2012-10-16 14:31:16.733962751 -0400
++++ stunnel-4.54-current/src/options.c	2012-10-16 14:32:10.634908024 -0400
+@@ -185,8 +185,12 @@ static char *parse_global_option(CMD cmd
+     case CMD_BEGIN:
          new_global_options.debug_level=LOG_NOTICE;
  #if !defined (USE_WIN32) && !defined (__vms)
 +#if defined(LOG_AUTHPRIV)
diff --git a/stunnel-4-sample.patch b/stunnel-4-sample.patch
index 4add9c6..53b3f30 100644
--- a/stunnel-4-sample.patch
+++ b/stunnel-4-sample.patch
@@ -1,6 +1,6 @@
-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
+diff -urNp stunnel-4.54-patched/tools/stunnel.conf-sample.in stunnel-4.54-current/tools/stunnel.conf-sample.in
+--- stunnel-4.54-patched/tools/stunnel.conf-sample.in	2012-10-16 14:31:16.732962752 -0400
++++ stunnel-4.54-current/tools/stunnel.conf-sample.in	2012-10-16 14:33:50.162807909 -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 12c18fc..2034fcc 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.53
-Release: 2%{?dist}
+Version: 4.54
+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 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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild