diff --git a/srcpkgs/sssd/patches/fix_tests.patch b/srcpkgs/sssd/patches/fix_tests.patch new file mode 100644 index 00000000000..33003a07cb8 --- /dev/null +++ b/srcpkgs/sssd/patches/fix_tests.patch @@ -0,0 +1,54 @@ +Fix tests by disabling failures related to softhsm, see + +https://github.com/SSSD/sssd/issues/5397 + +--- src/tests/cmocka/test_pam_srv.c ++++ src/tests/cmocka/test_pam_srv.c +@@ -41,6 +41,8 @@ + #include "tests/test_CA/SSSD_test_cert_x509_0002.h" + #include "tests/test_CA/SSSD_test_cert_x509_0005.h" + ++#define TEST_MODULE_NAME SOFTHSM2_PATH ++ + #include "tests/test_ECC_CA/SSSD_test_ECC_cert_x509_0001.h" + #else + #define SSSD_TEST_CERT_0001 "" +@@ -48,6 +50,7 @@ + #define SSSD_TEST_CERT_0005 "" + + #define SSSD_TEST_ECC_CERT_0001 "" ++#define TEST_MODULE_NAME "" + #endif + + #define TESTS_PATH "tp_" BASE_FILE_STEM +@@ -62,7 +65,6 @@ + #define TEST_TOKEN_NAME "SSSD Test Token" + #define TEST_TOKEN2_NAME "SSSD Test Token Number 2" + #define TEST_KEY_ID "C554C9F82C2A9D58B70921C143304153A8A42F17" +-#define TEST_MODULE_NAME SOFTHSM2_PATH + #define TEST_PROMPT "SSSD test cert 0001\nCN=SSSD test cert 0001,OU=SSSD test,O=SSSD" + #define TEST2_PROMPT "SSSD test cert 0002\nCN=SSSD test cert 0002,OU=SSSD test,O=SSSD" + #define TEST5_PROMPT "SSSD test cert 0005\nCN=SSSD test cert 0005,OU=SSSD test,O=SSSD" + +The test_ncache_* functions require a working user directory, which is +generally unavailable in xbps-src builds. + +--- src/tests/cmocka/test_negcache.c ++++ src/tests/cmocka/test_negcache.c +@@ -1089,7 +1089,7 @@ + setup, teardown), + cmocka_unit_test_setup_teardown(test_sss_ncache_domain_locate_type, + setup, teardown), +- ++#if 0 + /* user */ + cmocka_unit_test_setup_teardown(test_ncache_nocache_user, + test_ncache_setup, +@@ -1142,6 +1142,7 @@ + cmocka_unit_test_setup_teardown(test_ncache_both_gid, + test_ncache_setup, + test_ncache_teardown), ++#endif + }; + + tests_set_cwd(); diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template index 082a56831ae..7549109ee4f 100644 --- a/srcpkgs/sssd/template +++ b/srcpkgs/sssd/template @@ -1,7 +1,7 @@ # Template file for 'sssd' pkgname=sssd -version=2.3.1 -revision=2 +version=2.4.0 +revision=1 build_style=gnu-configure configure_args="--without-selinux --without-semanage --without-libwbclient --disable-cifs-idmap-plugin --without-samba --with-os=fedora @@ -27,8 +27,9 @@ maintainer="Yuusha Spacewolf " license="GPL-3.0-or-later" homepage="https://sssd.io" distfiles="https://github.com/SSSD/sssd/releases/download/${pkgname}-${version//./_}/${pkgname}-${version}.tar.gz" -checksum=ef8b047e6d0452a585862dffd16db725ac828e0d3fb594a8dea6d2f24a61ad17 +checksum=13d7eeff15e582279f70a3aad32daeb40d3749ec14947a4eded35adce7490cdd python_version=3 +nocross="configure attempts to run compiled output" do_check() { export CK_TIMEOUT_MULTIPLIER=10