[glibc] 01/01: patches/arm/unsubmitted-ldconfig-cache-abi.diff: correctly apply patch. Really fix #822489.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 752fff4cd69da7eb337e6785b31ba639cb4d2f4c
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Thu May 12 09:06:58 2016 +0200
patches/arm/unsubmitted-ldconfig-cache-abi.diff: correctly apply patch. Really fix #822489.
---
debian/changelog | 2 ++
debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6830395..1441452 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ glibc (2.22-9) UNRELEASED; urgency=medium
* debian/testsuite-xfail-debian.mk: drop check on i586 flavours.
* debian/patches/kfreebsd/local-tst-malloc-backtrace.diff: drop, obsoleted
by hurd-i386/cvs-libpthread.so.diff.
+ * debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff: correctly apply
+ patch. Really fix #822489.
-- Samuel Thibault <sthibault@debian.org> Thu, 12 May 2016 01:05:26 +0200
diff --git a/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff b/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff
index 35321eb..0a3f06a 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;
-+ Elf32(Ehdr) *ehdr = (Elf32(Ehdr) *) file_contents;
-+ Elf32(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: