Re: TAR_OPTIONS after one decade

[Simon Josefsson]

Hi.  I have committed this.

/Simon

From 4b17a1ae49e69df1ac5dc35a4f60b20ab958baf2 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 6 Sep 2022 14:32:05 +0200
Subject: [PATCH] gnumakefile: Improve tarball reproducibility.

* top/GNUmakefile (TAR_OPTIONS): Add --sort=name.  Suggested by
Tzvetelin Katchov <katchov@gnu.org>.
* DEPENDENCIES: Mention tar 1.28 dependency.
---
 ChangeLog       | 7 +++++++
 DEPENDENCIES    | 9 +++++++++
 top/GNUmakefile | 2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 26231407bb..d5a5af7d74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-09-06  Simon Josefsson  <simon@josefsson.org>
+
+       gnumakefile: Improve tarball reproducibility.
+       * top/GNUmakefile (TAR_OPTIONS): Add --sort=name.  Suggested by
+       Tzvetelin Katchov <katchov@gnu.org>.
+       * DEPENDENCIES: Mention tar 1.28 dependency.
+
 2022-09-05  Bruno Haible  <bruno@clisp.org>
 
        pthread-h: Fix compilation error on mingw with --enable-threads=windows.
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 23fa1f5a8b..3b24f45ad6 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -174,3 +174,12 @@ at any time.
     https://www.gnu.org/software/libtool/
   + Download:
     https://ftp.gnu.org/gnu/libtool/
+
+* GNU tar 1.28 or newer.
+  + Recommended.
+    Needed if you use the 'gnumakefile' module, which sets TAR_OPTIONS
+    to --sort=names (added in version 1.28) in GNUmakefile for 'make dist'.
+  + Homepage:
+    https://www.gnu.org/software/tar/
+  + Download:
+    https://ftp.gnu.org/gnu/tar/
diff --git a/top/GNUmakefile b/top/GNUmakefile
index 7a08c9d55b..a778610d28 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -26,7 +26,7 @@ _gl-Makefile := $(wildcard [M]akefile)
 ifneq ($(_gl-Makefile),)
 
 # Make tar archive easier to reproduce.
-export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
+export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner --sort=name
 
 # Allow the user to add to this in the Makefile.
 ALL_RECURSIVE_TARGETS =
-- 
2.30.2

signature.asc
Description: PGP signature