From patchwork Tue Apr 28 14:15:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1278515 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.137; helo=fraxinus.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=fc+pnk3L; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49BNvw2KGLz9sTN for ; Wed, 29 Apr 2020 00:15:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7A89586396; Tue, 28 Apr 2020 14:15:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id usumyvnvSyUR; Tue, 28 Apr 2020 14:15:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 33CB1863A1; Tue, 28 Apr 2020 14:15:19 +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 AAD3F1BF3FF for ; Tue, 28 Apr 2020 14:15:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A51048475D for ; Tue, 28 Apr 2020 14:15:17 +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 WImS01LGAhm3 for ; Tue, 28 Apr 2020 14:15:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7103F86C0E for ; Tue, 28 Apr 2020 14:15:16 +0000 (UTC) Received: by mail-qv1-f65.google.com with SMTP id fb4so10424343qvb.7 for ; Tue, 28 Apr 2020 07:15:16 -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; bh=I6ZBxTYOi1KnjNE/uXwS5Md2hkvcxsBnAOYULKuKAaE=; b=fc+pnk3LE1EzddQxv+cl8AE2oIuPmv4DU2fT3I66oL1gohDWaENsZriQVaQzOyRwAB O+FmybeMQq1SIAUOfLH6B69lIDbTtGTBx3P7q+X28Dwpy0W2zbK549cUdhiiPAn0yI88 aTLVN/OsMqGVUYU4lmRN0zJLUiJTvIEOhYf812QxyAyYk8Cf6zeB1kSVi//ZwFHuG7Hi 4k52FuWjc770wNh4MWS7ohgSwe0hLGSbpk3oFDI2OsesrK7psw1PFyc0sfSxprLR8DS7 NNOJjqbJQfHUZ1EmS1EHKWix9RvAPbUl+6ITOJYn5JIkABdRevwtZuqnF4X0HBsWJkgT 2hsQ== 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; bh=I6ZBxTYOi1KnjNE/uXwS5Md2hkvcxsBnAOYULKuKAaE=; b=phE4zkCIElFbL6FGDLVSPpJ//CyUCC44kkKNLJi6LBa8j3qaeZfDKRZDM7LqGdgI9o nOKtIKqLVC1pymqotsdpvFXSlxFpxq5dRiTygYFVS252pocsKsDlsLcboGZ5VKj4EE9b Mdv9jzg3Oxo0/Y/NcBfd1WVYAB5e2E0WiebeP6VBfKpuDUKA66kAnKmXlJmYsnFObwpG 33dzkhmVkjMMRF6WDwW62Ipt4KP+xMZfQRVAw65P4ohHmRRmi/aQH65ct68npDT+yvZh z4IBsRua6XrVa5PaYRH0hFC97D3KjNsi/EbrOg52XX4cwNdEU4bczgVXpVHFiyCggaFS ha2g== X-Gm-Message-State: AGi0PuZCUuWeDD4+XQCyVKOjmKPkgEVfYIjoaSsI/kDqiKptrqmfxZkW xwDBvg07jqP832c4yi97xsdzKm2NtBNBgQ== X-Google-Smtp-Source: APiQypIZoHR7+d4eqVIloZ2dJUrfeClZDD7DHQWd8OmWMVvhMH6DW0SDQkn95gPzOcaDcgM52QBwGg== X-Received: by 2002:a0c:eb11:: with SMTP id j17mr28042073qvp.197.1588083314734; Tue, 28 Apr 2020 07:15:14 -0700 (PDT) Received: from ryan-pc.birdiebarn.net (50-83-38-60.client.mchsi.com. [50.83.38.60]) by smtp.gmail.com with ESMTPSA id n13sm14102278qtf.15.2020.04.28.07.15.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 07:15:14 -0700 (PDT) From: Ryan Barnett To: buildroot@buildroot.org Date: Tue, 28 Apr 2020 09:15:04 -0500 Message-Id: <20200428141505.23883-1-ryanbarnett3@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH] package/cifs-utils: bump to version 6.10 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: Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In the version bump to 6.10 the following changes were: * Fix hash file to two spaces format * Add patch to respect DESTDIR and optionally install man pages for mount.smb3 by utilizing CONFIG_MAN. * Pass -std=c99 and -std=gnu11 to fix compile issues found with the sourcery-arm toolchain with C99 style code errors in smbinfo.c and defintion of 'struct sa' uisng gnu11 for C11 GNU extensions. Signed-off-by: Ryan Barnett --- ...-installing-mount.smb3-and-optionall.patch | 41 +++++++++++++++++++ package/cifs-utils/cifs-utils.hash | 4 +- package/cifs-utils/cifs-utils.mk | 7 +++- 3 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch diff --git a/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch b/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch new file mode 100644 index 0000000000..e36ec5b5da --- /dev/null +++ b/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch @@ -0,0 +1,41 @@ +From dbb4452787cb966cc74b2015689961875fd5d668 Mon Sep 17 00:00:00 2001 +From: Ryan Barnett +Date: Mon, 27 Apr 2020 22:03:25 -0500 +Subject: [PATCH] Use DESTDIR when installing mount.smb3 and optionally install + man page + +Properly create mount.smb3 symlink by using DESTDIR. Also use +CONFIG_MAN to optionally install manpage for mount.smb3. + +Signed-off-by: Ryan Barnett +--- +Upstream: https://marc.info/?l=linux-cifs&m=158804444725745&w=2 +--- + Makefile.am | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index fe9cd34..e0587f1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -119,11 +119,13 @@ endif + SUBDIRS = contrib + + install-exec-hook: +- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) ++ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) + ++if CONFIG_MAN + install-data-hook: +- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) ++ (cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) ++endif + + uninstall-hook: +- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) +- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) ++ rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3 ++ rm -f $(DESTDIR)$(man8dir)/mount.smb3.8 +-- +2.17.1 + diff --git a/package/cifs-utils/cifs-utils.hash b/package/cifs-utils/cifs-utils.hash index bbfbc1d8f4..5eaa84f370 100644 --- a/package/cifs-utils/cifs-utils.hash +++ b/package/cifs-utils/cifs-utils.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 18d8f1bf92c13c4d611502dbd6759e3a766ddc8467ec8a2eda3f589e40b9ac9c cifs-utils-6.9.tar.bz2 +sha256 92fc29c8e9039637f3344267500f1fa381e2cccd7d10142f0c1676fa575904a7 cifs-utils-6.10.tar.bz2 # Hash for license file: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk index 511e9ccc01..d9d590342e 100644 --- a/package/cifs-utils/cifs-utils.mk +++ b/package/cifs-utils/cifs-utils.mk @@ -4,12 +4,12 @@ # ################################################################################ -CIFS_UTILS_VERSION = 6.9 +CIFS_UTILS_VERSION = 6.10 CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils CIFS_UTILS_LICENSE = GPL-3.0+ CIFS_UTILS_LICENSE_FILES = COPYING -# Missing install-sh in release tarball +# Missing install-sh in release tarball and patching Makefile.am CIFS_UTILS_AUTORECONF = YES CIFS_UTILS_DEPENDENCIES = host-pkgconf @@ -17,6 +17,9 @@ CIFS_UTILS_DEPENDENCIES = host-pkgconf # the global BR2_RELRO_FULL option. CIFS_UTILS_CONF_OPTS = --disable-pie --disable-man +# uses C99 code in smbinfo.c but forgets to pass -std=c99 and c11 with mtab.c +CIFS_UTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99 -std=gnu11" + ifeq ($(BR2_PACKAGE_KEYUTILS),y) CIFS_UTILS_DEPENDENCIES += keyutils endif