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 8cf628b..0000000 Binary files a/EasyRSA-3.1.0.tgz.sig and /dev/null differ 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 0000000..6005924 Binary files /dev/null and b/EasyRSA-3.1.1.tgz.sig differ diff --git a/easy-rsa.changes b/easy-rsa.changes index e13e6c0..5ad6aaa 100644 --- a/easy-rsa.changes +++ b/easy-rsa.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Dec 13 23:09:09 UTC 2022 - Olav Reinert + +- fix for 3.1.1: + * add patch fix-747.patch from upstream + +------------------------------------------------------------------- +Sat Dec 3 19:41:33 UTC 2022 - Dirk Müller + +- 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..189fb87 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 @@ -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/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 +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 + 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 + + commit 6f8ba1e608d5223efa9dd296ed2c61418da991aa + Author: Richard T Bonhomme + 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 + + Signed-off-by: Richard T Bonhomme + +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/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