From 58869064b5bc58458e83e7bb7997095a30a4e54d Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Mon, 4 Oct 2010 11:54:02 -0400
Subject: [PATCH] - New upstream realease 4.34 - Updated authpriv and sample
 patches to match the new release

---
 .gitignore                                    |  2 ++
 sources                                       |  4 +--
 ...authpriv.patch => stunnel-4-authpriv.patch | 26 +++++++++----------
 ....33-sample.patch => stunnel-4-sample.patch |  6 ++---
 stunnel.spec                                  | 10 ++++---
 5 files changed, 27 insertions(+), 21 deletions(-)
 rename stunnel-4.33-authpriv.patch => stunnel-4-authpriv.patch (68%)
 rename stunnel-4.33-sample.patch => stunnel-4-sample.patch (82%)

diff --git a/.gitignore b/.gitignore
index 1ade0bf..f08c07c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 stunnel-4.33.tar.gz
 stunnel-4.33.tar.gz.asc
+/stunnel-4.34.tar.gz
+/stunnel-4.34.tar.gz.asc
diff --git a/sources b/sources
index 404846e..5dc2b91 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-559a864066d8cc4afd8a97682c90d41c  stunnel-4.33.tar.gz
-254638b0a97b4086915a92d5faa77b1a  stunnel-4.33.tar.gz.asc
+bbd274e8364ea3ceca0ee5190e13edd1  stunnel-4.34.tar.gz
+4b6f7bf07e4574a974a9a46ab77b74cb  stunnel-4.34.tar.gz.asc
diff --git a/stunnel-4.33-authpriv.patch b/stunnel-4-authpriv.patch
similarity index 68%
rename from stunnel-4.33-authpriv.patch
rename to stunnel-4-authpriv.patch
index ce9f8ce..adaf657 100644
--- a/stunnel-4.33-authpriv.patch
+++ b/stunnel-4-authpriv.patch
@@ -1,6 +1,6 @@
-diff -urNp stunnel-4.33-orig/doc/stunnel.8 stunnel-4.33/doc/stunnel.8
---- stunnel-4.33-orig/doc/stunnel.8	2010-03-26 16:03:54.000000000 -0400
-+++ stunnel-4.33/doc/stunnel.8	2010-04-07 12:13:03.000000000 -0400
+diff -urNp stunnel-4.34-orig/doc/stunnel.8 stunnel-4.34/doc/stunnel.8
+--- stunnel-4.34-orig/doc/stunnel.8	2010-10-04 11:28:17.197406956 -0400
++++ stunnel-4.34/doc/stunnel.8	2010-10-04 11:29:54.500398560 -0400
 @@ -165,7 +165,7 @@ info (6), or debug (7).  All logs for th
  all levels numerically less than it will be shown.  Use \fBdebug = debug\fR or
  \&\fBdebug = 7\fR for greatest debugging output.  The default is notice (5).
@@ -10,9 +10,9 @@ diff -urNp stunnel-4.33-orig/doc/stunnel.8 stunnel-4.33/doc/stunnel.8
  (Facilities are not supported on Win32.)
  .Sp
  Case is ignored for both facilities and levels.
-diff -urNp stunnel-4.33-orig/doc/stunnel.html stunnel-4.33/doc/stunnel.html
---- stunnel-4.33-orig/doc/stunnel.html	2010-03-26 16:03:55.000000000 -0400
-+++ stunnel-4.33/doc/stunnel.html	2010-04-07 12:13:03.000000000 -0400
+diff -urNp stunnel-4.34-orig/doc/stunnel.html stunnel-4.34/doc/stunnel.html
+--- stunnel-4.34-orig/doc/stunnel.html	2010-10-04 11:28:17.198407489 -0400
++++ stunnel-4.34/doc/stunnel.html	2010-10-04 11:30:24.549148361 -0400
 @@ -190,7 +190,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 <strong>debug = debug</strong> or
