From deb5b4bd6927e3d7ca2b8bbbd3ee890f3dbee492 Mon Sep 17 00:00:00 2001
From: oreinert <>
Date: Dec 14 2022 13:23:18 +0000
Subject: Update easy-rsa to version 3.1.1 / rev 14 via SR 1042804
https://build.opensuse.org/request/show/1042804
by user oreinert + dimstar_suse
- fix for 3.1.1:
* add patch fix-747.patch from upstream
- update to 3.1.1:
* Remove command 'renewable' (#715)
* Expand 'show-renew', include 'renewed/certs_by_serial' (#700)
* Resolve long-standing issue with --subca-len=N (#691)
* ++ NOTICE: Add EasyRSA-Renew-and-Revoke.md (#690)
* Require 'openssl-easyrsa.cnf' is up to date (#695}
* Introduce 'renew' (version 3). Only renew cert (#688)
* Always ensure X509-types files exist (#581 #696)
* Expand alias '--days' to all suitable options with a period (#674)
* Introduce --keep-tmp, keep temp files for debugging (#667)
* Introduce Option -q|--quiet, disable information output (#703)
* Add serialNumber (OID 2.5.4.5) to DN 'org' mode (#606)
* Support ampersand and dollar-sign in vars file (#590)
* Intr
---
diff --git a/packages/e/easy-rsa/.files b/packages/e/easy-rsa/.files
index 5e7cc16..7dbc45b 100644
Binary files a/packages/e/easy-rsa/.files and b/packages/e/easy-rsa/.files differ
diff --git a/packages/e/easy-rsa/.rev b/packages/e/easy-rsa/.rev
index edae595..9fb4ff5 100644
--- a/packages/e/easy-rsa/.rev
+++ b/packages/e/easy-rsa/.rev
@@ -133,4 +133,32 @@
<comment></comment>
<requestid>1004440</requestid>
</revision>
+ <revision rev="14" vrev="1">
+ <srcmd5>acdc02dd0aee2263cff2a804d9999abc</srcmd5>
+ <version>3.1.1</version>
+ <time>1671023463</time>
+ <user>dimstar_suse</user>
+ <comment>- fix for 3.1.1:
+ * add patch fix-747.patch from upstream
+- update to 3.1.1:
+ * Remove command 'renewable' (#715)
+ * Expand 'show-renew', include 'renewed/certs_by_serial' (#700)
+ * Resolve long-standing issue with --subca-len=N (#691)
+ * ++ NOTICE: Add EasyRSA-Renew-and-Revoke.md (#690)
+ * Require 'openssl-easyrsa.cnf' is up to date (#695}
+ * Introduce 'renew' (version 3). Only renew cert (#688)
+ * Always ensure X509-types files exist (#581 #696)
+ * Expand alias '--days' to all suitable options with a period (#674)
+ * Introduce --keep-tmp, keep temp files for debugging (#667)
+ * Introduce Option -q|--quiet, disable information output (#703)
+ * Add serialNumber (OID 2.5.4.5) to DN 'org' mode (#606)
+ * Support ampersand and dollar-sign in vars file (#590)
+ * Introduce 'rewind-renew' (#579)
+ * Expand status reports to include checking a single cert (#577)
+ * Introduce 'revoke-renewed' (#547)
+ * update OpenSSL for Windows to 3.0.5
+
+</comment>
+ <requestid>1042804</requestid>
+ </revision>
</revisionlist>
diff --git a/packages/e/easy-rsa/EasyRSA-3.1.0.tgz b/packages/e/easy-rsa/EasyRSA-3.1.0.tgz
deleted file mode 120000
index 971d154..0000000
--- a/packages/e/easy-rsa/EasyRSA-3.1.0.tgz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreiabwb7mwwg4aa7epvhhj6p4jwrv5ruef2lm2ab5m3wxfjb57gbwle
\ No newline at end of file
diff --git a/packages/e/easy-rsa/EasyRSA-3.1.0.tgz.sig b/packages/e/easy-rsa/EasyRSA-3.1.0.tgz.sig
deleted file mode 100644
index af8e906..0000000
Binary files a/packages/e/easy-rsa/EasyRSA-3.1.0.tgz.sig and /dev/null differ
diff --git a/packages/e/easy-rsa/EasyRSA-3.1.1.tgz b/packages/e/easy-rsa/EasyRSA-3.1.1.tgz
new file mode 120000
index 0000000..2de1e84
--- /dev/null
+++ b/packages/e/easy-rsa/EasyRSA-3.1.1.tgz
@@ -0,0 +1 @@
+/ipfs/bafkreidxtvbfzlhr3zlcmk32p3llsczw4ykm5ett6cfnpodjsj2azm5suu
\ No newline at end of file
diff --git a/packages/e/easy-rsa/EasyRSA-3.1.1.tgz.sig b/packages/e/easy-rsa/EasyRSA-3.1.1.tgz.sig
new file mode 100644
index 0000000..41a5c66
Binary files /dev/null and b/packages/e/easy-rsa/EasyRSA-3.1.1.tgz.sig differ
diff --git a/packages/e/easy-rsa/easy-rsa.changes b/packages/e/easy-rsa/easy-rsa.changes
index c0101f7..c1c9c66 100644
--- a/packages/e/easy-rsa/easy-rsa.changes
+++ b/packages/e/easy-rsa/easy-rsa.changes
@@ -1,4 +1,31 @@
-------------------------------------------------------------------
+Tue Dec 13 23:09:09 UTC 2022 - Olav Reinert <seroton10@gmail.com>
+
+- fix for 3.1.1:
+ * add patch fix-747.patch from upstream
+
+-------------------------------------------------------------------
+Sat Dec 3 19:41:33 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 3.1.1:
+ * Remove command 'renewable' (#715)
+ * Expand 'show-renew', include 'renewed/certs_by_serial' (#700)
+ * Resolve long-standing issue with --subca-len=N (#691)
+ * ++ NOTICE: Add EasyRSA-Renew-and-Revoke.md (#690)
+ * Require 'openssl-easyrsa.cnf' is up to date (#695}
+ * Introduce 'renew' (version 3). Only renew cert (#688)
+ * Always ensure X509-types files exist (#581 #696)
+ * Expand alias '--days' to all suitable options with a period (#674)
+ * Introduce --keep-tmp, keep temp files for debugging (#667)
+ * Introduce Option -q|--quiet, disable information output (#703)
+ * Add serialNumber (OID 2.5.4.5) to DN 'org' mode (#606)
+ * Support ampersand and dollar-sign in vars file (#590)
+ * Introduce 'rewind-renew' (#579)
+ * Expand status reports to include checking a single cert (#577)
+ * Introduce 'revoke-renewed' (#547)
+ * update OpenSSL for Windows to 3.0.5
+
+-------------------------------------------------------------------
Mon Sep 5 16:23:46 UTC 2022 - Florian "spirit" <packaging@sp1rit.anonaddy.me>
- Update to 3.1.0 (2022-05-18)
diff --git a/packages/e/easy-rsa/easy-rsa.spec b/packages/e/easy-rsa/easy-rsa.spec
index a1501e6..3c2173d 100644
--- a/packages/e/easy-rsa/easy-rsa.spec
+++ b/packages/e/easy-rsa/easy-rsa.spec
@@ -18,9 +18,8 @@
%define pname EasyRSA
-
Name: easy-rsa
-Version: 3.1.0
+Version: 3.1.1
Release: 0
Summary: CLI utility to build and manage a PKI CA
License: GPL-2.0-or-later
@@ -30,8 +29,8 @@ 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
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -41,6 +40,7 @@ certificates, including sub-CAs, and create Certificate Revokation Lists (CRL).
%prep
%setup -q -n %{pname}-%{version}
+%patch1 -p2
%patch100
%build
@@ -54,14 +54,9 @@ install -Dm0644 x509-types/* %{buildroot}/%{_sysconfdir}/%{name}/x509-types/
install -Dm0755 easyrsa %{buildroot}/%{_bindir}/easyrsa
%files
-%defattr(-,root,root)
%doc ChangeLog README.md README.quickstart.md
%doc doc/*
-%if 0%{?sle_version} == 11 || 0%{?sle_version} <= 120400
-%doc COPYING.md gpl-2.0.txt
-%else
%license COPYING.md gpl-2.0.txt
-%endif
%{_bindir}/easyrsa
%config(noreplace) %{_sysconfdir}/%{name}
diff --git a/packages/e/easy-rsa/fix-747.patch b/packages/e/easy-rsa/fix-747.patch
new file mode 100644
index 0000000..220048e
--- /dev/null
+++ b/packages/e/easy-rsa/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#*=}"
+
diff --git a/packages/e/easy-rsa/suse-packaging.patch b/packages/e/easy-rsa/suse-packaging.patch
index 40128c9..acf7c2d 100644
--- a/packages/e/easy-rsa/suse-packaging.patch
+++ b/packages/e/easy-rsa/suse-packaging.patch
@@ -1,11 +1,13 @@
---- easyrsa.orig 2022-09-05 18:43:38.396956744 +0200
-+++ easyrsa 2022-06-15 2022-09-05 18:44:14.154777676 +0200
-@@ -2972,7 +2972,7 @@
+Index: easyrsa
+===================================================================
+--- easyrsa.orig
++++ easyrsa
+@@ -4012,7 +4012,7 @@ vars_setup() {
# Removed for basic sanity - To re-enable provide a REASON
#prog_file2="$(which -- "$prog_file" 2>/dev/null)" && prog_file="$prog_file2"
#prog_file2="$(readlink -f "$prog_file" 2>/dev/null)" && prog_file="$prog_file2"
- prog_dir="${prog_file%/*}"
+ prog_dir="/etc/easy-rsa"
- if [ "$prog_dir" = . ]; then prog_in_pwd=1; else unset -v prog_in_pwd; fi
-
- # Program dir vars - This location is least wanted.
+ if [ "$prog_dir" = . ] || [ "$prog_dir" = "$PWD" ]; then
+ prog_in_pwd=1
+ else