[packages/gnutls/DEVEL] - updated to 3.4.4.1 - updated link patch
qboosh
qboosh at pld-linux.org
Tue Sep 8 19:06:07 CEST 2015
commit 2742db64d83bf77b7856cb153fe6758502c7663d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Sep 8 19:07:37 2015 +0200
- updated to 3.4.4.1
- updated link patch
gnutls-link.patch | 25 +++++++++++++++++++++++--
gnutls.spec | 8 ++++----
2 files changed, 27 insertions(+), 6 deletions(-)
---
diff --git a/gnutls.spec b/gnutls.spec
index 8dbbd23..8d514e7 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -8,12 +8,12 @@
Summary: The GNU Transport Layer Security Library
Summary(pl.UTF-8): Biblioteka GNU TLS (Transport Layer Security)
Name: gnutls
-Version: 3.4.2
+Version: 3.4.4.1
Release: 1
License: LGPL v2.1+ (libgnutls), LGPL v3+ (libdane), GPL v3+ (openssl library and tools)
Group: Libraries
-Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/%{name}-%{version}.tar.lz
-# Source0-md5: 62537f59d8c6e01aec1066ff870109dd
+Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/%{name}-%{version}.tar.xz
+# Source0-md5: 474efaba6fd6c6c6c0ebac2a3f431946
Patch0: %{name}-info.patch
Patch1: %{name}-link.patch
URL: http://www.gnutls.org/
@@ -30,7 +30,6 @@ BuildRequires: libidn-devel >= 0.5.6
BuildRequires: libstdc++-devel
BuildRequires: libtasn1-devel >= 4.3
BuildRequires: libtool >= 2:2
-BuildRequires: lzip
BuildRequires: nettle-devel >= 3.1
# miniopencdk is included in sources and currently maintained
# as part of gnutls, not external package
@@ -44,6 +43,7 @@ BuildRequires: tar >= 1:1.22
BuildRequires: texinfo >= 4.8
%{?with_tpm:BuildRequires: trousers-devel >= 0.3.11}
%{?with_dane:BuildRequires: unbound-devel}
+BuildRequires: xz
BuildRequires: zlib-devel
Requires: %{name}-libs = %{version}-%{release}
%{?with_dane:Requires: %{name}-dane = %{version}-%{release}}
diff --git a/gnutls-link.patch b/gnutls-link.patch
index f3e535d..d69b27f 100644
--- a/gnutls-link.patch
+++ b/gnutls-link.patch
@@ -1,5 +1,5 @@
---- gnutls-3.4.2/gl/m4/lib-link.m4.orig 2008-05-17 07:44:04.000000000 +0200
-+++ gnutls-3.4.2/gl/m4/lib-link.m4 2011-04-02 11:29:18.159546509 +0200
+--- gnutls-3.4.2/m4/lib-link.m4.orig 2008-05-17 07:44:04.000000000 +0200
++++ gnutls-3.4.2/m4/lib-link.m4 2011-04-02 11:29:18.159546509 +0200
@@ -322,7 +322,11 @@
fi
if test "X$found_dir" != "X"; then
@@ -12,3 +12,24 @@
if test "X$found_so" != "X"; then
dnl Linking with a shared library. We attempt to hardcode its
dnl directory into the executable's runpath, unless it's the
+--- gnutls-3.4.4.1/configure.ac.orig 2015-09-08 18:38:30.228498005 +0200
++++ gnutls-3.4.4.1/configure.ac 2015-09-08 18:38:32.501831080 +0200
+@@ -515,6 +515,7 @@
+ Trspi_Error_String(err);])],
+ [AC_MSG_RESULT(yes)
+ AC_SUBST([TSS_LIBS], [-ltspi])
++ AC_SUBST([TSS_DL_LIBS], [-ldl])
+ AC_SUBST([TSS_CFLAGS], [])
+ AC_DEFINE([HAVE_TROUSERS], 1, [Enable TPM])
+ with_tpm=yes],
+--- gnutls-3.4.4.1/lib/Makefile.am.orig 2015-07-21 11:42:08.000000000 +0200
++++ gnutls-3.4.4.1/lib/Makefile.am 2015-09-08 18:38:26.635165277 +0200
+@@ -137,7 +137,7 @@
+ auth/libgnutls_auth.la algorithms/libgnutls_alg.la \
+ extras/libgnutls_extras.la
+ thirdparty_libadd = $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LTLIBNSL) \
+- $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT)
++ $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT) $(TSS_DL_LIBS)
+
+ if HAVE_LIBIDN
+ thirdparty_libadd += $(LIBIDN_LIBS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnutls.git/commitdiff/2742db64d83bf77b7856cb153fe6758502c7663d
More information about the pld-cvs-commit
mailing list