Skip to contentSkip to conversation

Packages upgrade

PATCH New [email protected] 1 participant 4 messages Jun 4, 2025

lore
Share & tools
lore
#0 lore raw

cover Packages upgrade

From: Robert Yang <[email protected]>

The following changes since commit 2e817e6e4d53543766b935479b148a1950cc37c8:

oeqa/maturin/guessing-game: Bump dependencies to avoid security warning (2025-06-04 08:08:28 +0100)

are available in the Git repository at:

https://github.com/robertlinux/yocto rbt/upgrade
https://github.com/robertlinux/yocto/tree/rbt/upgrade

Robert Yang (3):
strace: 6.12 -> 6.15
quilt: 0.68 -> 0.69
nfs-utils: 2.8.2 -> 2.8.3

 ...0001-Fix-typecast-warning-with-clang.patch | 32 ---------------
 ...mon.c-fix-a-formatting-error-with-cl.patch | 40 -------------------
 ...{nfs-utils_2.8.2.bb => nfs-utils_2.8.3.bb} |  4 +-
 ...lt-native_0.68.bb => quilt-native_0.69.bb} |  0
 meta/recipes-devtools/quilt/quilt.inc         |  3 +-
 ...b-spec-filters-obs-usr-bin-sh-bin-sh.patch | 28 +++++++++++++
 .../quilt/{quilt_0.68.bb => quilt_0.69.bb}    |  0
 .../strace/strace/Makefile-ptest.patch        |  7 ++--
 .../strace/{strace_6.12.bb => strace_6.15.bb} |  4 +-
 9 files changed, 37 insertions(+), 81 deletions(-)
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-typecast-warning-with-clang.patch
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch
 rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.8.2.bb => nfs-utils_2.8.3.bb} (96%)
 rename meta/recipes-devtools/quilt/{quilt-native_0.68.bb => quilt-native_0.69.bb} (100%)
 create mode 100644 meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch
 rename meta/recipes-devtools/quilt/{quilt_0.68.bb => quilt_0.69.bb} (100%)
 rename meta/recipes-devtools/strace/{strace_6.12.bb => strace_6.15.bb} (93%)
Signature · 1 line
2.49.0
#1 lore raw

PATCH 1/3 strace: 6.12 -> 6.15

From: Robert Yang <[email protected]>

* Rebased Makefile-ptest.patch for 6.15
* License-Update: Update copyright year from 2024 to 2025

---
 meta/recipes-devtools/strace/strace/Makefile-ptest.patch   | 7 ++++---
 .../strace/{strace_6.12.bb => strace_6.15.bb}              | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename meta/recipes-devtools/strace/{strace_6.12.bb => strace_6.15.bb} (93%)
meta/recipes-devtools/strace/strace/Makefile-ptest.patch +4 -3
index a78c86f6a1..9520aa8842 100644
@@ -12,8 +12,9 @@ Signed-off-by: Anuj Mittal <[email protected]>
  tests/Makefile.am | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
+
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index e1254c3..149570d 100644
+index b29471f..b8b66f0 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
 @@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@
@@ -21,10 +22,10 @@ index e1254c3..149570d 100644
  MPERS_CC_FLAGS =
  ARCH_MFLAGS =
 +TEST_SUITE_LOG = test-suite.log
- AM_CFLAGS = $(WARN_CFLAGS)
+ AM_CFLAGS = $(WARN_CFLAGS) $(TEST_WARN_CFLAGS)
  bundled_CPPFLAGS =
  if USE_BUNDLED_HEADERS
-@@ -903,3 +904,22 @@ BUILT_SOURCES = ksysent.h
+@@ -932,3 +933,22 @@ BUILT_SOURCES = ksysent.h
  CLEANFILES = ksysent.h
  
  include ../src/scno.am
meta/recipes-devtools/strace/strace_6.15.bb renamed from meta/recipes-devtools/strace/strace_6.12.bb +2 -2
similarity index 93%
rename from meta/recipes-devtools/strace/strace_6.12.bb
rename to meta/recipes-devtools/strace/strace_6.15.bb
index c16e5dc478..d8ac2a53d0 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://strace.io"
 DESCRIPTION = "strace is a diagnostic, debugging and instructional userspace utility for Linux. It is used to monitor and tamper with interactions between processes and the Linux kernel, which include system calls, signal deliveries, and changes of process state."
 SECTION = "console/utils"
 LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2433d82e1432a76dc3eadd9002bfe304"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1efaf30bb0084b4a17a6f55f9cbcd25b"
 
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \
            file://update-gawk-paths.patch \
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \
            file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \
            file://0002-tests-Replace-off64_t-with-off_t.patch \
            "
-SRC_URI[sha256sum] = "c47da93be45b6055f4dc741d7f20efaf50ca10160a5b100c109b294fd9c0bdfe"
+SRC_URI[sha256sum] = "8552dfab08abc22a0f2048c98fd9541fd4d71b6882507952780dab7c7c512f51"
 
 
 inherit autotools github-releases ptest
Signature · 1 line
2.49.0
#2 lore raw

PATCH 2/3 quilt: 0.68 -> 0.69

In reply to [email protected]

From: Robert Yang <[email protected]>

Add 0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch to fix:
ERROR: quilt-0.69-r0 do_package_qa: QA Issue: /usr/share/quilt/spec-filters/obs contained in package quilt requires /usr/bin/sh, but no providers found in RDEPENDS:quilt? [file-rdeps]

---
 ...lt-native_0.68.bb => quilt-native_0.69.bb} |  0
 meta/recipes-devtools/quilt/quilt.inc         |  3 +-
 ...b-spec-filters-obs-usr-bin-sh-bin-sh.patch | 28 +++++++++++++++++++
 .../quilt/{quilt_0.68.bb => quilt_0.69.bb}    |  0
 4 files changed, 30 insertions(+), 1 deletion(-)
 rename meta/recipes-devtools/quilt/{quilt-native_0.68.bb => quilt-native_0.69.bb} (100%)
 create mode 100644 meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch
 rename meta/recipes-devtools/quilt/{quilt_0.68.bb => quilt_0.69.bb} (100%)
meta/recipes-devtools/quilt/quilt-native_0.69.bb renamed from meta/recipes-devtools/quilt/quilt-native_0.68.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/quilt/quilt-native_0.68.bb
rename to meta/recipes-devtools/quilt/quilt-native_0.69.bb
meta/recipes-devtools/quilt/quilt.inc +2 -1
index 4bae5c6c19..59d13237e2 100644
@@ -11,11 +11,12 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
         file://run-ptest \
         file://test.sh \
         file://0001-tests-Allow-different-output-from-mv.patch \
+        file://0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch \
 "
 
 SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch"
 
-SRC_URI[sha256sum] = "fe8c09de03c106e85b3737c8f03ade147c956b79ed7af485a1c8a3858db38426"
+SRC_URI[sha256sum] = "555ddffde22da3c86d1caf5a9c1fb8a152ac2b84730437bd39cc08849c9f4852"
 
 inherit autotools-brokensep ptest
 
meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch new file +28 -0
new file mode 100644
index 0000000000..219deab0d6
@@ -0,0 +1,28 @@
+From 0e00d22182c4cce3b242dd8f4166d3df238b3a0b Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Wed, 4 Jun 2025 00:21:40 -0700
+Subject: [PATCH] contrib/spec-filters/obs: /usr/bin/sh -> /bin/sh
+
+The /bin/sh is more common than /usr/bin/sh, the later one doesn't exist on
+distributions such as Ubuntu 22.04.
+
+Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/quilt-dev/2025-06/msg00002.html]
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ contrib/spec-filters/obs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/spec-filters/obs b/contrib/spec-filters/obs
+index 2f5b169..b675230 100755
+--- a/contrib/spec-filters/obs
++++ b/contrib/spec-filters/obs
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh
++#!/bin/sh
+ # Basic spec file filter for OBS packages
+ # https://build.opensuse.org/
+ 
+-- 
+2.49.0
+
meta/recipes-devtools/quilt/quilt_0.69.bb renamed from meta/recipes-devtools/quilt/quilt_0.68.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/quilt/quilt_0.68.bb
rename to meta/recipes-devtools/quilt/quilt_0.69.bb
Signature · 1 line
2.49.0
#3 lore raw

PATCH 3/3 nfs-utils: 2.8.2 -> 2.8.3

In reply to [email protected]

From: Robert Yang <[email protected]>

* Remove upstream merged patches:
0001-Fix-typecast-warning-with-clang.patch 0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch

---
 ...0001-Fix-typecast-warning-with-clang.patch | 32 ---------------
 ...mon.c-fix-a-formatting-error-with-cl.patch | 40 -------------------
 ...{nfs-utils_2.8.2.bb => nfs-utils_2.8.3.bb} |  4 +-
 3 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-typecast-warning-with-clang.patch
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch
 rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.8.2.bb => nfs-utils_2.8.3.bb} (96%)
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-typecast-warning-with-clang.patch deleted +0 -32
deleted file mode 100644
index f493a3051e..0000000000
@@ -1,32 +0,0 @@
-From 0a64c5ad17786796d84390e480a38b4f762229ae Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 18 Dec 2024 19:20:39 -0800
-Subject: [PATCH v2] Fix typecast warning with clang
-
-Fixes
-file.c:200:8: error: assigning to 'char *' from 'const char *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
-
-Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=173463533411103&w=2]
-Signed-off-by: Khem Raj <[email protected]>
-Cc: Benjamin Coddington <[email protected]>
-Cc: Steve Dickson <[email protected]>
----
-v2: Make base as const char pointer insread of trying type punning
-
- support/nsm/file.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/support/nsm/file.c b/support/nsm/file.c
-index de122b0f..68f99bf0 100644
---- a/support/nsm/file.c
-+++ b/support/nsm/file.c
-@@ -184,7 +184,8 @@ static char *
- nsm_make_temp_pathname(const char *pathname)
- {
- 	size_t size;
--	char *path, *base;
-+	char *path;
-+	const char *base;
- 	int len;
- 
- 	size = strlen(pathname) + sizeof(".new") + 1;
meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch deleted +0 -40
deleted file mode 100644
index a99ba284e0..0000000000
@@ -1,40 +0,0 @@
-From cc59a7fe15b6ca2ee43cba0dc1d699323b36ffcc Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Fri, 21 Mar 2025 10:42:56 +0100
-Subject: [PATCH] support/nfs/xcommon.c: fix a formatting error with clang
-
-Specifically, this happens:
-
-| xcommon.c:101:24: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
-|   101 |      vfprintf (stderr, fmt2, args);
-|       |                        ^~~~
-
-A similar approach (print \n seprately) is already used elsewhere in
-the same file.
-
-Upstream-Status: Submitted [via email to [email protected],[email protected]]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- support/nfs/xcommon.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c
-index 3989f0b..1d04dd1 100644
---- a/support/nfs/xcommon.c
-+++ b/support/nfs/xcommon.c
-@@ -94,13 +94,11 @@ xstrconcat4 (const char *s, const char *t, const char *u, const char *v) {
- void
- nfs_error (const char *fmt, ...) {
-      va_list args;
--     char *fmt2;
- 
--     fmt2 = xstrconcat2 (fmt, "\n");
-      va_start (args, fmt);
--     vfprintf (stderr, fmt2, args);
-+     vfprintf (stderr, fmt, args);
-+     fprintf (stderr, "\n");
-      va_end (args);
--     free (fmt2);
- }
- 
- /* Make a canonical pathname from PATH.  Returns a freshly malloced string.
meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb +1 -3
similarity index 96%
rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb
rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb
index 1f3afa0560..9668ac0e86 100644
@@ -22,13 +22,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
            file://nfsserver \
            file://nfscommon \
            file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \
-           file://0001-Fix-typecast-warning-with-clang.patch \
            file://0004-Use-nogroup-for-nobody-group.patch \
            file://0005-find-OE-provided-Kerberos.patch \
-           file://0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch \
            "
 
-SRC_URI[sha256sum] = "a39bbea76ac0ab9e6e8699caf3c308b6b310c20d458e8fa8606196d358e7fb15"
+SRC_URI[sha256sum] = "11e7c5847a8423a72931c865bd9296e7fd56ff270a795a849183900961711725"
 
 # Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
 # pull in the remainder of the dependencies.
Signature · 1 line
2.49.0