mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
core/glibc to 2.28-6
This commit is contained in:
Kevin Mihelich
parent
56f1913faf
commit
84a1e80fde
2 changed files with 91 additions and 4 deletions
|
|
@ -15,7 +15,7 @@ noautobuild=1
|
||||||
|
|
||||||
pkgname=glibc
|
pkgname=glibc
|
||||||
pkgver=2.28
|
pkgver=2.28
|
||||||
pkgrel=5
|
pkgrel=6
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
url='http://www.gnu.org/software/libc'
|
url='http://www.gnu.org/software/libc'
|
||||||
license=(GPL LGPL)
|
license=(GPL LGPL)
|
||||||
|
|
@ -27,18 +27,20 @@ source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
|
||||||
locale.gen.txt
|
locale.gen.txt
|
||||||
locale-gen
|
locale-gen
|
||||||
bz20338.patch
|
bz20338.patch
|
||||||
0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch)
|
0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch
|
||||||
|
file-truncated-while-reading-soname-after-patchelf.patch)
|
||||||
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
|
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
|
||||||
md5sums=('SKIP'
|
md5sums=('SKIP'
|
||||||
'07ac979b6ab5eeb778d55f041529d623'
|
'07ac979b6ab5eeb778d55f041529d623'
|
||||||
'476e9113489f93b348b21e144b6a8fcf'
|
'476e9113489f93b348b21e144b6a8fcf'
|
||||||
'dc0d3ad59aeaaf591b085a77de6e03e9'
|
'dc0d3ad59aeaaf591b085a77de6e03e9'
|
||||||
'58ffe75a9c5a1b22c535a5c2e725db22')
|
'58ffe75a9c5a1b22c535a5c2e725db22'
|
||||||
|
'0820504d2e83ee15f74a656771361872')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
mkdir -p glibc-build
|
mkdir -p glibc-build
|
||||||
|
|
||||||
[[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
|
[[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
|
||||||
cd glibc
|
cd glibc
|
||||||
|
|
||||||
local i; for i in ${source[@]}; do
|
local i; for i in ${source[@]}; do
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,85 @@
|
||||||
|
[PATCH] ldconfig: file truncated while reading soname after patchelf [BZ #23964]
|
||||||
|
|
||||||
|
The way loadaddr is computed from the first LOAD segment in process_elf_file
|
||||||
|
assumes .dynstr is also contained in that segment. That is not necessarily
|
||||||
|
true, especially for libraries that have been touched by patchelf.
|
||||||
|
|
||||||
|
With this patch, the address read from the dynamic segment is checked against
|
||||||
|
all applicable segments instead of only the first one.
|
||||||
|
|
||||||
|
[BZ #23964]
|
||||||
|
* elf/readelflib.c: Fix resolving of loadaddr for .dynstr vaddr.
|
||||||
|
---
|
||||||
|
elf/readelflib.c | 33 ++++++++++++++++-----------------
|
||||||
|
1 file changed, 16 insertions(+), 17 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/elf/readelflib.c b/elf/readelflib.c
|
||||||
|
index 5a1e2dc2df..bc1195c175 100644
|
||||||
|
--- a/elf/readelflib.c
|
||||||
|
+++ b/elf/readelflib.c
|
||||||
|
@@ -98,11 +98,6 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
|
||||||
|
|
||||||
|
switch (segment->p_type)
|
||||||
|
{
|
||||||
|
- case PT_LOAD:
|
||||||
|
- if (loadaddr == (ElfW(Addr)) -1)
|
||||||
|
- loadaddr = segment->p_vaddr - segment->p_offset;
|
||||||
|
- break;
|
||||||
|
-
|
||||||
|
case PT_DYNAMIC:
|
||||||
|
if (dynamic_addr)
|
||||||
|
error (0, 0, _("more than one dynamic segment\n"));
|
||||||
|
@@ -176,11 +171,6 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
- if (loadaddr == (ElfW(Addr)) -1)
|
||||||
|
- {
|
||||||
|
- /* Very strange. */
|
||||||
|
- loadaddr = 0;
|
||||||
|
- }
|
||||||
|
|
||||||
|
/* Now we can read the dynamic sections. */
|
||||||
|
if (dynamic_size == 0)
|
||||||
|
@@ -190,22 +180,31 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
|
||||||
|
check_ptr (dynamic_segment);
|
||||||
|
|
||||||
|
/* Find the string table. */
|
||||||
|
- dynamic_strings = NULL;
|
||||||
|
for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
|
||||||
|
++dyn_entry)
|
||||||
|
{
|
||||||
|
check_ptr (dyn_entry);
|
||||||
|
if (dyn_entry->d_tag == DT_STRTAB)
|
||||||
|
- {
|
||||||
|
- dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val - loadaddr);
|
||||||
|
- check_ptr (dynamic_strings);
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
+ break;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (dynamic_strings == NULL)
|
||||||
|
+ for (i = 0, segment = elf_pheader;i < elf_header->e_phnum; i++, segment++)
|
||||||
|
+ {
|
||||||
|
+ ElfW(Addr) vaddr = dyn_entry->d_un.d_ptr;
|
||||||
|
+ if (segment->p_type == PT_LOAD &&
|
||||||
|
+ vaddr >= segment->p_vaddr &&
|
||||||
|
+ vaddr < segment->p_vaddr + segment->p_filesz)
|
||||||
|
+ {
|
||||||
|
+ loadaddr = segment->p_vaddr - segment->p_offset;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if (loadaddr == (ElfW(Addr)) -1)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
+ dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val - loadaddr);
|
||||||
|
+ check_ptr (dynamic_strings);
|
||||||
|
+
|
||||||
|
/* Now read the DT_NEEDED and DT_SONAME entries. */
|
||||||
|
for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
|
||||||
|
++dyn_entry)
|
||||||
|
--
|
||||||
|
2.19.2
|
||||||
|
|
||||||
Loading…
Reference in a new issue