From 3da2ad391a2fd314157fd4b063455e70daa4b9c1 Mon Sep 17 00:00:00 2001
From: unknown <m.w@linux.pl>
Date: Fri, 28 Jun 2024 11:16:34 +0200
Subject: [PATCH] Added workaround for wrong generation of rpm

---
 CMakeLists.txt | 27 ++++++++-------------------
 pack.cmake     | 16 ++++++++++------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abee660..e83a273 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,8 @@ set(LSB_RELEASE_ID_SHORT "${LSB_RELEASE_ID_SHORT}")
 install(
     FILES
         ${CMAKE_CURRENT_LIST_DIR}/rsc/rublon.config.defaults
+        ${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh_pubkey.conf.default
+	${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh.conf.default
     DESTINATION
         share/rublon
     COMPONENT
@@ -42,34 +44,21 @@ install(
         GROUP_READ
 )
 
-if ( ${LSB_RELEASE_ID_SHORT} MATCHES "Ubuntu" OR ${LSB_RELEASE_ID_SHORT} MATCHES "Debian" )
+if (NOT ${LSB_RELEASE_ID_SHORT} MATCHES "Ubuntu" OR NOT ${LSB_RELEASE_ID_SHORT} MATCHES "Debian" )
 install(
     FILES
-        ${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh_pubkey.conf.default
-	${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh.conf.defaults
+        ${CMAKE_CURRENT_LIST_DIR}/service/login_rublon.mod
+	${CMAKE_CURRENT_LIST_DIR}/service/login_rublon.pp
+	${CMAKE_CURRENT_LIST_DIR}/service/login_rublon.te
     DESTINATION
         share/rublon
     COMPONENT
 	PAM
-    DESTINATION
-        share/rublon/service
-    USE_SOURCE_PERMISSIONS
-)
-else ()
-install(
-    DIRECTORY
-        ${CMAKE_CURRENT_LIST_DIR}/service/
-    COMPONENT
-	PAM
-    DESTINATION
-        share/rublon/service
-    FILE_PERMISSIONS
+    PERMISSIONS
         OWNER_READ
         OWNER_WRITE
-	OWNER_EXECUTE
         GROUP_READ
-	GROUP_READ
-	GROUP_EXECUTE
+
 )
 endif()
 if (${ENABLE_TESTS})
diff --git a/pack.cmake b/pack.cmake
index 8d2bc09..bc49275 100755
--- a/pack.cmake
+++ b/pack.cmake
@@ -36,18 +36,22 @@ set(CPACK_GENERATOR "DEB")
 # set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "libcurl4(>= 7.0.0), libc(>= 2.0)")
 # set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcurl4(>= 7.0.0), libc(>= 2.0), libssl(>= 1.0)")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA 
-	"${CMAKE_CURRENT_SOURCE_DIR}/service/postinst;${CMAKE_CURRENT_SOURCE_DIR}/service/postrm")
+	"${CMAKE_CURRENT_SOURCE_DIR}/service/helpers/postinst;${CMAKE_CURRENT_SOURCE_DIR}/service/helpers/postrm")
 else()
 set(CPACK_GENERATOR "RPM")
+list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/rublon/service/helpers")
+list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
+     "/usr/lib64/security"
+)
 set(CPACK_RPM_SPEC_MORE_DEFINE "%define _build_id_links none")
 set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
-set(CPACK_RPM_PACKAGE_REQUIRES_PRE "policycoreutils-devel")
+set(CPACK_RPM_PACKAGE_REQUIRES_PRE "policycoreutils")
 	if(${os_version_suffix} MATCHES ".el8")
-	set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/service/postinst_rhel_8")
-        set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/service/postrm_rhel_8")
+	set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/service/helpers/postinst_rhel_8")
+        set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/service/helpers/postrm_rhel_8")
 	else ()
-	set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/service/postinst_rhel")
-	set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/service/postrm_rhel")
+	set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/service/helpers/postinst_rhel")
+	set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/service/helpers/postrm_rhel")
 	endif()
 endif()