New upstream release 5.44

Disable libwrap support (#1518789)
This commit is contained in:
Tomas Mraz 2018-01-11 18:29:57 +01:00
parent f5d966e6f3
commit c195cb2d2f
4 changed files with 12 additions and 20 deletions

2
.gitignore vendored
View File

@ -102,3 +102,5 @@ stunnel-4.33.tar.gz.asc
/stunnel-5.41.tar.gz.asc
/stunnel-5.42.tar.gz
/stunnel-5.42.tar.gz.asc
/stunnel-5.44.tar.gz
/stunnel-5.44.tar.gz.asc

View File

@ -1,2 +1,2 @@
SHA512 (stunnel-5.42.tar.gz) = 875af19e8a4fa8e983e98d3e6bea198b789bea9b18933ed74aa1f9ce6922e4c4dd3a4ccae3b74c12de30c39b68c3210c9adb7cd228c7fefc28dff258dcdb4968
SHA512 (stunnel-5.42.tar.gz.asc) = 78dafc5699bc087dfce5d1653134469282aa15e5288087e98d4ffbdd97bb5ba8d22c93adb8f74a5a6d9894e724ac37d85479a1b1aad713629b836435b94e8c4d
SHA512 (stunnel-5.44.tar.gz) = a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
SHA512 (stunnel-5.44.tar.gz.asc) = 1efabb5248866823690ffec8df20208defa6e9b34be170b8ca77d6992861ed03766bee063f740c8ba05c27b4629b82ee21fbe73b04bdf386ac1bd3bfa378fcfa

View File

@ -1,12 +0,0 @@
diff -urNp stunnel-5.18/configure.ac stunnel-5.18-patch/configure.ac
--- stunnel-5.18/configure.ac 2015-06-01 10:25:32.000000000 -0400
+++ stunnel-5.18-patch/configure.ac 2015-06-22 11:34:50.244471487 -0400
@@ -274,7 +274,7 @@ AC_ARG_ENABLE(fips,
[ --disable-fips disable OpenSSL FIPS support],
[
case "$enableval" in
- yes) AC_MSG_RESULT([no])
+ yes) AC_MSG_RESULT([yes])
use_fips="yes"
AC_DEFINE([USE_FIPS], [1],
[Define to 1 to enable OpenSSL FIPS support])

View File

@ -3,7 +3,7 @@
Summary: A TLS-encrypting socket wrapper
Name: stunnel
Version: 5.42
Version: 5.44
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
@ -18,10 +18,9 @@ Source6: stunnel-pop3s-client.conf
Source7: stunnel@.service
Patch0: stunnel-5.40-authpriv.patch
Patch1: stunnel-5.40-systemd-service.patch
Patch2: stunnel-configure-ac.patch
Patch3: stunnel-5.42-system-ciphers.patch
# util-linux is needed for rename
BuildRequires: openssl-devel, pkgconfig, tcp_wrappers-devel, util-linux
BuildRequires: openssl-devel, pkgconfig, util-linux
BuildRequires: autoconf automake libtool
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2html
@ -42,11 +41,10 @@ conjunction with imapd to create a TLS secure IMAP server.
%setup -q
%patch0 -p1 -b .authpriv
%patch1 -p1 -b .systemd-service
#%patch2 -p1 -b .fips-config
%patch3 -p1 -b .system-ciphers
# Fix the configure script output for FIPS mode
sed -i '/yes).*result: no/,+1s/result: no/result: yes/;s/as_echo "no"/as_echo "yes"/' configure
sed -i '/yes).*result: no/,+1{s/result: no/result: yes/;s/as_echo "no"/as_echo "yes"/}' configure
%build
#autoreconf -v
@ -55,7 +53,7 @@ if pkg-config openssl ; then
CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
fi
%configure --enable-fips --enable-ipv6 --with-ssl=%{_prefix}\
%configure --enable-fips --enable-ipv6 --disable-libwrap --with-ssl=%{_prefix}\
CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'"
make V=1 LDADD="-pie -Wl,-z,defs,-z,relro,-z,now"
@ -117,6 +115,10 @@ cp %{SOURCE7} %{buildroot}%{_unitdir}/%{name}@.service
%endif
%changelog
* Thu Jan 11 2018 Tomáš Mráz <tmraz@redhat.com> - 5.44-1
- New upstream release 5.44
- Disable libwrap support (#1518789)
* Tue Aug 22 2017 Tomáš Mráz <tmraz@redhat.com> - 5.42-1
- New upstream release 5.42
- Use the system cipher list by default (#1483967)