-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Dependencies: * libwbclient is deprecated and removed upstream. * libxslt-devel is not used for building; xsltproc from libxslt is used instead. * xmlcatmgr does not seem to be used as a host make dependency. * python3 is required for cross compiling bindings. * http-parser-devel (http_parser.h) does not seem to be mentioned anywhere in the source code. * nscd does not seem to be used in hostmakedepends. Patches: * libressl.patch is removed due to openssl replacing libressl. * fix_tests.patch is divided into test_softhsm.patch and test_negcache.patch Misc: * "--without-python2-bindings" can be safely omitted from configure_args. * oidc-child now requires libjose which is not present in the repository, hence it is disabled.
- Loading branch information
Showing
7 changed files
with
109 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| configure was supposed to execute compiled testing binaries. | ||
|
|
||
| However, when it comes to cross compiling, the script chooses to exit | ||
| and interrupt the building. | ||
|
|
||
| Skipping execution is preferred to quitting in this case. | ||
|
|
||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -20460,10 +20460,7 @@ | ||
|
|
||
| if test "$cross_compiling" = yes | ||
| then : | ||
| - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
| -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | ||
| -as_fn_error $? "cannot run test program while cross compiling | ||
| -See \`config.log' for more details" "$LINENO" 5; } | ||
| + : | ||
| else $as_nop | ||
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| /* end confdefs.h. */ | ||
| @@ -22915,10 +22912,7 @@ | ||
| LIBS="$LIBS -L${sambalibdir} -lidmap-samba4 -Wl,-rpath ${sambalibdir}" | ||
| if test "$cross_compiling" = yes | ||
| then : | ||
| - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
| -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} | ||
| -as_fn_error $? "cannot run test program while cross compiling | ||
| -See \`config.log' for more details" "$LINENO" 5; } | ||
| + : | ||
| else $as_nop | ||
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| /* end confdefs.h. */ |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| Fix tests by disabling failures related to softhsm, see | ||
|
|
||
| https://github.com/SSSD/sssd/issues/5397 | ||
|
|
||
| --- a/src/tests/cmocka/test_pam_srv.c | ||
| +++ b/src/tests/cmocka/test_pam_srv.c | ||
| @@ -37,6 +37,7 @@ | ||
| #include "util/crypto/sss_crypto.h" | ||
|
|
||
| #ifdef HAVE_TEST_CA | ||
| +#define TEST_MODULE_NAME SOFTHSM2_PATH | ||
| #include "tests/test_CA/SSSD_test_cert_x509_0001.h" | ||
| #include "tests/test_CA/SSSD_test_cert_x509_0002.h" | ||
| #include "tests/test_CA/SSSD_test_cert_x509_0005.h" | ||
| @@ -52,6 +53,7 @@ | ||
| #define SSSD_TEST_CERT_0007 "" | ||
| #define SSSD_TEST_INTERMEDIATE_CA_CERT_0001 "" | ||
| #define SSSD_TEST_ECC_CERT_0001 "" | ||
| +#define TEST_MODULE_NAME "" | ||
| #endif | ||
|
|
||
| #define TESTS_PATH "tp_" BASE_FILE_STEM | ||
| @@ -71,7 +73,6 @@ | ||
| #define TEST_TOKEN2_NAME "SSSD Test Token Number 2" | ||
| #define TEST_KEY_ID "C554C9F82C2A9D58B70921C143304153A8A42F17" | ||
| #define TEST_LABEL "SSSD test cert 0001" | ||
| -#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" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| The test_ncache_* functions require a working user directory, which is | ||
| generally unavailable in xbps-src builds. | ||
|
|
||
| --- a/src/tests/cmocka/test_negcache.c | ||
| +++ b/src/tests/cmocka/test_negcache.c | ||
| @@ -1371,6 +1371,7 @@ | ||
| 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, | ||
| @@ -1423,6 +1424,7 @@ | ||
| cmocka_unit_test_setup_teardown(test_ncache_both_gid, | ||
| test_ncache_setup, | ||
| test_ncache_teardown), | ||
| +#endif | ||
| }; | ||
|
|
||
| tests_set_cwd(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.