From 85235ef5a3a08ae9dae544cd20456dd6d38b3dd3 Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Mon, 30 Mar 2015 16:14:49 -0400
Subject: [PATCH] New upstream release 5.14.

---
 .gitignore               |  3 +++
 sources                  |  6 +++---
 stunnel-5-authpriv.patch | 26 +++++++++++++-------------
 stunnel.spec             |  5 ++++-
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 833060a..a3bf661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,6 @@ stunnel-4.33.tar.gz.asc
 /stunnel-5.13.tar.gz
 /stunnel-5.13.tar.gz.asc
 /stunnel-5.13.tar.gz.sha256
+/stunnel-5.14.tar.gz
+/stunnel-5.14.tar.gz.asc
+/stunnel-5.14.tar.gz.sha256
diff --git a/sources b/sources
index 655725d..0474f49 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-1cd9997d6de9e8c82ac561039a33c329  stunnel-5.13.tar.gz
-3550cb68b05c1e9f6b6794c68d96d039  stunnel-5.13.tar.gz.asc
-ad6ffddafdc1e894513bd1da8740f913  stunnel-5.13.tar.gz.sha256
+e716501960dc6856d80f92547298f724  stunnel-5.14.tar.gz
+f3c19c87bf3492f8c977274ea2c9e82c  stunnel-5.14.tar.gz.asc
+98678f1da85ce435f4c6d0ad7c87ed6c  stunnel-5.14.tar.gz.sha256
diff --git a/stunnel-5-authpriv.patch b/stunnel-5-authpriv.patch
index aaabd38..ea87ec6 100644
--- a/stunnel-5-authpriv.patch
+++ b/stunnel-5-authpriv.patch
@@ -1,6 +1,6 @@
-diff -urNp stunnel-5.12/doc/stunnel.8 stunnel-5.12-patched/doc/stunnel.8
---- stunnel-5.12/doc/stunnel.8	2015-03-30 15:38:22.517507692 -0400
-+++ stunnel-5.12-patched/doc/stunnel.8	2015-03-30 15:29:30.440215517 -0400
+diff -urNp stunnel-5.14/doc/stunnel.8 stunnel-5.14-patched/doc/stunnel.8
+--- stunnel-5.14/doc/stunnel.8	2015-03-30 16:12:13.829931929 -0400
++++ stunnel-5.14-patched/doc/stunnel.8	2015-03-30 16:11:15.569663528 -0400
 @@ -202,7 +202,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-5.12/doc/stunnel.8 stunnel-5.12-patched/doc/stunnel.8
  (Facilities are not supported on Win32.)
  .Sp
  Case is ignored for both facilities and levels.
-diff -urNp stunnel-5.12/doc/stunnel.html stunnel-5.12-patched/doc/stunnel.html
---- stunnel-5.12/doc/stunnel.html	2015-03-30 15:38:22.517507692 -0400
-+++ stunnel-5.12-patched/doc/stunnel.html	2015-03-30 15:29:30.440215517 -0400
+diff -urNp stunnel-5.14/doc/stunnel.html stunnel-5.14-patched/doc/stunnel.html
+--- stunnel-5.14/doc/stunnel.html	2015-03-30 16:12:13.829931929 -0400
++++ stunnel-5.14-patched/doc/stunnel.html	2015-03-30 16:11:15.569663528 -0400
 @@ -202,7 +202,7 @@
  
  <p>Level is a one of the syslog level names or numbers emerg (0), alert (1), crit (2), err (3), warning (4), notice (5), info (6), or debug (7). All logs for the specified level and all levels numerically less than it will be shown. Use <i>debug = debug</i> or <i>debug = 7</i> for greatest debugging output. The default is notice (5).</p>
@@ -22,9 +22,9 @@ diff -urNp stunnel-5.12/doc/stunnel.html stunnel-5.12-patched/doc/stunnel.html
  
  <p>Case is ignored for both facilities and levels.</p>
  
-diff -urNp stunnel-5.12/doc/stunnel.pod stunnel-5.12-patched/doc/stunnel.pod
---- stunnel-5.12/doc/stunnel.pod	2015-03-30 15:38:22.517507692 -0400
-+++ stunnel-5.12-patched/doc/stunnel.pod	2015-03-30 15:29:30.440215517 -0400
+diff -urNp stunnel-5.14/doc/stunnel.pod stunnel-5.14-patched/doc/stunnel.pod
+--- stunnel-5.14/doc/stunnel.pod	2015-03-30 16:12:13.830931916 -0400
++++ stunnel-5.14-patched/doc/stunnel.pod	2015-03-30 16:11:15.570663516 -0400
 @@ -188,7 +188,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-5.12/doc/stunnel.pod stunnel-5.12-patched/doc/stunnel.pod
  (Facilities are not supported on Win32.)
  
  Case is ignored for both facilities and levels.
-diff -urNp stunnel-5.12/src/options.c stunnel-5.12-patched/src/options.c
---- stunnel-5.12/src/options.c	2015-03-19 05:51:04.000000000 -0400
-+++ stunnel-5.12-patched/src/options.c	2015-03-30 15:35:45.269490096 -0400
-@@ -468,8 +468,12 @@ NOEXPORT char *parse_global_option(CMD c
+diff -urNp stunnel-5.14/src/options.c stunnel-5.14-patched/src/options.c
+--- stunnel-5.14/src/options.c	2015-03-25 09:10:58.000000000 -0400
++++ stunnel-5.14-patched/src/options.c	2015-03-30 16:10:35.862162153 -0400
+@@ -470,8 +470,12 @@ NOEXPORT char *parse_global_option(CMD c
      case CMD_BEGIN:
          new_service_options.log_level=LOG_NOTICE;
  #if !defined (USE_WIN32) && !defined (__vms)
diff --git a/stunnel.spec b/stunnel.spec
index 415a3a0..a4e9ee3 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,6 +1,6 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 5.13
+Version: 5.14
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -113,6 +113,9 @@ cp $RPM_BUILD_ROOT%{_datadir}/doc/stunnel/examples/%{name}.service $RPM_BUILD_RO
 %endif
 
 %changelog
+* Mon Mar 30 2015 Avesh Agarwal <avagarwa@redhat.com> - 5.14-1
+- New upstream release 5.14.
+
 * Sun Mar 29 2015 Avesh Agarwal <avagarwa@redhat.com> - 5.13-1
 - New upstream release 5.13.