- crude fix for crashes of all applications with glibc-2.18

See: http://www.sourceware.org/ml/libc-alpha/2013-08/msg00257.html
     https://sourceware.org/glibc/wiki/Release/2.18#Packaging_Changes
     https://bugs.archlinux.org/task/36556?project=1

diff --git a/glibc-hack-strstr.patch b/glibc-hack-strstr.patch
new file mode 100644 (file)
index 0000000..6149f88
--- /dev/null
+++ b/glibc-hack-strstr.patch
@@ -0,0 +1,13 @@
+diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c
+index cd63b68..03d8b9a 100644
+--- a/sysdeps/x86_64/multiarch/strstr.c
++++ b/sysdeps/x86_64/multiarch/strstr.c
+@@ -86,7 +86,7 @@
+ /* Simple replacement of movdqu to address 4KB boundary cross issue.
+    If EOS occurs within less than 16B before 4KB boundary, we don't
+    cross to next page.  */
+-static __m128i
++static inline __m128i
+ __m128i_strloadu (const unsigned char * p, __m128i zero)
+ {
+   if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0))

diff --git a/glibc.spec b/glibc.spec
index bf828cad0558860240c1e41ffae4f49056e10ee7..233259af18be564834203b12e46261b7eb9c8b03 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -35,7 +35,7 @@ Summary(tr.UTF-8):    GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       1
+Release:       2
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
@@ -82,6 +82,7 @@ Patch29:      %{name}-arm-alignment-fix.patch
 
 Patch31:       %{name}-origin.patch
 Patch32:       %{name}-Os-fail-workaround.patch
+Patch33:       %{name}-hack-strstr.patch
 
 Patch38:       1055_all_glibc-resolv-dynamic.patch
 URL:           http://www.gnu.org/software/libc/
@@ -966,6 +967,7 @@ exit 1
 
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
 
 %patch38 -p1