diff mbox series

[AUH] xwayland: upgrading to 24.1.11 SUCCEEDED

Message ID 0101019de3ee84c8-2ef478ee-0885-45ea-8f71-7161d16c9d8e-000000@us-west-2.amazonses.com
State New
Headers show
Series [AUH] xwayland: upgrading to 24.1.11 SUCCEEDED | expand

Commit Message

auh@yoctoproject.org May 1, 2026, 2:25 p.m. UTC
Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe(s) *xwayland* to *24.1.11* has Succeeded.

Next steps:
    - apply the patch: git am 0001-xwayland-upgrade-24.1.9-24.1.11.patch
    - check the changes to upstream patches and summarize them in the commit message,
    - compile an image that contains the package
    - perform some basic sanity tests
    - amend the patch and sign it off: git commit -s --reset-author --amend
    - send it to the appropriate mailing list

Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.

Please review the attached files for further information and build/update failures.
Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler

Regards,
The Upgrade Helper

-- >8 --
From 0e80e3b1bdbadff59e81ff8282a89fd2edc3a2b0 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Fri, 1 May 2026 12:46:21 +0000
Subject: [PATCH] xwayland: upgrade 24.1.9 -> 24.1.11

---
 ...xwayland_24.1.9.bb => xwayland_24.1.11.bb} | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xwayland/{xwayland_24.1.9.bb => xwayland_24.1.11.bb} (62%)

Comments

Paul Barker May 8, 2026, 2:34 p.m. UTC | #1
On Fri, 2026-05-01 at 14:25 +0000, Auto Upgrade Helper via
lists.openembedded.org wrote:
> Hello,
> 
> this email is a notification from the Auto Upgrade Helper
> that the automatic attempt to upgrade the recipe(s) *xwayland* to *24.1.11* has Succeeded.
> 
> Next steps:
>     - apply the patch: git am 0001-xwayland-upgrade-24.1.9-24.1.11.patch
>     - check the changes to upstream patches and summarize them in the commit message,
>     - compile an image that contains the package
>     - perform some basic sanity tests
>     - amend the patch and sign it off: git commit -s --reset-author --amend
>     - send it to the appropriate mailing list
> 
> Alternatively, if you believe the recipe should not be upgraded at this time,
> you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
> automatic upgrades would no longer be attempted.
> 
> Please review the attached files for further information and build/update failures.
> Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler
> 
> Regards,
> The Upgrade Helper
> 
> -- >8 --
> From 0e80e3b1bdbadff59e81ff8282a89fd2edc3a2b0 Mon Sep 17 00:00:00 2001
> From: Upgrade Helper <auh@yoctoproject.org>
> Date: Fri, 1 May 2026 12:46:21 +0000
> Subject: [PATCH] xwayland: upgrade 24.1.9 -> 24.1.11
> 
> ---
>  ...xwayland_24.1.9.bb => xwayland_24.1.11.bb} | 38 ++++++++++++++++++-
>  1 file changed, 36 insertions(+), 2 deletions(-)
>  rename meta/recipes-graphics/xwayland/{xwayland_24.1.9.bb => xwayland_24.1.11.bb} (62%)
> 
> diff --git a/meta/recipes-graphics/xwayland/xwayland_24.1.9.bb b/meta/recipes-graphics/xwayland/xwayland_24.1.11.bb
> similarity index 62%
> rename from meta/recipes-graphics/xwayland/xwayland_24.1.9.bb
> rename to meta/recipes-graphics/xwayland/xwayland_24.1.11.bb
> index c4e2d7cfdb..a5cc7f41b6 100644
> --- a/meta/recipes-graphics/xwayland/xwayland_24.1.9.bb
> +++ b/meta/recipes-graphics/xwayland/xwayland_24.1.11.bb
> @@ -1,3 +1,37 @@
> +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
> +# The following is the difference between the old and the new license text.
> +# Please update the LICENSE value if needed, and summarize the changes in
> +# the commit message via 'License-Update:' tag.
> +# (example: 'License-Update: copyright years updated.')
> +#
> +# The changes:
> +#
> +# --- COPYING
> +# +++ COPYING
> +# @@ -314,6 +314,11 @@
> +#  OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> +#  SOFTWARE.
> +#  
> +# +Except as contained in this notice, the name of Silicon Graphics, Inc.
> +# +shall not be used in advertising or otherwise to promote the sale, use or
> +# +other dealings in this Software without prior written authorization from
> +# +Silicon Graphics, Inc.
> +# +
> +#  
> +#  Copyright (c) 1994, 1995  Hewlett-Packard Company
> +#  
> +# @@ -1778,6 +1783,8 @@
> +#  USE OR OTHER DEALINGS IN THE SOFTWARE.
> +#  
> +#  
> +# +Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
> +# +
> +#  Permission to use, copy, modify, distribute, and sell this software and its
> +#  documentation for any purpose is hereby granted without fee, provided that
> +#  this permission notice appear in supporting documentation.  This permission
> +# 
> +#

We discussed this update on the patch review call, we were concerned
about the LICENSE expression in the recipe not accurately covering
everything documented in the COPYING file in the source tree. So, I
grabbed xwayland v24.1.11 and ran scancode on the COPYING file alone:

  $ scancode --license --json results.json COPYING
  $ jq '.files[0].detected_license_expression_spdx' results.json

