gnu: tree: Fix problem with no output when fd3 is present.

* gnu/packages/patches/tree-disable-stddata.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/admin.scm (tree)[source](patches): New field.

1 files changed, 16 insertions, 0 deletions

diff --git a/gnu/packages/patches/tree-disable-stddata.patch b/gnu/packages/patches/tree-disable-stddata.patch
new file mode 100644
index 0000000000..52ca6e25f4
--- /dev/null
+++ b/gnu/packages/patches/tree-disable-stddata.patch
@@ -0,0 +1,16 @@
+Tree 2.0.0 and later will write its output in JSON format on fd3 if
+present, instead of the requested output on fd1, which breaks e.g.
+'password-store' tests.  Disable for now; upstream has been notified.
+
+diff --git a/tree.c b/tree.c
+--- a/tree.c
++++ b/tree.c
+@@ -133,7 +133,7 @@ int main(int argc, char **argv)
+   mb_cur_max = 1;
+ #endif
+ 
+-#ifdef __linux__
++#if 0
+   // Output JSON automatically to "stddata" if present:
+   if (fcntl(STDDATA_FILENO, F_GETFD) >= 0) {
+     Jflag = noindent = TRUE;