From patchwork Tue Apr 28 19:20:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1278661 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=F1WnV7eC; 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 49BWkG6NpXz9sTQ for ; Wed, 29 Apr 2020 05:22:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6256C87626; Tue, 28 Apr 2020 19:22:28 +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 dJlegHIpRiBr; Tue, 28 Apr 2020 19:22:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id ACA7F873B8; Tue, 28 Apr 2020 19:22:26 +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 2563E1BF2B9 for ; Tue, 28 Apr 2020 19:22:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 21CCC873B8 for ; Tue, 28 Apr 2020 19:22:26 +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 XP8oGO0d6miE for ; Tue, 28 Apr 2020 19:22:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id D703887034 for ; Tue, 28 Apr 2020 19:22:24 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id o19so23020908qkk.5 for ; Tue, 28 Apr 2020 12:22:24 -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=2YZVhvK8uppBBiUqyrtC2g9KTHCL+1Net9+B6bEPdD8=; b=F1WnV7eCep4ZLhGgGAlROL9cID4Fp86OPzQ8uanGYs9BGoxVu5gx6rh581Bl7UX4hg wARSzRPryzUkwpGDlHkOo9k1wSC+4WWTmUeqfX/re7bQcQqBe4rTtVchwjv9O1S8g/1S ZjhKpcmDmXkV9tYOqqKoHuMitTikEKv0WrecuAc25ve/eQ/uv76wPToCBx51zJ8SVLyh CwsKjKBz78FRXF7sYPp305jNuG42Z3nxyou43Et/HJUVa14Q+5rHAmF6gFqZxdtZTJSa e6lc2gjvx1Hw0+5z7KZjMXpl4p3vPtOUwHZctfV4s8UlwQl2mWpgArH/XCLi2WD5B0dp I5yQ== 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=2YZVhvK8uppBBiUqyrtC2g9KTHCL+1Net9+B6bEPdD8=; b=ajcmBbuAX7IFVhurZb3YLLelAjqrpQXYLkaxAT1yfu/qAPXDeiw3/rhfcSkWzv0vbx 34HjSG6lpXklyuF6g4Zyj4f9RTSQyon1cvXJfDqbAorEUrER5RZlJAhzjOXGLwRC2lZW gVVsZaqQmnt6+7HOxPbXvOoc1UszXSZXmYNit1PUjYzsLP0rWHAo9MJY/Q3eDt0HuX+D w67J9oFYLQC9fQQqWvzRnyazIUscekLQQe8ihgWS1MYb8JfxRjUs3wWmjZo2/6QGFITL EQ9+jOM1UtGgd7e5JY3JAHHbxaMTi7HMQK34IS1vRDIxwag7FN4slJTAxijBSTwpwtRI PDPg== X-Gm-Message-State: AGi0Pubp6CqVl2uIKvzyBRG1f1qeG6W4btpYkTRdc/h3UUZIMZzSeT70 z8DaxTEhdCNHrLy3a4gkagW4bKRkCLaL1w== X-Google-Smtp-Source: APiQypKX0sBdzhUZdRSTkNu2LindjVok9noNUR4xTvV2DtXWM82SlgtcZFMpAFNpdqILCwSMRfM/WQ== X-Received: by 2002:a37:3c7:: with SMTP id 190mr28267364qkd.109.1588101743287; Tue, 28 Apr 2020 12:22:23 -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 u11sm14492512qtj.10.2020.04.28.12.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 12:22:22 -0700 (PDT) From: Ryan Barnett To: buildroot@buildroot.org Date: Tue, 28 Apr 2020 14:20:28 -0500 Message-Id: <20200428192029.30349-1-ryanbarnett3@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH v2] 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: "Yann E . MORIN" , 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=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 CC: Yann E. MORIN --- Changes v1 -> v2: - use only -std=c11 (suggested by Yann) --- ...-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..1e08520698 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 +# usese C11 style with smbinfo.c and mtab.c +CIFS_UTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu11" + ifeq ($(BR2_PACKAGE_KEYUTILS),y) CIFS_UTILS_DEPENDENCIES += keyutils endif