[stunnel/f17] New upstream realease 4.55

Tue Mar 19 17:32:43 UTC 2013

commit a9fe4fbefc5cdfd51198697191e1aecf485f4278
Author: Avesh Agarwal <avagarwa at redhat.com>
Date:   Tue Mar 19 13:32:33 2013 -0400

    New upstream realease 4.55
    
    - Updated local patches
    - Fixed for pod2man as it build-requires perl-podlators
    - 884183: support for full relro.

 .gitignore               |    3 +++
 sources                  |    6 +++---
 stunnel-4-authpriv.patch |   34 +++++++++++++++++-----------------
 stunnel-4-sample.patch   |    6 +++---
 stunnel.spec             |   14 ++++++++++++--
 5 files changed, 38 insertions(+), 25 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 64a8601..e684af9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,6 @@ stunnel-4.33.tar.gz.asc
 /stunnel-4.52.tar.gz
 /stunnel-4.52.tar.gz.asc
 /stunnel-4.52.tar.gz.sha256
+/stunnel-4.55.tar.gz
+/stunnel-4.55.tar.gz.asc
+/stunnel-4.55.tar.gz.sha256
diff --git a/sources b/sources
index bd05c99..6da63ef 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-f5e713dda0e8efa659f372832ecd0c2c  stunnel-4.52.tar.gz
-3e84d222525e724788d3c2b29b899610  stunnel-4.52.tar.gz.asc
-7780ed80ba6d6f16b806290747ff195a  stunnel-4.52.tar.gz.sha256
+ebe6670368d30c6a01ca33b9c50cb239  stunnel-4.55.tar.gz
+923c640f882f4acfb13d4f4dc34b8498  stunnel-4.55.tar.gz.asc
+cb76d927b65fc7293ea53dd4aeea943f  stunnel-4.55.tar.gz.sha256
diff --git a/stunnel-4-authpriv.patch b/stunnel-4-authpriv.patch
index 6cbd478..ddcdf10 100644
--- a/stunnel-4-authpriv.patch
+++ b/stunnel-4-authpriv.patch
@@ -1,7 +1,7 @@
-diff -urNp stunnel-4.52/doc/stunnel.8 stunnel-4.52-patched/doc/stunnel.8
---- stunnel-4.52/doc/stunnel.8	2012-01-09 18:09:55.000000000 -0500
-+++ stunnel-4.52-patched/doc/stunnel.8	2012-03-05 18:29:08.910298860 -0500
-@@ -178,7 +178,7 @@ info (6), or debug (7).  All logs for th
+diff -urNp stunnel-4.55-patched/doc/stunnel.8 stunnel-4.55-current/doc/stunnel.8
+--- stunnel-4.55-patched/doc/stunnel.8	2013-03-04 17:18:14.910896621 -0500
++++ stunnel-4.55-current/doc/stunnel.8	2013-03-04 17:18:40.732911974 -0500
+@@ -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.52/doc/stunnel.8 stunnel-4.52-patched/doc/stunnel.8
  (Facilities are not supported on Win32.)
  .Sp
  Case is ignored for both facilities and levels.
