From nobody Sun Oct 16 01:39:37 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MqjVF4sM8z4gC6H; Sun, 16 Oct 2022 01:39:49 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MqjVF4KyYz3bmk; Sun, 16 Oct 2022 01:39:49 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665884389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZnZ1yVhnChwJ1j9l2xlvb3K2exgzgGG3oDVPuJK0n6U=; b=vUpikSmVoNpmr3tlTUAXUoIuxk2hTvqArG0A9uAH+7wnxgvUOEHt4cAtpsyiaKUWztTaNr lRj1GwLqKhrWxsO6XHClVm7EqE4WaapA7GMSZiRHqnovhnF/H6nodFgqqJi30v8W1dEOGz 5gOlil/dCcs4EMjFV7H+yjbZ1ApTmWaM/ki52iU44pMhDDOTy1O8uY2S00FbXaV4F8vmib L7V5ridcYDunw6rlCkE8AFaflkmKhRhSxgb29LFboS72SpaNLvHog9L0FMBoDixi9dZO2W 88feV7mk7eSerxoxwoW/MJMFhlcaLdU3Obx4OJjuRXGMf8WHLDJbkuv7oY8cGg== Received: from mail-vk1-f169.google.com (mail-vk1-f169.google.com [209.85.221.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MqjVF3G8xz1Lwy; Sun, 16 Oct 2022 01:39:49 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vk1-f169.google.com with SMTP id u204so3898266vkb.13; Sat, 15 Oct 2022 18:39:49 -0700 (PDT) X-Gm-Message-State: ACrzQf0Zd5eRWs7PSpTTMT+28cIlfEodPF83ILAiDyMdCistmWQLWfsi e6iMaLbN3tGVNyWrxH8bu1TJq5/DiVvKRqSYrpw= X-Google-Smtp-Source: AMsMyM7ORJySdHbuApYzCvH1dU0BeAlrcW2APFi5pJ1w01y7/cz2DvazZbRV5Ei6iZOd7XyfO5fu523ioQWyRnkv2CQ= X-Received: by 2002:ac5:c7b0:0:b0:3ab:2056:3bad with SMTP id d16-20020ac5c7b0000000b003ab20563badmr1767381vkn.24.1665884388930; Sat, 15 Oct 2022 18:39:48 -0700 (PDT) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 References: <202210121908.29CJ8aGO082553@gitrepo.freebsd.org> <20221013134520.vresa2tbdkflowdw@aniel.nours.eu> In-Reply-To: From: Nuno Teixeira Date: Sun, 16 Oct 2022 02:39:37 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 2b9b771202b2 - main - www/luakit-devel: update to 2.3.1-6 To: Jan Beich Cc: Baptiste Daroussin , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000003d3b8f05eb1cef6d" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665884389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZnZ1yVhnChwJ1j9l2xlvb3K2exgzgGG3oDVPuJK0n6U=; b=vNCl8jPfvJ7jdl9Ab+5ZdM9PF9byV0gux5RQNiTqpHm/CKCnvBbYpPZ+4RsIGJ/DcIwnuK 3w5dS9qGoH+6R8Xgb9lWsF4ZApQzg5TbokWn1pgJIn5ZH4NoM/EyZUTKvY0s+4dFCEqrYv c9jJrQIQA1TIEopRG73dFAHNJSG8+TudC546wf3HgtBhEQ0ebzrNjx8bD1vQ0Qp0oZuP8d AiNTH7XdNagOiBLsS2I2lMlzWyw0kAeBrLi7zS3XBe064gjWSy3bR1SRoQjHCjSZO6+TtZ 9uTwbPboxyxgBljX9gJzg5Do9P1pCR+dXfnGvta+oH9Rk4fcNIAs3j5ikCKbbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665884389; a=rsa-sha256; cv=none; b=v9HmqfjXGcm8vggduam5TUojXPMFJrvvhBvbGYJGzc1NoIcJcB7HH/pskpogJ/Z87NNrLi FJ5oscTNxEw7sQgs84BKPvnpB9KFuhbayvjfYpe+ya3QbCRQjPi699aVt0YAJw4OPOsxro TeqP8yeiR4HPn7mV+0DQm+DDlf5JdJ+ZKBUPJlz77klJDEySkViej3+B1J7S9llVlf0dYa boaAGPsJ0zpAVswBRdgSTJ/MljvbJJ38+FDvdWL+cYBeN2LjQ+ovMq+7DLl8OHfzvLPpp5 9ES1BElhG7xPh/LGYXDtZ+B8p4sj5SnzjkSa1h+uBMo4LvPqKBpIerN2lrloHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --0000000000003d3b8f05eb1cef6d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable The main problem here is not fetching and yes DISTVERSIONSUFFIX=3D-g acts like GH_TAGNAME=3D. Problem is that 2.3-26 transforms to 2.3.26 and 2.3.1-6 into 2.3.1.6 pkg version -t 2.3-26 2.3.1-6 =3D > pkg version -t 2.3.26 2.3.1.6 =3D > So the only solution is bump portepoch? Thanks Jan Beich escreveu no dia domingo, 16/10/2022 =C3=A0(s= ) 02:09: > Nuno Teixeira writes: > > > Hello, > > > > Yes, you are right > > pkg version -t 2.3.1.6,1 2.3.26,1 =3D=3D < > > > > -DISTVERSION=3D 2.3-26 > > +DISTVERSION=3D 2.3.1-6 > > > > This will cause problems in the future and we cannot bump PORTEPOCH for > > this reason. > > > > I can't think for a diferent solution for suffix -xy. > > > > Any hint to avoid portepoch bumping? > > Re-calculate version offset via "git rev-list --count 2.3.1..". When > fetching > a distfile in --g format Git discards everything befor= e > -g. > Try it yourself e.g., > > $ git archive blah-1234-g2b9b771202b2 | tar xOf - --include > www/luakit-devel/Makefile | head > PORTNAME=3D luakit > DISTVERSION=3D 2.3.1-6 > DISTVERSIONSUFFIX=3D -ge9c7693 > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000003d3b8f05eb1cef6d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
The main problem here is not fetching and yes DISTVER= SIONSUFFIX=3D-g<tag> acts like GH_TAGNAME=3D<tag>.
Problem is that 2.3-26 transforms to 2.3.26 and 2.3.1-6 into 2= .3.1.6

pkg version -t 2.3-26 2.3.1-6 =3D >
pkg version -t 2.3.26 2.3.1.6 =3D >

So th= e only solution is bump portepoch?

Thanks
<= /div>

Jan Beich <jbeich@freebsd.org= > escreveu no dia domingo, 16/10/2022 =C3=A0(s) 02:09:
Nuno Teixeira <eduardo@freebsd.org> w= rites:

> Hello,
>
> Yes, you are right
> pkg version -t 2.3.1.6,1 2.3.26,1 =3D=3D <
>
> -DISTVERSION=3D 2.3-26
> +DISTVERSION=3D 2.3.1-6
>
> This will cause problems in the future and we cannot bump PORTEPOCH fo= r
> this reason.
>
> I can't think for a diferent solution for suffix -xy.
>
> Any hint to avoid portepoch bumping?

Re-calculate version offset via "git rev-list --count 2.3.1..". W= hen fetching
a distfile in <tag>-<offset>-g<hash> format Git discards = everything before -g.
Try it yourself e.g.,

=C2=A0 $ git archive blah-1234-g2b9b771202b2 | tar xOf - --include www/luak= it-devel/Makefile | head
=C2=A0 PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0luakit
=C2=A0 DISTVERSION=3D=C2=A0 =C2=A0 2.3.1-6
=C2=A0 DISTVERSIONSUFFIX=3D=C2=A0 =C2=A0 =C2=A0 -ge9c7693


--
Nun= o Teixeira
FreeBSD Committer (ports)
--0000000000003d3b8f05eb1cef6d--