[glibc] 02/02: Add glibc 2.26 _hurd_exec_paths compatibility symbol for now.
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.27
in repository glibc.
commit 216d84514455043ce95c6af3c583b096eaba08ad
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Jan 9 02:51:44 2018 +0100
Add glibc 2.26 _hurd_exec_paths compatibility symbol for now.
---
debian/changelog | 11 +++++++++++
debian/patches/hurd-i386/local-exec_filename.diff | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7c942d5..806c2a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+glibc (2.26.9000+20180108.401311cf-0experimental1) UNRELEASED; urgency=medium
+
+ [ Samuel Thibault ]
+ * debian/patches/hurd-i386/local-exec_filename.diff: Add glibc 2.26
+ _hurd_exec_paths compatibility symbol for now.
+
+ [ Aurelien Jarno ]
+ *
+
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 08 Jan 2018 23:27:20 +0100
+
glibc (2.26.9000+20180108.401311cf-0experimental0) experimental; urgency=medium
[ Samuel Thibault ]
diff --git a/debian/patches/hurd-i386/local-exec_filename.diff b/debian/patches/hurd-i386/local-exec_filename.diff
index fe110ed..4c5e2a4 100644
--- a/debian/patches/hurd-i386/local-exec_filename.diff
+++ b/debian/patches/hurd-i386/local-exec_filename.diff
@@ -19,19 +19,17 @@ Index: glibc-2.26/hurd/Versions
===================================================================
--- glibc-2.26.orig/hurd/Versions
+++ glibc-2.26/hurd/Versions
-@@ -140,7 +140,11 @@ libc {
+@@ -140,6 +140,10 @@ libc {
_hurd_sigstate_unlock;
_hurd_sigstate_delete;
}
-- GLIBC_2.27 {
+ GLIBC_2.21 {
+ # "quasi-internal" functions
+ _hurd_exec_file_name;
+ }
-+ GLIBC_2.26 {
+ GLIBC_2.27 {
# "quasi-internal" functions
_hurd_exec_paths;
- }
Index: glibc-2.26/hurd/hurdexec.c
===================================================================
--- glibc-2.26.orig/hurd/hurdexec.c
@@ -83,10 +81,13 @@ Index: glibc-2.26/hurd/hurdexec.c
err = __file_exec (file, task, flags,
args, argslen, env, envlen,
dtable, MACH_MSG_TYPE_COPY_SEND, dtablesize,
-@@ -435,3 +458,9 @@ _hurd_exec_paths (task_t task, file_t fi
+@@ -435,3 +458,12 @@ _hurd_exec_paths (task_t task, file_t fi
free (env);
return err;
}
++#if SHLIB_COMPAT (libc, GLIBC_2_26, GLIBC_2_27)
++compat_symbol (libc, _hurd_exec_paths, _hurd_exec_paths, GLIBC_2_26);
++#endif
+extern error_t _hurd_exec_file_name (task_t task,
+ file_t file,
+ const char *filename,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: