From patchwork Sun Dec 15 09:29:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 54104 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09439E77199 for ; Sun, 15 Dec 2024 09:29:51 +0000 (UTC) Received: from a27-30.smtp-out.us-west-2.amazonses.com (a27-30.smtp-out.us-west-2.amazonses.com [54.240.27.30]) by mx.groups.io with SMTP id smtpd.web11.33340.1734254975608843039 for ; Sun, 15 Dec 2024 01:29:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=abHbbzq3; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=CBgIJSuM; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.30, mailfrom: 01010193c9a6f094-ea9eaa72-f546-48b6-b226-41ea833d750c-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1734254981; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=1G+qNi7EaMa07dpbfP61iRfiUznwvI48dGkO2lYDSng=; b=abHbbzq3OsTEIfh30PXbcGGNQAoW5U8343dV4A9MJPkmanSQ5+wnNTqWNzIrH7m9 bUSnr6WSOlqcoo8ATIGx1/bn+nJWRwr4b+a53wpnPAIIQXAWAQO2NwguPmEMlnfSQ2H Eu6PMNF5x77wQeJ+0cTZgN8lfsR6nBEv1sfF5GiA= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1734254981; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=1G+qNi7EaMa07dpbfP61iRfiUznwvI48dGkO2lYDSng=; b=CBgIJSuMSNsgn1D1khpFOJHVB57vYchrAt+8RfgVL0W1wd4o7K4wBo33Xy6eyIvh vSGsZA+ux0tcKSsBgJZS/vFiYQvAGyFGy1YLbqlt8Zl6rBwXvOddK4q7qCXmYkYKaHV UjwCuRMuSYVebt4Y3ihKmkMNIU5rd47Mc4Dr7Kj4= MIME-Version: 1.0 From: auh@yoctoproject.org To: Robert Yang Cc: openembedded-core@lists.openembedded.org Subject: [AUH] nfs-utils: upgrading to 2.8.2 SUCCEEDED Message-ID: <01010193c9a6f094-ea9eaa72-f546-48b6-b226-41ea833d750c-000000@us-west-2.amazonses.com> Date: Sun, 15 Dec 2024 09:29:41 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.12.15-54.240.27.30 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Dec 2024 09:29:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208710 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *nfs-utils* to *2.8.2* has Succeeded. Next steps: - apply the patch: git am 0001-nfs-utils-upgrade-2.8.1-2.8.2.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 931e38190035c51d5c3da0928fba14f88d961b48 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sun, 15 Dec 2024 06:59:28 +0000 Subject: [PATCH] nfs-utils: upgrade 2.8.1 -> 2.8.2 --- ...-fix-undefined-function-for-libnsm.a.patch | 258 ++---------------- ...t-Makefile.am-Do-not-use-build-flags.patch | 7 +- .../bugfix-adjust-statd-service-name.patch | 6 +- .../nfs-utils/nfs-utils/clang-warnings.patch | 3 +- .../nfs-utils-debianize-start-statd.patch | 12 +- ...{nfs-utils_2.8.1.bb => nfs-utils_2.8.2.bb} | 2 +- 6 files changed, 32 insertions(+), 256 deletions(-) rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.8.1.bb => nfs-utils_2.8.2.bb} (98%) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch index 7603eb680d..b7e4666600 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch @@ -1,4 +1,4 @@ -From 690a90a5b7786e40b5447ad7c5f19a7657d27405 Mon Sep 17 00:00:00 2001 +From 04ce5a767db00f790328c4357d8b0869fbc2b684 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 14 Dec 2018 17:44:32 +0800 Subject: [PATCH] Makefile.am: fix undefined function for libnsm.a @@ -27,11 +27,11 @@ Rebase it. Signed-off-by: Robert Yang --- - support/misc/Makefile.am | 2 +- - support/misc/file.c | 115 --------------------------------------------------------------------------------------------------------------- - support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - support/nsm/Makefile.am | 2 +- - 4 files changed, 113 insertions(+), 117 deletions(-) + support/misc/Makefile.am | 2 +- + support/misc/{file.c => misc.c} | 4 ---- + support/nsm/Makefile.am | 2 +- + 3 files changed, 2 insertions(+), 6 deletions(-) + rename support/misc/{file.c => misc.c} (98%) diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am index f9993e3..8b0e9db 100644 @@ -46,244 +46,24 @@ index f9993e3..8b0e9db 100644 nfsd_path.c workqueue.c xstat.c MAINTAINERCLEANFILES = Makefile.in -diff --git a/support/misc/file.c b/support/misc/file.c -deleted file mode 100644 -index 06f6bb2..0000000 +diff --git a/support/misc/file.c b/support/misc/misc.c +similarity index 98% +rename from support/misc/file.c +rename to support/misc/misc.c +index 06f6bb2..e7c3819 100644 --- a/support/misc/file.c -+++ /dev/null -@@ -1,115 +0,0 @@ --/* -- * Copyright 2009 Oracle. All rights reserved. -- * Copyright 2017 Red Hat, Inc. All rights reserved. -- * -- * This file is part of nfs-utils. -- * -- * nfs-utils is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * nfs-utils is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with nfs-utils. If not, see . -- */ -- ++++ b/support/misc/misc.c +@@ -18,10 +18,6 @@ + * along with nfs-utils. If not, see . + */ + -#ifdef HAVE_CONFIG_H -#include -#endif - --#include -- --#include --#include --#include --#include --#include --#include --#include --#include -- --#include "xlog.h" --#include "misc.h" -- --/* -- * Returns a dynamically allocated, '\0'-terminated buffer -- * containing an appropriate pathname, or NULL if an error -- * occurs. Caller must free the returned result with free(3). -- */ --__attribute__((__malloc__)) --char * --generic_make_pathname(const char *base, const char *leaf) --{ -- size_t size; -- char *path; -- int len; -- -- size = strlen(base) + strlen(leaf) + 2; -- if (size > PATH_MAX) -- return NULL; -- -- path = malloc(size); -- if (path == NULL) -- return NULL; -- -- len = snprintf(path, size, "%s/%s", base, leaf); -- if ((len < 0) || ((size_t)len >= size)) { -- free(path); -- return NULL; -- } -- -- return path; --} -- -- --/** -- * generic_setup_basedir - set up basedir -- * @progname: C string containing name of program, for error messages -- * @parentdir: C string containing pathname to on-disk state, or NULL -- * @base: character buffer to contain the basedir that is set up -- * @baselen: size of @base in bytes -- * -- * This runs before logging is set up, so error messages are directed -- * to stderr. -- * -- * Returns true and sets up our basedir, if @parentdir was valid -- * and usable; otherwise false is returned. -- */ --_Bool --generic_setup_basedir(const char *progname, const char *parentdir, char *base, -- const size_t baselen) --{ -- static char buf[PATH_MAX]; -- struct stat st; -- char *path; -- -- /* First: test length of name and whether it exists */ -- if ((strlen(parentdir) >= baselen) || (strlen(parentdir) >= PATH_MAX)) { -- (void)fprintf(stderr, "%s: Directory name too long: %s", -- progname, parentdir); -- return false; -- } -- if (lstat(parentdir, &st) == -1) { -- (void)fprintf(stderr, "%s: Failed to stat %s: %s", -- progname, parentdir, strerror(errno)); -- return false; -- } -- -- /* Ensure we have a clean directory pathname */ -- strncpy(buf, parentdir, sizeof(buf)-1); -- path = dirname(buf); -- if (*path == '.') { -- (void)fprintf(stderr, "%s: Unusable directory %s", -- progname, parentdir); -- return false; -- } -- -- xlog(D_CALL, "Using %s as the state directory", parentdir); -- strcpy(base, parentdir); -- return true; --} -diff --git a/support/misc/misc.c b/support/misc/misc.c -new file mode 100644 -index 0000000..e7c3819 ---- /dev/null -+++ b/support/misc/misc.c -@@ -0,0 +1,111 @@ -+/* -+ * Copyright 2009 Oracle. All rights reserved. -+ * Copyright 2017 Red Hat, Inc. All rights reserved. -+ * -+ * This file is part of nfs-utils. -+ * -+ * nfs-utils is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * nfs-utils is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with nfs-utils. If not, see . -+ */ -+ -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "xlog.h" -+#include "misc.h" -+ -+/* -+ * Returns a dynamically allocated, '\0'-terminated buffer -+ * containing an appropriate pathname, or NULL if an error -+ * occurs. Caller must free the returned result with free(3). -+ */ -+__attribute__((__malloc__)) -+char * -+generic_make_pathname(const char *base, const char *leaf) -+{ -+ size_t size; -+ char *path; -+ int len; -+ -+ size = strlen(base) + strlen(leaf) + 2; -+ if (size > PATH_MAX) -+ return NULL; -+ -+ path = malloc(size); -+ if (path == NULL) -+ return NULL; -+ -+ len = snprintf(path, size, "%s/%s", base, leaf); -+ if ((len < 0) || ((size_t)len >= size)) { -+ free(path); -+ return NULL; -+ } -+ -+ return path; -+} -+ -+ -+/** -+ * generic_setup_basedir - set up basedir -+ * @progname: C string containing name of program, for error messages -+ * @parentdir: C string containing pathname to on-disk state, or NULL -+ * @base: character buffer to contain the basedir that is set up -+ * @baselen: size of @base in bytes -+ * -+ * This runs before logging is set up, so error messages are directed -+ * to stderr. -+ * -+ * Returns true and sets up our basedir, if @parentdir was valid -+ * and usable; otherwise false is returned. -+ */ -+_Bool -+generic_setup_basedir(const char *progname, const char *parentdir, char *base, -+ const size_t baselen) -+{ -+ static char buf[PATH_MAX]; -+ struct stat st; -+ char *path; -+ -+ /* First: test length of name and whether it exists */ -+ if ((strlen(parentdir) >= baselen) || (strlen(parentdir) >= PATH_MAX)) { -+ (void)fprintf(stderr, "%s: Directory name too long: %s", -+ progname, parentdir); -+ return false; -+ } -+ if (lstat(parentdir, &st) == -1) { -+ (void)fprintf(stderr, "%s: Failed to stat %s: %s", -+ progname, parentdir, strerror(errno)); -+ return false; -+ } -+ -+ /* Ensure we have a clean directory pathname */ -+ strncpy(buf, parentdir, sizeof(buf)-1); -+ path = dirname(buf); -+ if (*path == '.') { -+ (void)fprintf(stderr, "%s: Unusable directory %s", -+ progname, parentdir); -+ return false; -+ } -+ -+ xlog(D_CALL, "Using %s as the state directory", parentdir); -+ strcpy(base, parentdir); -+ return true; -+} + #include + + #include diff --git a/support/nsm/Makefile.am b/support/nsm/Makefile.am index 8f5874e..68f1a46 100644 --- a/support/nsm/Makefile.am diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch index 351407ddcd..a4bc1109ca 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch @@ -1,4 +1,4 @@ -From 9efa7a0d37665d9bb0f46d2407883a5ab42c2b84 Mon Sep 17 00:00:00 2001 +From 065c06ee64de56b54eff85628aeaf1946a2480b1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 24 Jul 2023 20:39:16 -0700 Subject: [PATCH] locktest: Makefile.am: Do not use build flags @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 3 deletions(-) diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am -index e8914655..2fd36971 100644 +index e891465..2fd3697 100644 --- a/tools/locktest/Makefile.am +++ b/tools/locktest/Makefile.am @@ -2,8 +2,5 @@ @@ -31,6 +31,3 @@ index e8914655..2fd36971 100644 -testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD) MAINTAINERCLEANFILES = Makefile.in --- -2.41.0 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch index f13d7b380c..a6e24c8db6 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch @@ -1,7 +1,7 @@ -From 398fed3bb0350cb1229e54e7020ae0e044c206d1 Mon Sep 17 00:00:00 2001 +From 08fbcc191800e2844e39a0bb19c952db917f1e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20=C3=96lmann?= Date: Wed, 17 Feb 2016 08:33:45 +0100 -Subject: bugfix: adjust statd service name +Subject: [PATCH] bugfix: adjust statd service name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -21,7 +21,7 @@ Signed-off-by: Robert Yang 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/statd/start-statd b/utils/statd/start-statd -index af5c950..df9b9be 100755 +index 4bcbb60..3d3a8c8 100755 --- a/utils/statd/start-statd +++ b/utils/statd/start-statd @@ -28,10 +28,10 @@ fi diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/clang-warnings.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/clang-warnings.patch index fde99b599e..80992348dd 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/clang-warnings.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/clang-warnings.patch @@ -1,4 +1,4 @@ -From 1ab0c326405c6daa06f1a7eb4b0b60bf4e0584c2 Mon Sep 17 00:00:00 2001 +From 075ad791be83b7162624bd0fadf37aca48a8899d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 31 Dec 2019 08:15:34 -0800 Subject: [PATCH] Detect warning options during configure @@ -14,7 +14,6 @@ Wdiscarded-qualifiers is gcc specific and this is no longer needed Upstream-Status: Pending Signed-off-by: Khem Raj - --- support/nfs/xcommon.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-debianize-start-statd.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-debianize-start-statd.patch index ede0dcefc4..547796b39d 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-debianize-start-statd.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-debianize-start-statd.patch @@ -1,4 +1,7 @@ -[PATCH] nfs-utils: debianize start-statd +From 3c5efd37c8bc5d1330fc8fdd1847e7195e65051c Mon Sep 17 00:00:00 2001 +From: Henrik Riomar +Date: Mon, 29 Jun 2015 14:22:35 +0800 +Subject: [PATCH] [PATCH] nfs-utils: debianize start-statd Upstream-Status: Pending @@ -13,7 +16,7 @@ Signed-off-by: Wenzong Fan 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/utils/statd/start-statd b/utils/statd/start-statd -index 2fd6039..f591b34 100755 +index 67a2f4a..4bcbb60 100755 --- a/utils/statd/start-statd +++ b/utils/statd/start-statd @@ -17,6 +17,14 @@ then @@ -31,12 +34,9 @@ index 2fd6039..f591b34 100755 # First try systemd if it's installed. if [ -d /run/systemd/system ]; then # Quit only if the call worked. -@@ -25,4 +33,4 @@ fi +@@ -30,4 +38,4 @@ fi cd / # Fall back to launching it ourselves. -exec rpc.statd --no-notify +exec rpc.statd --no-notify $STATDOPTS --- -2.6.6 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb similarity index 98% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.1.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb index 488a1a7e70..543c68f7f5 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb @@ -33,7 +33,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ " -SRC_URI[sha256sum] = "a0be95b08396908048583fcf6b34a7c1ab49d53e8a12eb28673ccfd2eff0c505" +SRC_URI[sha256sum] = "a39bbea76ac0ab9e6e8699caf3c308b6b310c20d458e8fa8606196d358e7fb15" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies.