From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GFyKEE9+Hl8jKgAA0tVLHw (envelope-from ) for ; Mon, 27 Jul 2020 07:12:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MstZDE9+Hl/qHwAAB5/wlQ (envelope-from ) for ; Mon, 27 Jul 2020 07:12:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 49FFF9403E7 for ; Mon, 27 Jul 2020 07:12:14 +0000 (UTC) Received: from localhost ([::1]:50388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzxIx-00012b-HM for larch@yhetil.org; Mon, 27 Jul 2020 03:12:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzxIo-00012U-Q7 for guix-patches@gnu.org; Mon, 27 Jul 2020 03:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42339) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jzxIo-0001M8-8W for guix-patches@gnu.org; Mon, 27 Jul 2020 03:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jzxIo-00031P-34 for guix-patches@gnu.org; Mon, 27 Jul 2020 03:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42306] [PATCH] gnu: Add nfs4-acl-tools Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Jul 2020 07:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 42306@debbugs.gnu.org Received: via spool by 42306-submit@debbugs.gnu.org id=B42306.159583391711604 (code B ref 42306); Mon, 27 Jul 2020 07:12:02 +0000 Received: (at 42306) by debbugs.gnu.org; 27 Jul 2020 07:11:57 +0000 Received: from localhost ([127.0.0.1]:53885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzxId-000311-V6 for submit@debbugs.gnu.org; Mon, 27 Jul 2020 03:11:57 -0400 Received: from mail-ej1-f42.google.com ([209.85.218.42]:33961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jzxIZ-00030l-Al for 42306@debbugs.gnu.org; Mon, 27 Jul 2020 03:11:51 -0400 Received: by mail-ej1-f42.google.com with SMTP id y10so15987730eje.1 for <42306@debbugs.gnu.org>; Mon, 27 Jul 2020 00:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leibniz-psychology-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=1W71Ik3aR/Pd66zGsuzvBScdIIZ85lix33C5Dxz2IJg=; b=PkPRi/j4DHexY0dbkjb4PQd1hVHw9Y6isIfX/COC/K6h3wV6fMMw7Yq5DG3st5Y3YU ocys1KRqyv9757ns9PdBLU4aDcI8U+xj9sFEL+98fDN7vFzdnAeiNeVY1hJe13ycMOnF fDjUwhjUhQ7ghEt1UcGuKMKB2og/+GxYgkDb+RI9fa62UkWu3Ii1VoBYZcHDiwyr5q2b lNYTI0KEiGBHb5lmD6QV24s/iKFxceswflRB6N0fOhP6fJ9T6TGkDM08WAv0ii24makd odN4IW+v66U7arJklRKDGy5/Yo2clstPhATT12rM0upcnXaunJbpq5eNMWONuqZp2hgM xjcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=1W71Ik3aR/Pd66zGsuzvBScdIIZ85lix33C5Dxz2IJg=; b=FKDWNz7/H8fO3F1Omv2Th5LtJoT5NWTJG9QdDFC6+NHtDz5gXC51SIC5YfuPmU8gKx Wi50iADQA6QeZvwU4lr6oF9m33CIjsY/RsJzGNCMEc1/7kHa2J3bVw0vW15YLEE4kPDg L8rbmJdsNuaiCcWVpdyNub9MpG51ymronN/XVkoQI5o5HYBpOFnwKB6+g0+SVByARTMc s/HvMzz5Uz6u49l7O0aDttlK/FskKO5Y3aFw33NlqPt+OZZOLGGzt3lCzRPXq7KEtXI6 EbwdFRQ9+t+ZmWZLd2Ckq+dkI1q55KYPv3PvGjo/lE2nfMTqUSr+YwaCjhN81iM9WISR MXQA== X-Gm-Message-State: AOAM532+69qwHf3DV1XX5Vi9iuLS3ejFRFDwLtj20k6wriEuYAtnA7rF f1sCnbhggfUd46bg4WDE7A3+ASkuoAf/BjliSoQol+4gyKpoV+kHkbv2PTqBpJ+6duLKgTpHqZb IPNHSqjWTRtR9FTGOXUGfgnxA551BNvJwDGgRBGK9CD+ThF1LTboYZWJv3KxGNv6VQC3ggoQUOQ j3Guj/j8pR X-Google-Smtp-Source: ABdhPJxtBNcFQXUFCtjxCazUaq+5RdZbqa79njMeYeNiouBDtjVJx//7p4Mk7W0OjbKQx26Wz7Rk/g== X-Received: by 2002:a17:906:774d:: with SMTP id o13mr19437029ejn.373.1595833901317; Mon, 27 Jul 2020 00:11:41 -0700 (PDT) Received: from localhost (dynamic-2a01-0c23-806b-2300-d1a7-edea-86bc-1290.c23.pool.telefonica.de. [2a01:c23:806b:2300:d1a7:edea:86bc:1290]) by smtp.gmail.com with ESMTPSA id mj22sm6471162ejb.118.2020.07.27.00.11.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 00:11:40 -0700 (PDT) Date: Mon, 27 Jul 2020 09:11:39 +0200 From: Lars-Dominik Braun Message-ID: <20200727071139.GB3225@zpidnp36> References: <20200710092101.GA22947@zpidnp36> <87blk3vcyn.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="+xNpyl7Qekk2NvDX" Content-Disposition: inline In-Reply-To: <87blk3vcyn.fsf@gnu.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=leibniz-psychology-org.20150623.gappssmtp.com header.s=20150623 header.b=PkPRi/j4; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.61 X-TUID: leXb/WcDmvGz --+xNpyl7Qekk2NvDX Content-Type: multipart/mixed; boundary="mxv5cy4qt+RJ9ypb" Content-Disposition: inline --mxv5cy4qt+RJ9ypb Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hey Marius, > Sorry for the late reply... no problem. > The patch mostly LGTM, but no longer applies. Can you rebase it on > current master? Meanwhile, a few comments: Sure, see attached patch, which (hopefully) also improves the description. I noticed linting fails with a pattern matching error, because git:// proto= col URI=E2=80=99s are not supported. The second patch fixes it, but I=E2=80=99m= not sure that=E2=80=99s a =E2=80=9Cproper=E2=80=9D solution. Cheers, Lars --mxv5cy4qt+RJ9ypb Content-Type: text/x-diff; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-Add-nfs4-acl-tools.patch" Content-Transfer-Encoding: quoted-printable =46rom 41e8245fe4f5629a2382ca8dfa1558785d67ef78 Mon Sep 17 00:00:00 2001 =46rom: Lars-Dominik Braun Date: Fri, 10 Jul 2020 11:15:58 +0200 Subject: [PATCH 1/2] gnu: Add nfs4-acl-tools * gnu/packages/acl.scm (nfs4-acl-tools): New variable. * gnu/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/acl.scm | 46 ++++++++++++ .../nfs4-acl-tools-0.3.7-fixpaths.patch | 73 +++++++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 gnu/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8274e158d0..34be1b02e8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1321,6 +1321,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ + %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index bcab125164..128afc52c2 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -5,6 +5,7 @@ ;;; Copyright =A9 2017 Efraim Flashner ;;; Copyright =A9 2018 Ricardo Wurmus ;;; Copyright =A9 2019 Marius Bakke +;;; Copyright =A9 2020 Lars-Dominik Braun ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,11 +25,14 @@ (define-module (gnu packages acl) #:use-module (guix licenses) #:use-module (gnu packages attr) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages gettext) #:use-module (gnu packages perl) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (guix build-system gnu)) =20 @@ -89,3 +93,45 @@ (description "Library and tools for manipulating access control lists.") (license (list gpl2+ lgpl2.1+)))) + +(define-public nfs4-acl-tools + (package + (name "nfs4-acl-tools") + (version "0.3.7") + (source (origin + (method git-fetch) + ;; tarballs are available here: + ;; http://linux-nfs.org/~bfields/nfs4-acl-tools/ + (uri (git-reference + (url "git://git.linux-nfs.org/projects/bfields/nfs4-ac= l-tools.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lq9xdaskxysggs918vs8x42xvmg9nj7lla21ni2scw5ljld3h1i")) + (patches (search-patches "nfs4-acl-tools-0.3.7-fixpaths.patc= h")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-bin-sh + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (substitute* "include/buildmacros" + (("/bin/sh") (string-append (assoc-ref inputs "bash-minimal= ") "/bin/sh"))) + #t))))) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("bash-minimal" ,bash-minimal) + ("libtool" ,libtool))) + (inputs + `(("attr" ,attr))) + (home-page "https://linux-nfs.org/wiki/index.php/Main_Page") + (synopsis "Commandline ACL utilities for the Linux NFSv4 client") + (description "This package provides the commandline utilities +@command{nfs4_getfacl} and @command{nfs4_setfacl}, which are similar to th= eir +POSIX equivalents @command{getfacl} and @command{setfacl}. They fetch and +manipulate access control lists for files and directories on NFSv4 mounts.= ") + (license bsd-3))) + diff --git a/gnu/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch b/gnu= /packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch new file mode 100644 index 0000000000..23cb586766 --- /dev/null +++ b/gnu/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch @@ -0,0 +1,73 @@ +Remove fixed search paths from autotools. + +--- a/m4/package_utilies.m4 1970-01-01 01:00:01.000000000 +0100 ++++ b/m4/package_utilies.m4 2020-07-07 12:41:48.871661042 +0200 +@@ -23,32 +23,32 @@ + AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) +=20 + if test -z "$MAKE"; then +- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/freeware/bin) ++ AC_PATH_PROG(MAKE, gmake) + fi + if test -z "$MAKE"; then +- AC_PATH_PROG(MAKE, make,, /usr/bin) ++ AC_PATH_PROG(MAKE, make) + fi + make=3D$MAKE + AC_SUBST(make) + AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) +=20 + if test -z "$LIBTOOL"; then +- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin) ++ AC_PATH_PROG(LIBTOOL, glibtool) + fi + if test -z "$LIBTOOL"; then +- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bi= n) ++ AC_PATH_PROG(LIBTOOL, libtool) + fi + libtool=3D$LIBTOOL + AC_SUBST(libtool) + AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) +=20 + if test -z "$TAR"; then +- AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/us= r/bin) ++ AC_PATH_PROG(TAR, tar) + fi + tar=3D$TAR + AC_SUBST(tar) + if test -z "$ZIP"; then +- AC_PATH_PROG(ZIP, gzip,, /bin:/usr/local/bin:/usr/freeware/bin) ++ AC_PATH_PROG(ZIP, gzip) + fi +=20 + zip=3D$ZIP +@@ -61,25 +61,25 @@ + AC_SUBST(makedepend) +=20 + if test -z "$AWK"; then +- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin) ++ AC_PATH_PROG(AWK, awk) + fi + awk=3D$AWK + AC_SUBST(awk) +=20 + if test -z "$SED"; then +- AC_PATH_PROG(SED, sed,, /bin:/usr/bin) ++ AC_PATH_PROG(SED, sed) + fi + sed=3D$SED + AC_SUBST(sed) +=20 + if test -z "$ECHO"; then +- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin) ++ AC_PATH_PROG(ECHO, echo) + fi + echo=3D$ECHO + AC_SUBST(echo) +=20 + if test -z "$SORT"; then +- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin) ++ AC_PATH_PROG(SORT, sort) + fi + sort=3D$SORT + AC_SUBST(sort) --=20 2.20.1 --mxv5cy4qt+RJ9ypb Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-guix-lint-Ignore-unsupported-source-URL-s.patch" Content-Transfer-Encoding: quoted-printable =46rom 5c9dddd0d4b54ca73f4fe4ebac37789bde0e54ce Mon Sep 17 00:00:00 2001 =46rom: Lars-Dominik Braun Date: Mon, 27 Jul 2020 09:09:24 +0200 Subject: [PATCH 2/2] =3D?UTF-8?q?guix:=3D20lint:=3D20Ignore=3D20unsupported= =3D20sour?=3D =3D?UTF-8?q?ce=3D20URL=3DE2=3D80=3D99s.?=3D MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * guix/lint.scm (check-source): Add match case for #f. --- guix/lint.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/lint.scm b/guix/lint.scm index 8a55f3e744..395630aa1c 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -794,6 +794,9 @@ descriptions maintained upstream." (#t ;; We found a working URL, so stop right away. '()) + (#f + ;; Unsupported URL or other error, skip. + (loop rest '())) ((? lint-warning? warning) (loop rest (cons warning warnings)))))))) =20 --=20 2.20.1 --mxv5cy4qt+RJ9ypb-- --+xNpyl7Qekk2NvDX Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEyk+M9DfXR4/aBV/UQhN3ARo3hEYFAl8eficACgkQQhN3ARo3 hEYQvgv/Z54B3HgqnwiFYhQmH/0JxRJ9Qf3RnjsJ7fJVxPmZzHpAOBmhSd2xXgCW YvJn1xbzWcanX1gmi4nANQsVd4Bq5ILKe1dW5MQMsBhxxqMyznaxHlXHdVXxa/yf ziEbsX8BWJeSFIiVTmm1VxDC+DNHp6al8fJAN9LAHesoJa30BI5JNZMsv5/Mr/vo JmIL7u9anpG5MB+5AomTkfHvDAjVVk6DrSKVK+OG/16pcItAUDPMsLxixLU9LqkC MBlIkpqPb5XYQBI4myf/goY+RLS0OsqXX0mpKsRTgGoKT8BtN982FxwEJteKgyZn kGqFMRkC2T0SOEh6OFr3PpGnXBf6aBKrb8Xkod/ZuVEGgiFA9DZfGFGytJwaaC7C z5mUiw3A/uCr5wQmMS12NMUnk97//4i89R4yyI0Q24oxqvRWUrKLEoh17lqjIsFF jifOUD5vM+KqmGkywg7wBZJFmZOi+RpRHlDUh3kf0Bdz0/2NiNInYBxSew2gPSc6 iUSGmRNv =xPhs -----END PGP SIGNATURE----- --+xNpyl7Qekk2NvDX--