[glibc] 02/05: debian/patches/any/cvs-vectorized-strcspn-guards.diff: patch backported from upstream to allow usage of strcspn in ld.so.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit c8c1c4002d8eb2022eb61a8cc0f644316d02da8a
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Jun 18 16:27:39 2017 +0200
debian/patches/any/cvs-vectorized-strcspn-guards.diff: patch backported from upstream to allow usage of strcspn in ld.so.
---
debian/changelog | 2 ++
.../patches/any/cvs-vectorized-strcspn-guards.diff | 21 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 24 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index f5b7553..f68af7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ glibc (2.24-12) UNRELEASED; urgency=medium
debian/patches/any/local-CVE-2017-1000366-rtld-LD_PRELOAD.diff: add
patches to protect the dynamic linker against stack clashes
(CVE-2017-1000366).
+ * debian/patches/any/cvs-vectorized-strcspn-guards.diff: patch backported
+ from upstream to allow usage of strcspn in ld.so.
[ John Paul Adrian Glaubitz ]
* debian/sysdeps/sh3.mk: copy from sh4.mk. Closes: #851867.
diff --git a/debian/patches/any/cvs-vectorized-strcspn-guards.diff b/debian/patches/any/cvs-vectorized-strcspn-guards.diff
new file mode 100644
index 0000000..bb5f701
--- /dev/null
+++ b/debian/patches/any/cvs-vectorized-strcspn-guards.diff
@@ -0,0 +1,21 @@
+2017-06-14 Florian Weimer <fweimer@redhat.com>
+
+ * sysdeps/i386/i686/multiarch/strcspn-c.c: Add IS_IN (libc) guard.
+ * sysdeps/i386/i686/multiarch/varshift.c: Likewise.
+
+--- a/sysdeps/i386/i686/multiarch/strcspn-c.c
++++ b/sysdeps/i386/i686/multiarch/strcspn-c.c
+@@ -1,2 +1,4 @@
+-#define __strcspn_sse2 __strcspn_ia32
+-#include <sysdeps/x86_64/multiarch/strcspn-c.c>
++#if IS_IN (libc)
++# define __strcspn_sse2 __strcspn_ia32
++# include <sysdeps/x86_64/multiarch/strcspn-c.c>
++#endif
+--- a/sysdeps/i386/i686/multiarch/varshift.c
++++ b/sysdeps/i386/i686/multiarch/varshift.c
+@@ -1 +1,3 @@
+-#include <sysdeps/x86_64/multiarch/varshift.c>
++#if IS_IN (libc)
++# include <sysdeps/x86_64/multiarch/varshift.c>
++#endif
diff --git a/debian/patches/series b/debian/patches/series
index 712d740..fdcced4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -222,3 +222,4 @@ any/cvs-malloc-hardening.diff
any/local-CVE-2017-1000366-rtld-LD_LIBRARY_PATH.diff
any/local-CVE-2017-1000366-rtld-LD_PRELOAD.diff
any/local-CVE-2017-1000366-rtld-LD_AUDIT.diff
+any/cvs-vectorized-strcspn-guards.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: