[stunnel/f18] New upstream realease 4.56.
avesh
avesh at fedoraproject.org
Mon Aug 5 18:09:50 UTC 2013
commit 9f99a416a17610bbd176a09e7850d127fa973070
Author: Avesh Agarwal <avagarwa at redhat.com>
Date: Mon Aug 5 14:09:41 2013 -0400
New upstream realease 4.56.
- Updated local patches.
- Fixed upstream URL in spec file.
- Sourced URL of sha256 hash file in spec file.
.gitignore | 3 +++
sources | 6 +++---
stunnel-4-authpriv.patch | 24 ++++++++++++------------
stunnel-4-sample.patch | 6 +++---
stunnel.spec | 19 +++++++++++++------
5 files changed, 34 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 617001f..58f031b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ stunnel-4.33.tar.gz.asc
/stunnel-4.55.tar.gz
/stunnel-4.55.tar.gz.asc
/stunnel-4.55.tar.gz.sha256
+/stunnel-4.56.tar.gz
+/stunnel-4.56.tar.gz.asc
+/stunnel-4.56.tar.gz.sha256
diff --git a/sources b/sources
index 6da63ef..adfec02 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ebe6670368d30c6a01ca33b9c50cb239 stunnel-4.55.tar.gz
-923c640f882f4acfb13d4f4dc34b8498 stunnel-4.55.tar.gz.asc
-cb76d927b65fc7293ea53dd4aeea943f stunnel-4.55.tar.gz.sha256
+ac4c4a30bd7a55b6687cbd62d864054c stunnel-4.56.tar.gz
+d68c7dd65d515c678cdde15bbf0ce344 stunnel-4.56.tar.gz.asc
+edd00caa66ee2d158a727c60c8843028 stunnel-4.56.tar.gz.sha256
diff --git a/stunnel-4-authpriv.patch b/stunnel-4-authpriv.patch
index ddcdf10..5e0c443 100644
--- a/stunnel-4-authpriv.patch
+++ b/stunnel-4-authpriv.patch
@@ -1,6 +1,6 @@
-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
+diff -urNp stunnel-4.56-patched/doc/stunnel.8 stunnel-4.56-current/doc/stunnel.8
+--- stunnel-4.56-patched/doc/stunnel.8 2013-03-28 14:38:34.921698500 -0400
++++ stunnel-4.56-current/doc/stunnel.8 2013-03-28 14:39:09.676668676 -0400
@@ -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).
@@ -10,9 +10,9 @@ diff -urNp stunnel-4.55-patched/doc/stunnel.8 stunnel-4.55-current/doc/stunnel.8
(Facilities are not supported on Win32.)
.Sp
Case is ignored for both facilities and levels.
-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
+diff -urNp stunnel-4.56-patched/doc/stunnel.html stunnel-4.56-current/doc/stunnel.html
+--- stunnel-4.56-patched/doc/stunnel.html 2013-03-28 14:38:34.960698467 -0400
++++ stunnel-4.56-current/doc/stunnel.html 2013-03-28 14:39:09.678668674 -0400
@@ -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
@@ -22,9 +22,9 @@ diff -urNp stunnel-4.55-patched/doc/stunnel.html stunnel-4.55-current/doc/stunne
(Facilities are not supported on Win32.)</p>
<p>Case is ignored for both facilities and levels.</p>
</dd>
-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
+diff -urNp stunnel-4.56-patched/doc/stunnel.pod stunnel-4.56-current/doc/stunnel.pod
+--- stunnel-4.56-patched/doc/stunnel.pod 2013-03-28 14:38:34.959698468 -0400
++++ stunnel-4.56-current/doc/stunnel.pod 2013-03-28 14:39:09.678668674 -0400
@@ -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,9 +34,9 @@ diff -urNp stunnel-4.55-patched/doc/stunnel.pod stunnel-4.55-current/doc/stunnel
(Facilities are not supported on Win32.)
Case is ignored for both facilities and levels.
-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
+diff -urNp stunnel-4.56-patched/src/options.c stunnel-4.56-current/src/options.c
+--- stunnel-4.56-patched/src/options.c 2013-03-28 14:38:34.919698502 -0400
++++ stunnel-4.56-current/src/options.c 2013-03-28 14:39:09.680668671 -0400
@@ -185,8 +185,12 @@ static char *parse_global_option(CMD cmd
case CMD_BEGIN:
new_global_options.debug_level=LOG_NOTICE;
diff --git a/stunnel-4-sample.patch b/stunnel-4-sample.patch
index 657b728..8528bf1 100644
--- a/stunnel-4-sample.patch
+++ b/stunnel-4-sample.patch
@@ -1,6 +1,6 @@
-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
+diff -urNp stunnel-4.56-patched/tools/stunnel.conf-sample.in stunnel-4.56-current/tools/stunnel.conf-sample.in
+--- stunnel-4.56-patched/tools/stunnel.conf-sample.in 2013-03-28 14:38:34.992698440 -0400
++++ stunnel-4.56-current/tools/stunnel.conf-sample.in 2013-03-28 14:40:31.423595815 -0400
@@ -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 10f054c..374bd60 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -1,12 +1,13 @@
Summary: An SSL-encrypting socket wrapper
Name: stunnel
-Version: 4.55
+Version: 4.56
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
-URL: http://stunnel.mirt.net/
-Source0: ftp://stunnel.mirt.net/stunnel/stunnel-%{version}.tar.gz
-Source1: ftp://stunnel.mirt.net/stunnel/stunnel-%{version}.tar.gz.asc
+URL: http://www.stunnel.org/
+Source0: ftp://ftp.stunnel.org/stunnel/stunnel-%{version}.tar.gz
+Source1: ftp://ftp.stunnel.org/stunnel/stunnel-%{version}.tar.gz.asc
+Source7: ftp://ftp.stunnel.org/stunnel/stunnel-%{version}.tar.gz.sha256
Source2: Certificate-Creation
Source3: sfinger.xinetd
Source4: stunnel-sfinger.conf
@@ -18,7 +19,7 @@ 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
+%if 0%{?fedora} > 18 || 0%{?rhel} >= 7
BuildRequires: perl-podlators
%endif
@@ -41,7 +42,7 @@ if pkg-config openssl ; then
CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
fi
-%configure --disable-fips --enable-ipv6 \
+%configure --enable-fips --enable-ipv6 \
CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'"
make LDADD="-pie -Wl,-z,defs,-z,relro,-z,now"
@@ -83,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_sysconfdir}/stunnel/*
%changelog
+* Mon Aug 5 2013 Avesh Agarwal <avagarwa at redhat.com> - 4.56-1
+- New upstream realease 4.56.
+- Updated local patches.
+- Fixed upstream URL in spec file.
+- Sourced URL of sha256 hash file in spec file.
+
* Tue Mar 19 2013 Avesh Agarwal <avagarwa at redhat.com> - 4.55-1
- New upstream realease 4.55
- Updated local patches
More information about the scm-commits
mailing list