New upstream realease 4.55
- Updated local patches - enabled fips mode - Fixed for pod2man as it build-requires perl-podlators
This commit is contained in:
Avesh Agarwal
parent
167536753a
commit
c0e3ca3f6b
3
.gitignore
vendored
3
.gitignore
vendored
@ -28,3 +28,6 @@ stunnel-4.33.tar.gz.asc
|
||||
/stunnel-4.54.tar.gz
|
||||
/stunnel-4.54.tar.gz.asc
|
||||
/stunnel-4.54.tar.gz.sha256
|
||||
/stunnel-4.55.tar.gz
|
||||
/stunnel-4.55.tar.gz.asc
|
||||
/stunnel-4.55.tar.gz.sha256
|
||||
|
||||
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
c2b1db99e3ed547214568959a8ed18ac stunnel-4.54.tar.gz
|
||||
b7cd936bae7b56dae6fe1f06d90c4db1 stunnel-4.54.tar.gz.asc
|
||||
4da789296deb1544f48a3d3a11f0599f stunnel-4.54.tar.gz.sha256
|
||||
ebe6670368d30c6a01ca33b9c50cb239 stunnel-4.55.tar.gz
|
||||
923c640f882f4acfb13d4f4dc34b8498 stunnel-4.55.tar.gz.asc
|
||||
cb76d927b65fc7293ea53dd4aeea943f stunnel-4.55.tar.gz.sha256
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -urNp stunnel-4.54-patched/doc/stunnel.8 stunnel-4.54-current/doc/stunnel.8
|
||||
--- stunnel-4.54-patched/doc/stunnel.8 2012-10-16 14:31:16.728962756 -0400
|
||||
+++ stunnel-4.54-current/doc/stunnel.8 2012-10-16 14:32:10.604908059 -0400
|
||||
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).
|
||||
@ -10,9 +10,9 @@ diff -urNp stunnel-4.54-patched/doc/stunnel.8 stunnel-4.54-current/doc/stunnel.8
|
||||
(Facilities are not supported on Win32.)
|
||||
.Sp
|
||||
Case is ignored for both facilities and levels.
|
||||
diff -urNp stunnel-4.54-patched/doc/stunnel.html stunnel-4.54-current/doc/stunnel.html
|
||||
--- stunnel-4.54-patched/doc/stunnel.html 2012-10-16 14:31:16.729962755 -0400
|
||||
+++ stunnel-4.54-current/doc/stunnel.html 2012-10-16 14:32:10.606908057 -0400
|
||||
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
|
||||
@ -22,9 +22,9 @@ diff -urNp stunnel-4.54-patched/doc/stunnel.html stunnel-4.54-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.54-patched/doc/stunnel.pod stunnel-4.54-current/doc/stunnel.pod
|
||||
--- stunnel-4.54-patched/doc/stunnel.pod 2012-10-16 14:31:16.728962756 -0400
|
||||
+++ stunnel-4.54-current/doc/stunnel.pod 2012-10-16 14:32:10.610908053 -0400
|
||||
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,9 +34,9 @@ diff -urNp stunnel-4.54-patched/doc/stunnel.pod stunnel-4.54-current/doc/stunnel
|
||||
(Facilities are not supported on Win32.)
|
||||
|
||||
Case is ignored for both facilities and levels.
|
||||
diff -urNp stunnel-4.54-patched/src/options.c stunnel-4.54-current/src/options.c
|
||||
--- stunnel-4.54-patched/src/options.c 2012-10-16 14:31:16.733962751 -0400
|
||||
+++ stunnel-4.54-current/src/options.c 2012-10-16 14:32:10.634908024 -0400
|
||||
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;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -urNp stunnel-4.54-patched/tools/stunnel.conf-sample.in stunnel-4.54-current/tools/stunnel.conf-sample.in
|
||||
--- stunnel-4.54-patched/tools/stunnel.conf-sample.in 2012-10-16 14:31:16.732962752 -0400
|
||||
+++ stunnel-4.54-current/tools/stunnel.conf-sample.in 2012-10-16 14:33:50.162807909 -0400
|
||||
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
|
||||
|
||||
16
stunnel.spec
16
stunnel.spec
@ -1,7 +1,7 @@
|
||||
Summary: An SSL-encrypting socket wrapper
|
||||
Name: stunnel
|
||||
Version: 4.54
|
||||
Release: 2%{?dist}
|
||||
Version: 4.55
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
Group: Applications/Internet
|
||||
URL: http://stunnel.mirt.net/
|
||||
@ -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
|
||||
@ -37,7 +41,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"
|
||||
|
||||
@ -79,6 +83,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%exclude %{_sysconfdir}/stunnel/*
|
||||
|
||||
%changelog
|
||||
*Mon Mar 4 2013 Avesh Agarwal <avagarwa@redhat.com> - 4.55-1
|
||||
- New upstream realease 4.55
|
||||
- Updated local patches
|
||||
- enabled fips mode
|
||||
- Fixed for pod2man as it build-requires perl-podlators
|
||||
|
||||
*Mon Dec 10 2012 Avesh Agarwal <avagarwa@redhat.com> - 4.54-2
|
||||
- 884183: support for full relro.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user