From d1cc987298b581fca8f004cddbedc380cd8543f11b5714cfa55464052754e77c Mon Sep 17 00:00:00 2001
From: Olav Reinert <seroton10@gmail.com>
Date: Tue, 13 Dec 2022 23:20:05 +0000
Subject: [PATCH] Accepting request 1042800 from
 home:oreinert:branches:network:vpn

- fix for 3.1.1:
   * add patch fix-474.patch from upstream

OBS-URL: https://build.opensuse.org/request/show/1042800
OBS-URL: https://build.opensuse.org/package/show/network:vpn/easy-rsa?expand=0&rev=36
---
 easy-rsa.changes |  6 ++++++
 easy-rsa.spec    |  3 +++
 fix-747.patch    | 42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 fix-747.patch

diff --git a/easy-rsa.changes b/easy-rsa.changes
index e57e69a..c4a4745 100644
--- a/easy-rsa.changes
+++ b/easy-rsa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 13 23:09:09 UTC 2022 - Olav Reinert <seroton10@gmail.com>
+
+- fix for 3.1.1:
+   * add patch fix-474.patch from upstream
+
 -------------------------------------------------------------------
 Sat Dec  3 19:41:33 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/easy-rsa.spec b/easy-rsa.spec
index 38a8dfa..1d68226 100644
--- a/easy-rsa.spec
+++ b/easy-rsa.spec
@@ -29,6 +29,7 @@ Source:         https://github.com/OpenVPN/%{name}/releases/download/v%{version}
 Source1:        https://github.com/OpenVPN/%{name}/releases/download/v%{version}/%{pname}-%{version}.tgz.sig
 # https://github.com/OpenVPN/easy-rsa/tree/master/release-keys
 Source2:        %{name}.keyring
+Patch1:         fix-747.patch
 Patch100:       suse-packaging.patch
 BuildArch:      noarch
 
@@ -39,6 +40,8 @@ certificates, including sub-CAs, and create Certificate Revokation Lists (CRL).
 
 %prep
 %setup -q -n %{pname}-%{version}
+ls
+%patch1 -p2
 %patch100
 
 %build
diff --git a/fix-747.patch b/fix-747.patch
new file mode 100644
index 0000000..67e1354
--- /dev/null
+++ b/fix-747.patch
@@ -0,0 +1,42 @@
+commit 4472516e24b068542cfd1ff5c3e51c3b89eb38b1
+Author: Richard T Bonhomme <tincantech@protonmail.com>
+Date:   Mon Oct 31 00:34:42 2022 +0000
+
+    Reset option flag check 'number_only' per option
+    
+    Squashed commit of the following:
+    
+    commit 4aada5ffcd8cff893618bbbfe24f589f33665352
+    Merge: 439cdc1 6f8ba1e
+    Author: Richard T Bonhomme <tincantech@protonmail.com>
+    Date:   Mon Oct 31 00:31:56 2022 +0000
+    
+        Merge branch 'bugfix-number-only' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-bugfix-number-only
+    
+        Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
+    
+    commit 6f8ba1e608d5223efa9dd296ed2c61418da991aa
+    Author: Richard T Bonhomme <tincantech@protonmail.com>
+    Date:   Sun Oct 30 23:56:46 2022 +0000
+    
+        Reset option flag check 'number_only' per option
+    
+        Closes: #747
+    
+        Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
+    
+    Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
+
+diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
+index 6ee8f73..8909977 100755
+--- a/easyrsa3/easyrsa
++++ b/easyrsa3/easyrsa
+@@ -4897,7 +4897,7 @@ unset -v die_error_exit easyrsa_error_exit \
+ # Parse options
+ while :; do
+ 	# Separate option from value:
+-	unset -v opt val is_empty empty_ok
++	unset -v opt val is_empty empty_ok number_only
+ 	opt="${1%%=*}"
+ 	val="${1#*=}"
+