[wrynose][PATCH 1/3] libslirp: fix upstream version check

[wrynose][PATCH 1/3] libslirp: fix upstream version check

[Peter Marko]

From: Alexander Kanavin <alex@linutronix.de>

The regex excludes bogus old yyyymmdd tags which sort higher than real versions.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 2a60e5db4460cd8ec99b43d8f2ff733ba509c373)
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 meta/recipes-connectivity/slirp/libslirp_4.9.1.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb b/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb
index 9f7005d709..50577fd4ae 100644
--- a/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb
+++ b/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727"
 
 SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
 SRCREV = "9c744e1e52aa0d9646ed91d789d588696292c21e"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 DEPENDS = "glib-2.0"
 

[wrynose][PATCH 2/3] libslirp: upgrade 4.9.1 -> 4.9.3

[Peter Marko]

From: Alexander Kanavin <alex@linutronix.de>

License-Update: license moved to a separate file
https://gitlab.com/qemu-project/libslirp/-/commit/d6cfac6d060d57c0e38a9c61157eaf6962b6c257

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 16f511425c537239e487b73998f9d8133a8ca2c4)

Full release notes:
* https://gitlab.freedesktop.org/slirp/libslirp/-/blob/v4.9.3/CHANGELOG.md?ref_type=tags

It also shows one "change":
* bootp: allow https for UEFI HTTP boot
It however does not change ABI and can also be interpreted as security
feature (allowing https), thus should be allowed for LTS backport.

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 .../slirp/{libslirp_4.9.1.bb => libslirp_4.9.3.bb}           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/slirp/{libslirp_4.9.1.bb => libslirp_4.9.3.bb} (70%)

diff --git a/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb b/meta/recipes-connectivity/slirp/libslirp_4.9.3.bb
similarity index 70%
rename from meta/recipes-connectivity/slirp/libslirp_4.9.1.bb
rename to meta/recipes-connectivity/slirp/libslirp_4.9.3.bb
index 50577fd4ae..734e59a59b 100644
--- a/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb
+++ b/meta/recipes-connectivity/slirp/libslirp_4.9.3.bb
@@ -2,10 +2,11 @@ SUMMARY = "A general purpose TCP-IP emulator"
 DESCRIPTION = "A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
 HOMEPAGE = "https://gitlab.freedesktop.org/slirp/libslirp"
 LICENSE = "BSD-3-Clause & MIT"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f95a9bf4a7e411164fe843697ccda59e \
+                    file://LICENSE;md5=cfea6044642fd63b90ce9d79f5db64d9"
 
 SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
-SRCREV = "9c744e1e52aa0d9646ed91d789d588696292c21e"
+SRCREV = "dd76415fce457e319d665eb8210d05c5731360ba"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 DEPENDS = "glib-2.0"

[wrynose][PATCH 3/3] libslirp: add tag in SRC_URI

[Peter Marko]

From: Peter Marko <peter.marko@siemens.com>

This is partial cherry-pick for single recipe:
* 00864cf5bcb6d85ec73d338c3e17e263512409a4

It will allow future cherry-picks from mastear and also uses single
filename in downloads mirror between master and wrynose (tag is added to
filename).

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 meta/recipes-connectivity/slirp/libslirp_4.9.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/slirp/libslirp_4.9.3.bb b/meta/recipes-connectivity/slirp/libslirp_4.9.3.bb
index 734e59a59b..1b45fd3247 100644
--- a/meta/recipes-connectivity/slirp/libslirp_4.9.3.bb
+++ b/meta/recipes-connectivity/slirp/libslirp_4.9.3.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f95a9bf4a7e411164fe843697ccda59e \
                     file://LICENSE;md5=cfea6044642fd63b90ce9d79f5db64d9"
 
-SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
+SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master;tag=v${PV}"
 SRCREV = "dd76415fce457e319d665eb8210d05c5731360ba"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 

Re: [OE-core] [wrynose][PATCH 1/3] libslirp: fix upstream version check

[Yoann Congal]

On Sun Aug 23, 2026 at 5:57 PM CEST, Peter Marko via lists.openembedded.org wrote:
> From: Alexander Kanavin <alex@linutronix.de>
>
> The regex excludes bogus old yyyymmdd tags which sort higher than real versions.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (From OE-Core rev: 2a60e5db4460cd8ec99b43d8f2ff733ba509c373)
> Signed-off-by: Peter Marko <peter.marko@siemens.com>
> ---
>  meta/recipes-connectivity/slirp/libslirp_4.9.1.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb b/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb
> index 9f7005d709..50577fd4ae 100644
> --- a/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb
> +++ b/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb
> @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727"
>  
>  SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
>  SRCREV = "9c744e1e52aa0d9646ed91d789d588696292c21e"
> +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
>  
>  DEPENDS = "glib-2.0"
>  

