upg gnutls ldns
This commit is contained in:
parent
67fa1428db
commit
38f4d09f74
9 changed files with 50 additions and 40 deletions
|
|
@ -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@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 @@ Signed-off-by: Daiki Ueno <ueno@gnu.org>
|
|||
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 @@ index 7ddaa594e6..b002dba721 100644
|
|||
- 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)
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
pkgname=gnutls
|
||||
pkgver=3.7.7
|
||||
pkgrel=02
|
||||
pkgdesc="A library which provides a secure layer over a reliable transport layer w/o zstd"
|
||||
pkgrel=03
|
||||
pkgdesc="A library which provides a secure layer over a reliable transport layer"
|
||||
arch=('x86_64')
|
||||
url="https://www.gnutls.org/"
|
||||
options=('!zipman')
|
||||
|
|
@ -20,7 +20,7 @@ checkdepends=('net-tools' 'tpm2-tools')
|
|||
optdepends=('guile: for use with Guile bindings'
|
||||
'tpm2-tss: support for TPM2 wrapped keys')
|
||||
source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/${pkgname}-${pkgver}.tar.xz{,.sig}
|
||||
0001-fix-avx-detection.patch)
|
||||
0001-fix-avx-detection.patch)
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
|
|
@ -48,10 +48,6 @@ build() {
|
|||
make
|
||||
}
|
||||
|
||||
# 3.7.7-02 some tests fail and the third one just gets stuck, no processing, no exit, and this is
|
||||
# due to the patch, it wasn't happening before. So we issue this temporarily till a better edition
|
||||
# appears to solve this problem.
|
||||
#
|
||||
#check() {
|
||||
# cd ${pkgname}-${pkgver}
|
||||
# # disable parallel tests:
|
||||
|
|
@ -78,6 +74,5 @@ validpgpkeys=('5D46CB0F763405A7053556F47A75A648B3F9220C') # "Zoltan Fridrich <zf
|
|||
|
||||
sha256sums=(be9143d0d58eab64dba9b77114aaafac529b6c0d7e81de6bdf1c9b59027d2106 # gnutls-3.7.7.tar.xz
|
||||
dd7d0e7ba0b82fbe07088eed3c1e3970ceceb1add01dea8fef93db0710aa5e97 # gnutls-3.7.7.tar.xz.sig
|
||||
250c13305115001cfc52e0a65e5bfb62e53b6697cfb1ee30a8a24da9181c63da) # 0001-fix-avx-detection.patch
|
||||
|
||||
f5a7155e319d823f72c1ae682aa8d93161965f87c453e7896a1149c4669ba92f) # 0001-fix-avx-detection.patch
|
||||
|
||||
|
|
|
|||
|
|
@ -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 @@ source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/${pkgname}-${pkgver}.tar.xz
|
|||
0001-fix-avx-detection.patch)
|
||||
sha256sums=('be9143d0d58eab64dba9b77114aaafac529b6c0d7e81de6bdf1c9b59027d2106'
|
||||
'SKIP'
|
||||
'250c13305115001cfc52e0a65e5bfb62e53b6697cfb1ee30a8a24da9181c63da')
|
||||
'f5a7155e319d823f72c1ae682aa8d93161965f87c453e7896a1149c4669ba92f')
|
||||
#validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno@unixuser.org>"
|
||||
validpgpkeys=('5D46CB0F763405A7053556F47A75A648B3F9220C') # "Zoltan Fridrich <zfridric@redhat.com>"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,3 +2,5 @@ net-tools
|
|||
tpm2-tss
|
||||
tpm2-tools
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
gpg -v --recv-key D605848ED7E69871
|
||||
gpg --recv-keys 7A75A648B3F9220C
|
||||
gpg -v --recv-key 7A75A648B3F9220C
|
||||
|
|
|
|||
25
ldns/1acee0c5d35f4a04df07e5d5f4490e6318513997.patch
Normal file
25
ldns/1acee0c5d35f4a04df07e5d5f4490e6318513997.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
From 1acee0c5d35f4a04df07e5d5f4490e6318513997 Mon Sep 17 00:00:00 2001
|
||||
From: Willem Toorop <willem@nlnetlabs.nl>
|
||||
Date: Sun, 14 Aug 2022 17:19:02 +0200
|
||||
Subject: [PATCH] Issue #183 EDNS OPT can have no rdata
|
||||
|
||||
---
|
||||
host2wire.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/host2wire.c b/host2wire.c
|
||||
index 49e4924a..137257cd 100644
|
||||
--- a/host2wire.c
|
||||
+++ b/host2wire.c
|
||||
@@ -449,7 +449,10 @@ ldns_pkt2buffer_wire_compress(ldns_buffer *buffer, const ldns_pkt *packet, ldns_
|
||||
, ldns_buffer_export(edns_buf));
|
||||
ldns_buffer_free(edns_buf);
|
||||
}
|
||||
- ldns_rr_push_rdf(edns_rr, edns_rdf ? edns_rdf : packet->_edns_data);
|
||||
+ if (edns_rdf)
|
||||
+ ldns_rr_push_rdf(edns_rr, edns_rdf);
|
||||
+ else if (packet->_edns_data)
|
||||
+ ldns_rr_push_rdf(edns_rr, packet->_edns_data);
|
||||
(void)ldns_rr2buffer_wire_compress(buffer, edns_rr, LDNS_SECTION_ADDITIONAL, compression_data);
|
||||
/* take the edns rdata back out of the rr before we free rr */
|
||||
if (!edns_rdf)
|
||||
|
|
@ -6,22 +6,15 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=ldns
|
||||
pkgver=1.8.2
|
||||
pkgrel=02
|
||||
pkgver=1.8.3
|
||||
pkgrel=01
|
||||
pkgdesc='Fast DNS library supporting recent RFCs'
|
||||
url='https://www.nlnetlabs.nl/projects/ldns/'
|
||||
arch=('x86_64')
|
||||
depends=('openssl' 'dnssec-anchors')
|
||||
optdepends=('libpcap: ldns-dpa tool')
|
||||
makedepends=('libpcap')
|
||||
source=("https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
|
||||
https://github.com/NLnetLabs/ldns/commit/1acee0c5d35f4a04df07e5d5f4490e6318513997.patch)
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
# https://github.com/NLnetLabs/ldns/issues/183
|
||||
patch -p1 -i ../1acee0c5d35f4a04df07e5d5f4490e6318513997.patch
|
||||
}
|
||||
source=("https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc})
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
|
@ -47,6 +40,7 @@ package() {
|
|||
|
||||
license=('custom:BSD')
|
||||
|
||||
sha256sums=(b92b001cdd382de653620a05445e42e17a827eec93d64ee587ad291a533cc1e9 # ldns-1.8.2.tar.gz
|
||||
03084dcee80fc1b6de47117bc9e0106e541fdda3600dbe0f6d9a8fb44d21d14e) # 1acee0c5d35f4a04df07e5d5f4490e6318513997.patch
|
||||
validpgpkeys=('DC34EE5DB2417BCC151E5100E5F8F8212F77A498') # Willem Toorop
|
||||
|
||||
sha256sums=(c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860 # ldns-1.8.3.tar.gz
|
||||
b872fb26a76591af93a73c0dda6532d5dc4c236fec05512f81e81cb2687ef65f) # ldns-1.8.3.tar.gz.asc
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
# Contributor: jiribb <jiribb@gmail.com>
|
||||
|
||||
pkgname=ldns
|
||||
pkgver=1.8.2
|
||||
pkgrel=2
|
||||
pkgver=1.8.3
|
||||
pkgrel=1
|
||||
pkgdesc='Fast DNS library supporting recent RFCs'
|
||||
url='https://www.nlnetlabs.nl/projects/ldns/'
|
||||
license=('custom:BSD')
|
||||
|
|
@ -12,16 +12,10 @@ arch=('x86_64')
|
|||
depends=('openssl' 'dnssec-anchors')
|
||||
optdepends=('libpcap: ldns-dpa tool')
|
||||
makedepends=('libpcap')
|
||||
source=("https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
|
||||
https://github.com/NLnetLabs/ldns/commit/1acee0c5d35f4a04df07e5d5f4490e6318513997.patch)
|
||||
sha256sums=('b92b001cdd382de653620a05445e42e17a827eec93d64ee587ad291a533cc1e9'
|
||||
'03084dcee80fc1b6de47117bc9e0106e541fdda3600dbe0f6d9a8fb44d21d14e')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
# https://github.com/NLnetLabs/ldns/issues/183
|
||||
patch -p1 -i ../1acee0c5d35f4a04df07e5d5f4490e6318513997.patch
|
||||
}
|
||||
source=("https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc})
|
||||
sha256sums=('c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860'
|
||||
'SKIP')
|
||||
validpgpkeys=('DC34EE5DB2417BCC151E5100E5F8F8212F77A498') # Willem Toorop
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
|
|
|||
1
ldns/key
Normal file
1
ldns/key
Normal file
|
|
@ -0,0 +1 @@
|
|||
gpg -v --recv-keys E5F8F8212F77A498
|
||||
Loading…
Add table
Add a link
Reference in a new issue