From 2ede5998727ba1bcf7618933d12d560a40a1db2b Mon Sep 17 00:00:00 2001
From: avesh agarwal <avesh@fedoraproject.org>
Date: Wed, 7 Apr 2010 16:25:50 +0000
Subject: [PATCH] - New upstream realease 4.33 - Updated authpriv and sample
 patches to match the new release - Addresses bz 580117 (inted mode support
 issue)

---
 .cvsignore                                    |  4 ++--
 sources                                       |  4 ++--
 ...hpriv.patch => stunnel-4.33-authpriv.patch | 24 +++++++++----------
 ...-sample.patch => stunnel-4.33-sample.patch |  6 ++---
 stunnel.spec                                  | 11 ++++++---
 5 files changed, 27 insertions(+), 22 deletions(-)
 rename stunnel-4.32-authpriv.patch => stunnel-4.33-authpriv.patch (69%)
 rename stunnel-4.32-sample.patch => stunnel-4.33-sample.patch (81%)

diff --git a/.cvsignore b/.cvsignore
index 2c54c38..1ade0bf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-stunnel-4.32.tar.gz
-stunnel-4.32.tar.gz.asc
+stunnel-4.33.tar.gz
+stunnel-4.33.tar.gz.asc
diff --git a/sources b/sources
index 8c09856..404846e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-72379c615c5a4986c7981d0941ed2e6b  stunnel-4.32.tar.gz
-093bc62b5b1aed74dd8a88ff6033cb72  stunnel-4.32.tar.gz.asc
+559a864066d8cc4afd8a97682c90d41c  stunnel-4.33.tar.gz
+254638b0a97b4086915a92d5faa77b1a  stunnel-4.33.tar.gz.asc
diff --git a/stunnel-4.32-authpriv.patch b/stunnel-4.33-authpriv.patch
similarity index 69%
rename from stunnel-4.32-authpriv.patch
rename to stunnel-4.33-authpriv.patch
index 9791fe3..ce9f8ce 100644
--- a/stunnel-4.32-authpriv.patch
+++ b/stunnel-4.33-authpriv.patch
@@ -1,6 +1,6 @@
-diff -urNp stunnel-4.32/doc/stunnel.8 stunnel-4.32-modified/doc/stunnel.8
---- stunnel-4.32/doc/stunnel.8	2010-03-23 11:11:56.000000000 -0400
-+++ stunnel-4.32-modified/doc/stunnel.8	2010-03-29 15:07:16.000000000 -0400
+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
 @@ -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.32/doc/stunnel.8 stunnel-4.32-modified/doc/stunnel.8
  (Facilities are not supported on Win32.)
  .Sp
  Case is ignored for both facilities and levels.
-diff -urNp stunnel-4.32/doc/stunnel.html stunnel-4.32-modified/doc/stunnel.html
---- stunnel-4.32/doc/stunnel.html	2010-03-23 11:11:57.000000000 -0400
-+++ stunnel-4.32-modified/doc/stunnel.html	2010-03-29 15:07:38.000000000 -0400
+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
 @@ -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.32/doc/stunnel.html stunnel-4.32-modified/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.32/doc/stunnel.pod stunnel-4.32-modified/doc/stunnel.pod
---- stunnel-4.32/doc/stunnel.pod	2010-03-23 11:11:27.000000000 -0400
-+++ stunnel-4.32-modified/doc/stunnel.pod	2010-03-29 15:07:59.000000000 -0400
+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
 @@ -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,9 +34,9 @@ diff -urNp stunnel-4.32/doc/stunnel.pod stunnel-4.32-modified/doc/stunnel.pod
  (Facilities are not supported on Win32.)
  
  Case is ignored for both facilities and levels.
-diff -urNp stunnel-4.32/src/options.c stunnel-4.32-modified/src/options.c
---- stunnel-4.32/src/options.c	2010-03-23 10:58:34.000000000 -0400
-+++ stunnel-4.32-modified/src/options.c	2010-03-29 15:08:50.000000000 -0400
+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
      case CMD_INIT:
          new_global_options.debug_level=LOG_NOTICE;
diff --git a/stunnel-4.32-sample.patch b/stunnel-4.33-sample.patch
similarity index 81%
rename from stunnel-4.32-sample.patch
rename to stunnel-4.33-sample.patch
index 29d6464..361ea12 100644
--- a/stunnel-4.32-sample.patch
+++ b/stunnel-4.33-sample.patch
@@ -1,6 +1,6 @@
-diff -urNp stunnel-4.32/tools/stunnel.conf-sample.in stunnel-4.32-modified/tools/stunnel.conf-sample.in
---- stunnel-4.32/tools/stunnel.conf-sample.in	2010-01-18 08:17:49.000000000 -0500
-+++ stunnel-4.32-modified/tools/stunnel.conf-sample.in	2010-03-29 15:09:33.000000000 -0400
+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
 @@ -4,15 +4,15 @@
  ; please read the manual and make sure you understand them
  
diff --git a/stunnel.spec b/stunnel.spec
index e0e6348..48c58ac 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,6 +1,6 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.32
+Version: 4.33
 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.32-authpriv.patch
-Patch1: stunnel-4.32-sample.patch
+Patch0: stunnel-4.33-authpriv.patch
+Patch1: stunnel-4.33-sample.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
@@ -79,6 +79,11 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* 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
+- Addresses bz 580117 (inted mode support issue)
+
 * Mon Mar 29 2010 Avesh Agarwal <avagarwa@redhat.com> - 4.32-1
 - New upstream realease 4.32
 - Updated authpriv and sample patches to match the new release