coreutils-8.29-ls-abmon-width.patch: use upstream fix for the test

coreutils-8.29-ls-abmon-width.patch

@@ -1,7 +1,7 @@
 From 5a820c5a312d6a5b7a1a755cd0f81c84f7c676d7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
 Date: Wed, 14 Mar 2018 11:31:43 -0700
-Subject: [PATCH] ls: increase the allowed abmon width from 5 to 12
+Subject: [PATCH 1/2] ls: increase the allowed abmon width from 5 to 12
 
 This will impact relatively few languages,
 and will make Arabic or Catalan etc.
@@ -55,7 +55,7 @@ index e474047..a81266b 100755
      )
 +    n_dupes=$(echo "$months" | sort | uniq -d | wc -l)
      test "$n_widths" = "1" || { fail=1; break 2; }
-+    #test "$n_dupes" = "0" || { fail=1; break 2; }
++    test "$n_dupes" = "0" || { fail=1; break 2; }
    done
  done
  if test "$fail" = "1"; then
@@ -67,3 +67,38 @@ index e474047..a81266b 100755
 -- 
 2.14.3
 
+
+From 58196889eb9621a0bc8a97d7eda1174efb1b078c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Tue, 29 May 2018 10:10:35 -0700
+Subject: [PATCH 2/2] tests: fix periodic false failure in month alignment
+
+* tests/ls/abmon-align.sh: Base relative month adjustment
+from the middle of the month, to avoid failures due
+to months being repeated.
+Fixes https://bugs.gnu.org/31644
+
+Upstream-commit: c8eb21c9c0ba00559afc5e0d200085ac656396e0
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ tests/ls/abmon-align.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/ls/abmon-align.sh b/tests/ls/abmon-align.sh
+index a81266b..8bd20ae 100755
+--- a/tests/ls/abmon-align.sh
++++ b/tests/ls/abmon-align.sh
+@@ -19,8 +19,9 @@
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+ print_ver_ ls
+ 
++mid_month="$(date +%Y-%m-15)" || framework_failure_
+ for mon in $(seq -w 12); do
+-    touch -d"+$mon month" $mon.ts || framework_failure_
++    touch -d"$mid_month +$mon month" $mon.ts || framework_failure_
+ done
+ 
+ 
+-- 
+2.14.3
+