From 7ea624efc3cbd6975117004a8e73d63ff2acc290 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 23 Jul 2016 22:59:22 -0700
Subject: [PATCH 1/2] maint: sort THANKS.in

* THANKS.in: Move J.T. Conklin's name "down" so it is in
en_US.UTF-8-sorted order.
---
 THANKS.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/THANKS.in b/THANKS.in
index 98f34a0..73e654a 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -33,9 +33,9 @@ Francois Pinard                     address@hidden
 Gaumond Pierre                      address@hidden
 Greg Ubben                          address@hidden
 Isamu Hasegawa                      address@hidden
-J.T. Conklin                        address@hidden
 Jakub Jelinek                       address@hidden
 Jason Molenda                       address@hidden
+J.T. Conklin                        address@hidden
 Karl Berry                          address@hidden
 Karl Heuer                          address@hidden
 Kaveh R. Ghazi                      address@hidden
-- 
2.8.0-rc2


From 6eaaab38fa0a63977b0cf849ffd86fb2d09300d4 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 23 Jul 2016 23:07:38 -0700
Subject: [PATCH 2/2] maint: skip a check when en_US.UTF-8 collation rules are
 broken

* cfg.mk (sc_THANKS_in_sorted): This check would fail on systems
for which "." is not ignored.  Add a quick sort-based check for
that error, and skip the check on any broken system.
---
 cfg.mk | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index f312682..b1cd85e 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -132,15 +132,21 @@ sc_THANKS_in_duplicates:
 	    && { echo '$(ME): remove the above names from THANKS.in'	\
 		  1>&2; exit 1; } || :

-# Ensure the contributor list stays sorted.  Use our sort as other
-# implementations may result in a different order.
+# Ensure the contributor list stays sorted.  However, if the system's
+# en_US.UTF-8 locale data is erroneous, give a diagnostic and skip
+# this test.  This affects at least OS X 10.10.5-10.11.6.
 sc_THANKS_in_sorted:
-	@sed '/^$$/,/^$$/!d;/^$$/d' THANKS.in > address@hidden;			\
-	LC_ALL=en_US.UTF-8 sort -f -k1,1 address@hidden > address@hidden
-	@diff -u address@hidden address@hidden; diff=$$?;					\
-	rm -f address@hidden address@hidden;						\
-	test "$$diff" = 0						\
-	  || { echo '$(ME): THANKS.in is unsorted' 1>&2; exit 1; }
+	@printf '%s\n' ja j.b| LC_ALL=en_US.UTF-8 sort -c 2> /dev/null	\
+	  && {								\
+	    sed '/^$$/,/^$$/!d;/^$$/d' $(srcdir)/THANKS.in > address@hidden &&	\
+	    LC_ALL=en_US.UTF-8 sort -f -k1,1 address@hidden > address@hidden &&		\
+	    diff -u address@hidden address@hidden; diff=$$?;				\
+	    rm -f address@hidden address@hidden;						\
+	    test "$$diff" = 0						\
+	      || { echo '$(ME): THANKS.in is unsorted' 1>&2; exit 1; };	\
+	    }								\
+	  || { echo '$(ME): this system has erroneous locale data;'	\
+		    'skipping $@' 1>&2; }

 update-copyright-env = \
   UPDATE_COPYRIGHT_USE_INTERVALS=2 \
-- 
2.8.0-rc2