From b76e8a4c9de90b661a45723a628d08082c1b5872 Mon Sep 17 00:00:00 2001
From: David Sommerseth <dazo@eurephia.org>
Date: Fri, 10 Nov 2023 00:54:08 +0100
Subject: [PATCH 1/2] Fix false exit status on pre runtime scriptlet (Elkhan
 Mammadli <elkhan@almalinux.org>, RHBZ#2239722)

Signed-off-by: David Sommerseth <dazo@eurephia.org>
---
 openvpn.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openvpn.spec b/openvpn.spec
index 81a4aad..298c68c 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -6,7 +6,7 @@
 
 Name:              openvpn
 Version:           2.5.9
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           A full-featured TLS VPN solution
 URL:               https://community.openvpn.net/
 Source0:           https://build.openvpn.net/downloads/releases/%{name}-%{version}.tar.gz
@@ -155,6 +155,7 @@ getent group openvpn &>/dev/null || groupadd -r openvpn
 getent passwd openvpn &>/dev/null || \
     /usr/sbin/useradd -r -g openvpn -s /sbin/nologin -c OpenVPN \
         -d /etc/openvpn openvpn
+exit 0
 
 %post
 for srv in `systemctl | awk '/openvpn-client@.*\.service/{print $1} /openvpn-server@.*\.service/{print $1}'`;
@@ -201,6 +202,9 @@ done
 
 
 %changelog
+* Thu Nov 9 2023 David Sommerseth  <davids@openvpn.net> - 2.5.9-2
+- Fix false exit status on pre runtime scriptlet (Elkhan Mammadli <elkhan@almalinux.org>, RHBZ#2239722)
+
 * Thu Feb 16 2023 David Sommerseth <davids@openvpn.net> - 2.5.9-1
 - Update to upstream OpenVPN 2.5.9
 

From 0e61c751fc1c55094e4ed3d5ec472d9e3de9b24b Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Thu, 16 Nov 2023 18:34:16 +0300
Subject: [PATCH 2/2] Remove unnecessary files

---
 sources         |  2 --
 tests/tests.yml | 14 --------------
 2 files changed, 16 deletions(-)
 delete mode 100644 sources
 delete mode 100644 tests/tests.yml

diff --git a/sources b/sources
deleted file mode 100644
index 0de5f76..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA512 (openvpn-2.5.9.tar.gz) = 48d04e08ba62aa098d9e3bc246cf521c6e8b200bd817488a05989ae6c42d8fd144ddf03de43eb2f3c4778a643217db4220288c2d40f324076771a20b95d5028b
-SHA512 (openvpn-2.5.9.tar.gz.asc) = 62a8115dedcfcd61cd6ce3e193c7654402b32d1ff5f44ab73115991e7adee848e14b0c76d20b414fc543ec7c6fef6c85823b7d1fa44a7f86fe67f50db482bf19
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index f36be1c..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Tests for openvpn using NM's tests
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    repositories:
-    - repo: "https://gitlab.freedesktop.org/NetworkManager/NetworkManager-ci"
-      dest: "NetworkManager-ci"
-    tests:
-    - sanity-tests:
-        dir: NetworkManager-ci
-        run: run/osci/run-tests openvpn
-