This gave the wonderful expression:

  "MIT AND ((X11 AND HPND-sell-variant AND HPND AND
  LicenseRef-scancode-other-permissive) AND BSD-3-Clause) AND ((ICU AND
  LicenseRef-scancode-other-permissive) AND NCSA) AND
  (LicenseRef-scancode-mit-old-style AND
  LicenseRef-scancode-other-permissive AND
  LicenseRef-scancode-warranty-disclaimer AND (ICU AND
  LicenseRef-scancode-other-permissive)) AND (MIT-open-group AND X11)
  AND (LicenseRef-scancode-mit-old-style AND
  LicenseRef-scancode-other-permissive AND
  LicenseRef-scancode-warranty-disclaimer) AND HPND AND
  LicenseRef-scancode-other-permissive AND DEC-3-Clause AND NCSA AND
  SGI-B-2.0 AND LicenseRef-scancode-xfree86-1.0 AND
  (LicenseRef-scancode-other-permissive AND (ICU AND
  LicenseRef-scancode-other-permissive) AND
  LicenseRef-scancode-warranty-disclaimer) AND (HPND-sell-variant AND
  LicenseRef-scancode-mit-old-style AND
  LicenseRef-scancode-other-permissive AND
  LicenseRef-scancode-warranty-disclaimer) AND (ICU AND
  LicenseRef-scancode-other-permissive) AND (MIT AND NCSA) AND
  (LicenseRef-scancode-other-permissive AND ICU AND
  LicenseRef-scancode-warranty-disclaimer) AND Adobe-Display-PostScript
  AND HPND-UC AND LicenseRef-scancode-mit-old-style AND
  LicenseRef-scancode-warranty-disclaimer AND HPND-sell-variant AND
  (LicenseRef-scancode-mit-old-style AND
  LicenseRef-scancode-other-permissive) AND
  (LicenseRef-scancode-mit-old-style AND (ICU AND
  LicenseRef-scancode-other-permissive) AND
  LicenseRef-scancode-warranty-disclaimer) AND
  (LicenseRef-scancode-mit-old-style AND
  LicenseRef-scancode-other-permissive AND (ICU AND
  LicenseRef-scancode-other-permissive) AND
  LicenseRef-scancode-warranty-disclaimer) AND
  (LicenseRef-scancode-mit-old-style AND
  LicenseRef-scancode-other-permissive AND (ICU AND
  LicenseRef-scancode-other-permissive)) AND ISC AND ICU AND X11 AND
  BSD-3-Clause AND (LicenseRef-scancode-mit-old-style AND HPND) AND
  HPND-sell-MIT-disclaimer-xserver AND (HPND-MIT-disclaimer AND
  HPND-sell-variant-MIT-disclaimer AND HPND-sell-variant)"

Resolving this to something we can use is beyond me... Do we have any
license wrangling experts who would like to assist?

Best regards,
diff mbox series

Patch

diff --git a/meta/recipes-graphics/xwayland/xwayland_24.1.9.bb b/meta/recipes-graphics/xwayland/xwayland_24.1.11.bb
similarity index 62%
rename from meta/recipes-graphics/xwayland/xwayland_24.1.9.bb
rename to meta/recipes-graphics/xwayland/xwayland_24.1.11.bb
index c4e2d7cfdb..a5cc7f41b6 100644
--- a/meta/recipes-graphics/xwayland/xwayland_24.1.9.bb
+++ b/meta/recipes-graphics/xwayland/xwayland_24.1.11.bb
@@ -1,3 +1,37 @@ 
+# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes in
+# the commit message via 'License-Update:' tag.
+# (example: 'License-Update: copyright years updated.')
+#
+# The changes:
+#
+# --- COPYING
+# +++ COPYING
+# @@ -314,6 +314,11 @@
+#  OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+#  SOFTWARE.
+#  
+# +Except as contained in this notice, the name of Silicon Graphics, Inc.
+# +shall not be used in advertising or otherwise to promote the sale, use or
+# +other dealings in this Software without prior written authorization from
+# +Silicon Graphics, Inc.
+# +
+#  
+#  Copyright (c) 1994, 1995  Hewlett-Packard Company
+#  
+# @@ -1778,6 +1783,8 @@
+#  USE OR OTHER DEALINGS IN THE SOFTWARE.
+#  
+#  
+# +Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+# +
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  this permission notice appear in supporting documentation.  This permission
+# 
+#
+
 SUMMARY = "XWayland is an X Server that runs under Wayland."
 DESCRIPTION = "XWayland is an X Server running as a Wayland client, \
 and thus is capable of displaying native X11 client applications in a \
@@ -7,10 +41,10 @@  a way to run unported applications in the meantime."
 HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=21e33dcccf2d5034f798a8ea62622939"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f8778cfcd90ece0e4b225f30182227ca"
 
 SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz"
-SRC_URI[sha256sum] = "f297af27a84508db9b80d1cbbcc69c3801da38eb64c72f3b5b50f582459afdd0"
+SRC_URI[sha256sum] = "27115a1a8819078409bf6fecfeb7724e8137bd36426de7005a5b3aae0a2138ff"
 
 UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"