From ef69c59e4d3e74d99a0f87f4d55e27be2df05353 Mon Sep 17 00:00:00 2001
From: avesh agarwal <avesh@fedoraproject.org>
Date: Tue, 16 Feb 2010 20:33:45 +0000
Subject: [PATCH] - New upstream realease 4.31 - Updated authpriv and sample
 patches to match the new release

---
 .cvsignore                                    |  2 ++
 sources                                       |  4 +--
 ...hpriv.patch => stunnel-4.31-authpriv.patch | 26 +++++++++----------
 ...-sample.patch => stunnel-4.31-sample.patch |  6 ++---
 stunnel.spec                                  | 10 ++++---
 5 files changed, 27 insertions(+), 21 deletions(-)
 rename stunnel-4.30-authpriv.patch => stunnel-4.31-authpriv.patch (66%)
 rename stunnel-4.30-sample.patch => stunnel-4.31-sample.patch (81%)

diff --git a/.cvsignore b/.cvsignore
index 33f3a8b..a4ed374 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,5 @@ stunnel-4.29.tar.gz
 stunnel-4.29.tar.gz.asc
 stunnel-4.30.tar.gz
 stunnel-4.30.tar.gz.asc
+stunnel-4.31.tar.gz
+stunnel-4.31.tar.gz.asc
diff --git a/sources b/sources
index 1af5905..884c96e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3b171b8d3ac24a45c06cd280fe649bce  stunnel-4.30.tar.gz
-c2a9f6ffdce5b64a1f1ae00c0fa21c73  stunnel-4.30.tar.gz.asc
+2fc31bc0c940fbe545a88d896b13cacf  stunnel-4.31.tar.gz
+5b15b676d724d2de1c96eb31d6058ef6  stunnel-4.31.tar.gz.asc
diff --git a/stunnel-4.30-authpriv.patch b/stunnel-4.31-authpriv.patch
similarity index 66%
rename from stunnel-4.30-authpriv.patch
rename to stunnel-4.31-authpriv.patch
index a7de51c..22d23d5 100644
--- a/stunnel-4.30-authpriv.patch
+++ b/stunnel-4.31-authpriv.patch
@@ -1,6 +1,6 @@
-diff -urNp stunnel-4.30-orig/doc/stunnel.8 stunnel-4.30/doc/stunnel.8
---- stunnel-4.30-orig/doc/stunnel.8	2010-01-21 06:26:39.000000000 -0500
-+++ stunnel-4.30/doc/stunnel.8	2010-01-26 14:43:46.000000000 -0500
+diff -urNp stunnel-4.31/doc/stunnel.8 stunnel-4.31-modified/doc/stunnel.8
+--- stunnel-4.31/doc/stunnel.8	2010-02-03 07:46:46.000000000 -0500
++++ stunnel-4.31-modified/doc/stunnel.8	2010-02-16 15:16:37.000000000 -0500
 @@ -169,7 +169,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.30-orig/doc/stunnel.8 stunnel-4.30/doc/stunnel.8
  (Facilities are not supported on Win32.)
  .Sp
  Case is ignored for both facilities and levels.
-diff -urNp stunnel-4.30-orig/doc/stunnel.html stunnel-4.30/doc/stunnel.html
---- stunnel-4.30-orig/doc/stunnel.html	2010-01-21 06:26:39.000000000 -0500
-+++ stunnel-4.30/doc/stunnel.html	2010-01-26 14:43:46.000000000 -0500
+diff -urNp stunnel-4.31/doc/stunnel.html stunnel-4.31-modified/doc/stunnel.html
+--- stunnel-4.31/doc/stunnel.html	2010-02-03 07:46:46.000000000 -0500
++++ stunnel-4.31-modified/doc/stunnel.html	2010-02-16 15:16:37.000000000 -0500
 @@ -193,7 +193,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,10 +22,10 @@ diff -urNp stunnel-4.30-orig/doc/stunnel.html stunnel-4.30/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.30-orig/doc/stunnel.pod stunnel-4.30/doc/stunnel.pod
---- stunnel-4.30-orig/doc/stunnel.pod	2010-01-21 06:26:37.000000000 -0500
-+++ stunnel-4.30/doc/stunnel.pod	2010-01-26 14:43:46.000000000 -0500
-@@ -144,7 +144,7 @@ info (6), or debug (7).  All logs for th
+diff -urNp stunnel-4.31/doc/stunnel.pod stunnel-4.31-modified/doc/stunnel.pod
+--- stunnel-4.31/doc/stunnel.pod	2010-02-03 07:46:41.000000000 -0500
++++ stunnel-4.31-modified/doc/stunnel.pod	2010-02-16 15:16:37.000000000 -0500
+@@ -136,7 +136,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.30-orig/doc/stunnel.pod stunnel-4.30/doc/stunnel.pod
  (Facilities are not supported on Win32.)
  
  Case is ignored for both facilities and levels.
-diff -urNp stunnel-4.30-orig/src/options.c stunnel-4.30/src/options.c
---- stunnel-4.30-orig/src/options.c	2010-01-21 05:52:43.000000000 -0500
-+++ stunnel-4.30/src/options.c	2010-01-26 14:49:32.000000000 -0500
+diff -urNp stunnel-4.31/src/options.c stunnel-4.31-modified/src/options.c
+--- stunnel-4.31/src/options.c	2010-01-29 05:43:23.000000000 -0500
++++ stunnel-4.31-modified/src/options.c	2010-02-16 15:16:37.000000000 -0500
 @@ -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.30-sample.patch b/stunnel-4.31-sample.patch
similarity index 81%
rename from stunnel-4.30-sample.patch
rename to stunnel-4.31-sample.patch
index 8e654bb..a378086 100644
--- a/stunnel-4.30-sample.patch
+++ b/stunnel-4.31-sample.patch
@@ -1,6 +1,6 @@
-diff -urNp stunnel-4.30-orig/tools/stunnel.conf-sample.in stunnel-4.30/tools/stunnel.conf-sample.in
---- stunnel-4.30-orig/tools/stunnel.conf-sample.in	2010-01-18 08:17:49.000000000 -0500
-+++ stunnel-4.30/tools/stunnel.conf-sample.in	2010-01-26 14:59:41.000000000 -0500
+diff -urNp stunnel-4.31/tools/stunnel.conf-sample.in stunnel-4.31-modified/tools/stunnel.conf-sample.in
+--- stunnel-4.31/tools/stunnel.conf-sample.in	2010-01-18 08:17:49.000000000 -0500
++++ stunnel-4.31-modified/tools/stunnel.conf-sample.in	2010-02-16 15:16:52.000000000 -0500
 @@ -4,15 +4,15 @@
  ; please read the manual and make sure you understand them
  
diff --git a/stunnel.spec b/stunnel.spec
index d84d038..0a03b2a 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,6 +1,6 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.30
+Version: 4.31
 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.30-authpriv.patch
-Patch1: stunnel-4.30-sample.patch
+Patch0: stunnel-4.31-authpriv.patch
+Patch1: stunnel-4.31-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
+* Tue Feb 16 2010 Avesh Agarwal <avagarwa@redhat.com> - 4.31-1
+- New upstream realease 4.31
+- Updated authpriv and sample patches to match the new release
+
 * Tue Jan 26 2010 Avesh Agarwal <avagarwa@redhat.com> - 4.30-1
 - New upstream realease 4.30
 - Updated authpriv and sample patches for the new release