aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2021-02-17 09:30:53 -0300
committerLeo <thinkabit.ukim@gmail.com>2021-02-17 14:29:54 +0000
commit5d25e0b7dcb23d62a8bbec7c4a8057a46b66c9c3 (patch)
tree2fee1c6c097e06695e4aac58714aeac3977e6aff
parent2bdb7f1dd1a6c8f37c66e586131e61e032960bd8 (diff)
downloadaports-5d25e0b7dcb23d62a8bbec7c4a8057a46b66c9c3.tar.gz
aports-5d25e0b7dcb23d62a8bbec7c4a8057a46b66c9c3.tar.bz2
aports-5d25e0b7dcb23d62a8bbec7c4a8057a46b66c9c3.tar.xz
main/libgcrypt: upgrade to 1.9.2
-rw-r--r--main/libgcrypt/APKBUILD8
-rw-r--r--main/libgcrypt/fix_building_with_disable-asm_on_x86.patch67
2 files changed, 3 insertions, 72 deletions
diff --git a/main/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index 5c8dae7632..f99334d25b 100644
--- a/main/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgcrypt
-pkgver=1.9.1
-pkgrel=1
+pkgver=1.9.2
+pkgrel=0
pkgdesc="General purpose crypto library based on the code used in GnuPG"
url="https://www.gnupg.org/"
arch="all"
@@ -9,7 +9,6 @@ license="LGPL-2.1-or-later"
makedepends="libgpg-error-dev texinfo"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
source="https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$pkgver.tar.bz2
- fix_building_with_disable-asm_on_x86.patch
"
# secfixes:
@@ -48,5 +47,4 @@ package() {
rm -f $pkgdir/usr/share/info/dir
}
-sha512sums="e8a028724cf5476fff0ca82c5c279a64b3bc5d1fd1472b784df4084b185266825baffc49e27b90db7453c8faef68cd0b8264f379abacee629bbdf6b11f2a28d6 libgcrypt-1.9.1.tar.bz2
-e4689eb005596390eeec6fdccaa853aaf9e2554b6c6ca823830a48919f3004463e5dc49556f5f5183784949f05a4bc273b0c5a8e69fa8e3a9f5b61850bf6c36a fix_building_with_disable-asm_on_x86.patch"
+sha512sums="d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016 libgcrypt-1.9.2.tar.bz2"
diff --git a/main/libgcrypt/fix_building_with_disable-asm_on_x86.patch b/main/libgcrypt/fix_building_with_disable-asm_on_x86.patch
deleted file mode 100644
index 15aef1bca0..0000000000
--- a/main/libgcrypt/fix_building_with_disable-asm_on_x86.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Pulled from upstream master - https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=af23ab5c5482d625ff52e60606cf044e2b0106c8
-
-From af23ab5c5482d625ff52e60606cf044e2b0106c8 Mon Sep 17 00:00:00 2001
-From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
-Date: Fri, 29 Jan 2021 18:14:40 +0200
-Subject: [PATCH 1/1] Fix building with --disable-asm on x86
-
-* cipher/keccak.c (USE_64BIT_BMI2, USE_64BIT_SHLD)
-(USE_32BIT_BMI2): Depend also on HAVE_CPU_ARCH_X86.
-* random/rndjent.c [__i386__ || __x86_64__] (USE_JENT): Depend
-also on HAVE_CPU_ARCH_X86.
---
-
-Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
----
- cipher/keccak.c | 9 ++++++---
- random/rndjent.c | 2 +-
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/cipher/keccak.c b/cipher/keccak.c
-index 87a47ac3..795a02e5 100644
---- a/cipher/keccak.c
-+++ b/cipher/keccak.c
-@@ -40,21 +40,24 @@
-
- /* USE_64BIT_BMI2 indicates whether to compile with 64-bit Intel BMI2 code. */
- #undef USE_64BIT_BMI2
--#if defined(USE_64BIT) && defined(HAVE_GCC_INLINE_ASM_BMI2)
-+#if defined(USE_64BIT) && defined(HAVE_GCC_INLINE_ASM_BMI2) && \
-+ defined(HAVE_CPU_ARCH_X86)
- # define USE_64BIT_BMI2 1
- #endif
-
-
- /* USE_64BIT_SHLD indicates whether to compile with 64-bit Intel SHLD code. */
- #undef USE_64BIT_SHLD
--#if defined(USE_64BIT) && defined (__GNUC__) && defined(__x86_64__)
-+#if defined(USE_64BIT) && defined (__GNUC__) && defined(__x86_64__) && \
-+ defined(HAVE_CPU_ARCH_X86)
- # define USE_64BIT_SHLD 1
- #endif
-
-
- /* USE_32BIT_BMI2 indicates whether to compile with 32-bit Intel BMI2 code. */
- #undef USE_32BIT_BMI2
--#if defined(USE_32BIT) && defined(HAVE_GCC_INLINE_ASM_BMI2)
-+#if defined(USE_32BIT) && defined(HAVE_GCC_INLINE_ASM_BMI2) && \
-+ defined(HAVE_CPU_ARCH_X86)
- # define USE_32BIT_BMI2 1
- #endif
-
-diff --git a/random/rndjent.c b/random/rndjent.c
-index 3d01290f..56648a87 100644
---- a/random/rndjent.c
-+++ b/random/rndjent.c
-@@ -57,7 +57,7 @@
- #define JENT_USES_GETTIME 2
- #define JENT_USES_READ_REAL_TIME 3
- #ifdef ENABLE_JENT_SUPPORT
--# if defined (__i386__) || defined(__x86_64__)
-+# if (defined (__i386__) || defined(__x86_64__)) && defined(HAVE_CPU_ARCH_X86)
- # define USE_JENT JENT_USES_RDTSC
- # elif defined (HAVE_CLOCK_GETTIME)
- # if _AIX
---
-2.11.0
-