aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernd Kuhls <bernd.kuhls@t-online.de>2019-10-20 23:15:32 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-04-09 00:04:06 +0200
commitc2331ec5a067cf89a7bbb8827f332aea6cbbbb8b (patch)
tree07d8859f5b5601e05048c2d84abe37b72edd746e
parent33505725fb5ac7fbc4ed938eb41dbe4d8d578726 (diff)
downloadbuildroot-c2331ec5a067cf89a7bbb8827f332aea6cbbbb8b.tar.gz
buildroot-c2331ec5a067cf89a7bbb8827f332aea6cbbbb8b.tar.bz2
package/gnutls: bump version to 3.6.10
Release notes: https://lists.gnupg.org/pipermail/gnutls-help/2019-September/004574.html Removed patch applied upstream, also removed autoreconf. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 3029eb045c903c43564beec32f10b1fc3567f09b) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/gnutls/0001-read_cpuid_vals-use-__get_cpuid_count-only-when-available.patch82
-rw-r--r--package/gnutls/gnutls.hash4
-rw-r--r--package/gnutls/gnutls.mk4
3 files changed, 3 insertions, 87 deletions
diff --git a/package/gnutls/0001-read_cpuid_vals-use-__get_cpuid_count-only-when-available.patch b/package/gnutls/0001-read_cpuid_vals-use-__get_cpuid_count-only-when-available.patch
deleted file mode 100644
index 5a4e524eb4..0000000000
--- a/package/gnutls/0001-read_cpuid_vals-use-__get_cpuid_count-only-when-available.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From ef80617d1e17e0878a909baad62a75ba265c0e00 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Fri, 2 Aug 2019 21:57:40 +0200
-Subject: [PATCH] read_cpuid_vals: use __get_cpuid_count() only when available
-
-This makes the functionality available on gcc 4.8.
-
-Resolves: #812
-
-Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-[Retrieved from:
-https://github.com/gnutls/gnutls/commit/ef80617d1e17e0878a909baad62a75ba265c0e00]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- configure.ac | 11 +++++++++++
- lib/accelerated/x86/x86-common.c | 24 ++++++++++++++++++++----
- 2 files changed, 31 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6a1d3dbc5c..1bf9bce95e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -182,6 +182,17 @@ case $host_cpu in
- ;;
- esac
-
-+# check for gcc's __get_cpuid_count functionality
-+AC_MSG_CHECKING([for __get_cpuid_count])
-+AC_LINK_IFELSE(
-+ [AC_LANG_SOURCE([
-+ #include <cpuid.h>
-+ int main(void) { unsigned t1; return __get_cpuid_count(7, 0, &t1, &t1, &t1, &t1); }
-+ ])],
-+ [AC_DEFINE([HAVE_GET_CPUID_COUNT], [1], [use __get_cpuid_count]) AC_MSG_RESULT([yes])],
-+ [AC_MSG_RESULT([no])]
-+)
-+
- fi
-
- AC_ARG_ENABLE(tls13-interop,
-diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c
-index fb3ff90919..516d6776c5 100644
---- a/lib/accelerated/x86/x86-common.c
-+++ b/lib/accelerated/x86/x86-common.c
-@@ -106,17 +106,33 @@ unsigned int _gnutls_x86_cpuid_s[4];
- #define VIA_PADLOCK_PHE (1<<21)
- #define VIA_PADLOCK_PHE_SHA512 (1<<22)
-
-+#ifndef HAVE_GET_CPUID_COUNT
-+static inline void
-+get_cpuid_level7(unsigned int *eax, unsigned int *ebx,
-+ unsigned int *ecx, unsigned int *edx)
-+{
-+ /* we avoid using __get_cpuid_count, because it is not available with gcc 4.8 */
-+ if (__get_cpuid_max(7, 0) < 7)
-+ return;
-+
-+ __cpuid_count(7, 0, *eax, *ebx, *ecx, *edx);
-+ return;
-+}
-+#else
-+# define get_cpuid_level7(a,b,c,d) __get_cpuid_count(7, 0, a, b, c, d)
-+#endif
-+
- static unsigned read_cpuid_vals(unsigned int vals[4])
- {
- unsigned t1, t2, t3;
-- if (!__get_cpuid(1, &t1, &vals[0],
-- &vals[1], &t2))
-+ vals[0] = vals[1] = vals[2] = vals[3] = 0;
-+
-+ if (!__get_cpuid(1, &t1, &vals[0], &vals[1], &t2))
- return 0;
- /* suppress AVX512; it works conditionally on certain CPUs on the original code */
- vals[1] &= 0xfffff7ff;
-
-- if (!__get_cpuid_count(7, 0, &t1, &vals[2], &t2, &t3))
-- return 0;
-+ get_cpuid_level7(&t1, &vals[2], &t2, &t3);
-
- return 1;
- }
diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash
index 0149e4a277..c8a1e1cbca 100644
--- a/package/gnutls/gnutls.hash
+++ b/package/gnutls/gnutls.hash
@@ -1,6 +1,6 @@
# Locally calculated after checking pgp signature
-# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.9.tar.xz.sig
-sha256 4331fca55817ecdd74450b908a6c29b4f05bb24dd13144c6284aa34d872e1fcb gnutls-3.6.9.tar.xz
+# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.10.tar.xz.sig
+sha256 b1f3ca67673b05b746a961acf2243eaae0ffe658b6a6494265c648e7c7812293 gnutls-3.6.10.tar.xz
# Locally calculated
sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 375c536320..13029bbe2f 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -5,13 +5,11 @@
################################################################################
GNUTLS_VERSION_MAJOR = 3.6
-GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).9
+GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).10
GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
GNUTLS_LICENSE = LGPL-2.1+ (core library)
GNUTLS_LICENSE_FILES = doc/COPYING.LESSER
-# We're patching configure.ac
-GNUTLS_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y)
GNUTLS_LICENSE := $(GNUTLS_LICENSE), GPL-3.0+ (gnutls-openssl library)