From a61a4538791fdb67acaba0db7142eabcbfb5c0c1 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Wed, 15 Jun 2016 09:52:19 +0200 Subject: [PATCH] updated to 3.5.1 --- .gitignore | 1 + ...patch => gnutls-3.5.1-default-policy.patch | 18 +++++++------- gnutls-3.5.1-srp-tests.patch | 24 +++++++++++++++++++ gnutls.spec | 23 +++++++++++------- sources | 2 +- 5 files changed, 49 insertions(+), 19 deletions(-) rename gnutls-3.4.1-default-policy.patch => gnutls-3.5.1-default-policy.patch (57%) create mode 100644 gnutls-3.5.1-srp-tests.patch diff --git a/.gitignore b/.gitignore index 6258e31..e992092 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ gnutls-2.10.1-nosrp.tar.bz2 /gnutls-3.4.11-hobbled.tar.xz /gnutls-3.4.12-hobbled.tar.xz /gnutls-3.4.13-hobbled.tar.xz +/gnutls-3.5.1-hobbled.tar.xz diff --git a/gnutls-3.4.1-default-policy.patch b/gnutls-3.5.1-default-policy.patch similarity index 57% rename from gnutls-3.4.1-default-policy.patch rename to gnutls-3.5.1-default-policy.patch index 083b133..4a3dabb 100644 --- a/gnutls-3.4.1-default-policy.patch +++ b/gnutls-3.5.1-default-policy.patch @@ -1,16 +1,16 @@ -diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c -index 06e6cf4..17d830e 100644 ---- a/lib/gnutls_priority.c -+++ b/lib/gnutls_priority.c -@@ -1060,6 +1060,7 @@ gnutls_priority_init(gnutls_priority_t * priority_cache, +diff --git a/lib/priority.c b/lib/priority.c +index 767312c..0657940 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -1215,6 +1215,7 @@ gnutls_priority_init(gnutls_priority_t * priority_cache, bulk_rmadd_func *bulk_fn; bulk_rmadd_func *bulk_given_fn; const cipher_entry_st *centry; -+ unsigned dset = 0; ++ unsigned dset; if (err_pos) *err_pos = priorities; -@@ -1077,10 +1078,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache, +@@ -1232,10 +1233,16 @@ gnutls_priority_init(gnutls_priority_t * priority_cache, (*priority_cache)->sr = SR_PARTIAL; (*priority_cache)->min_record_version = 1; @@ -21,10 +21,10 @@ index 06e6cf4..17d830e 100644 + dset = 1; + } - darg = resolve_priorities(priorities); + darg = _gnutls_resolve_priorities(priorities); + if (darg == NULL && dset == 1) { + priorities = "NORMAL"; -+ darg = resolve_priorities(priorities); ++ darg = _gnutls_resolve_priorities(priorities); + } if (darg == NULL) { gnutls_assert(); diff --git a/gnutls-3.5.1-srp-tests.patch b/gnutls-3.5.1-srp-tests.patch new file mode 100644 index 0000000..7dc089c --- /dev/null +++ b/gnutls-3.5.1-srp-tests.patch @@ -0,0 +1,24 @@ +diff --git a/tests/srpbase64.c b/tests/srpbase64.c +index 80c1752..cb26e8b 100644 +--- a/tests/srpbase64.c ++++ b/tests/srpbase64.c +@@ -34,6 +34,8 @@ + + #include "utils.h" + ++#ifdef ENABLE_SRP ++ + static void encode(const char *test_name, const gnutls_datum_t *raw, const char *expected) + { + int ret; +@@ -175,3 +177,10 @@ void doit(void) + } + } + ++#else ++ ++void doit(void) ++{ ++ exit(77); ++} ++#endif diff --git a/gnutls.spec b/gnutls.spec index e714c4f..a6940b1 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -2,7 +2,7 @@ %bcond_without guile Summary: A TLS protocol implementation Name: gnutls -Version: 3.4.13 +Version: 3.5.1 Release: 1%{?dist} # The libraries are LGPLv2.1+, utilities are GPLv3+ License: GPLv3+ and LGPLv2+ @@ -14,7 +14,7 @@ BuildRequires: autogen-libopts-devel >= 5.18 autogen BuildRequires: nettle-devel >= 3.1.1 BuildRequires: trousers-devel >= 0.3.11.2 BuildRequires: libidn-devel -BuildRequires: gperf, net-tools +BuildRequires: gperf, net-tools, datefudge Requires: crypto-policies Requires: p11-kit-trust Requires: libtasn1 >= 4.3 @@ -35,8 +35,9 @@ Source1: libgnutls-config Source2: hobble-gnutls Patch1: gnutls-3.2.7-rpath.patch Patch3: gnutls-3.1.11-nosrp.patch -Patch4: gnutls-3.4.1-default-policy.patch +Patch4: gnutls-3.5.1-default-policy.patch Patch5: gnutls-3.4.2-no-now-guile.patch +Patch6: gnutls-3.5.1-srp-tests.patch # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174 Provides: bundled(gnulib) = 20130424 @@ -140,6 +141,7 @@ This package contains Guile bindings for the library. %patch3 -p1 -b .nosrp %patch4 -p1 -b .default-policy %patch5 -p1 -b .guile +%patch6 -p1 -b .srp-tests sed 's/gnutls_srp.c//g' -i lib/Makefile.in sed 's/gnutls_srp.lo//g' -i lib/Makefile.in @@ -175,7 +177,6 @@ make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_bindir}/srptool -rm -f $RPM_BUILD_ROOT%{_bindir}/gnutls-srpcrypt cp -f %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/libgnutls-config rm -f $RPM_BUILD_ROOT%{_mandir}/man1/srptool.1 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*srp* @@ -226,8 +227,8 @@ fi %files -f gnutls.lang %defattr(-,root,root,-) %{_libdir}/libgnutls.so.30* -%doc README AUTHORS NEWS THANKS -%license COPYING COPYING.LESSER +%doc README.md AUTHORS NEWS THANKS +%license LICENSE doc/COPYING doc/COPYING.LESSER %files c++ %{_libdir}/libgnutlsxx.so.* @@ -249,7 +250,6 @@ fi %{_bindir}/ocsptool %{_bindir}/psktool %{_bindir}/p11tool -%{_bindir}/crywrap %if %{with dane} %{_bindir}/danetool %endif @@ -267,11 +267,16 @@ fi %files guile %defattr(-,root,root,-) %{_libdir}/guile/2.0/guile-gnutls*.so* -%{_datadir}/guile/site/gnutls -%{_datadir}/guile/site/gnutls.scm +%{_libdir}/guile/2.0/site-ccache/gnutls.go +%{_libdir}/guile/2.0/site-ccache/gnutls/extra.go +%{_datadir}/guile/site/2.0/gnutls.scm +%{_datadir}/guile/site/2.0/gnutls/extra.scm %endif %changelog +* Wed Jun 15 2016 Nikos Mavrogiannopoulos 3.5.1-1 +- New upstream release + * Tue Jun 7 2016 Nikos Mavrogiannopoulos 3.4.13-1 - New upstream release (#1343258) - Addresses issue with setuid programs introduced in 3.4.12 (#1343342) diff --git a/sources b/sources index 0549f3d..3e5a62a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe69780ac42323eab8119d288dc403cf gnutls-3.4.13-hobbled.tar.xz +f0f521cb3c0a3d2149d5bb4b7ebd090a gnutls-3.5.1-hobbled.tar.xz