This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.25
in repository glibc.
commit 2589d79e8765e8e0be6c3bbc25b04825f7455cb7
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Sun Aug 27 20:13:58 2017 +0000
patches/hurd-i386/git-stack_chk_fail_local.diff: New patch
---
debian/changelog | 1 +
.../hurd-i386/git-stack_chk_fail_local.diff | 73 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 75 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 09c420e..3989351 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ glibc (2.25-0experimental4) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* patches/hurd-i386/git-bits-sysmacros.h.diff: New patch.
+ * patches/hurd-i386/git-stack_chk_fail_local.diff: New patch.
-- Aurelien Jarno <aure...@debian.org> Sun, 27 Aug 2017 01:51:15 +0200
diff --git a/debian/patches/hurd-i386/git-stack_chk_fail_local.diff
b/debian/patches/hurd-i386/git-stack_chk_fail_local.diff
new file mode 100644
index 0000000..9d27f6e
--- /dev/null
+++ b/debian/patches/hurd-i386/git-stack_chk_fail_local.diff
@@ -0,0 +1,73 @@
+commit 97e02ad23392f929862d6a04643e7f2fd91baebc
+Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
+Date: Sun Aug 27 22:10:17 2017 +0200
+
+ hurd: fix build with -fstack-protector-strong
+
+ libmachuser and libhurduser also need stack_chk_fail_local and they do not
+ link against libc_nonshared.
+
+ * mach/stack_chk_fail_local.c: New file.
+ * hurd/stack_chk_fail_local.c: New file.
+ * mach/Machrules ($(interface-library)-routines): Add
+ stack_chk_fail_local.
+ * mach/Versions (GLIBC_2.4): Add __stack_chk_fail.
+ * hurd/Versions (GLIBC_2.4): Add __stack_chk_fail.
+
+diff --git a/hurd/Versions b/hurd/Versions
+index 77f5b4271e..011edc7384 100644
+--- a/hurd/Versions
++++ b/hurd/Versions
+@@ -129,6 +129,10 @@ libc {
+ # functions used in macros & inline functions
+ __errno_location;
+ }
++ GLIBC_2.4 {
++ # functions used by RPC stubs
++ __stack_chk_fail
++ }
+
+ HURD_CTHREADS_0.3 {
+ # weak refs to libthreads functions that libc calls iff libthreads in use
+diff --git a/hurd/stack_chk_fail_local.c b/hurd/stack_chk_fail_local.c
+new file mode 100644
+index 0000000000..305871fbc0
+--- /dev/null
++++ b/hurd/stack_chk_fail_local.c
+@@ -0,0 +1 @@
++#include <debug/stack_chk_fail_local.c>
+diff --git a/mach/Machrules b/mach/Machrules
+index 36adfc7681..29114b1eef 100644
+--- a/mach/Machrules
++++ b/mach/Machrules
+@@ -221,7 +221,7 @@ endif
+
+ ifdef interface-library
+
+-$(interface-library)-routines = $(interface-routines)
++$(interface-library)-routines = $(interface-routines) stack_chk_fail_local
+ extra-libs += $(interface-library)
+ extra-libs-others += $(interface-library)
+
+diff --git a/mach/Versions b/mach/Versions
+index 0097aad59b..b22fda4cf4 100644
+--- a/mach/Versions
++++ b/mach/Versions
+@@ -54,6 +54,10 @@ libc {
+ # This was always there, but not exported as it should have been.
+ mig_strncpy;
+ }
++ GLIBC_2.4 {
++ # functions used by RPC stubs
++ __stack_chk_fail
++ }
+ GLIBC_2.23 {
+ __mach_host_self_;
+ }
+diff --git a/mach/stack_chk_fail_local.c b/mach/stack_chk_fail_local.c
+new file mode 100644
+index 0000000000..305871fbc0
+--- /dev/null
++++ b/mach/stack_chk_fail_local.c
+@@ -0,0 +1 @@
++#include <debug/stack_chk_fail_local.c>
diff --git a/debian/patches/series b/debian/patches/series
index 102c557..75026ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -133,6 +133,7 @@ hurd-i386/tg2.25-tls.diff
hurd-i386/git-__inet6_scopeid_pton.diff
hurd-i386/local-nocheck-installed-headers.diff
hurd-i386/git-bits-sysmacros.h.diff
+hurd-i386/git-stack_chk_fail_local.diff
i386/local-biarch.diff
i386/local-cmov.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
