diff mbox series

[meta-webserver,1/4] cockpit: upgrade 352 -> 364

Message ID 20260730180257.3733387-1-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-webserver,1/4] cockpit: upgrade 352 -> 364 | expand

Commit Message

Khem Raj July 30, 2026, 6:02 p.m. UTC 
Upstream changes (release notes):
 * 353: Networking - suggest prefix length and gateway address; bug fixes.
 * 354: Convert documentation to AsciiDoc; work around Firefox 146/147
   bug; bug fixes.
 * 355: ws - remove obsolete pam_cockpit_cert module; shell - add
   StartTransientUnit as a sudo alternative.
 * 356: systemd - allow editing timers created by Cockpit; convert
   license headers to SPDX format.
 * 357: lib - use browser context menu on shift; bridge - support
   Python 3.14 on old kernels.
 * 358: Networking - add Wi-Fi support; Cockpit Client updated to GTK 4.
 * 359: Bug fixes and translation updates.
 * 360: ws - CVE-2026-4631 (be more explicit when handling hostnames on
   cli); ws - support loading a custom login page.
 * 361: Remove all "Mount" actions in Anaconda mode; dependency updates.
 * 362: Fix arbitrary code execution via specially crafted logs page link
   (CVE-2026-4802); bug fixes.
 * 363: Translation updates.
 * 364: Bug fixes and translation updates.

cockpit 356 converted all license headers to SPDX format, moving the
LGPL-2.1 text from COPYING to LICENSES/LGPL-2.1.txt. Update
LIC_FILES_CHKSUM path accordingly (md5 is unchanged).

Refresh 0001-Warn-not-error-if-xsltproc-is-not-found.patch: the
configure.ac context shifted (-61 lines); same MSG_ERROR → MSG_WARN
change preserved.

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 .../cockpit/{cockpit_352.bb => cockpit_364.bb}              | 4 ++--
 .../0001-Warn-not-error-if-xsltproc-is-not-found.patch      | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)
 rename meta-webserver/recipes-webadmin/cockpit/{cockpit_352.bb => cockpit_364.bb} (97%)
diff mbox series

Patch

diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_352.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_364.bb
similarity index 97%
rename from meta-webserver/recipes-webadmin/cockpit/cockpit_352.bb
rename to meta-webserver/recipes-webadmin/cockpit/cockpit_364.bb
index 6b1fdcaeb1..07e2b9d163 100644
--- a/meta-webserver/recipes-webadmin/cockpit/cockpit_352.bb
+++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_364.bb
@@ -2,14 +2,14 @@  SUMMARY = "Admin interface for Linux machines"
 DESCRIPTION = "Cockpit makes it easy to administer your GNU/Linux servers via a web browser"
 
 LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1.txt;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI += " \
     https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \
     file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \
     file://cockpit.pam \
     "
-SRC_URI[sha256sum] = "72098a51f85c4a63f2e276af119920a5faca978b57652df562b409b5941b5146"
+SRC_URI[sha256sum] = "514cea072e1ef137323ab92bdb07a66bbb5106ecd584e7a046294cf0170cb690"
 
 inherit gettext pkgconfig autotools systemd features_check python3targetconfig
 
diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch
index db583cfd29..b8e812f0ae 100644
--- a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch
+++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch
@@ -3,6 +3,8 @@  From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 7 Sep 2022 11:12:28 -0700
 Subject: [PATCH] Warn not error if xsltproc is not found
 
+Refreshed for cockpit 364 (context shifted; same intent preserved).
+
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
@@ -11,10 +13,10 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6896c19..2a1fb52 100644
+index 0d12145..36cb2c4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -182,7 +182,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir])
+@@ -121,7 +121,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir])
  # package as xgettext, and we find them by PATH, so just check for the one.
  AC_PATH_PROG([XGETTEXT], [xgettext], [no])
  if test "$XGETTEXT" = "no"; then