The branch, master has been updated via d938a84 Bump version to 1.1.4 via 42f9d4d gitlab-ci: Allow freebsd to fail via 6df5d14 tests: Allow to filter tests via de959bc cmake: Check for -Wno-bad-function-cast from 4efe631 cmake: Remove configure check for pam_modutil_search_key
https://git.samba.org/?p=pam_wrapper.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d938a84d88c5882a08babfb5e10f03a9135237a3 Author: Andreas Schneider <a...@samba.org> Date: Fri Jun 25 10:12:07 2021 +0200 Bump version to 1.1.4 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> commit 42f9d4dee0c46174f305e65f87d82b2bcb12fe58 Author: Andreas Schneider <a...@samba.org> Date: Tue Oct 5 09:31:12 2021 +0200 gitlab-ci: Allow freebsd to fail Reviewed-by: Ralph Boehme <s...@samba.org> commit 6df5d14e49edc586b5000d552a26e0629b1f3b41 Author: Andreas Schneider <a...@samba.org> Date: Fri Jun 25 13:45:31 2021 +0200 tests: Allow to filter tests Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> commit de959bc431c9f87eb25b9e006b3a783a66048bd0 Author: Andreas Schneider <a...@samba.org> Date: Fri Jun 25 10:52:14 2021 +0200 cmake: Check for -Wno-bad-function-cast Fixes the build on freebsd. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci.yml | 3 +++ CHANGELOG | 9 +++++++++ CMakeLists.txt | 8 ++++---- CompilerChecks.cmake | 3 +++ src/python/CMakeLists.txt | 8 +++++--- tests/test_pam_wrapper.c | 7 ++++++- 6 files changed, 30 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 839c834..1439b2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,6 +132,9 @@ freebsd/x86_64: when: on_failure paths: - obj/ + # pam_wrapper stopped to work with the latest OpenPAM version, this is a + # bigger effort to investigate. + allow_failure: true tumbleweed/x86_64/gcc: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$TUMBLEWEED_BUILD diff --git a/CHANGELOG b/CHANGELOG index 39772b3..608f45b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,15 @@ ChangeLog ========== +version 1.1.4 (released 2020-10-28) + * NOTE: pam_wrapper stopped working with the latest OpenPAM on FreeBSD 12. + Help is needed to add back support. + * Added support to retrieve the PAM environment from a python's + PAMTEST_GETENVLIST + * Added a new keyword parameter to reuse the PAM handle in libpamtest + * Fixed pid range + * Fixed constructor/destructor on AIX + version 1.1.3 (released 2020-03-26) * Fixed paths in pkgconfig and cmake config files diff --git a/CMakeLists.txt b/CMakeLists.txt index b453ec3..37dff75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") include(DefineCMakeDefaults) include(DefineCompilerFlags) -project(pam_wrapper VERSION 1.1.3 LANGUAGES C) +project(pam_wrapper VERSION 1.1.4 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) @@ -25,13 +25,13 @@ set(APPLICATION_NAME ${PROJECT_NAME}) # Increment PATCH. set(LIBRARY_VERSION_MAJOR 0) set(LIBRARY_VERSION_MINOR 0) -set(LIBRARY_VERSION_PATCH 6) +set(LIBRARY_VERSION_PATCH 7) set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR}) -set(PAMTEST_LIBRARY_VERSION_MAJOR 0) +set(PAMTEST_LIBRARY_VERSION_MAJOR 1) set(PAMTEST_LIBRARY_VERSION_MINOR 0) -set(PAMTEST_LIBRARY_VERSION_PATCH 5) +set(PAMTEST_LIBRARY_VERSION_PATCH 0) set(PAMTEST_LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") set(PAMTEST_LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR}) diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake index 4fa1a83..6c74b0b 100644 --- a/CompilerChecks.cmake +++ b/CompilerChecks.cmake @@ -95,6 +95,9 @@ if (UNIX) add_c_compiler_flag("-Wno-error=tautological-compare" SUPPORTED_COMPILER_FLAGS) endif() + # Needed by src/python/CMakeLists.txt + check_c_compiler_flag("-Wno-cast-function-type" WITH_WNO_CAST_FUNCTION_TYPE) + # Unset CMAKE_REQUIRED_FLAGS unset(CMAKE_REQUIRED_FLAGS) endif() diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index e8730d9..faaf569 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -3,6 +3,8 @@ project(pypamtest C) add_subdirectory(python2) add_subdirectory(python3) -set_source_files_properties(pypamtest.c - DIRECTORY python2 python3 - PROPERTIES COMPILE_OPTIONS "-Wno-cast-function-type") +if (WITH_WNO_CAST_FUNCTION_TYPE) + set_source_files_properties(pypamtest.c + DIRECTORY python2 python3 + PROPERTIES COMPILE_OPTIONS "-Wno-cast-function-type") +endif() diff --git a/tests/test_pam_wrapper.c b/tests/test_pam_wrapper.c index 1e0c292..6fca804 100644 --- a/tests/test_pam_wrapper.c +++ b/tests/test_pam_wrapper.c @@ -985,7 +985,8 @@ static void test_libpamtest_get_failed_test(void **state) assert_ptr_equal(failed_tc, &tests[0]); } -int main(void) { +int main(int argc, char *argv[]) +{ int rc; const struct CMUnitTest init_tests[] = { @@ -1056,6 +1057,10 @@ int main(void) { cmocka_unit_test(test_get_set), }; + if (argc == 2) { + cmocka_set_test_filter(argv[1]); + } + rc = cmocka_run_group_tests(init_tests, NULL, NULL); return rc; -- pam wrapper repository