From 319237947f1226f887c7f28167742d6fc22b98c8 Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.com>
Date: Aug 21 2023 13:11:50 +0000
Subject: Merge branch 'f39' into f38


Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>

---

diff --git a/.gitignore b/.gitignore
index 36dc2e4..d0d30d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,5 @@ openvpn-2.1.2.tar.gz.asc
 /openvpn-2.6.3.tar.gz.asc
 /openvpn-2.6.5.tar.gz
 /openvpn-2.6.5.tar.gz.asc
+/openvpn-2.6.6.tar.gz
+/openvpn-2.6.6.tar.gz.asc
diff --git a/openvpn.spec b/openvpn.spec
index 32ee4c7..32ddbb2 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -26,7 +26,7 @@
 %bcond_without tests_long
 
 Name:              openvpn
-Version:           2.6.5
+Version:           2.6.6
 Release:           1%{?dist}
 Summary:           A full-featured TLS VPN solution (beta release)
 URL:               https://community.openvpn.net/
@@ -107,12 +107,12 @@ to similar features as the various script-hooks.
 %prep
 gpgv2 --quiet --keyring %{SOURCE10} %{SOURCE1} %{SOURCE0}
 %setup -q -n %{name}-%{version}
-%patch1 -p1
+%patch -P 1 -p1
 %if 0%{?rhel} > 7 || 0%{?fedora} > 34
 # The crypto-policy patch is only valid on RHEL-8 and newer plus Fedora
-%patch2 -p1
+%patch -P 2 -p1
 %endif
-%patch50 -p1
+%patch -P 50 -p1
 
 # %%doc items shouldn't be executable.
 find contrib sample -type f -perm /100 \
@@ -250,6 +250,13 @@ getent passwd openvpn &>/dev/null || \
 
 
 %changelog
+* Mon Aug 21 2023 Frank Lichtenheld <frank@lichtenheld.com> - 2.6.6-1
+- Update to upstream OpenVPN 2.6.6
+- Fix "warning: %patchN is deprecated"
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Wed Jun 14 2023 David Sommerseth <davids@openvpn.net> - 2.6.5-1
 - Update to upstream OpenVPN 2.6.5
 
diff --git a/sources b/sources
index 4487d27..a91fc3d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openvpn-2.6.5.tar.gz) = f4643f74857a8b2d4d1c737c488c1669c5973eedb0a9e5215585d5e36cfba4640690a3f0ef85f1369e89102003e5872a73e5e5a9c272f6e92b3c5acfb23aed2b
-SHA512 (openvpn-2.6.5.tar.gz.asc) = d1530dc7da3f5bced79c024e126107b7d342c87d4bf647b7a1ab5ec344a19995f4a650a923b12fc1209f0eac49d1185c40141bc8b76627b26f79163796b2e240
+SHA512 (openvpn-2.6.6.tar.gz) = f4c528fff6ed130d135d3d5d95dd73b1a9c8eb780b8fbfa30e12107795c1d01a6aaf8940e5b92f4968ddc59a2deb59905ff714632e512444a2f5b0df0dde3cba
+SHA512 (openvpn-2.6.6.tar.gz.asc) = 9409f4699af8451c2a0e58d58c87659a12b86b78f67a0c9a113b045e13d8e62c602cd83e2a6af7afc47ac615c10178533ca67b6988b5da9aa150bf0fd304069a