Marcel Telka
2023-10-12 866d8c544ebc35c5283ab6361bab644095447d9e
gnutls-3: drop autoreconf call; use parallel build

7 files modified
112 ■■■■ changed files
components/library/gnutls-3/Makefile 10 ●●●● patch | view | raw | blame | history
components/library/gnutls-3/gnutls.p5m 14 ●●●●● patch | view | raw | blame | history
components/library/gnutls-3/manifests/sample-manifest.p5m 9 ●●●●● patch | view | raw | blame | history
components/library/gnutls-3/patches/03_pkcs11_common.patch 12 ●●●● patch | view | raw | blame | history
components/library/gnutls-3/patches/04-fix-netstat.patch 6 ●●●● patch | view | raw | blame | history
components/library/gnutls-3/test/results-all.master 61 ●●●●● patch | view | raw | blame | history
tools/.gnupg/pubring.gpg patch | view | raw | blame | history
components/library/gnutls-3/Makefile
@@ -28,12 +28,14 @@
BUILD_BITS= 64_and_32
USE_DEFAULT_TEST_TRANSFORMS= yes
USE_PARALLEL_BUILD= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        gnutls
COMPONENT_MJR_VERSION=    3.8
COMPONENT_VERSION=    $(COMPONENT_MJR_VERSION).1
COMPONENT_REVISION=    1
COMPONENT_REVISION=    2
COMPONENT_SUMMARY=    GNU transport layer security library
COMPONENT_PROJECT_URL=  https://gnutls.org/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -50,12 +52,14 @@
CFLAGS += -I$(USRINCDIR)/idn2
CONFIGURE_OPTIONS += --disable-guile
CONFIGURE_OPTIONS += --disable-dependency-tracking
CONFIGURE_OPTIONS += --with-default-trust-store-file=/etc/certs/ca-certificates.crt
CONFIGURE_OPTIONS += --with-default-trust-store-dir=/etc/certs/CA
COMPONENT_PRE_CONFIGURE_ACTION= ( cd $(SOURCE_DIR) && autoreconf -if )
# Drop 32-bit binaries
COMPONENT_POST_INSTALL_ACTION += $(RM) -r $(PROTOUSRBINDIR32) ;
# usr/share/info/dir is provided by text/texinfo
COMPONENT_POST_INSTALL_ACTION += $(RM) $(PROTOUSRSHAREDIR)/info/dir ;
unexport SHELLOPTS
components/library/gnutls-3/gnutls.p5m
@@ -23,19 +23,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
# We don't deliver 32 bit apps
<transform file path=.*/bin/$(MACH32)/.+ -> drop>
# dir files aren't allowed
<transform file path=.+/info/dir -> drop>
file path=usr/bin/$(MACH32)/certtool
file path=usr/bin/$(MACH32)/gnutls-cli
file path=usr/bin/$(MACH32)/gnutls-cli-debug
file path=usr/bin/$(MACH32)/gnutls-serv
file path=usr/bin/$(MACH32)/ocsptool
file path=usr/bin/$(MACH32)/p11tool
file path=usr/bin/$(MACH32)/psktool
file path=usr/bin/$(MACH32)/tpmtool
file path=usr/bin/certtool
file path=usr/bin/gnutls-cli
file path=usr/bin/gnutls-cli-debug
@@ -86,7 +73,6 @@
file path=usr/share/doc/gnutls/gnutls-modauth.png
file path=usr/share/doc/gnutls/gnutls-x509.png
file path=usr/share/doc/gnutls/pkcs11-vision.png
file path=usr/share/info/dir
file path=usr/share/info/gnutls-client-server-use-case.png
file path=usr/share/info/gnutls-crypto-layers.png
file path=usr/share/info/gnutls-handshake-sequence.png
components/library/gnutls-3/manifests/sample-manifest.p5m
@@ -23,14 +23,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/$(MACH32)/certtool
file path=usr/bin/$(MACH32)/gnutls-cli
file path=usr/bin/$(MACH32)/gnutls-cli-debug
file path=usr/bin/$(MACH32)/gnutls-serv
file path=usr/bin/$(MACH32)/ocsptool
file path=usr/bin/$(MACH32)/p11tool
file path=usr/bin/$(MACH32)/psktool
file path=usr/bin/$(MACH32)/tpmtool
file path=usr/bin/certtool
file path=usr/bin/gnutls-cli
file path=usr/bin/gnutls-cli-debug
@@ -81,7 +73,6 @@
file path=usr/share/doc/gnutls/gnutls-modauth.png
file path=usr/share/doc/gnutls/gnutls-x509.png
file path=usr/share/doc/gnutls/pkcs11-vision.png
file path=usr/share/info/dir
file path=usr/share/info/gnutls-client-server-use-case.png
file path=usr/share/info/gnutls-crypto-layers.png
file path=usr/share/info/gnutls-handshake-sequence.png
components/library/gnutls-3/patches/03_pkcs11_common.patch
@@ -5,15 +5,15 @@
Status: This patch has been submitted to upstream, not yet accepted.
--- gnutls-3.4.6/src/tpmtool.c    Tue Jul 21 02:42:08 2015
+++ gnutls-3.4.6/src/tpmtool.c    Thu Nov 19 13:43:02 2015
@@ -184,7 +184,9 @@
     gnutls_datum_t data, sig = {NULL, 0};
--- gnutls-3.8.1/src/tpmtool.c.orig
+++ gnutls-3.8.1/src/tpmtool.c
@@ -194,7 +194,9 @@
     gnutls_datum_t data, sig = { NULL, 0 };
     int pk;
 
+#ifdef ENABLE_PKCS11
     pkcs11_common(NULL);
+#endif
 
     data.data = (void*)TEST_DATA;
     data.size = sizeof(TEST_DATA)-1;
     data.data = (void *)TEST_DATA;
     data.size = sizeof(TEST_DATA) - 1;
components/library/gnutls-3/patches/04-fix-netstat.patch
@@ -1,7 +1,7 @@
illumos doesn't support netstat -l.
--- gnutls-3.7.8/tests/scripts/common.sh.orig    2022-09-27 14:42:22.000000000 +0000
+++ gnutls-3.7.8/tests/scripts/common.sh    2022-10-31 11:28:56.517033635 +0000
@@ -80,7 +80,7 @@
--- gnutls-3.8.1/tests/scripts/common.sh.orig
+++ gnutls-3.8.1/tests/scripts/common.sh
@@ -79,7 +79,7 @@
 check_if_port_listening() {
     local PORT=$1
     have_port_finder
components/library/gnutls-3/test/results-all.master
@@ -172,6 +172,7 @@
# FAIL:  0
# XPASS: 0
# ERROR: 0
PASS: sanity-cpp
PASS: tls13/supported_versions
PASS: tls13/tls12-no-tls13-exts
PASS: tls13/post-handshake-with-cert
@@ -547,35 +548,47 @@
PASS: tls-channel-binding
PASS: strict-der
PASS: system-prio-file
PASS: dtls-sliding-window
PASS: ip-utils
PASS: name-constraints-ip
PASS: conv-utf8
PASS: str-unicode
PASS: str-idna
PASS: tls10-prf
PASS: tls12-prf
PASS: gnutls_record_overhead
PASS: eagain
PASS: tls12-rehandshake-cert
PASS: eagain-auto-auth
PASS: pkcs11-cert-import-url-exts
PASS: pkcs11-get-exts
PASS: pkcs11-get-raw-issuer-exts
PASS: pkcs11-cert-import-url4-exts
SKIP: pkcs11/pkcs11-chainverify
SKIP: pkcs11/pkcs11-get-issuer
SKIP: pkcs11/pkcs11-is-known
SKIP: pkcs11/pkcs11-combo
SKIP: pkcs11/pkcs11-privkey
SKIP: pkcs11/pkcs11-pubkey-import-rsa
SKIP: pkcs11/pkcs11-pubkey-import-ecdsa
FAIL: pkcs11/pkcs11-chainverify
FAIL: pkcs11/pkcs11-get-issuer
FAIL: pkcs11/pkcs11-is-known
FAIL: pkcs11/pkcs11-combo
FAIL: pkcs11/pkcs11-privkey
FAIL: pkcs11/pkcs11-pubkey-import-rsa
FAIL: pkcs11/pkcs11-pubkey-import-ecdsa
PASS: pkcs11-import-url-privkey
SKIP: pkcs11-privkey-fork
SKIP: pkcs11/pkcs11-ec-privkey-test
FAIL: pkcs11/pkcs11-ec-privkey-test
PASS: pkcs11-privkey-always-auth
PASS: pkcs11-privkey-export
SKIP: pkcs11/pkcs11-import-with-pin
FAIL: pkcs11/pkcs11-import-with-pin
SKIP: pkcs11/pkcs11-privkey-pthread
PASS: pkcs11/pkcs11-pin-func
SKIP: pkcs11/pkcs11-obj-import
FAIL: pkcs11/pkcs11-obj-import
SKIP: pkcs11-privkey-fork-reinit
SKIP: pkcs11-mechanisms
PASS: pkcs11-privkey-safenet-always-auth
SKIP: pkcs11/pkcs11-rsa-pss-privkey-test
SKIP: pkcs11/tls-neg-pkcs11-key
SKIP: pkcs11/pkcs11-privkey-generate
SKIP: pkcs11/gnutls_x509_crt_list_import_url
SKIP: pkcs11/gnutls_pcert_list_import_x509_file
SKIP: pkcs11/pkcs11-eddsa-privkey-test
FAIL: pkcs11/pkcs11-rsa-pss-privkey-test
FAIL: pkcs11/tls-neg-pkcs11-key
FAIL: pkcs11/pkcs11-privkey-generate
FAIL: pkcs11/gnutls_x509_crt_list_import_url
FAIL: pkcs11/gnutls_pcert_list_import_x509_file
FAIL: pkcs11/pkcs11-eddsa-privkey-test
SKIP: pkcs11-token-raw
SKIP: pkcs11-obj-raw
PASS: pkcs11-import-url-privkey-caps
@@ -597,10 +610,10 @@
PASS: tls13-early-data-neg2
PASS: resume-with-record-size-limit
PASS: record-sendfile
SKIP: tls13/post-handshake-with-cert-pkcs11
FAIL: tls13/post-handshake-with-cert-pkcs11
SKIP: pkcs11/tls-neg-pkcs11-no-key
SKIP: global-init-override
SKIP: pkcs11/distrust-after
FAIL: pkcs11/distrust-after
PASS: rfc2253-escape-test.sh
PASS: rsa-md5-collision/rsa-md5-collision.sh
PASS: systemkey.sh
@@ -661,13 +674,13 @@
PASS: gnutls-cli-rawpk.sh
PASS: dh-fips-approved.sh
SKIP: p11-kit-trust.sh
SKIP: testpkcs11.sh
SKIP: certtool-pkcs11.sh
FAIL: testpkcs11.sh
FAIL: certtool-pkcs11.sh
SKIP: tpmtool_test.sh
# TOTAL: 492
# PASS:  432
# SKIP:  55
# TOTAL: 505
# PASS:  445
# SKIP:  35
# XFAIL: 0
# FAIL:  5
# FAIL:  25
# XPASS: 0
# ERROR: 0
tools/.gnupg/pubring.gpg
Binary files differ