Merging upstream version 3.5.5 (Closes: #1098233).
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
c86ae7dcba
commit
6af28b7e8e
GPG key ID:
FBB4F0E80A80222F
144 changed files with 43534 additions and 11497 deletions
86
CMakeModules/FindLibPAM.cmake
Normal file
86
CMakeModules/FindLibPAM.cmake
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
# - Try to find LibPAM
|
||||
# Once done this will define
|
||||
#
|
||||
# LIBPAM_FOUND - system has LibPAM
|
||||
# LIBPAM_INCLUDE_DIRS - the LibPAM include directory
|
||||
# LIBPAM_LIBRARIES - link these to use LibPAM
|
||||
#
|
||||
# Author Roman Janota <xjanot04@fit.vutbr.cz>
|
||||
# Copyright (c) 2022 CESNET, z.s.p.o.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
# 3. The name of the author may not be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
if(LIBPAM_LIBRARIES AND LIBPAM_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
set(LIBPAM_FOUND TRUE)
|
||||
else()
|
||||
|
||||
find_path(LIBPAM_INCLUDE_DIR
|
||||
NAMES
|
||||
security/pam_appl.h
|
||||
security/pam_modules.h
|
||||
PATHS
|
||||
/opt/local/include
|
||||
/sw/include
|
||||
${CMAKE_INCLUDE_PATH}
|
||||
${CMAKE_INSTALL_PREFIX}/include
|
||||
)
|
||||
|
||||
find_library(LIBPAM_LIBRARY
|
||||
NAMES
|
||||
pam
|
||||
PATHS
|
||||
/usr/lib
|
||||
/usr/lib64
|
||||
/opt/local/lib
|
||||
/sw/lib
|
||||
${CMAKE_LIBRARY_PATH}
|
||||
${CMAKE_INSTALL_PREFIX}/lib
|
||||
)
|
||||
|
||||
if(LIBPAM_INCLUDE_DIR AND LIBPAM_LIBRARY)
|
||||
set(LIBPAM_FOUND TRUE)
|
||||
|
||||
# check if the function pam_start_confdir is in pam_appl.h header (added in PAM 1.4)
|
||||
file(STRINGS ${LIBPAM_INCLUDE_DIR}/security/pam_appl.h PAM_CONFDIR REGEX "pam_start_confdir")
|
||||
if ("${PAM_CONFDIR}" STREQUAL "")
|
||||
set(LIBPAM_HAVE_CONFDIR FALSE)
|
||||
else()
|
||||
set(LIBPAM_HAVE_CONFDIR TRUE)
|
||||
endif()
|
||||
else()
|
||||
set(LIBPAM_FOUND FALSE)
|
||||
endif()
|
||||
|
||||
set(LIBPAM_INCLUDE_DIRS ${LIBPAM_INCLUDE_DIR})
|
||||
set(LIBPAM_LIBRARIES ${LIBPAM_LIBRARY})
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(LibPAM DEFAULT_MSG LIBPAM_LIBRARIES LIBPAM_INCLUDE_DIRS)
|
||||
|
||||
# show the LIBPAM_INCLUDE_DIRS and LIBPAM_LIBRARIES variables only in the advanced view
|
||||
mark_as_advanced(LIBPAM_INCLUDE_DIRS LIBPAM_LIBRARIES)
|
||||
|
||||
endif()
|
||||
110
CMakeModules/FindMbedTLS.cmake
Normal file
110
CMakeModules/FindMbedTLS.cmake
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
# - Try to find MbedTLS
|
||||
# Once done this will define
|
||||
#
|
||||
# MBEDTLS_FOUND - MbedTLS was found
|
||||
# MBEDTLS_INCLUDE_DIRS - MbedTLS include directories
|
||||
# MBEDTLS_LIBRARIES - link these to use MbedTLS
|
||||
# MBEDTLS_VERSION - version of MbedTLS
|
||||
#
|
||||
# Author Roman Janota <janota@cesnet.cz>
|
||||
# Copyright (c) 2024 CESNET, z.s.p.o.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
# 3. The name of the author may not be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
if(MBEDTLS_LIBRARIES AND MBEDTLS_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
set(MBEDTLS_FOUND TRUE)
|
||||
else()
|
||||
find_path(MBEDTLS_INCLUDE_DIR
|
||||
NAMES
|
||||
mbedtls/ssl.h
|
||||
PATHS
|
||||
/opt/local/include
|
||||
/sw/include
|
||||
${CMAKE_INCLUDE_PATH}
|
||||
${CMAKE_INSTALL_PREFIX}/include
|
||||
)
|
||||
|
||||
find_library(MBEDTLS_LIBRARY
|
||||
NAMES
|
||||
libmbedtls.so
|
||||
PATHS
|
||||
/usr/lib
|
||||
/usr/lib64
|
||||
/opt/local/lib
|
||||
/sw/lib
|
||||
${CMAKE_LIBRARY_PATH}
|
||||
${CMAKE_INSTALL_PREFIX}/lib
|
||||
)
|
||||
|
||||
find_library(MBEDX509_LIBRARY
|
||||
NAMES
|
||||
libmbedx509.so
|
||||
PATHS
|
||||
/usr/lib
|
||||
/usr/lib64
|
||||
/opt/local/lib
|
||||
/sw/lib
|
||||
${CMAKE_LIBRARY_PATH}
|
||||
${CMAKE_INSTALL_PREFIX}/lib
|
||||
)
|
||||
|
||||
find_library(MBEDCRYPTO_LIBRARY
|
||||
NAMES
|
||||
libmbedcrypto.so
|
||||
PATHS
|
||||
/usr/lib
|
||||
/usr/lib64
|
||||
/opt/local/lib
|
||||
/sw/lib
|
||||
${CMAKE_LIBRARY_PATH}
|
||||
${CMAKE_INSTALL_PREFIX}/lib
|
||||
)
|
||||
|
||||
if(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
|
||||
# learn MbedTLS version
|
||||
if(EXISTS "${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h")
|
||||
file(STRINGS "${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h" MBEDTLS_VERSION
|
||||
REGEX "#define[ \t]+MBEDTLS_VERSION_STRING[ \t]+\"([0-9]+\.[0-9]+\.[0-9]+)\"")
|
||||
string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" MBEDTLS_VERSION ${MBEDTLS_VERSION})
|
||||
endif()
|
||||
if(NOT MBEDTLS_VERSION)
|
||||
message(STATUS "MBEDTLS_VERSION not found, assuming MbedTLS is too old and cannot be used!")
|
||||
set(MBEDTLS_INCLUDE_DIR "MBEDTLS_INCLUDE_DIR-NOTFOUND")
|
||||
set(MBEDTLS_LIBRARY "MBEDTLS_LIBRARY-NOTFOUND")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
|
||||
set(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
|
||||
|
||||
find_package_handle_standard_args(MbedTLS FOUND_VAR MBEDTLS_FOUND
|
||||
REQUIRED_VARS MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARIES
|
||||
VERSION_VAR MBEDTLS_VERSION)
|
||||
|
||||
# show the MBEDTLS_INCLUDE_DIR and MBEDTLS_LIBRARIES variables only in the advanced view
|
||||
mark_as_advanced(MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARIES)
|
||||
endif()
|
||||
|
|
@ -2,7 +2,11 @@
|
|||
|
||||
# check that format checking is available - always use before SOURCE_FORMAT
|
||||
macro(SOURCE_FORMAT_ENABLE)
|
||||
find_package(Uncrustify 0.71)
|
||||
if(NOT ${ARGC} EQUAL 1)
|
||||
message(FATAL_ERROR "source_format_enable() needs the required Uncrustify version!")
|
||||
endif()
|
||||
|
||||
find_package(Uncrustify ${ARGV0})
|
||||
if(UNCRUSTIFY_FOUND)
|
||||
set(SOURCE_FORMAT_ENABLED TRUE)
|
||||
else()
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# Additionally, "compat.h" include directory is added and can be included.
|
||||
#
|
||||
# Author Michal Vasko <mvasko@cesnet.cz>
|
||||
# Copyright (c) 2021 CESNET, z.s.p.o.
|
||||
# Copyright (c) 2021 - 2023 CESNET, z.s.p.o.
|
||||
#
|
||||
# This source code is licensed under BSD 3-Clause License (the "License").
|
||||
# You may not use this file except in compliance with the License.
|
||||
|
|
@ -15,7 +15,6 @@
|
|||
# https://opensource.org/licenses/BSD-3-Clause
|
||||
#
|
||||
include(CheckSymbolExists)
|
||||
include(CheckFunctionExists)
|
||||
include(CheckIncludeFile)
|
||||
include(TestBigEndian)
|
||||
if(POLICY CMP0075)
|
||||
|
|
@ -24,10 +23,35 @@ endif()
|
|||
|
||||
macro(USE_COMPAT)
|
||||
# compatibility checks
|
||||
set(CMAKE_REQUIRED_DEFINITIONS -D_POSIX_C_SOURCE=200809L)
|
||||
list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_POSIX_C_SOURCE=200809L)
|
||||
list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
|
||||
list(APPEND CMAKE_REQUIRED_DEFINITIONS -D__BSD_VISIBLE=1)
|
||||
set(CMAKE_REQUIRED_LIBRARIES pthread)
|
||||
|
||||
check_symbol_exists(_POSIX_TIMERS "unistd.h" HAVE_CLOCK)
|
||||
if(NOT HAVE_CLOCK)
|
||||
message(FATAL_ERROR "Missing support for clock_gettime() and similar functions!")
|
||||
endif()
|
||||
|
||||
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
|
||||
find_package(Threads)
|
||||
list(APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
|
||||
|
||||
check_symbol_exists(pthread_mutex_timedlock "pthread.h" HAVE_PTHREAD_MUTEX_TIMEDLOCK)
|
||||
check_symbol_exists(pthread_mutex_clocklock "pthread.h" HAVE_PTHREAD_MUTEX_CLOCKLOCK)
|
||||
check_symbol_exists(pthread_rwlock_timedrdlock "pthread.h" HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK)
|
||||
check_symbol_exists(pthread_rwlock_clockrdlock "pthread.h" HAVE_PTHREAD_RWLOCK_CLOCKRDLOCK)
|
||||
check_symbol_exists(pthread_rwlock_timedwrlock "pthread.h" HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK)
|
||||
check_symbol_exists(pthread_rwlock_clockwrlock "pthread.h" HAVE_PTHREAD_RWLOCK_CLOCKWRLOCK)
|
||||
check_symbol_exists(pthread_cond_clockwait "pthread.h" HAVE_PTHREAD_COND_CLOCKWAIT)
|
||||
if(HAVE_PTHREAD_MUTEX_CLOCKLOCK)
|
||||
# can use CLOCK_MONOTONIC only if we have pthread_mutex_clocklock()
|
||||
check_symbol_exists(_POSIX_MONOTONIC_CLOCK "unistd.h" HAVE_CLOCK_MONOTONIC)
|
||||
endif()
|
||||
if(HAVE_CLOCK_MONOTONIC)
|
||||
set(COMPAT_CLOCK_ID "CLOCK_MONOTONIC")
|
||||
else()
|
||||
set(COMPAT_CLOCK_ID "CLOCK_REALTIME")
|
||||
endif()
|
||||
|
||||
check_symbol_exists(vdprintf "stdio.h;stdarg.h" HAVE_VDPRINTF)
|
||||
check_symbol_exists(asprintf "stdio.h" HAVE_ASPRINTF)
|
||||
|
|
@ -41,14 +65,26 @@ macro(USE_COMPAT)
|
|||
|
||||
check_symbol_exists(get_current_dir_name "unistd.h" HAVE_GET_CURRENT_DIR_NAME)
|
||||
|
||||
check_function_exists(pthread_mutex_timedlock HAVE_PTHREAD_MUTEX_TIMEDLOCK)
|
||||
check_function_exists(timegm HAVE_TIMEGM)
|
||||
|
||||
TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
|
||||
# crypt
|
||||
check_include_file("crypt.h" HAVE_CRYPT_H)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "QNX")
|
||||
list(APPEND CMAKE_REQUIRED_LIBRARIES -llogin)
|
||||
elseif(NOT APPLE)
|
||||
list(APPEND CMAKE_REQUIRED_LIBRARIES -lcrypt)
|
||||
endif()
|
||||
check_symbol_exists(crypt_r "crypt.h" HAVE_CRYPT_R)
|
||||
|
||||
test_big_endian(IS_BIG_ENDIAN)
|
||||
|
||||
check_include_file("stdatomic.h" HAVE_STDATOMIC)
|
||||
|
||||
unset(CMAKE_REQUIRED_DEFINITIONS)
|
||||
unset(CMAKE_REQUIRED_LIBRARIES)
|
||||
list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_POSIX_C_SOURCE=200809L)
|
||||
list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
|
||||
list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D__BSD_VISIBLE=1)
|
||||
list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
|
||||
|
||||
# header and source file (adding the source directly allows for hiding its symbols)
|
||||
configure_file(${PROJECT_SOURCE_DIR}/compat/compat.h.in ${PROJECT_BINARY_DIR}/compat/compat.h @ONLY)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue