From patchwork Sat Oct 3 08:13:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1376202 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=FjtWMkjf; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C3KQT1jFtz9s1t for ; Sat, 3 Oct 2020 18:14:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9748086A11; Sat, 3 Oct 2020 08:14:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 66KiC5SVl5xA; Sat, 3 Oct 2020 08:14:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6FE0886A3C; Sat, 3 Oct 2020 08:14:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3CA9E1BF2CD for ; Sat, 3 Oct 2020 08:14:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3176986A3C for ; Sat, 3 Oct 2020 08:14:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1p4G0dcfhB+C for ; Sat, 3 Oct 2020 08:14:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id C058486A11 for ; Sat, 3 Oct 2020 08:14:13 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id s13so3772820wmh.4 for ; Sat, 03 Oct 2020 01:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EPWUayQlKVBI+ZgsUHz70ZtSILyFyZbUpGGgEPJATJY=; b=FjtWMkjf0sZ8w51jpwEsL6VSoUihb6WSkiZmzv++RFsTID/RXPLu9UBS3Cx6ZLYVg9 pMD0OJHheHqoE5AOEQM587m4hqYmxZs+RSBYTYa7o/y+NctImMKy1WxnxAzbDl8AWKnj SMDQ81GJoMF/IT2dGLlKDE0yhcru2nY/tAag6wrIjIEoKuAJ5ILt1chmWuNaq3CnNWq2 HKec0Ka7q7IljoWRvC2EEwGTVf0hwVLdBI1nGD/gsNui+HxQ3cftI2jGtddnYtGt3geU Ycvzh6k3vBYXl8eKI6Jcp2WfwotpcYbsfUw8DeUtK+Nss4r1kfaXzQ8UJxSZioDoYMDC KU5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EPWUayQlKVBI+ZgsUHz70ZtSILyFyZbUpGGgEPJATJY=; b=pc6noYyNCOzOkoJS87ssSjcpIkm8o540ds8iv6ZrhdgoF1CHqSTzJ/AwC30uR0VHJb YjcT51oEpAi7zJDeflTp70ijeNS5ovTfCwT8sMZamv23i6Sx14M8MSh/zt3TT7vEd5KS GRhKbUsKijXiAvIZaqeNmWrRf/efNzX8HT7NlRPaz4LhzsYNVvRkrAyEzoAc5XfRfP9Y Z6uJI8mOPqKImEYMbxv7spOqSKVINWifGJjO6SFkorMMBOb/upXYDk+tRKjHTXuWzi46 pgBFZoZd0BwofJzM3r0SA5gzee/HkD4s2mQVl/AlKSmGSBQY/fO5JHv0nQhUjwFD7gaM jyxg== X-Gm-Message-State: AOAM533OEYFvgNsCQJ9bU38Jrg1MAMaImer3gLCrP8Fe8bGBl4xDJNqH LJwkXo22sBmUKNgz4tC2WycdFyBMRPD4+A== X-Google-Smtp-Source: ABdhPJzqS3hiPNAh1cKT/kIlJNjHCvrHs78geHfE2ldY5pEqcvsyTe6s3CL/69vMJRTIe8u5Zm5siQ== X-Received: by 2002:a1c:2403:: with SMTP id k3mr6483056wmk.153.1601712851932; Sat, 03 Oct 2020 01:14:11 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id 88sm4458627wrl.76.2020.10.03.01.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 01:14:11 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 3 Oct 2020 10:13:59 +0200 Message-Id: <20201003081359.2969479-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/xfsprogs: bump to version 5.8.0 X-BeenThere: buildroot@busybox.net 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: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Update hash of GPL-2.0 file because spdx tags have been updated by https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=c7498b6911d03f2bd7f74e9f9862d8d5fbd5b5da - Drop third patch (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- ...eclare-globals-provided-by-libraries.patch | 83 ------------------- package/xfsprogs/xfsprogs.hash | 6 +- package/xfsprogs/xfsprogs.mk | 2 +- 3 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 package/xfsprogs/0003-xfsprogs-do-not-redeclare-globals-provided-by-libraries.patch diff --git a/package/xfsprogs/0003-xfsprogs-do-not-redeclare-globals-provided-by-libraries.patch b/package/xfsprogs/0003-xfsprogs-do-not-redeclare-globals-provided-by-libraries.patch deleted file mode 100644 index ef2053e9bb..0000000000 --- a/package/xfsprogs/0003-xfsprogs-do-not-redeclare-globals-provided-by-libraries.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 123b851389ef9a012a469ef982ac7b819db59342 Mon Sep 17 00:00:00 2001 -From: Eric Sandeen -Date: Thu, 30 Jan 2020 13:34:17 -0500 -Subject: xfsprogs: do not redeclare globals provided by libraries - -In each of these cases, db, logprint, and mdrestore are redeclaring -as a global variable something which was already provided by a -library they link with. - -gcc now defaults to -fno-common and trips over these global variables -which are declared in utilities as well as in libxfs and libxlog, and -it causes the build to fail. - -Signed-off-by: Eric Sandeen -Reviewed-by: Darrick J. Wong -Reviewed-by: Christoph Hellwig -Signed-off-by: Eric Sandeen - -[Retrieved from: -https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=123b851389ef9a012a469ef982ac7b819db59342] -Signed-off-by: Fabrice Fontaine ---- - db/init.c | 1 - - logprint/logprint.c | 4 ++-- - mdrestore/xfs_mdrestore.c | 1 - - 3 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/db/init.c b/db/init.c -index 455220a86..0ac373685 100644 ---- a/db/init.c -+++ b/db/init.c -@@ -27,7 +27,6 @@ static int force; - static struct xfs_mount xmount; - struct xfs_mount *mp; - static struct xlog xlog; --libxfs_init_t x; - xfs_agnumber_t cur_agno = NULLAGNUMBER; - - static void -diff --git a/logprint/logprint.c b/logprint/logprint.c -index 7754a2a6e..511a32aca 100644 ---- a/logprint/logprint.c -+++ b/logprint/logprint.c -@@ -24,7 +24,6 @@ int print_buffer; - int print_overwrite; - int print_no_data; - int print_no_print; --int print_exit = 1; /* -e is now default. specify -c to override */ - static int print_operation = OP_PRINT; - - static void -@@ -132,6 +131,7 @@ main(int argc, char **argv) - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - memset(&mount, 0, sizeof(mount)); -+ print_exit = 1; /* -e is now default. specify -c to override */ - - progname = basename(argv[0]); - while ((c = getopt(argc, argv, "bC:cdefl:iqnors:tDVv")) != EOF) { -@@ -152,7 +152,7 @@ main(int argc, char **argv) - case 'e': - /* -e is now default - */ -- print_exit++; -+ print_exit = 1; - break; - case 'C': - print_operation = OP_COPY; -diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c -index 3375e0806..1cd399dbc 100644 ---- a/mdrestore/xfs_mdrestore.c -+++ b/mdrestore/xfs_mdrestore.c -@@ -7,7 +7,6 @@ - #include "libxfs.h" - #include "xfs_metadump.h" - --char *progname; - static int show_progress = 0; - static int show_info = 0; - static int progress_since_warning = 0; --- -cgit 1.2.3-1.el7 - diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index 629d6fcf9d..79f953b33c 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae xfsprogs-5.2.1.tar.xz +sha256 8ef46ed9e6bb927f407f541dc4324857c908ddf1374265edc910d23724048c6b xfsprogs-5.8.0.tar.xz # Hash for license files -sha256 7ae50a5344af14d6231aff6814632a220b3127da4099aea2c6070fd79c407c1a LICENSES/GPL-2.0 -sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 +sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 43c921aa17..bfaf9fd712 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFSPROGS_VERSION = 5.2.1 +XFSPROGS_VERSION = 5.8.0 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers)