MIME-Version: 1.0
References: <aJSiHuZN-BPDWvWU@falared>
In-Reply-To: <aJSiHuZN-BPDWvWU@falared>
From: Konstantin Kulikov <k.kulikov2@gmail.com>
Date: Fri, 8 Aug 2025 16:28:25 +0300
Message-ID: <CAD+eXGSNVHQ9WycsTvCikK6uGUsZJFW9fiNuhzVseADs_GFQ6A@mail.gmail.com>
Subject: Re: Need help for aport patch workflow
To: faustin@fala.red
Cc: ~alpine/devel@lists.alpinelinux.org
Content-Type: multipart/alternative; boundary="0000000000001122ca063bda8d55"

--0000000000001122ca063bda8d55
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

I only did that once or twice, but I find it helpful to have a git history
available, so I'd just grab a repo, checkout a tag and then test patches
there.
The problem is
1. patch may apply cleanly and produce correct results - nice
2. patch may apply cleanly and produce wrong results due to something else
changing - bleh
3. patch may not apply at all - investigate history and fix, problem may
have been fixed in a different way
4. patch merged upstream as is - nice

I don't think this is automatable, although tests help..

On Thu, Aug 7, 2025 at 3:55=E2=80=AFPM Faustin Lammler <faustin@fala.red> w=
rote:

> Hi!
> I am trying to bump mariadb version 11.4.7 > 11.4.8 and I am struggling
> with the patch process.
>
> Can someone point me to the correct workflow? I did not found any
> documentation on how to do that on the wiki nor on the aport repository.
>
> As far as I understand the process, the approach would be:
> 1/ abuild bump mariadb-11.4.8
> 2/ abuild fetch && abuild unpack
> 3/ edit patch in src/mariadb...
> 4/ generate updated patch
> 5/ abuild checksum
> 6/ abuild prepare
> ...
>
> The step 4/ is the one that I am struggling with. If there is no better
> way than to edit files and to manually go trough all patches with `diff
> -up` then I will do it, but there might be something much more
> efficient?
>
> Thanks a lot for your help.
>
> --
> Faustin
>

--0000000000001122ca063bda8d55
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div>I only did that once or twice, but I find it helpful =
to have a git history available, so I&#39;d just grab a repo, checkout a ta=
g and then test patches there.</div><div>The problem is</div><div>1. patch =
may apply cleanly and produce correct results - nice</div><div>2. patch may=
 apply cleanly and produce wrong results due to something else changing - b=
leh</div><div>3. patch may not apply at all - investigate history and fix, =
problem may have been fixed in a different way</div><div>4. patch merged up=
stream as is - nice</div><div><br></div><div>I don&#39;t think this is auto=
matable, although tests help..</div></div><br><div class=3D"gmail_quote gma=
il_quote_container"><div dir=3D"ltr" class=3D"gmail_attr">On Thu, Aug 7, 20=
25 at 3:55=E2=80=AFPM Faustin Lammler &lt;faustin@fala.red&gt; wrote:<br></=
div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;bor=
der-left:1px solid rgb(204,204,204);padding-left:1ex">Hi!<br>
I am trying to bump mariadb version 11.4.7 &gt; 11.4.8 and I am struggling<=
br>
with the patch process.<br>
<br>
Can someone point me to the correct workflow? I did not found any<br>
documentation on how to do that on the wiki nor on the aport repository.<br=
>
<br>
As far as I understand the process, the approach would be:<br>
1/ abuild bump mariadb-11.4.8<br>
2/ abuild fetch &amp;&amp; abuild unpack<br>
3/ edit patch in src/mariadb...<br>
4/ generate updated patch<br>
5/ abuild checksum<br>
6/ abuild prepare<br>
...<br>
<br>
The step 4/ is the one that I am struggling with. If there is no better<br>
way than to edit files and to manually go trough all patches with `diff<br>
-up` then I will do it, but there might be something much more<br>
efficient?<br>
<br>
Thanks a lot for your help.<br>
<br>
-- <br>
Faustin<br>
</blockquote></div>

--0000000000001122ca063bda8d55--