From 05ab97341fadc6c2378eff31febf17fd80e50db04703ac9bdf6aa6c264ab91ba Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 27 Feb 2023 09:39:20 +0000 Subject: [PATCH] Fix building with cmocka >= 1.1.6 OBS-URL: https://build.opensuse.org/package/show/devel:tools/pam_wrapper?expand=0&rev=36 --- pam_wrapper-fix-cmocka-1.1.6+-support.patch | 107 ++++++++++++++++++++ pam_wrapper.changes | 6 ++ pam_wrapper.spec | 3 +- 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 pam_wrapper-fix-cmocka-1.1.6+-support.patch diff --git a/pam_wrapper-fix-cmocka-1.1.6+-support.patch b/pam_wrapper-fix-cmocka-1.1.6+-support.patch new file mode 100644 index 0000000..32ec671 --- /dev/null +++ b/pam_wrapper-fix-cmocka-1.1.6+-support.patch @@ -0,0 +1,107 @@ +From 9e7f8ac9ee1f968ac8af2d9c2e9dbd91a3090b73 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Fri, 17 Feb 2023 18:08:45 +0100 +Subject: [PATCH 1/2] cmake: Drop FindCMocka.cmake Module +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We should use config mode. + +Signed-off-by: Andreas Schneider +Reviewed-by: Pavel Filipenský +--- + cmake/Modules/FindCMocka.cmake | 49 ---------------------------------- + 1 file changed, 49 deletions(-) + delete mode 100644 cmake/Modules/FindCMocka.cmake + +diff --git a/cmake/Modules/FindCMocka.cmake b/cmake/Modules/FindCMocka.cmake +deleted file mode 100644 +index 2dd9fc5..0000000 +--- a/cmake/Modules/FindCMocka.cmake ++++ /dev/null +@@ -1,49 +0,0 @@ +-# - Try to find CMocka +-# Once done this will define +-# +-# CMOCKA_ROOT_DIR - Set this variable to the root installation of CMocka +-# +-# Read-Only variables: +-# CMOCKA_FOUND - system has CMocka +-# CMOCKA_INCLUDE_DIR - the CMocka include directory +-# CMOCKA_LIBRARIES - Link these to use CMocka +-# CMOCKA_DEFINITIONS - Compiler switches required for using CMocka +-# +-#============================================================================= +-# Copyright (c) 2011-2012 Andreas Schneider +-# +-# Distributed under the OSI-approved BSD License (the "License"); +-# see accompanying file Copyright.txt for details. +-# +-# This software is distributed WITHOUT ANY WARRANTY; without even the +-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +-# See the License for more information. +-#============================================================================= +-# +- +-find_path(CMOCKA_INCLUDE_DIR +- NAMES +- cmocka.h +- PATHS +- ${CMOCKA_ROOT_DIR}/include +-) +- +-find_library(CMOCKA_LIBRARY +- NAMES +- cmocka +- PATHS +- ${CMOCKA_ROOT_DIR}/include +-) +- +-if (CMOCKA_LIBRARY) +- set(CMOCKA_LIBRARIES +- ${CMOCKA_LIBRARIES} +- ${CMOCKA_LIBRARY} +- ) +-endif (CMOCKA_LIBRARY) +- +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(CMocka DEFAULT_MSG CMOCKA_LIBRARIES CMOCKA_INCLUDE_DIR) +- +-# show the CMOCKA_INCLUDE_DIR and CMOCKA_LIBRARIES variables only in the advanced view +-mark_as_advanced(CMOCKA_INCLUDE_DIR CMOCKA_LIBRARIES) +-- +2.39.2 + + +From 8e94874bf5c0d569a16985eafa9922d8c527a9fb Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Fri, 17 Feb 2023 17:51:27 +0100 +Subject: [PATCH 2/2] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Schneider +Reviewed-by: Pavel Filipenský +--- + tests/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 9d56f21..26f2da2 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,5 +1,9 @@ + project(tests C) + ++if (TARGET cmocka::cmocka) ++ set(CMOCKA_LIBRARY cmocka::cmocka) ++endif() ++ + set(PAM_MATRIX_PATH "${CMAKE_BINARY_DIR}/src/modules/pam_matrix.so") + + configure_file(services/matrix.in ${CMAKE_CURRENT_BINARY_DIR}/services/matrix @ONLY) +-- +2.39.2 + diff --git a/pam_wrapper.changes b/pam_wrapper.changes index cb6b1da..60eabc1 100644 --- a/pam_wrapper.changes +++ b/pam_wrapper.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 27 09:38:30 UTC 2023 - Andreas Schneider + +- Fix building with cmocka >= 1.1.6 + * Added pam_wrapper-fix-cmocka-1.1.6+-support.patch + ------------------------------------------------------------------- Thu Oct 28 08:40:28 UTC 2021 - Andreas Schneider diff --git a/pam_wrapper.spec b/pam_wrapper.spec index 1db0e32..97709d5 100644 --- a/pam_wrapper.spec +++ b/pam_wrapper.spec @@ -1,7 +1,7 @@ # # spec file for package pam_wrapper # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,7 @@ URL: https://cwrap.org/ Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz Source1: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc Source2: %{name}-rpmlintrc +Patch0: pam_wrapper-fix-cmocka-1.1.6+-support.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: libcmocka-devel