-diff -urNp stunnel-4.52/doc/stunnel.html stunnel-4.52-patched/doc/stunnel.html
---- stunnel-4.52/doc/stunnel.html	2012-01-09 18:09:56.000000000 -0500
-+++ stunnel-4.52-patched/doc/stunnel.html	2012-03-05 18:29:50.890228103 -0500
-@@ -212,7 +212,7 @@ emerg (0), alert (1), crit (2), err (3),
+diff -urNp stunnel-4.55-patched/doc/stunnel.html stunnel-4.55-current/doc/stunnel.html
+--- stunnel-4.55-patched/doc/stunnel.html	2013-03-04 17:18:14.910896621 -0500
++++ stunnel-4.55-current/doc/stunnel.html	2013-03-04 17:18:40.733912012 -0500
+@@ -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.52/doc/stunnel.html stunnel-4.52-patched/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.52/doc/stunnel.pod stunnel-4.52-patched/doc/stunnel.pod
---- stunnel-4.52/doc/stunnel.pod	2012-01-09 18:09:38.000000000 -0500
-+++ stunnel-4.52-patched/doc/stunnel.pod	2012-03-05 18:30:27.118167249 -0500
-@@ -152,7 +152,7 @@ info (6), or debug (7).  All logs for th
+diff -urNp stunnel-4.55-patched/doc/stunnel.pod stunnel-4.55-current/doc/stunnel.pod
+--- stunnel-4.55-patched/doc/stunnel.pod	2013-03-04 17:18:14.910896621 -0500
++++ stunnel-4.55-current/doc/stunnel.pod	2013-03-04 17:18:40.733912012 -0500
+@@ -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.52/doc/stunnel.pod stunnel-4.52-patched/doc/stunnel.pod
  (Facilities are not supported on Win32.)
  
  Case is ignored for both facilities and levels.
-diff -urNp stunnel-4.52/src/options.c stunnel-4.52-patched/src/options.c
---- stunnel-4.52/src/options.c	2012-01-01 16:41:58.000000000 -0500
-+++ stunnel-4.52-patched/src/options.c	2012-03-05 18:33:23.820872899 -0500
-@@ -175,8 +175,12 @@ static char *parse_global_option(CMD cmd
-     case CMD_INIT:
+diff -urNp stunnel-4.55-patched/src/options.c stunnel-4.55-current/src/options.c
+--- stunnel-4.55-patched/src/options.c	2013-03-04 17:18:14.910896621 -0500
++++ stunnel-4.55-current/src/options.c	2013-03-04 17:18:40.733912012 -0500
+@@ -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 2d3fff9..657b728 100644
--- a/stunnel-4-sample.patch
+++ b/stunnel-4-sample.patch
@@ -1,6 +1,6 @@
-diff -urNp stunnel-4.52/tools/stunnel.conf-sample.in stunnel-4.52-patched/tools/stunnel.conf-sample.in
---- stunnel-4.52/tools/stunnel.conf-sample.in	2012-01-01 16:46:46.000000000 -0500
-+++ stunnel-4.52-patched/tools/stunnel.conf-sample.in	2012-03-05 18:36:03.793609849 -0500
+diff -urNp stunnel-4.55-patched/tools/stunnel.conf-sample.in stunnel-4.55-current/tools/stunnel.conf-sample.in
+--- stunnel-4.55-patched/tools/stunnel.conf-sample.in	2013-03-04 17:18:14.912896649 -0500
++++ stunnel-4.55-current/tools/stunnel.conf-sample.in	2013-03-04 17:20:35.724985350 -0500
 @@ -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 195eab0..3a15bbf 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,6 +1,6 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
-Version: 4.52
+Version: 4.55
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -17,6 +17,10 @@ Patch1: stunnel-4-sample.patch
 Buildroot: %{_tmppath}/stunnel-root
 # util-linux is needed for rename
 BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
+# for /usr/bin/pod2man
+%if 0%{?fedora} > 18
+BuildRequires: perl-podlators
+%endif
 
 %description
 Stunnel is a socket wrapper which can provide SSL (Secure Sockets
@@ -39,7 +43,7 @@ if pkg-config openssl ; then
 fi
 %configure --disable-fips --enable-ipv6 \
 	CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'"
-make LDADD="-pie -Wl,-z,defs,-z,relro"
+make LDADD="-pie -Wl,-z,defs,-z,relro,-z,now"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -79,6 +83,12 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Tue Mar 19 2013 Avesh Agarwal <avagarwa at redhat.com> - 4.55-1
+- New upstream realease 4.55
+- Updated local patches
+- Fixed for pod2man as it build-requires perl-podlators
+- 884183: support for full relro.
+
 * Tue Mar 6 2012 Avesh Agarwal <avagarwa at redhat.com> - 4.52-1
 - New upstream realease 4.52
 - Updated local patches