Hello Peter,

Thanks for the series. But, with regrets, I don't think it is acceptable
under the policy:
* 1&3/3 are not bug fixes (UPSTREAM_CHECK_GITTAGREGEX is not used right
  now on stables)
* 2/3 is the upgrade. It contains: 
  "Changed: bootp: allow https for UEFI HTTP boot"
  and that is a feature change (even if, behind it there is only a one
  line change)

I think you did this backport to fix CVE-2026-9539. I think we'll have
to backport the fix, (like you did on scarthgap).

Thanks!
-- 
Yoann Congal
Smile ECS

Re: [OE-core] [wrynose][PATCH 1/3] libslirp: fix upstream version check

[Alexander Kanavin]

On Thu, 3 Sept 2026 at 22:45, Yoann Congal via lists.openembedded.org
<yoann.congal=smile.fr@lists.openembedded.org> wrote:
> Thanks for the series. But, with regrets, I don't think it is acceptable
> under the policy:
> * 1&3/3 are not bug fixes (UPSTREAM_CHECK_GITTAGREGEX is not used right
>   now on stables)

Being able to check upstream versions is a valid use case for stable
branches too, even if the functionality is not currently used by Yocto
project itself. Users can check what the latest (or latest stable,
if/when that support is backported) version is, and make their own
decision about updating it downstream.

It's a *very* low risk change as well, as it is used only in the
version check and nowhere in actual builds.

Alex

RE: [OE-core] [wrynose][PATCH 1/3] libslirp: fix upstream version check

[Marko, Peter]

> -----Original Message-----
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Sent: Friday, September 4, 2026 2:39 PM
> To: yoann.congal@smile.fr
> Cc: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>;
> openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [wrynose][PATCH 1/3] libslirp: fix upstream version check
> 
> On Thu, 3 Sept 2026 at 22:45, Yoann Congal via lists.openembedded.org
> <yoann.congal=smile.fr@lists.openembedded.org> wrote:
> > Thanks for the series. But, with regrets, I don't think it is acceptable
> > under the policy:
> > * 1&3/3 are not bug fixes (UPSTREAM_CHECK_GITTAGREGEX is not used right
> >   now on stables)

I don't really insist on this commit being backported.
However, it would be very beneficial for future cherry-picks.
Since this line is next to both SRC_URI and SRCREV, any cherry-pick results in hard conflict.

I'd like to keep the series as is, but I can also send it without this commit if requested.
Please let me know Yoann.

Peter

> 
> Being able to check upstream versions is a valid use case for stable
> branches too, even if the functionality is not currently used by Yocto
> project itself. Users can check what the latest (or latest stable,
> if/when that support is backported) version is, and make their own
> decision about updating it downstream.
> 
> It's a *very* low risk change as well, as it is used only in the
> version check and nowhere in actual builds.
> 
> Alex

Re: [OE-core] [wrynose][PATCH 1/3] libslirp: fix upstream version check

[Yoann Congal]

On Sat Sep 12, 2026 at 6:12 PM CEST, Peter Marko wrote:
>
>
>> -----Original Message-----
>> From: Alexander Kanavin <alex.kanavin@gmail.com>
>> Sent: Friday, September 4, 2026 2:39 PM
>> To: yoann.congal@smile.fr
>> Cc: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>;
>> openembedded-core@lists.openembedded.org
>> Subject: Re: [OE-core] [wrynose][PATCH 1/3] libslirp: fix upstream version check
>> 
>> On Thu, 3 Sept 2026 at 22:45, Yoann Congal via lists.openembedded.org
>> <yoann.congal=smile.fr@lists.openembedded.org> wrote:
>> > Thanks for the series. But, with regrets, I don't think it is acceptable
>> > under the policy:
>> > * 1&3/3 are not bug fixes (UPSTREAM_CHECK_GITTAGREGEX is not used right
>> >   now on stables)
>
> I don't really insist on this commit being backported.
> However, it would be very beneficial for future cherry-picks.
> Since this line is next to both SRC_URI and SRCREV, any cherry-pick results in hard conflict.
>
> I'd like to keep the series as is, but I can also send it without this commit if requested.
> Please let me know Yoann.

Hello,

I've discussed this with Paul and we are goind to take this series
through review: Every changes are low-risks and have value, so, in this
case I was overly cautious.

Expect this in the next wrynose series (this week).

Regards,

>
> Peter
>
>> 
>> Being able to check upstream versions is a valid use case for stable
>> branches too, even if the functionality is not currently used by Yocto
>> project itself. Users can check what the latest (or latest stable,
>> if/when that support is backported) version is, and make their own
>> decision about updating it downstream.
>> 
>> It's a *very* low risk change as well, as it is used only in the
>> version check and nowhere in actual builds.
>> 
>> Alex


-- 
Yoann Congal
Smile ECS