From fbbe52520711fc9fcf2669742c6f5826d1d55992 Mon Sep 17 00:00:00 2001
From: David Sommerseth <dazo@eurephia.org>
Date: Wed, 28 Oct 2020 12:57:24 +0100
Subject: [PATCH] Update to upstream OpenVPN 2.5.0

Signed-off-by: David Sommerseth <dazo@eurephia.org>
---
 openvpn.spec | 56 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/openvpn.spec b/openvpn.spec
index 7376df4..ffe16e0 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -1,42 +1,55 @@
 %define _hardened_build 1
-#define prerelease rc22
 
 # Build conditionals
 # tests_long - Enabled by default, enables long running tests in %%check
 %bcond_without tests_long
 
 Name:              openvpn
-Version:           2.4.9
-Release:           2%{?prerelease:.%{prerelease}}%{?dist}
-Summary:           A full-featured SSL VPN solution
+Version:           2.5.0
+Release:           1%{?dist}
+Summary:           A full-featured TLS VPN solution
 URL:               https://community.openvpn.net/
-Source0:           https://build.openvpn.net/downloads/releases/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.xz
-Source1:           https://build.openvpn.net/downloads/releases/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.xz.asc
+Source0:           https://build.openvpn.net/downloads/releases/%{name}-%{version}.tar.xz
+Source1:           https://build.openvpn.net/downloads/releases/%{name}-%{version}.tar.xz.asc
 Source2:           roadwarrior-server.conf
 Source3:           roadwarrior-client.conf
 # Upstream signing key
-Source6:           gpgkey-F554A3687412CFFEBDEFE0A312F5F7B42F2B01E7.gpg
+Source10:          gpgkey-F554A3687412CFFEBDEFE0A312F5F7B42F2B01E7.gpg
 Patch1:            0001-Change-the-default-cipher-to-AES-256-GCM-for-server-.patch
 Patch50:           openvpn-2.4-change-tmpfiles-permissions.patch
 License:           GPLv2
 BuildRequires:     gnupg2
 BuildRequires:     gcc
-BuildRequires:     systemd-devel
+BuildRequires:     automake
+BuildRequires:     autoconf
+BuildRequires:     autoconf-archive
+BuildRequires:     libtool
+BuildRequires:     gettext
 BuildRequires:     lzo-devel
 BuildRequires:     lz4-devel
 BuildRequires:     openssl-devel
 BuildRequires:     pkcs11-helper-devel >= 1.11
 BuildRequires:     pam-devel
 BuildRequires:     libselinux-devel
-# For the perl_default_filter macro
-BuildRequires:     perl-macros
+BuildRequires:     libcmocka-devel
 BuildRequires:     systemd
+BuildRequires:     systemd-devel
+
 %{?systemd_requires}
-# For /sbin/ip.
-BuildRequires:     iproute
-Requires:          iproute
 Requires(pre):     /usr/sbin/useradd
 
+%if 0%{?rhel} > 7 || 0%{?fedora} > 29
+BuildRequires:  python3-docutils
+%else
+# We cannot use python36-docutils on RHEL-7 as
+# the ./configure script does not currently find
+# the rst2man-3 executable, it only looks for rst2man
+BuildRequires:  python-docutils
+%endif
+
+# For the perl_default_filter macro
+BuildRequires:     perl-macros
+
 # Filter out the perl(Authen::PAM) dependency.
 # No perl dependency is really needed at all.
 %{?perl_default_filter}
@@ -60,20 +73,18 @@ to similar features as the various script-hooks.
 
 
 %prep
-gpgv2 --quiet --keyring %{SOURCE6} %{SOURCE1} %{SOURCE0}
-%setup -q -n %{name}-%{version}%{?prerelease:_%{prerelease}}
+gpgv2 --quiet --keyring %{SOURCE10} %{SOURCE1} %{SOURCE0}
+%setup -q -n %{name}-%{version}
 %patch1 -p1 -b .ch_default_cipher
 %patch50 -p1
 
-sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' doc/openvpn.8
-
 # %%doc items shouldn't be executable.
 find contrib sample -type f -perm /100 \
     -exec chmod a-x {} \;
 
 %build
 %configure \
-    --enable-iproute2 \
+    --enable-silent-rules \
     --with-crypto-library=openssl \
     --enable-pkcs11 \
     --enable-selinux \
@@ -82,8 +93,7 @@ find contrib sample -type f -perm /100 \
     --enable-async-push \
     --docdir=%{_pkgdocdir} \
     SYSTEMD_UNIT_DIR=%{_unitdir} \
-    TMPFILES_DIR=%{_tmpfilesdir} \
-    IPROUTE=/sbin/ip
+    TMPFILES_DIR=%{_tmpfilesdir}
 %{__make}
 
 %check
@@ -135,7 +145,7 @@ mkdir -m 0770 -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
 cp -a AUTHORS ChangeLog contrib sample distro/systemd/README.systemd $RPM_BUILD_ROOT%{_pkgdocdir}
 
 # Remove some files which does not really belong here
-rm -f $RPM_BUILD_ROOT%{_pkgdocdir}/sample/Makefile{,.in,.am}
+rm -f  $RPM_BUILD_ROOT%{_pkgdocdir}/sample/Makefile{,.in,.am}
 rm -f  $RPM_BUILD_ROOT%{_pkgdocdir}/contrib/multilevel-init.patch
 rm -rf $RPM_BUILD_ROOT%{_pkgdocdir}/sample/sample-keys
 
@@ -156,7 +166,6 @@ getent passwd openvpn &>/dev/null || \
 %postun
 %systemd_postun_with_restart openvpn-client@\*.service
 %systemd_postun_with_restart openvpn-server@\*.service
-%systemd_postun_with_restart openvpn@\*.service
 
 %files
 %{_pkgdocdir}
@@ -183,6 +192,9 @@ getent passwd openvpn &>/dev/null || \
 
 
 %changelog
+* Wed Oct 28 2020 David Sommerseth <dazo@eurephia.org> - 2.5.0-1
+- Update to upstream OpenVPN 2.5.0
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild