diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-18 12:44:17 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-18 12:44:17 +0000 |
commit | 562f63fe48ccc347bd973fbfcfdabe8f01ae4663 (patch) | |
tree | a2f4271742b26a500c252912d4e785f4bdefa59c | |
parent | 6280d87f52dd924ff2c61d3762b6b9b77b97f5e4 (diff) | |
download | aports-562f63fe48ccc347bd973fbfcfdabe8f01ae4663.tar.bz2 aports-562f63fe48ccc347bd973fbfcfdabe8f01ae4663.tar.xz |
main/libc0.9.32: disable HARDWIRED_ABSPATH again
ldd seems to be fixed
-rw-r--r-- | main/libc0.9.32/0001-utils-ldd-Check-for-returned-pointer-from-strrchr-no.patch | 28 | ||||
-rw-r--r-- | main/libc0.9.32/APKBUILD | 14 | ||||
-rw-r--r-- | main/libc0.9.32/uclibcconfig.arm | 2 | ||||
-rw-r--r-- | main/libc0.9.32/uclibcconfig.powerpc | 2 | ||||
-rw-r--r-- | main/libc0.9.32/uclibcconfig.x86 | 2 | ||||
-rw-r--r-- | main/libc0.9.32/uclibcconfig.x86_64 | 2 |
6 files changed, 40 insertions, 10 deletions
diff --git a/main/libc0.9.32/0001-utils-ldd-Check-for-returned-pointer-from-strrchr-no.patch b/main/libc0.9.32/0001-utils-ldd-Check-for-returned-pointer-from-strrchr-no.patch new file mode 100644 index 000000000..4764e006d --- /dev/null +++ b/main/libc0.9.32/0001-utils-ldd-Check-for-returned-pointer-from-strrchr-no.patch @@ -0,0 +1,28 @@ +From 85f4b028d767fc390a7b866d2f58d58be489242d Mon Sep 17 00:00:00 2001 +From: Kevin Day <thekevinday@gmail.com> +Date: Wed, 30 Mar 2011 04:51:22 -0700 +Subject: [PATCH] utils/ldd: Check for returned pointer from strrchr not the + value it holds + +Signed-off-by: Kevin Day <thekevinday@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + utils/ldd.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/utils/ldd.c b/utils/ldd.c +index 3858c81..904075c 100644 +--- a/utils/ldd.c ++++ b/utils/ldd.c +@@ -553,7 +553,7 @@ static struct library *find_elf_interpreter(ElfW(Ehdr) *ehdr) + interp_name = strdup(s); + interp_dir = strdup(s); + tmp = strrchr(interp_dir, '/'); +- if (*tmp) ++ if (tmp) + *tmp = '\0'; + else { + free(interp_dir); +-- +1.7.4.4 + diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 082d999a8..915a64a70 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -4,7 +4,7 @@ pkgname=libc$_abiver _gitver= pkgver=0.9.32_rc3 _ver=${pkgver/_/-} -pkgrel=7 +pkgrel=8 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -29,6 +29,7 @@ source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2 0001-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch 0001-malloc-standard-synchronize-on-fork.patch 0001-resolv-fix-res_close-not-to-hang-with-ipv6.patch + 0001-utils-ldd-Check-for-returned-pointer-from-strrchr-no.patch uclibcconfig.x86 uclibcconfig.x86_64 uclibcconfig.i486 @@ -131,9 +132,10 @@ b4fb68ad3d0e8331b1b40c30eb21dfdc 0002-stdlib-fix-arc4random-return-type-to-u_in 3e151ae3d3613dff9296d166aca3a800 0001-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch 30f27fe51fdc4d121166ad2af18dfb8d 0001-malloc-standard-synchronize-on-fork.patch 2ab8c375fe1cd406319b4c5ef538da2b 0001-resolv-fix-res_close-not-to-hang-with-ipv6.patch -3f87dc1f171493f5fde3bf4ae7180b8a uclibcconfig.x86 -be0a43796e418d2733d91f9888d213c3 uclibcconfig.x86_64 -3f87dc1f171493f5fde3bf4ae7180b8a uclibcconfig.i486 -1e35f7a57641be6c20ac11701aeb7dcd uclibcconfig.arm -ebc09b6da3b8d9bd20a4c798d2e3475c uclibcconfig.powerpc +12f6297249755d3996918485bbd6031d 0001-utils-ldd-Check-for-returned-pointer-from-strrchr-no.patch +b878bcfe02bf7a886ca85620fb330f56 uclibcconfig.x86 +8048c16964e93d5971b8dff6726d5afa uclibcconfig.x86_64 +b878bcfe02bf7a886ca85620fb330f56 uclibcconfig.i486 +92d2b7918dbecf1b7a3542ba9d4f7162 uclibcconfig.arm +cce29d6e7890b7d0bab2b67c809173a3 uclibcconfig.powerpc 7bf1af84106de9e05160ed6d4853c54f sha512-crypt.patch" diff --git a/main/libc0.9.32/uclibcconfig.arm b/main/libc0.9.32/uclibcconfig.arm index 19e18b6b9..87f764e15 100644 --- a/main/libc0.9.32/uclibcconfig.arm +++ b/main/libc0.9.32/uclibcconfig.arm @@ -230,7 +230,7 @@ UCLIBC_HAS_UTMPX=y RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr" MULTILIB_DIR="lib" -HARDWIRED_ABSPATH=y +# HARDWIRED_ABSPATH is not set=y # # Security options diff --git a/main/libc0.9.32/uclibcconfig.powerpc b/main/libc0.9.32/uclibcconfig.powerpc index da1216f80..3dc2cc48a 100644 --- a/main/libc0.9.32/uclibcconfig.powerpc +++ b/main/libc0.9.32/uclibcconfig.powerpc @@ -214,7 +214,7 @@ UCLIBC_HAS_UTMPX=y RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr" MULTILIB_DIR="lib" -HARDWIRED_ABSPATH=y +# HARDWIRED_ABSPATH is not set=y # # Security options diff --git a/main/libc0.9.32/uclibcconfig.x86 b/main/libc0.9.32/uclibcconfig.x86 index f9f520e0b..89e1a1254 100644 --- a/main/libc0.9.32/uclibcconfig.x86 +++ b/main/libc0.9.32/uclibcconfig.x86 @@ -229,7 +229,7 @@ UCLIBC_HAS_UTMPX=y RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr" MULTILIB_DIR="lib" -HARDWIRED_ABSPATH=y +# HARDWIRED_ABSPATH is not set # # Security options diff --git a/main/libc0.9.32/uclibcconfig.x86_64 b/main/libc0.9.32/uclibcconfig.x86_64 index 0b7adb28a..74ba226d4 100644 --- a/main/libc0.9.32/uclibcconfig.x86_64 +++ b/main/libc0.9.32/uclibcconfig.x86_64 @@ -212,7 +212,7 @@ UCLIBC_HAS_UTMPX=y RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr" MULTILIB_DIR="lib" -HARDWIRED_ABSPATH=y +# HARDWIRED_ABSPATH is not set=y # # Security options |