Accepting request 1042804 from network:vpn

- 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

OBS-URL: https://build.opensuse.org/request/show/1042804
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/easy-rsa?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2022-12-14 13:11:03 +00:00 committed by Git OBS Bridge
commit efd050710b
8 changed files with 83 additions and 17 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:01b07ecb58dc003e47d4e74f9fc4da35ec6842e96cd003d66ed72a43df983659
size 61255

Binary file not shown.

3
EasyRSA-3.1.1.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:779d425cacf1de56262b7a7ed6b90b36e614ce9273f08ad7b86992740cb3b2a5
size 68434

BIN
EasyRSA-3.1.1.tgz.sig Normal file

Binary file not shown.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
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>

View File

@ -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}

42
fix-747.patch Normal file
View File

@ -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#*=}"

View File

@ -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