Viorel Munteanu <[email protected]> writes:

> Add support for makeself releases 2.5.0 through 2.7.1.
>
> Tested with makeself 2.5.0, 2.6.0, 2.7.0 and 2.7.1.

Mentioning a file to test with may be nice in the commit message.

>
> Archives created with makeself 2.6.0 identify as 2.5.0, but the format
> is similar so they can be unpacked regardless.

LGTM.

>
> Closes: https://bugs.gentoo.org/970509
> Signed-off-by: Viorel Munteanu <[email protected]>
> ---
>  eclass/unpacker.eclass | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
> index 0ace3ae53cb9..e51c51dfa339 100644
> --- a/eclass/unpacker.eclass
> +++ b/eclass/unpacker.eclass
> @@ -1,4 +1,4 @@
> -# Copyright 1999-2025 Gentoo Authors
> +# Copyright 1999-2026 Gentoo Authors
>  # Distributed under the terms of the GNU General Public License v2
>  
>  # @ECLASS: unpacker.eclass
> @@ -218,7 +218,8 @@ unpack_makeself() {
>                               skip=$(head -n ${skip} "${src}" | wc -c)
>                               exe="dd"
>                               ;;
> -                     2.4.5)
> +                     # 2.6.0's header also contains "2.5.0"; unpack_makeself 
> works in both cases
> +                     2.4.5|2.5.0|2.7.0|2.7.1)
>                               # e.g.: skip="713"
>                               skip=$(
>                                       sed -n -e 
> '/^skip=/{s:skip="\(.*\)":\1:p;q}' "${src}"

Attachment: signature.asc
Description: PGP signature

Reply via email to