@@ -22,9 +22,9 @@ diff -urNp stunnel-4.33-orig/doc/stunnel.html stunnel-4.33/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.33-orig/doc/stunnel.pod stunnel-4.33/doc/stunnel.pod
---- stunnel-4.33-orig/doc/stunnel.pod	2010-03-26 16:03:41.000000000 -0400
-+++ stunnel-4.33/doc/stunnel.pod	2010-04-07 12:13:03.000000000 -0400
+diff -urNp stunnel-4.34-orig/doc/stunnel.pod stunnel-4.34/doc/stunnel.pod
+--- stunnel-4.34-orig/doc/stunnel.pod	2010-10-04 11:28:17.197406956 -0400
++++ stunnel-4.34/doc/stunnel.pod	2010-10-04 11:31:02.659398482 -0400
 @@ -132,7 +132,7 @@ info (6), or debug (7).  All logs for th
  all levels numerically less than it will be shown.  Use B<debug = debug> or
  B<debug = 7> for greatest debugging output.  The default is notice (5).
@@ -34,10 +34,10 @@ diff -urNp stunnel-4.33-orig/doc/stunnel.pod stunnel-4.33/doc/stunnel.pod
  (Facilities are not supported on Win32.)
  
  Case is ignored for both facilities and levels.
-diff -urNp stunnel-4.33-orig/src/options.c stunnel-4.33/src/options.c
---- stunnel-4.33-orig/src/options.c	2010-04-05 14:44:43.000000000 -0400
-+++ stunnel-4.33/src/options.c	2010-04-07 12:13:03.000000000 -0400
-@@ -139,8 +139,12 @@ static char *parse_global_option(CMD cmd
+diff -urNp stunnel-4.34-orig/src/options.c stunnel-4.34/src/options.c
+--- stunnel-4.34-orig/src/options.c	2010-10-04 11:28:17.192398749 -0400
++++ stunnel-4.34/src/options.c	2010-10-04 11:35:34.047161189 -0400
+@@ -140,8 +140,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.33-sample.patch b/stunnel-4-sample.patch
similarity index 82%
rename from stunnel-4.33-sample.patch
rename to stunnel-4-sample.patch
index 361ea12..79c9bb7 100644
--- a/stunnel-4.33-sample.patch
+++ b/stunnel-4-sample.patch
@@ -1,6 +1,6 @@
-diff -urNp stunnel-4.33-orig/tools/stunnel.conf-sample.in stunnel-4.33/tools/stunnel.conf-sample.in
---- stunnel-4.33-orig/tools/stunnel.conf-sample.in	2010-01-18 08:17:49.000000000 -0500
-+++ stunnel-4.33/tools/stunnel.conf-sample.in	2010-04-07 12:13:11.000000000 -0400
+diff -urNp stunnel-4.34-orig/tools/stunnel.conf-sample.in stunnel-4.34/tools/stunnel.conf-sample.in
+--- stunnel-4.34-orig/tools/stunnel.conf-sample.in	2010-10-04 11:28:17.196407053 -0400
++++ stunnel-4.34/tools/stunnel.conf-sample.in	2010-10-04 11:38:18.545425374 -0400
 @@ -4,15 +4,15 @@
  ; please read the manual and make sure you understand them
  
diff --git a/stunnel.spec b/stunnel.spec
index 48c58ac..24eed13 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,6 +1,6 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.33
+Version: 4.34
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -12,8 +12,8 @@ Source3: sfinger.xinetd
 Source4: stunnel-sfinger.conf
 Source5: pop3-redirect.xinetd
 Source6: stunnel-pop3s-client.conf
-Patch0: stunnel-4.33-authpriv.patch
-Patch1: stunnel-4.33-sample.patch
+Patch0: stunnel-4-authpriv.patch
+Patch1: stunnel-4-sample.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -79,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Mon Oct 4 2010 Avesh Agarwal <avagarwa@redhat.com> - 4.34-1
+- New upstream realease 4.34
+- Updated authpriv and sample patches to match the new release
+
 * Wed Apr 7 2010 Avesh Agarwal <avagarwa@redhat.com> - 4.33-1
 - New upstream realease 4.33
 - Updated authpriv and sample patches to match the new release