From b0d69befb9223b8ca013e1d0cf2a9c50f826d2c9 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Mon, 25 Mar 2024 22:42:41 +0100
Subject: [PATCH] gnutls: update to 3.8.4
---
components/library/gnutls/gnutls.p5m | 8 +++++---
components/library/gnutls/manifests/sample-manifest.p5m | 8 +++++---
components/library/gnutls/Makefile | 9 ++-------
components/library/gnutls/pkg5 | 3 ---
components/library/gnutls/test/results-all.master | 7 ++++---
5 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/components/library/gnutls/Makefile b/components/library/gnutls/Makefile
index 0e945c2..b4b4dba 100644
--- a/components/library/gnutls/Makefile
+++ b/components/library/gnutls/Makefile
@@ -33,12 +33,12 @@
COMPONENT_NAME= gnutls
COMPONENT_MJR_VERSION= 3.8
-COMPONENT_VERSION= $(COMPONENT_MJR_VERSION).3
+COMPONENT_VERSION= $(COMPONENT_MJR_VERSION).4
COMPONENT_SUMMARY= GNU transport layer security library
COMPONENT_PROJECT_URL= https://gnutls.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
-COMPONENT_ARCHIVE_HASH= sha256:f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e
+COMPONENT_ARCHIVE_HASH= sha256:2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b
COMPONENT_ARCHIVE_URL= https://www.gnupg.org/ftp/gcrypt/gnutls/v$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).sig
COMPONENT_FMRI= library/gnutls-3
@@ -56,19 +56,14 @@
# usr/share/info/dir is provided by text/texinfo
COMPONENT_POST_INSTALL_ACTION += $(RM) $(PROTOUSRSHAREDIR)/info/dir ;
-unexport SHELLOPTS
-
# Auto-generated dependencies
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
-REQUIRED_PACKAGES += compress/zstd
-REQUIRED_PACKAGES += library/brotli
REQUIRED_PACKAGES += library/desktop/p11-kit
REQUIRED_PACKAGES += library/gmp
REQUIRED_PACKAGES += library/libidn2
REQUIRED_PACKAGES += library/libtasn1
REQUIRED_PACKAGES += library/libunistring
REQUIRED_PACKAGES += library/nettle
-REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
diff --git a/components/library/gnutls/gnutls.p5m b/components/library/gnutls/gnutls.p5m
index 3ad5ba3..be13952 100644
--- a/components/library/gnutls/gnutls.p5m
+++ b/components/library/gnutls/gnutls.p5m
@@ -49,9 +49,9 @@
file path=usr/include/gnutls/urls.h
file path=usr/include/gnutls/x509-ext.h
file path=usr/include/gnutls/x509.h
-link path=usr/lib/$(MACH64)/libgnutls.so target=libgnutls.so.30.37.1
-link path=usr/lib/$(MACH64)/libgnutls.so.30 target=libgnutls.so.30.37.1
-file path=usr/lib/$(MACH64)/libgnutls.so.30.37.1
+link path=usr/lib/$(MACH64)/libgnutls.so target=libgnutls.so.30.38.0
+link path=usr/lib/$(MACH64)/libgnutls.so.30 target=libgnutls.so.30.38.0
+file path=usr/lib/$(MACH64)/libgnutls.so.30.38.0
link path=usr/lib/$(MACH64)/libgnutlsxx.so target=libgnutlsxx.so.30.0.0
link path=usr/lib/$(MACH64)/libgnutlsxx.so.30 target=libgnutlsxx.so.30.0.0
file path=usr/lib/$(MACH64)/libgnutlsxx.so.30.0.0
@@ -1272,8 +1272,10 @@
file path=usr/share/man/man3/gnutls_x509_rdn_get_by_oid.3
file path=usr/share/man/man3/gnutls_x509_rdn_get_oid.3
file path=usr/share/man/man3/gnutls_x509_spki_deinit.3
+file path=usr/share/man/man3/gnutls_x509_spki_get_rsa_oaep_params.3
file path=usr/share/man/man3/gnutls_x509_spki_get_rsa_pss_params.3
file path=usr/share/man/man3/gnutls_x509_spki_init.3
+file path=usr/share/man/man3/gnutls_x509_spki_set_rsa_oaep_params.3
file path=usr/share/man/man3/gnutls_x509_spki_set_rsa_pss_params.3
file path=usr/share/man/man3/gnutls_x509_tlsfeatures_add.3
file path=usr/share/man/man3/gnutls_x509_tlsfeatures_check_crt.3
diff --git a/components/library/gnutls/manifests/sample-manifest.p5m b/components/library/gnutls/manifests/sample-manifest.p5m
index 443aa20..9b334c2 100644
--- a/components/library/gnutls/manifests/sample-manifest.p5m
+++ b/components/library/gnutls/manifests/sample-manifest.p5m
@@ -49,9 +49,9 @@
file path=usr/include/gnutls/urls.h
file path=usr/include/gnutls/x509-ext.h
file path=usr/include/gnutls/x509.h
-link path=usr/lib/$(MACH64)/libgnutls.so target=libgnutls.so.30.37.1
-link path=usr/lib/$(MACH64)/libgnutls.so.30 target=libgnutls.so.30.37.1
-file path=usr/lib/$(MACH64)/libgnutls.so.30.37.1
+link path=usr/lib/$(MACH64)/libgnutls.so target=libgnutls.so.30.38.0
+link path=usr/lib/$(MACH64)/libgnutls.so.30 target=libgnutls.so.30.38.0
+file path=usr/lib/$(MACH64)/libgnutls.so.30.38.0
link path=usr/lib/$(MACH64)/libgnutlsxx.so target=libgnutlsxx.so.30.0.0
link path=usr/lib/$(MACH64)/libgnutlsxx.so.30 target=libgnutlsxx.so.30.0.0
file path=usr/lib/$(MACH64)/libgnutlsxx.so.30.0.0
@@ -1272,8 +1272,10 @@
file path=usr/share/man/man3/gnutls_x509_rdn_get_by_oid.3
file path=usr/share/man/man3/gnutls_x509_rdn_get_oid.3
file path=usr/share/man/man3/gnutls_x509_spki_deinit.3
+file path=usr/share/man/man3/gnutls_x509_spki_get_rsa_oaep_params.3
file path=usr/share/man/man3/gnutls_x509_spki_get_rsa_pss_params.3
file path=usr/share/man/man3/gnutls_x509_spki_init.3
+file path=usr/share/man/man3/gnutls_x509_spki_set_rsa_oaep_params.3
file path=usr/share/man/man3/gnutls_x509_spki_set_rsa_pss_params.3
file path=usr/share/man/man3/gnutls_x509_tlsfeatures_add.3
file path=usr/share/man/man3/gnutls_x509_tlsfeatures_check_crt.3
diff --git a/components/library/gnutls/pkg5 b/components/library/gnutls/pkg5
index b992de6..0fb0841 100644
--- a/components/library/gnutls/pkg5
+++ b/components/library/gnutls/pkg5
@@ -1,14 +1,11 @@
{
"dependencies": [
- "compress/zstd",
- "library/brotli",
"library/desktop/p11-kit",
"library/gmp",
"library/libidn2",
"library/libtasn1",
"library/libunistring",
"library/nettle",
- "library/zlib",
"system/library",
"system/library/g++-13-runtime",
"system/library/gcc-13-runtime",
diff --git a/components/library/gnutls/test/results-all.master b/components/library/gnutls/test/results-all.master
index 6c38bf4..86b029b 100644
--- a/components/library/gnutls/test/results-all.master
+++ b/components/library/gnutls/test/results-all.master
@@ -292,7 +292,7 @@
PASS: resume-lifetime
PASS: mini-dtls-srtp
PASS: rsa-encrypt-decrypt
-PASS: mini-loss-time
+FAIL: mini-loss-time
PASS: gnutls-strcodes
PASS: mini-record
PASS: mini-dtls-record
@@ -336,6 +336,7 @@
PASS: sign-is-secure
PASS: spki
PASS: spki-abstract
+PASS: rsa-rsa-oaep
PASS: rsa-rsa-pss
PASS: mini-dtls-fork
PASS: dtls-pthread
@@ -681,10 +682,10 @@
SKIP: certtool-pkcs11.sh
SKIP: pkcs11-tool.sh
SKIP: tpmtool_test.sh
-# TOTAL: 509
+# TOTAL: 510
# PASS: 448
# SKIP: 56
# XFAIL: 0
-# FAIL: 5
+# FAIL: 6
# XPASS: 0
# ERROR: 0
--
Gitblit v1.9.3