GNU bug report logs - #42306
[PATCH] gnu: Add nfs4-acl-tools

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 42306 in the body.
You can then email your comments to 42306 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Lars-Dominik Braun <ldb <at> leibniz-psychology.org>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add nfs4-acl-tools
Date: Fri, 10 Jul 2020 11:21:01 +0200

[Message part 1 (text/plain, inline)]

* 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                          | 45 ++++++++++++
 .../nfs4-acl-tools-0.3.7-fixpaths.patch       | 73 +++++++++++++++++++
 3 files changed, 119 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 5c3b391960..1acb5c1f94 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1315,6 +1315,7 @@ dist_patch_DATA =						\
   %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..c9ea335615 100644
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2019 Marius Bakke <mbakke <at> fastmail.com>
+;;; Copyright © 2020 Lars-Dominik Braun <ldb <at> leibniz-psychology.org>
 ;;;
 ;;; 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))
 
@@ -89,3 +93,44 @@
     (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-acl-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.patch"))))
+    (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 "http://linux-nfs.org/wiki/index.php/Main_Page")
+    (synopsis "This package contains commandline ACL utilities for the Linux
+NFSv4 client")
+    (description "Provides the commandline utilities nfs4_setfacl and
+nfs4_getfacl, which are similar to their POSIX equivalents.")
+    (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])
+ 
+     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=$MAKE
+     AC_SUBST(make)
+     AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
+ 
+     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/bin)
++	AC_PATH_PROG(LIBTOOL, libtool)
+     fi
+     libtool=$LIBTOOL
+     AC_SUBST(libtool)
+     AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
+ 
+     if test -z "$TAR"; then
+-        AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
++        AC_PATH_PROG(TAR, tar)
+     fi
+     tar=$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
+ 
+     zip=$ZIP
+@@ -61,25 +61,25 @@
+     AC_SUBST(makedepend)
+ 
+     if test -z "$AWK"; then
+-        AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
++        AC_PATH_PROG(AWK, awk)
+     fi
+     awk=$AWK
+     AC_SUBST(awk)
+ 
+     if test -z "$SED"; then
+-        AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
++        AC_PATH_PROG(SED, sed)
+     fi
+     sed=$SED
+     AC_SUBST(sed)
+ 
+     if test -z "$ECHO"; then
+-        AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
++        AC_PATH_PROG(ECHO, echo)
+     fi
+     echo=$ECHO
+     AC_SUBST(echo)
+ 
+     if test -z "$SORT"; then
+-        AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
++        AC_PATH_PROG(SORT, sort)
+     fi
+     sort=$SORT
+     AC_SUBST(sort)
-- 
2.20.1

[signature.asc (application/pgp-signature, inline)]

Message #8 received at 42306 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <marius <at> gnu.org>
To: Lars-Dominik Braun <ldb <at> leibniz-psychology.org>, 42306 <at> debbugs.gnu.org
Subject: Re: [bug#42306] [PATCH] gnu: Add nfs4-acl-tools
Date: Sat, 25 Jul 2020 17:20:00 +0200

[Message part 1 (text/plain, inline)]

Hello!

Sorry for the late reply...

The patch mostly LGTM, but no longer applies.  Can you rebase it on
current master?  Meanwhile, a few comments:

Lars-Dominik Braun <ldb <at> leibniz-psychology.org> writes:

> * 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.

[...]

> +    (synopsis "This package contains commandline ACL utilities for the Linux
> +NFSv4 client")

Just "Command line ACL utilities for NFS"

> +    (description "Provides the commandline utilities nfs4_setfacl and
> +nfs4_getfacl, which are similar to their POSIX equivalents.")

Descriptions OTOH should be complete sentences, something like:

"This package provides the command line utilities
@command{nfs4_setfacl} and @command{nfs4_getfacl} [...]".

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 42306 <at> debbugs.gnu.org (full text, mbox):

From: Lars-Dominik Braun <ldb <at> leibniz-psychology.org>
To: Marius Bakke <marius <at> gnu.org>
Cc: 42306 <at> debbugs.gnu.org
Subject: Re: [bug#42306] [PATCH] gnu: Add nfs4-acl-tools
Date: Mon, 27 Jul 2020 09:11:39 +0200

[Message part 1 (text/plain, inline)]

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:// protocol
URI’s are not supported. The second patch fixes it, but I’m not sure that’s a
“proper” solution.

Cheers,
Lars

[0001-gnu-Add-nfs4-acl-tools.patch (text/x-diff, attachment)]

[0002-guix-lint-Ignore-unsupported-source-URL-s.patch (text/x-diff, attachment)]

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 42306 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <marius <at> gnu.org>
To: Lars-Dominik Braun <ldb <at> leibniz-psychology.org>
Cc: 42306 <at> debbugs.gnu.org
Subject: Re: [bug#42306] [PATCH] gnu: Add nfs4-acl-tools
Date: Thu, 30 Jul 2020 00:01:28 +0200

[Message part 1 (text/plain, inline)]

Lars-Dominik Braun <ldb <at> leibniz-psychology.org> writes:

> 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.

Thanks!  FYI I had to convert the patch from ISO-8859-1 encoding to
UTF-8 in order to make it apply.

Applied with the following changes:

[diff (text/x-patch, inline)]

diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm
index 128afc52c2..a6409765ff 100644
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -27,7 +27,6 @@
   #: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)
@@ -116,14 +115,13 @@
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-bin-sh
-           (lambda* (#:key inputs native-inputs #:allow-other-keys)
+           (lambda _
              (substitute* "include/buildmacros"
-               (("/bin/sh") (string-append (assoc-ref inputs "bash-minimal") "/bin/sh")))
+               (("/bin/sh") (which "sh")))
              #t)))))
     (native-inputs
      `(("automake" ,automake)
        ("autoconf" ,autoconf)
-       ("bash-minimal" ,bash-minimal)
        ("libtool" ,libtool)))
     (inputs
      `(("attr" ,attr)))
@@ -134,4 +132,3 @@
 POSIX equivalents @command{getfacl} and @command{setfacl}.  They fetch and
 manipulate access control lists for files and directories on NFSv4 mounts.")
     (license bsd-3)))
-

[Message part 3 (text/plain, inline)]

...however I also decided to move it to (gnu packages nfs).

> I noticed linting fails with a pattern matching error, because git:// protocol
> URI’s are not supported. The second patch fixes it, but I’m not sure that’s a
> “proper” solution.

Me neither and I don't feel like jumping on that one right away.  :-)

It seems we already have a number of git:// URLs around so it would be
good to fix it, can you submit the second patch to a separate issue?

Thanks!

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 42306 <at> debbugs.gnu.org (full text, mbox):

From: Lars-Dominik Braun <ldb <at> leibniz-psychology.org>
To: Marius Bakke <marius <at> gnu.org>
Cc: 42306 <at> debbugs.gnu.org
Subject: Re: [bug#42306] [PATCH] gnu: Add nfs4-acl-tools
Date: Thu, 30 Jul 2020 09:17:38 +0200

[Message part 1 (text/plain, inline)]

Hey,

> Thanks!  FYI I had to convert the patch from ISO-8859-1 encoding to
> UTF-8 in order to make it apply.
hm, that’s weird, it worked for me.

> It seems we already have a number of git:// URLs around so it would be
> good to fix it, can you submit the second patch to a separate issue?
Done, see bug#42615

Thank you,
Lars

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.