diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2021-01-04 23:01:41 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2021-01-14 05:11:51 +0000 |
| commit | 4d6171d68ab67980cf416a71e310fb8aee9b0b18 (patch) | |
| tree | c1c3ae04e299a75c109217b676c1ed92d46f5b2a | |
| parent | 13e3f9132f2918cf78dd04b3faf436560ac074dd (diff) | |
| download | aports-4d6171d68ab67980cf416a71e310fb8aee9b0b18.tar.gz aports-4d6171d68ab67980cf416a71e310fb8aee9b0b18.tar.bz2 aports-4d6171d68ab67980cf416a71e310fb8aee9b0b18.tar.xz | |
main/nettle: upgrade to 3.7
| -rw-r--r-- | main/nettle/APKBUILD | 11 | ||||
| -rw-r--r-- | main/nettle/fix-pcc.patch | 54 |
2 files changed, 61 insertions, 4 deletions
diff --git a/main/nettle/APKBUILD b/main/nettle/APKBUILD index 700a38b03e..7dee89e025 100644 --- a/main/nettle/APKBUILD +++ b/main/nettle/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=nettle -pkgver=3.6 +pkgver=3.7 pkgrel=0 pkgdesc="A low-level cryptographic library" url="https://www.lysator.liu.se/~nisse/nettle/" @@ -11,7 +11,9 @@ license="LGPL-2.0-or-later" depends_dev="gmp-dev" makedepends="$depends_dev m4" subpackages="$pkgname-static $pkgname-dev $pkgname-utils" -source="https://ftp.gnu.org/gnu/nettle/nettle-$pkgver.tar.gz" +source="https://ftp.gnu.org/gnu/nettle/nettle-$pkgver.tar.gz + fix-pcc.patch + " build() { ./configure \ @@ -29,7 +31,7 @@ build() { --enable-static make # strip comments in fields from .pc as it confuses pkgconf - sed -i -e 's/ \#.*//' *.pc + sed -i -e 's/ \#.*//' ./*.pc } check() { @@ -47,4 +49,5 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51 nettle-3.6.tar.gz" +sha512sums="be32eff0ea3c83abb8b6670d049a8ce21ea9c7cac3e1a5d41ae003d5160e2683572c7dd8930b869ac1db0b89f9423605e0a8ec0cff074c63e2a60c71996ef66c nettle-3.7.tar.gz +5dc732fec72e7c9b08b46215454398e514cd24c508ae6cacbf63f0dac2c692e872bf85617886ddc83ae6f07f4e52569ee678ac4864da56dfb5692800583bc6d8 fix-pcc.patch" diff --git a/main/nettle/fix-pcc.patch b/main/nettle/fix-pcc.patch new file mode 100644 index 0000000000..b710023ec3 --- /dev/null +++ b/main/nettle/fix-pcc.patch @@ -0,0 +1,54 @@ +From 49cb4039be99d2d49f5c97edd22fc47976c34651 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> +Date: Sun, 10 Jan 2021 20:39:49 +0100 +Subject: [PATCH] ppc: Fix use of __GLIBC_PREREQ in fat-ppc.c. + +* fat-ppc.c: Don't use __GLIBC_PREREQ in the same preprocessor +conditional as defined(__GLIBC_PREREQ), but move to a nested #if +conditional. Fixes compile error on OpenBSD/powerpc64, reported by +Jasper Lievisse Adriaanse. +--- + ChangeLog | 7 +++++++ + fat-ppc.c | 11 ++++++----- + 2 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 578f2591..a5506897 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,10 @@ ++2021-01-10 Niels Möller <nisse@lysator.liu.se> ++ ++ * fat-ppc.c: Don't use __GLIBC_PREREQ in the same preprocessor ++ conditional as defined(__GLIBC_PREREQ), but move to a nested #if ++ conditional. Fixes compile error on OpenBSD/powerpc64, reported by ++ Jasper Lievisse Adriaanse. ++ + 2021-01-04 Niels Möller <nisse@lysator.liu.se> + + * Released Nettle-3.7. +diff --git a/fat-ppc.c b/fat-ppc.c +index c7f0d11a..3adbb88c 100644 +--- a/fat-ppc.c ++++ b/fat-ppc.c +@@ -42,11 +42,12 @@ + + #if defined(_AIX) + # include <sys/systemcfg.h> +-#elif defined(__linux__) && defined(__GLIBC__) && \ +- defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 16) +-# define USE_GETAUXVAL 1 +-# include <asm/cputable.h> +-# include <sys/auxv.h> ++#elif defined(__linux__) && defined(__GLIBC__) && defined(__GLIBC_PREREQ) ++# if __GLIBC_PREREQ(2, 16) ++# define USE_GETAUXVAL 1 ++# include <asm/cputable.h> ++# include <sys/auxv.h> ++# endif + #elif defined(__FreeBSD__) + # include <machine/cpu.h> + # ifdef PPC_FEATURE2_HAS_VEC_CRYPTO +-- +GitLab + |