From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 3 May 2016 13:21:24 +0000 (+0000)
Subject: Sort find output that is used for distribution tarballs
X-Git-Tag: v_3_0_25~52
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/faq/developer-manual/diff?a=commitdiff_plain;h=4032e0039bc0508419902f7d81150a065181f1e4;p=privoxy.git

Sort find output that is used for distribution tarballs

... to get reproducible results.
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 76baeaaa..3f4a3c58 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  GNUmakefile is built automatically from GNUmakefile.in
 #
-# $Id: GNUmakefile.in,v 1.244 2016/05/03 13:20:58 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.245 2016/05/03 13:21:08 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001-2016 members of the
 # Privoxy team. https://www.privoxy.org/
@@ -175,11 +175,11 @@ CONFIGS = 	config trust default.action match-all.action \
 # are included here
 # and escape every '#' in the find. doh.
 CONFIG_FILES = $(CONFIGS) \
-		`find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"`
+		`find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS" | sort`
 
 DOC_FILES = AUTHORS LICENSE README ChangeLog INSTALL \
-		`find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \
-		`find doc/webserver/ -name "*.css"` \
+		`find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html" | sort` \
+		`find doc/webserver/ -name "*.css" | sort` \
                 $(MAN_PAGE)
 
 #############################################################################
@@ -404,7 +404,7 @@ tarball-dist: dist-check clean clobber
 
 	for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \
 	-o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \
-	-name "PACKAGERS" \)`; do \
+	-name "PACKAGERS" \) | sort`; do \
 	   files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
 	done &&  \
 	cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \