[glibc] 01/01: Update to upstream change
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 2b4718084e0311a8201bf4e741f121b420259c4d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Aug 28 14:19:32 2017 +0200
Update to upstream change
---
.../hurd-i386/git-stack_chk_fail_local.diff | 32 ----------------------
1 file changed, 32 deletions(-)
diff --git a/debian/patches/hurd-i386/git-stack_chk_fail_local.diff b/debian/patches/hurd-i386/git-stack_chk_fail_local.diff
index 9d27f6e..955fe59 100644
--- a/debian/patches/hurd-i386/git-stack_chk_fail_local.diff
+++ b/debian/patches/hurd-i386/git-stack_chk_fail_local.diff
@@ -11,24 +11,7 @@ Date: Sun Aug 27 22:10:17 2017 +0200
* 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
@@ -49,21 +32,6 @@ index 36adfc7681..29114b1eef 100644
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: