From 7818d26efd4e040c64780c54f58713a387e8de2257a9f76a749b927dfd50a45e Mon Sep 17 00:00:00 2001 From: Olav Reinert Date: Tue, 13 Dec 2022 22:54:13 +0000 Subject: [PATCH] Accepting request 1039861 from home:dirkmueller:Factory - 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 OBS-URL: https://build.opensuse.org/request/show/1039861 OBS-URL: https://build.opensuse.org/package/show/network:vpn/easy-rsa?expand=0&rev=35 --- EasyRSA-3.1.0.tgz | 3 --- EasyRSA-3.1.0.tgz.sig | Bin 310 -> 0 bytes EasyRSA-3.1.1.tgz | 3 +++ EasyRSA-3.1.1.tgz.sig | Bin 0 -> 310 bytes easy-rsa.changes | 21 +++++++++++++++++++++ easy-rsa.spec | 9 +-------- suse-packaging.patch | 14 ++++++++------ 7 files changed, 33 insertions(+), 17 deletions(-) delete mode 100644 EasyRSA-3.1.0.tgz delete mode 100644 EasyRSA-3.1.0.tgz.sig create mode 100644 EasyRSA-3.1.1.tgz create mode 100644 EasyRSA-3.1.1.tgz.sig diff --git a/EasyRSA-3.1.0.tgz b/EasyRSA-3.1.0.tgz deleted file mode 100644 index b748af9..0000000 --- a/EasyRSA-3.1.0.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01b07ecb58dc003e47d4e74f9fc4da35ec6842e96cd003d66ed72a43df983659 -size 61255 diff --git a/EasyRSA-3.1.0.tgz.sig b/EasyRSA-3.1.0.tgz.sig deleted file mode 100644 index 8cf628bcc56fa218ade8b971e8fe815870f68df64065e5a4513ffad65f0da4b1..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j-4{G;dhhX*X)xg9TZmO>dh4Gj(j0%C=uKL82|5OS76 z895CN4y*bH{ySvQuYX2?Ee?XdI*0<55ymgIC)d5usFe@a;9xvUNHx1c*Ttg}EU@d{fQW_5eR%aM6TK@Xarcjh8iJNwe+d&-G{zb2+Q1=l z2qHn$3CIv9(r0SztIl206u~Tcxu`IM`^kzgAHtINyH&~vTV!A6l{btpDB8il+pydu z0d6^8)w%AEugt*xFs_yix|T6WlJeumQios;gva8tJn#N&5gq2>4J*Puuj-$*Tukkt zhIW%(!PFa=Ej|zVlaR>69`G(F5#Pjr&K%&;%4XT9fup=i4YDA!yH?Z+@T}_yt}F+x IpYYs$&XIVQ0RR91 diff --git a/EasyRSA-3.1.1.tgz b/EasyRSA-3.1.1.tgz new file mode 100644 index 0000000..494cab8 --- /dev/null +++ b/EasyRSA-3.1.1.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:779d425cacf1de56262b7a7ed6b90b36e614ce9273f08ad7b86992740cb3b2a5 +size 68434 diff --git a/EasyRSA-3.1.1.tgz.sig b/EasyRSA-3.1.1.tgz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..600592489b3a04d8324bcad8cb38468840ffc9052fcb2345c4ccf5816c01f252 GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j-4{G;dhhX*X)xg9TZmO>dh4Gj(j0%J+jJ^%^{5OS76 z895CN4ot-d{yDnA5uHQ>!#3e@4m7Sf z;nBZUV6))KK*yPflT&VVhxh+d6F}t3-GNQvfO_U;MBfq4h@zzt!eS*=K + +- 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" diff --git a/easy-rsa.spec b/easy-rsa.spec index 146351a..38a8dfa 100644 --- a/easy-rsa.spec +++ b/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 @@ -31,7 +30,6 @@ Source1: https://github.com/OpenVPN/%{name}/releases/download/v%{version} # https://github.com/OpenVPN/easy-rsa/tree/master/release-keys Source2: %{name}.keyring Patch100: suse-packaging.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -54,14 +52,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/suse-packaging.patch b/suse-packaging.patch index af6d06d..5a2cd10 100644 --- a/suse-packaging.patch +++ b/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