Backport patch for #559 to 3.0

Backport the patch from a4e37cfe54167cca2610aa401b06caae6fa4f724 to 3.0
that fixes the data arguments on Darwin and BSD.  Patch originally
authored by @tincantech.

Update .gitignore to ignore macOS .DS_Store files.

Update ChangeLog for v3.0.9 release

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2022-05-09 21:14:32 -05:00
parent 6b803b5a7b
commit 8670ee4a1f
No known key found for this signature in database
GPG Key ID: 72964219390D0D0E
3 changed files with 5 additions and 1 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ dist-staging
easyrsa3/safessl-easyrsa.cnf easyrsa3/safessl-easyrsa.cnf
testdeps/* testdeps/*
shellcheck shellcheck
.DS_Store

View File

@ -21,6 +21,7 @@ Easy-RSA 3 ChangeLog
* Warnings are no longer silenced by --batch (#523) * Warnings are no longer silenced by --batch (#523)
* Improve packaging options (#510) * Improve packaging options (#510)
* Update regex for POSIX compliance (#556) * Update regex for POSIX compliance (#556)
* Correct date format for Darwin/BSD (#559)
3.0.8 (2020-09-09) 3.0.8 (2020-09-09)
* Provide --version option (#372) * Provide --version option (#372)

View File

@ -1635,7 +1635,9 @@ Non-decimal value for EASYRSA_FIX_OFFSET: '$EASYRSA_FIX_OFFSET'"
allow_renew_date="$(( now_sec + EASYRSA_CERT_RENEW * 86400 ))" allow_renew_date="$(( now_sec + EASYRSA_CERT_RENEW * 86400 ))"
if [ "$EASYRSA_FIX_OFFSET" ]; then if [ "$EASYRSA_FIX_OFFSET" ]; then
start_fix_sec="$(date -j "${this_year}01010000.00" +%s)" start_fix_sec="$(
date -j -f '%Y%m%d%H%M%S' "${this_year}0101000000" +%s
)"
end_fix_sec="$(( start_fix_sec + fix_days * 86400 ))" end_fix_sec="$(( start_fix_sec + fix_days * 86400 ))"
# Convert to date-stamps for SSL input # Convert to date-stamps for SSL input
start_fixdate="$(date -j -r "$start_fix_sec" +%Y%m%d%H%M%SZ)" start_fixdate="$(date -j -r "$start_fix_sec" +%Y%m%d%H%M%SZ)"