From fcd00547aa6ce00fb6b57f64c83970f7b1b4f9df Mon Sep 17 00:00:00 2001
From: Steve Muskiewicz <steve.muskiewicz@plexxi.com>
Date: Thu, 19 Aug 2021 09:50:30 -0400
Subject: [PATCH] Revert "reapply other RPM fixes from prior PR (service file
 updates and systemd path exclusions)"

This reverts commit 0eb01524373687c78333aa0dfeb0ee93dd3c4e5b.
---
 CMakeLists.txt                      | 3 ---
 systemd/softether-vpnserver.service | 7 ++-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ced8d4a..a6edcc0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,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]