[SCM] pam wrapper repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  f140952 Bump version to 1.1.7
       via  633aa0c cmake: Fix installation of python module
      from  0d3b5be Bump version to 1.1.6

https://git.samba.org/?p=pam_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f140952e99bb0682bc6da7858f6ca25b70fab86c
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jul 23 10:23:24 2024 +0200

    Bump version to 1.1.7
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 633aa0cedd09458507c38a997814ce79aaeebae9
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jul 23 10:07:54 2024 +0200

    cmake: Fix installation of python module
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGELOG                         | 3 +++
 CMakeLists.txt                    | 4 ++--
 src/python/python3/CMakeLists.txt | 8 ++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/CHANGELOG b/CHANGELOG
index 1b1e48e..eb0803a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 ChangeLog
 ==========
 
+version 1.1.7 (released 2023-07-23)
+  * Fix installation of python module
+
 version 1.1.6 (released 2023-07-23)
   * Improve config dir creation if we have pam_start_confdir()
   * Fixed PAM_WRAPPER_DISABLE_DEEPBIND
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2f548b..38df203 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.6 LANGUAGES C)
+project(pam_wrapper VERSION 1.1.7 LANGUAGES C)
 
 # global needed variables
 set(APPLICATION_NAME ${PROJECT_NAME})
@@ -25,7 +25,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
 #     Increment PATCH.
 set(LIBRARY_VERSION_MAJOR 0)
 set(LIBRARY_VERSION_MINOR 0)
-set(LIBRARY_VERSION_PATCH 9)
+set(LIBRARY_VERSION_PATCH 10)
 set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}")
 set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR})
 
diff --git a/src/python/python3/CMakeLists.txt b/src/python/python3/CMakeLists.txt
index 4e8b967..cd96ab4 100644
--- a/src/python/python3/CMakeLists.txt
+++ b/src/python/python3/CMakeLists.txt
@@ -1,6 +1,10 @@
 project(python3-pamtest C)
 
-find_package(Python 3.6 COMPONENTS Development)
+find_package(Python 3.6 COMPONENTS Development Interpreter)
+# Allow to specify sitearch dir on the commandline
+if (NOT PYTHON_INSTALL_SITEARCH)
+    set(PYTHON_INSTALL_SITEARCH ${Python_SITEARCH})
+endif()
 
 if (Python_Development_FOUND)
     add_library(python3-pamtest
@@ -18,5 +22,5 @@ if (Python_Development_FOUND)
     install(TARGETS
                 python3-pamtest
             DESTINATION
-                ${CMAKE_INSTALL_PREFIX}/${Python_SITELIB})
+                ${PYTHON_INSTALL_SITEARCH})
 endif()


-- 
pam wrapper repository