[glibc] 01/01: patches/arm/unsubmitted-ldconfig-cache-abi.diff: apply fix from Steve McIntyre to fix an armhf ABI detection crash in ldconfig on arm64. Closes: #822489.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 11482702e09348848c8b18d754a8f4341a2549bc
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon Apr 25 18:40:29 2016 +0200
patches/arm/unsubmitted-ldconfig-cache-abi.diff: apply fix from Steve McIntyre to fix an armhf ABI detection crash in ldconfig on arm64. Closes: #822489.
---
debian/changelog | 3 +++
debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ce7dd9d..a5099dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ glibc (2.22-8) UNRELEASED; urgency=medium
[ Aurelien Jarno ]
* patches/kfreebsd/local-sysdeps.diff: update to revision 6015 (from
glibc-bsd) to fix FTBFS.
+ * patches/arm/unsubmitted-ldconfig-cache-abi.diff: apply fix from Steve
+ McIntyre to fix an armhf ABI detection crash in ldconfig on arm64.
+ Closes: #822489.
-- Samuel Thibault <sthibault@debian.org> Tue, 19 Apr 2016 23:28:29 +0200
diff --git a/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff b/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff
index 79f80c5..35321eb 100644
--- a/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff
+++ b/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff
@@ -40,8 +40,8 @@ index e767f9e..37483fc 100644
+static int is_library_hf(const char *file_name, void *file_contents, size_t file_length)
+{
+ unsigned int i;
-+ ElfW(Ehdr) *ehdr = (ElfW(Ehdr) *) file_contents;
-+ ElfW(Shdr) *shdrs;
++ Elf32(Ehdr) *ehdr = (Elf32(Ehdr) *) file_contents;
++ Elf32(Shdr) *shdrs;
+
+ shdrs = file_contents + ehdr->e_shoff;
+ for (i = 0; i < ehdr->e_shnum; i++)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: