From c01d8e60581219a1f6fe4e60ce72d41680720c8a Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Mon, 16 Aug 2021 16:06:34 +0500
Subject: [PATCH] Revert "RPM package and systemd service file fixes (for
 CentOS 8)"

---
 CMakeLists.txt                      | 4 ----
 systemd/softether-vpnserver.service | 7 ++-----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 673f30f7..a6edcc0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,6 @@ if(UNIX)
   set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
   set(CPACK_RPM_PACKAGE_GROUP "Applications/Internet")
   set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0")
-  set(CPACK_RPM_COMMON_PACKAGE_PROVIDES "libcedar.so()(64bit)")
 
   # Exclude system directories
   if(CPACK_GENERATOR STREQUAL "RPM")
@@ -96,9 +95,6 @@ if(UNIX)
         COMMAND tr \n \;
         OUTPUT_VARIABLE CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
         ERROR_QUIET)
-    list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib")
-    list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib/systemd")
-    list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib/systemd/system")
   endif()
 
   include(CPack)
diff --git a/systemd/softether-vpnserver.service b/systemd/softether-vpnserver.service
index 37adff98..15427ad6 100644
--- a/systemd/softether-vpnserver.service
+++ b/systemd/softether-vpnserver.service
@@ -16,11 +16,8 @@ Restart=on-failure
 PrivateTmp=yes
 ProtectHome=yes
 ProtectSystem=full
-ReadOnlyPaths=/
-ReadWritePaths=-@DIR@/softether/vpnserver
-ReadWritePaths=@CPACK_PACKAGING_INSTALL_PREFIX@/run/softether
-ReadWritePaths=@CPACK_PACKAGING_INSTALL_PREFIX@/var/log/softether
-ReadWritePaths=@CPACK_PACKAGING_INSTALL_PREFIX@/var/lib/softether
+ReadOnlyDirectories=/
+ReadWriteDirectories=-@DIR@/softether/vpnserver
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYSLOG CAP_SETUID
 
 [Install]