[SCM] Resolv Wrapper Repository - branch master updated
The branch, master has been updated via f2e7f58 cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode via dcbc2d4 tests: Fix pointer type for assert_string_equal() from 7403361 Bump version to 1.1.8 https://git.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master - Log - commit f2e7f58025ecb4cf399494166abea01813b1d0f0 Author: Andreas Schneider Date: Fri Feb 17 17:51:27 2023 +0100 cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský commit dcbc2d4c8f0648b0c1b78b2b43c3a28640dc3576 Author: Andreas Schneider Date: Fri Feb 17 18:01:57 2023 +0100 tests: Fix pointer type for assert_string_equal() error: pointer targets in passing argument 1 of ‘_assert_string_equal’ differ in signedness [-Werror=pointer-sign] Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský --- Summary of changes: tests/CMakeLists.txt | 4 tests/test_dns_fake.c | 16 2 files changed, 12 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1262bed..7f2f4ee 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(TORTURE_LIBRARY torture) # A simple DNS server for testing diff --git a/tests/test_dns_fake.c b/tests/test_dns_fake.c index c057ebe..4f19f12 100644 --- a/tests/test_dns_fake.c +++ b/tests/test_dns_fake.c @@ -392,7 +392,7 @@ static void test_res_fake_uri_query(void **state) assert_int_equal(prio, 2); assert_int_equal(weight, 5); - assert_string_equal(rrdata, "https://vpn.cwrap.org/VPN;); + assert_string_equal((const char *)rrdata, "https://vpn.cwrap.org/VPN;); assert_int_equal(ns_parserr(, ns_s_an, 1, ), 0); assert_int_equal(ns_rr_type(rr), ns_t_uri); @@ -402,7 +402,7 @@ static void test_res_fake_uri_query(void **state) assert_int_equal(prio, 2); assert_int_equal(weight, 10); - assert_string_equal(rrdata, "https://vpn2.cwrap.org/VPN;); + assert_string_equal((const char *)rrdata, "https://vpn2.cwrap.org/VPN;); assert_int_equal(ns_parserr(, ns_s_an, 2, ), 0); assert_int_equal(ns_rr_type(rr), ns_t_uri); @@ -412,7 +412,7 @@ static void test_res_fake_uri_query(void **state) assert_int_equal(prio, 2); assert_int_equal(weight, 20); - assert_string_equal(rrdata, "https://vpn3.cwrap.org/VPN;); + assert_string_equal((const char *)rrdata, "https://vpn3.cwrap.org/VPN;); } @@ -461,7 +461,7 @@ static void test_res_fake_uri_query_minimal(void **state) assert_int_equal(prio, 1); assert_int_equal(weight, 100); - assert_string_equal(rrdata, "ftp://ftp.cwrap.org/public;); + assert_string_equal((const char *)rrdata, "ftp://ftp.cwrap.org/public;); } static void test_res_fake_soa_query(void **state) @@ -746,7 +746,7 @@ static void test_res_fake_txt_query(void **state) assert_int_equal(ns_rr_type(rr), ns_t_txt); rrdata = ns_rr_rdata(rr); - assert_string_equal(rrdata, "v=spf1 mx"); + assert_string_equal((const char *)rrdata, "v=spf1 mx"); } static void test_res_fake_uri_nsearch(void **state) @@ -787,7 +787,7 @@ static void test_res_fake_uri_nsearch(void **state) NS_GET16(weight, rrdata); assert_int_equal(prio, 2); assert_int_equal(weight, 5); - assert_string_equal(rrdata, "https://vpn.cwrap.org/VPN;); + assert_string_equal((const char *)rrdata, "https://vpn.cwrap.org/VPN;); assert_int_equal(ns_parserr(, ns_s_an, 1, ), 0); assert_int_equal(ns_rr_type(rr), ns_t_uri); @@ -796,7 +796,7 @@ static void test_res_fake_uri_nsearch(void **state) NS_GET16(weight, rrdata); assert_int_equal(prio, 2); assert_int_equal(weight, 10); - assert_string_equal(rrdata, "https://vpn2.cwrap.org/VPN;); + assert_string_equal((const char *)rrdata, "https://vpn2.cwrap.org/VPN;); assert_int_equal(ns_parserr(, ns_s_an, 2, ), 0); assert_int_equal(ns_rr_type(rr), ns_t_uri); @@ -805,7 +805,7 @@ static void test_res_fake_uri_nsearch(void **state) NS_GET16(weight, rrdata); assert_int_equal(prio, 2); assert_int_equal(weight, 20); - assert_string_equal(rrdata, "https://vpn3.cwrap.org/VPN;); + assert_string_equal((const char *)rrdata, "https://vpn3.cwrap.org/VPN;); } int main(void) -- Resolv Wrapper Repository
[SCM] Priv Wrapper Repository - branch main updated
The branch, main has been updated
via 295bcbe cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
from f387dad Bump version to 1.0.1
https://git.samba.org/?p=priv_wrapper.git;a=shortlog;h=main
- Log -
commit 295bcbe9de1fb37531678d482efb12583b77c6d0
Author: Andreas Schneider
Date: Fri Feb 17 17:51:27 2023 +0100
cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
Signed-off-by: Andreas Schneider
Reviewed-by: Pavel Filipenský
---
Summary of changes:
tests/CMakeLists.txt | 4
1 file changed, 4 insertions(+)
Changeset truncated at 500 lines:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d33cf15..46147cf 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()
+
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
--
Priv Wrapper Repository
[SCM] pam wrapper repository - branch master updated
The branch, master has been updated
via 8e94874 cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
via 9e7f8ac cmake: Drop FindCMocka.cmake Module
from 2b486d5 Drop support for Python 2
https://git.samba.org/?p=pam_wrapper.git;a=shortlog;h=master
- Log -
commit 8e94874bf5c0d569a16985eafa9922d8c527a9fb
Author: Andreas Schneider
Date: Fri Feb 17 17:51:27 2023 +0100
cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
Signed-off-by: Andreas Schneider
Reviewed-by: Pavel Filipenský
commit 9e7f8ac9ee1f968ac8af2d9c2e9dbd91a3090b73
Author: Andreas Schneider
Date: Fri Feb 17 18:08:45 2023 +0100
cmake: Drop FindCMocka.cmake Module
We should use config mode.
Signed-off-by: Andreas Schneider
Reviewed-by: Pavel Filipenský
---
Summary of changes:
cmake/Modules/FindCMocka.cmake | 49 --
tests/CMakeLists.txt | 4
2 files changed, 4 insertions(+), 49 deletions(-)
delete mode 100644 cmake/Modules/FindCMocka.cmake
Changeset truncated at 500 lines:
diff --git a/cmake/Modules/FindCMocka.cmake b/cmake/Modules/FindCMocka.cmake
deleted file mode 100644
index 2dd9fc5..000
--- 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)
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)
--
pam wrapper repository
[SCM] UID Wrapper Repository - branch master updated
The branch, master has been updated via 850f24c cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode from 9db9f48 cmake: Print a message that uid_wrapper was found with find_package() https://git.samba.org/?p=uid_wrapper.git;a=shortlog;h=master - Log - commit 850f24c6366abda30bfd77734b90330b8809d306 Author: Andreas Schneider Date: Fri Feb 17 17:51:27 2023 +0100 cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský --- Summary of changes: tests/CMakeLists.txt | 4 1 file changed, 4 insertions(+) Changeset truncated at 500 lines: diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 635e86e..68e050e 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() + add_library(uwrap_fake_socket_wrapper SHARED uwrap_fake_socket_wrapper.c) target_compile_options(uwrap_fake_socket_wrapper PRIVATE -- UID Wrapper Repository
[SCM] NSS Wrapper Repository - branch master updated
The branch, master has been updated
via 2c879a0 cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
from db887c0 Bump version to 1.1.15
https://git.samba.org/?p=nss_wrapper.git;a=shortlog;h=master
- Log -
commit 2c879a0ffa70cee33329291d7576ec971d420da2
Author: Andreas Schneider
Date: Fri Feb 17 17:51:27 2023 +0100
cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
Signed-off-by: Andreas Schneider
Reviewed-by: Pavel Filipenský
---
Summary of changes:
tests/CMakeLists.txt | 4
1 file changed, 4 insertions(+)
Changeset truncated at 500 lines:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3b94076..733cc4e 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(TESTSUITE_LIBRARIES nss_utils ${NWRAP_REQUIRED_LIBRARIES}
${CMOCKA_LIBRARY})
string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
--
NSS Wrapper Repository
