From 6eb3f60e1727be90715a994396d32927235c373f Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 13 Jul 2015 09:06:20 +0200 Subject: [PATCH] updated to 3.4.3 Resolves: rhbz#1242295 --- .gitignore | 1 + gnutls-3.4.2-internals.patch | 13 ------------- gnutls.spec | 15 ++++++++------- sources | 2 +- 4 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 gnutls-3.4.2-internals.patch diff --git a/.gitignore b/.gitignore index cbdb989..94fb990 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ gnutls-2.10.1-nosrp.tar.bz2 /gnutls-3.3.14-hobbled.tar.xz /gnutls-3.4.1-hobbled.tar.xz /gnutls-3.4.2-hobbled.tar.xz +/gnutls-3.4.3-hobbled.tar.xz diff --git a/gnutls-3.4.2-internals.patch b/gnutls-3.4.2-internals.patch deleted file mode 100644 index 7bfb957..0000000 --- a/gnutls-3.4.2-internals.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/libgnutls.map b/lib/libgnutls.map -index 3dc7ea1..787b16a 100644 ---- a/lib/libgnutls.map -+++ b/lib/libgnutls.map -@@ -1076,7 +1076,7 @@ GNUTLS_FIPS140_3_4 { - _gnutls_ecdh_compute_key; - }; - --GNUTLS_PRIVATE { -+GNUTLS_PRIVATE_3_4 { - global: - # Internal symbols needed by libgnutls-openssl: - _gnutls_pkix1_asn; diff --git a/gnutls.spec b/gnutls.spec index 69b5fce..741a605 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -2,8 +2,8 @@ %bcond_without guile Summary: A TLS protocol implementation Name: gnutls -Version: 3.4.2 -Release: 3%{?dist} +Version: 3.4.3 +Release: 1%{?dist} # The libraries are LGPLv2.1+, utilities are GPLv3+ License: GPLv3+ and LGPLv2+ Group: System Environment/Libraries @@ -35,8 +35,7 @@ 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 -Patch5: gnutls-3.4.2-internals.patch -Patch6: gnutls-3.4.2-no-now-guile.patch +Patch5: gnutls-3.4.2-no-now-guile.patch # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174 Provides: bundled(gnulib) = 20130424 @@ -139,8 +138,7 @@ This package contains Guile bindings for the library. %patch1 -p1 -b .rpath %patch3 -p1 -b .nosrp %patch4 -p1 -b .default-policy -%patch5 -p1 -b .internals -%patch6 -p1 -b .guile +%patch5 -p1 -b .guile sed 's/gnutls_srp.c//g' -i lib/Makefile.in sed 's/gnutls_srp.lo//g' -i lib/Makefile.in @@ -273,10 +271,13 @@ fi %endif %changelog +* Mon Jul 13 2015 Nikos Mavrogiannopoulos 3.4.3-1 +- new upstream release + * Thu Jul 02 2015 Adam Jackson 3.4.2-3 - Only disable -z now for the guile modules -* Wed Jun 18 2015 Nikos Mavrogiannopoulos 3.4.2-2 +* Thu Jun 18 2015 Nikos Mavrogiannopoulos 3.4.2-2 - rename the symbol version for internal symbols to avoid clashes with 3.3.x. diff --git a/sources b/sources index 19fea51..48313a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcd504309eac6b180d495eeb7b8a13ad gnutls-3.4.2-hobbled.tar.xz +8b9b5605b83fcdcd29c2cccbda6d2bbb gnutls-3.4.3-hobbled.tar.xz