[arch-commits] Commit in gnutls/trunk (0001-fix-avx-detection.patch PKGBUILD)

[Andreas Radke]

    Date: Wednesday, August 17, 2022 @ 15:44:37
  Author: andyrtr
Revision: 453043

upgpkg: gnutls 3.7.7-3: fix AVX detection - FS#75613 - upstream patch changed

Modified:
  gnutls/trunk/0001-fix-avx-detection.patch
  gnutls/trunk/PKGBUILD

------------------------------+
 0001-fix-avx-detection.patch |    6 +++---
 PKGBUILD                     |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Modified: 0001-fix-avx-detection.patch
===================================================================
--- 0001-fix-avx-detection.patch	2022-08-17 15:34:07 UTC (rev 453042)
+++ 0001-fix-avx-detection.patch	2022-08-17 15:44:37 UTC (rev 453043)
@@ -1,4 +1,4 @@
-From b87d46ea52b87daeca2d6e75d79a3e33456b5787 Mon Sep 17 00:00:00 2001
+From ef8a26638432066d8e683b216142d695fd16d222 Mon Sep 17 00:00:00 2001
 From: Daiki Ueno <ueno at gnu.org>
 Date: Mon, 15 Aug 2022 09:39:18 +0900
 Subject: [PATCH] accelerated: clear AVX bits if it cannot be queried through
@@ -20,7 +20,7 @@
  1 file changed, 32 insertions(+), 5 deletions(-)
 
 diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c
-index 7ddaa594e6..b002dba721 100644
+index 7ddaa594e6..85e2f93d4d 100644
 --- a/lib/accelerated/x86/x86-common.c
 +++ b/lib/accelerated/x86/x86-common.c
 @@ -81,6 +81,26 @@ unsigned int _gnutls_x86_cpuid_s[4];
@@ -67,7 +67,7 @@
 -		return 0;
 -
 -	return ((_gnutls_x86_cpuid_s[1] & bit_AVX));
-+	return (_gnutls_x86_cpuid_s[1] & bit_AVX);
++	return (_gnutls_x86_cpuid_s[1] & (bit_AVX|bit_MOVBE)) == (bit_AVX|bit_MOVBE);
  }
  
  static unsigned check_pclmul(void)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-17 15:34:07 UTC (rev 453042)
+++ PKGBUILD	2022-08-17 15:44:37 UTC (rev 453043)
@@ -3,7 +3,7 @@
 
 pkgname=gnutls
 pkgver=3.7.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('x86_64')
 license=('GPL3' 'LGPL2.1')
@@ -20,7 +20,7 @@
         0001-fix-avx-detection.patch)
 sha256sums=('be9143d0d58eab64dba9b77114aaafac529b6c0d7e81de6bdf1c9b59027d2106'
             'SKIP'
-            '250c13305115001cfc52e0a65e5bfb62e53b6697cfb1ee30a8a24da9181c63da')
+            'f5a7155e319d823f72c1ae682aa8d93161965f87c453e7896a1149c4669ba92f')
 #validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno at unixuser.org>"
 validpgpkeys=('5D46CB0F763405A7053556F47A75A648B3F9220C') # "Zoltan Fridrich <zfridric at redhat.com>"