Use the correct unbound root key

This commit is contained in:
Nikos Mavrogiannopoulos 2013-11-27 09:42:27 +01:00
parent 954b8bd232
commit 20323dfe71
2 changed files with 6 additions and 27 deletions

View File

@ -1,24 +0,0 @@
diff -up gnutls-3.1.10/tests/dsa/testdsa.rndport gnutls-3.1.10/tests/dsa/testdsa
--- gnutls-3.1.10/tests/dsa/testdsa.rndport 2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/dsa/testdsa 2013-03-26 15:50:38.973561603 +0100
@@ -23,7 +23,7 @@
srcdir="${srcdir:-.}"
SERV="${SERV:-../../src/gnutls-serv} -q"
CLI="${CLI:-../../src/gnutls-cli}"
-PORT="${PORT:-5559}"
+PORT="${PORT:-$((RANDOM+5000))}"
DEBUG=""
unset RETCODE
diff -up gnutls-3.1.10/tests/openpgp-certs/testcerts.rndport gnutls-3.1.10/tests/openpgp-certs/testcerts
--- gnutls-3.1.10/tests/openpgp-certs/testcerts.rndport 2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/openpgp-certs/testcerts 2013-03-26 15:52:33.207007952 +0100
@@ -23,7 +23,7 @@
srcdir="${srcdir:-.}"
SERV="${SERV:-../../src/gnutls-serv} -q"
CLI="${CLI:-../../src/gnutls-cli}"
-PORT="${PORT:-5557}"
+PORT="${PORT:-$((RANDOM+5000))}"
DEBUG=""
if test "${WINDIR}" != "";then

View File

@ -3,7 +3,7 @@
Summary: A TLS protocol implementation
Name: gnutls
Version: 3.2.7
Release: 1%{?dist}
Release: 2%{?dist}
# The libraries are LGPLv2.1+, utilities are GPLv3+
License: GPLv3+ and LGPLv2+
Group: System Environment/Libraries
@ -14,7 +14,7 @@ BuildRequires: autogen-libopts-devel >= 5.18 autogen
BuildRequires: nettle-devel >= 2.7.1
BuildRequires: trousers-devel >= 0.3.11.2
%if %{with dane}
BuildRequires: unbound-devel
BuildRequires: unbound-devel unbound-libs
%endif
%if %{with guile}
BuildRequires: guile-devel
@ -30,7 +30,6 @@ Patch1: gnutls-3.2.7-rpath.patch
# Use only FIPS approved ciphers in the FIPS mode
Patch7: gnutls-2.12.21-fips-algorithms.patch
Patch8: gnutls-3.1.11-nosrp.patch
# Use random port in some tests to avoid conflicts during simultaneous builds on the same machine
Patch9: gnutls-3.2.7-suiteb.patch
# Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
@ -160,6 +159,7 @@ export LDFLAGS="-Wl,--no-add-needed"
--disable-guile \
%endif
%if %{with dane}
--with-unbound-root-key-file=/var/lib/unbound/root.key \
--enable-dane \
%else
--disable-dane \
@ -266,6 +266,9 @@ fi
%endif
%changelog
* Tue Nov 27 2013 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.2.7-2
- Use the following root key for unbound /var/lib/unbound/root.key (#1012494)
* Mon Nov 25 2013 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.2.7-1
- new upstream release
- added dependency to autogen-libopts-devel to use the system's