rename the symbol version for internal symbols to avoid clashes with 3.3.x

Resolves: rhbz#1232447, rhbz#1230889, rhbz#1233191
This commit is contained in:
Nikos Mavrogiannopoulos 2015-06-18 15:54:56 +02:00
parent 3893efa4b8
commit 82221f2ab4
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,13 @@
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;

View File

@ -3,7 +3,7 @@
Summary: A TLS protocol implementation
Name: gnutls
Version: 3.4.2
Release: 1%{?dist}
Release: 2%{?dist}
# The libraries are LGPLv2.1+, utilities are GPLv3+
License: GPLv3+ and LGPLv2+
Group: System Environment/Libraries
@ -35,6 +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
# Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
Provides: bundled(gnulib) = 20130424
@ -137,6 +138,8 @@ 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
sed 's/gnutls_srp.c//g' -i lib/Makefile.in
sed 's/gnutls_srp.lo//g' -i lib/Makefile.in
rm -f lib/minitasn1/*.c lib/minitasn1/*.h
@ -272,6 +275,10 @@ fi
%endif
%changelog
* Wed Jun 18 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.4.2-2
- rename the symbol version for internal symbols to avoid clashes
with 3.3.x.
* Wed Jun 17 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.4.2-1
- new upstream release