commit 5a5e658f9a75757736f272a39f609797b475ab9a
Author: Jakub Bogusz <[email protected]>
Date: Tue Sep 8 19:07:37 2015 +0200
- updated to 3.4.4.1
- updated link patch
gnutls-link.patch | 45 ++++++++++++++++++++++-----------------------
gnutls.spec | 7 +++----
2 files changed, 25 insertions(+), 27 deletions(-)
---
diff --git a/gnutls.spec b/gnutls.spec
index aa2db97..d83b4ee 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -11,12 +11,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/
@@ -33,7 +33,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
diff --git a/gnutls-link.patch b/gnutls-link.patch
index 0e83dd3..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,25 +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.3.26/lib/Makefile.am.orig 2017-01-09 08:11:25.000000000 +0100
-+++ gnutls-3.3.26/lib/Makefile.am 2017-02-04 10:47:27.231553284 +0100
-@@ -149,7 +149,7 @@
- endif
+--- 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 ENABLE_TROUSERS
--thirdparty_libadd += $(LIBDL)
-+thirdparty_libadd += $(LTLIBDL)
- endif
-
- if ENABLE_OPENPGP
---- gnutls-3.3.26/configure.ac.orig 2017-01-09 07:42:13.000000000 +0100
-+++ gnutls-3.3.26/configure.ac 2017-02-04 10:47:15.884886746 +0100
-@@ -329,7 +329,7 @@
-
- AC_DEFINE([ENABLE_FIPS140], 1, [Enable FIPS140-2 mode])
-
-- AC_SUBST([FIPS140_LIBS], $LIBDL)
-+ AC_SUBST([FIPS140_LIBS], $LTLIBDL)
- else
- enable_fips=no
- AC_MSG_WARN([[
+ if HAVE_LIBIDN
+ thirdparty_libadd += $(LIBIDN_LIBS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnutls.git/commitdiff/3504caa7336a2ed7f7e4dfa9081d84fa94d7b83e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
