diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-07-24 09:32:06 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-07-30 07:03:40 +0000 |
| commit | 9b59b303937d3c5e11dc01aa3da53ae5e8e93566 (patch) | |
| tree | 847f6d537322aca77ad5ff093ee6d28051043fa9 /main/musl/0006-make-dynamic-linker-accept-colon-as-a-separator-for-.patch | |
| parent | 86759609760f21984c719f15a4ceb6a8e0e4bb64 (diff) | |
| download | aports-9b59b303937d3c5e11dc01aa3da53ae5e8e93566.tar.bz2 aports-9b59b303937d3c5e11dc01aa3da53ae5e8e93566.tar.xz | |
main/musl: cherry-pick fixes, update alpine specific patches
four additional fixes from upstream git.
dns patch fixed to implement ns_{put,get}* as real functions,
and macro ns_msg_getflag added.
netlink patch is reworked to provide alias interface names
for ipv4 where appropriate, and for ipv6 link-local scope ids.
few error paths have been fixed, and if_nameindex() memory
allocation strategy has been improved.
setxid patch added.
(cherry picked from commit 3227b4ad816f850f655b6f44dc497926cb2cdcd1)
Diffstat (limited to 'main/musl/0006-make-dynamic-linker-accept-colon-as-a-separator-for-.patch')
| -rw-r--r-- | main/musl/0006-make-dynamic-linker-accept-colon-as-a-separator-for-.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/main/musl/0006-make-dynamic-linker-accept-colon-as-a-separator-for-.patch b/main/musl/0006-make-dynamic-linker-accept-colon-as-a-separator-for-.patch new file mode 100644 index 0000000000..032b3cbf6e --- /dev/null +++ b/main/musl/0006-make-dynamic-linker-accept-colon-as-a-separator-for-.patch @@ -0,0 +1,28 @@ +From 349381aa8c0fc385e54e1068dd5f2b27af55cd12 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Fri, 11 Jul 2014 00:26:12 -0400 +Subject: [PATCH] make dynamic linker accept colon as a separator for + LD_PRELOAD + +--- + src/ldso/dynlink.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c +index 55124ff..6b7f0f3 100644 +--- a/src/ldso/dynlink.c ++++ b/src/ldso/dynlink.c +@@ -862,8 +862,8 @@ static void load_preload(char *s) + int tmp; + char *z; + for (z=s; *z; s=z) { +- for ( ; *s && isspace(*s); s++); +- for (z=s; *z && !isspace(*z); z++); ++ for ( ; *s && (isspace(*s) || *s==':'); s++); ++ for (z=s; *z && !isspace(*z) && *z!=':'; z++); + tmp = *z; + *z = 0; + load_library(s, 0); +-- +2.0.2 + |