Michał Górny <[email protected]> writes:

> Permit whitespace when verifying openssl-dgst format, to make it also
> work for the shasum format used by tarsnap.  However, given the changes
> seem to be merely whitespace, just accept both rather than having two
> confusing names for them.
>
>     openssl-dgst: SHA256(filename)=digest
>     shasum: SHA256 (filename) = digest
>
> Closes: https://bugs.gentoo.org/969167
> Signed-off-by: Michał Górny <[email protected]>
> ---

Thanks.

Reviewed-by: Sam James <[email protected]>

>  eclass/verify-sig.eclass | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> (I'll also cherry-pick ulm's EAPI 9 conversion with it)
>
> diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
> index e66b28ec75697..a3c7a4e1495ea 100644
> --- a/eclass/verify-sig.eclass
> +++ b/eclass/verify-sig.eclass
> @@ -1,4 +1,4 @@
> -# Copyright 2020-2025 Gentoo Authors
> +# Copyright 2020-2026 Gentoo Authors
>  # Distributed under the terms of the GNU General Public License v2
>  
>  # @ECLASS: verify-sig.eclass
> @@ -344,11 +344,12 @@ verify-sig_verify_unsigned_checksums() {
>                               [[ -n ${junk} ]] && continue
>                               ;;
>                       openssl-dgst)
> -                             [[ ${line} != *"("*")="* ]] && continue
> -                             checksum=${line##*)=}
> +                             [[ ${line} != *\(*\)*=* ]] && continue
> +                             checksum=${line##*=}
>                               algo=${line%%(*}
> +                             algo=${algo%% }
>                               filename=${line#*(}
> -                             filename=${filename%)=*}
> +                             filename=${filename%)*=*}
>                               ;;
>               esac
>  

Attachment: signature.asc
Description: PGP signature

Reply via email to