Merge branch 'master' into i486

2 files changed, 45 insertions, 0 deletions

diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
new file mode 100644
index 00000000..4b29ad28
--- /dev/null
+++ b/core/grep/PKGBUILD
@@ -0,0 +1,10 @@
+# see https://bugs.archlinux.org/task/60201
+
+source+=('c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch')
+md5sums+=('0d3082d1d1fb77e7575c106fc4df1341')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch
+  autoreconf -vfi
+}
diff --git a/core/grep/c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch b/core/grep/c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch
new file mode 100644
index 00000000..75c62541
--- /dev/null
+++ b/core/grep/c505b0bce73c712f1297bc5f424e0de5e4ec3137.patch
@@ -0,0 +1,35 @@
+From c505b0bce73c712f1297bc5f424e0de5e4ec3137 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 9 Aug 2018 10:52:48 -0700
+Subject: tests: backref-alt works with glibc 2.28
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Jaroslav Skarvada (Bug#32409).
+* tests/Makefile.am (XFAIL_TESTS) [!USE_INCLUDED_REGEX]:
+Don’t add backref-alt, since this bug is fixed in glibc 2.28.
+---
+ tests/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 9f52941..d9f9ee8 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -56,9 +56,9 @@ XFAIL_TESTS = triple-backref
+ if USE_INCLUDED_REGEX
+ XFAIL_TESTS += equiv-classes
+ else
+-# The backslash-alt test fails for glibc, which needs to be fixed.
+-# FIXME-2015: Remove this once the glibc bug is fixed.
+-XFAIL_TESTS += backref-alt
++# The backslash-alt test fails for glibc 2.27 and earlier.
++# If you're using older glibc you can upgrade to glibc 2.28 or later,
++# configure --with-included-regex, or ignore the test failure.
+ endif
+ 
+ TESTS =						\
+-- 
+cgit v1.0-41-gc330
+