From mboxrd@z Thu Jan 1 00:00:00 1970 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 smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F40CC433EF for ; Sat, 22 Jan 2022 19:13:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id E828260B96; Sat, 22 Jan 2022 19:13:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sj36FYl8lQma; Sat, 22 Jan 2022 19:13:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id C273A6076A; Sat, 22 Jan 2022 19:13:56 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A1E191BF95D for ; Sat, 22 Jan 2022 19:13:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9E17E6076A for ; Sat, 22 Jan 2022 19:13:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gcdYDcJ9Jcdt for ; Sat, 22 Jan 2022 19:13:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [IPv6:2a01:e0c:1:1599::10]) by smtp3.osuosl.org (Postfix) with ESMTPS id 7D0C060596 for ; Sat, 22 Jan 2022 19:13:53 +0000 (UTC) Received: from ymorin.is-a-geek.org (unknown [IPv6:2a01:cb19:8b51:cb00:8038:e8ec:605a:7149]) (Authenticated sender: yann.morin.1998@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id 2C18FB00548; Sat, 22 Jan 2022 20:13:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1642878830; bh=MvEjfo+1mJboEfzf3URFc7Pw3CXCxg+agboezmN0i24=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CN1bTgOvmkfWZyFnwpJdh+QWWN9owY2QzPjULHg5O5U8PdvURV9seFHGbuNFalhKI a/c08td5qgX8wMVSxczYqsEwoLCFplN3USKrYoVtBAubF5PxPmNZnaJktOFuQFCveX KH3LtwBlHHh00BOscg1kHJu788u+KlH3y9DFfL8unnbJgp2THBygjS2buOWUFXGzoM VR3smjXlQ7IzGhFyB6cgkab4plFO+dAFtznbnx9K9nt7Gq+61R4K5JztSIKBOp2e4G 3cyv3A3u21o+JwaJ7mc5vz/kwa7KGyW6IgL9y7+7xjOVZa+PCXG+YMktv/IHyYMFOD WkWaDZZv/+iCg== Received: by ymorin.is-a-geek.org (sSMTP sendmail emulation); Sat, 22 Jan 2022 20:13:46 +0100 Date: Sat, 22 Jan 2022 20:13:46 +0100 From: "Yann E. MORIN" To: Petr Vorel Message-ID: <20220122191346.GB3621364@scaer> References: <20220122185049.1194-1-petr.vorel@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220122185049.1194-1-petr.vorel@gmail.com> User-Agent: Mutt/1.5.22 (2013-10-16) Subject: Re: [Buildroot] [PATCH v2 1/2] package/nfs-utils: bump version to 2.6.1 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Giulio Benetti , buildroot@buildroot.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Petr, All, On 2022-01-22 19:50 +0100, Petr Vorel spake thusly: > This version dropped support to NFSv2. > > Drop patches backported from this release. > > Signed-off-by: Petr Vorel Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1->v2: > * note dropped NFSv2 support > > ...nfsdcltrack-sqlite-Fix-printf-format.patch | 52 --------------- > ...rack-nfsdcltrack.c-Fix-printf-format.patch | 48 -------------- > ...track-Use-uint64_t-instead-of-time_t.patch | 66 ------------------- > package/nfs-utils/nfs-utils.hash | 4 +- > package/nfs-utils/nfs-utils.mk | 2 +- > 5 files changed, 3 insertions(+), 169 deletions(-) > delete mode 100644 package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch > delete mode 100644 package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch > delete mode 100644 package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch > > diff --git a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch b/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch > deleted file mode 100644 > index 14894602c4..0000000000 > --- a/package/nfs-utils/0001-nfsdcltrack-sqlite-Fix-printf-format.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From d05ba5335e869bcd68c0def795c55fd5037914e3 Mon Sep 17 00:00:00 2001 > -From: Petr Vorel > -Date: Thu, 22 Jul 2021 16:15:44 +0000 > -Subject: [PATCH] nfsdcltrack/sqlite: Fix printf format > - > -sqlite.c: In function 'sqlite_remove_unreclaimed': > -sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] > - 547 | ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", > - | ~~^ > - | | > - | long int > - | %lld > - 548 | grace_start); > - | ~~~~~~~~~~~ > - | | > - | time_t {aka long long int} > - > -Found in Buildroot riscv32 build. > - > -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log > - > -Signed-off-by: Petr Vorel > -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=4f2a5b64386600430ec6b71e57b88c5efaa70aed > -Signed-off-by: Giulio Benetti > ---- > - utils/nfsdcltrack/sqlite.c | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c > -index f79aebb3..cea4a411 100644 > ---- a/utils/nfsdcltrack/sqlite.c > -+++ b/utils/nfsdcltrack/sqlite.c > -@@ -46,6 +46,7 @@ > - #include > - #include > - #include > -+#include > - #include > - #include > - #include > -@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start) > - int ret; > - char *err = NULL; > - > -- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", > -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64, > - grace_start); > - if (ret < 0) { > - return ret; > --- > -2.25.1 > - > diff --git a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch b/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch > deleted file mode 100644 > index 0893959460..0000000000 > --- a/package/nfs-utils/0002-nfsdcltrack-nfsdcltrack.c-Fix-printf-format.patch > +++ /dev/null > @@ -1,48 +0,0 @@ > -From 14eb2cae4fca95609ae4efde2444fd0a5ddfca04 Mon Sep 17 00:00:00 2001 > -From: Petr Vorel > -Date: Thu, 22 Jul 2021 16:15:45 +0000 > -Subject: [PATCH] nfsdcltrack/nfsdcltrack.c: Fix printf format > - > -nfsdcltrack.c: In function 'cltrack_gracedone': > -nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=] > - 528 | xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); > - | ~~^ ~~~~~~~~~ > - | | | > - | long int time_t {aka long long int} > - | %lld > - > -Found in Buildroot riscv32 build. > - > -Link: http://autobuild.buildroot.net/results/9bc1d43a588338b7395af7bc97535ee16a6ea2d9/build-end.log > - > -Signed-off-by: Petr Vorel > -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=5a53426c0f4e84f6644c11e4f01015597d3bb82c > -Signed-off-by: Giulio Benetti > ---- > - utils/nfsdcltrack/nfsdcltrack.c | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c > -index e926f1c0..0b37c094 100644 > ---- a/utils/nfsdcltrack/nfsdcltrack.c > -+++ b/utils/nfsdcltrack/nfsdcltrack.c > -@@ -33,6 +33,7 @@ > - #include > - #include > - #include > -+#include > - #include > - #include > - #include > -@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr) > - if (*tail) > - return -EINVAL; > - > -- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); > -+ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime); > - > - ret = sqlite_remove_unreclaimed(gracetime); > - > --- > -2.25.1 > - > diff --git a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch b/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch > deleted file mode 100644 > index 384f4fd806..0000000000 > --- a/package/nfs-utils/0003-nfsdcltrack-Use-uint64_t-instead-of-time_t.patch > +++ /dev/null > @@ -1,66 +0,0 @@ > -From 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001 > -From: Steve Dickson > -Date: Tue, 27 Jul 2021 21:12:17 -0400 > -Subject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t > - > -With recent commits (4f2a5b64,5a53426c) that fixed > -compile errors on x86_64 machines, caused similar > -errors on i686 machines. > - > -The variable type that was being used was a time_t, > -which changes size between architects, which > -caused the compile error. > - > -Changing the variable to uint64_t fixed the issue. > - > -Signed-off-by: Steve Dickson > -Upstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4 > -Signed-off-by: Petr Vorel > ---- > - utils/nfsdcltrack/nfsdcltrack.c | 2 +- > - utils/nfsdcltrack/sqlite.c | 2 +- > - utils/nfsdcltrack/sqlite.h | 2 +- > - 3 files changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c > -index 0b37c094..7c1c4bcc 100644 > ---- a/utils/nfsdcltrack/nfsdcltrack.c > -+++ b/utils/nfsdcltrack/nfsdcltrack.c > -@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr) > - { > - int ret; > - char *tail; > -- time_t gracetime; > -+ uint64_t gracetime; > - > - > - ret = sqlite_prepare_dbh(storagedir); > -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c > -index cea4a411..cf0c6a45 100644 > ---- a/utils/nfsdcltrack/sqlite.c > -+++ b/utils/nfsdcltrack/sqlite.c > -@@ -540,7 +540,7 @@ out_err: > - * remove any client records that were not reclaimed since grace_start. > - */ > - int > --sqlite_remove_unreclaimed(time_t grace_start) > -+sqlite_remove_unreclaimed(uint64_t grace_start) > - { > - int ret; > - char *err = NULL; > -diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h > -index 06e7c044..ba8cdfa8 100644 > ---- a/utils/nfsdcltrack/sqlite.h > -+++ b/utils/nfsdcltrack/sqlite.h > -@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen, > - int sqlite_remove_client(const unsigned char *clname, const size_t namelen); > - int sqlite_check_client(const unsigned char *clname, const size_t namelen, > - const bool has_session); > --int sqlite_remove_unreclaimed(const time_t grace_start); > -+int sqlite_remove_unreclaimed(const uint64_t grace_start); > - int sqlite_query_reclaiming(const time_t grace_start); > - > - #endif /* _SQLITE_H */ > --- > -2.32.0 > - > diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash > index 2073bebd8a..a73bf80e70 100644 > --- a/package/nfs-utils/nfs-utils.hash > +++ b/package/nfs-utils/nfs-utils.hash > @@ -1,4 +1,4 @@ > -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc > -sha256 51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6aebe3dd nfs-utils-2.5.4.tar.xz > +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc > +sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz > # Locally computed > sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > index 07b44b5a93..6a3a801359 100644 > --- a/package/nfs-utils/nfs-utils.mk > +++ b/package/nfs-utils/nfs-utils.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NFS_UTILS_VERSION = 2.5.4 > +NFS_UTILS_VERSION = 2.6.1 > NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz > NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) > NFS_UTILS_LICENSE = GPL-2.0+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot