aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-05-12 08:05:56 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-05-12 08:05:56 +0000
commit3730991b1d1c34e4da7fccebe397b02c220733f9 (patch)
treefe078745c18aa99bf0352fe2b0c95578255dd2e3 /main
parent2148c8adcbd9a2cc492d33f5ad9030378ae3b0db (diff)
downloadaports-3730991b1d1c34e4da7fccebe397b02c220733f9.tar.bz2
aports-3730991b1d1c34e4da7fccebe397b02c220733f9.tar.xz
main/libc0.9.32: fix for resolver with nptl
http://lists.uclibc.org/pipermail/uclibc/2010-May/044056.html
Diffstat (limited to 'main')
-rw-r--r--main/libc0.9.32/APKBUILD4
-rw-r--r--main/libc0.9.32/uclibc-resolv-tls.patch15
2 files changed, 18 insertions, 1 deletions
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index 84fe97a842..47bc5862ea 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -3,7 +3,7 @@ _abiver=0.9.32
pkgname=libc$_abiver
_gitver=100507
pkgver=${_abiver}_alpha0_git$_gitver
-pkgrel=1
+pkgrel=2
pkgdesc="C library for developing embedded Linux systems"
url=http://uclibc.org
license="LGPL-2"
@@ -20,6 +20,7 @@ source="http://build.alpinelinux.org:8010/distfiles/$_snapfile
0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch
0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch
uclibc-libm-pic.patch
+ uclibc-resolv-tls.patch
uclibcconfig.x86
uclibcconfig.i486
"
@@ -98,5 +99,6 @@ md5sums="46e98672dc2a4309d9a7c65b4e626845 libc0.9.32-0.9.32_alpha0_git100507.ta
826666b365f2d63a71d67eb76c94f7bc 0001-static-build-fix-internal-locking-weaks-to-get-pulle.patch
0800a489a738c7b1d8c3643cb9806926 0002-resolv-various-memory-corruption-and-off-by-one-fixe.patch
2f9739a980be24a842c57516155c7885 uclibc-libm-pic.patch
+d08831b452acdeaa3037525ee617edab uclibc-resolv-tls.patch
e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86
e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486"
diff --git a/main/libc0.9.32/uclibc-resolv-tls.patch b/main/libc0.9.32/uclibc-resolv-tls.patch
new file mode 100644
index 0000000000..45a228517b
--- /dev/null
+++ b/main/libc0.9.32/uclibc-resolv-tls.patch
@@ -0,0 +1,15 @@
+diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
+index 320aec4..f8066d2 100644
+--- a/libc/inet/resolv.c
++++ b/libc/inet/resolv.c
+@@ -2916,8 +2916,8 @@ static void res_sync_func(void)
+ __nameserver[n].sa4 = rp->nsaddr_list[n]; /* struct copy */
+ #endif
+ }
+- __resolv_timeout = rp->retrans;
+- __resolv_attempts = rp->retry;
++ __resolv_timeout = rp->retrans ?: RES_TIMEOUT;
++ __resolv_attempts = rp->retry ?: RES_DFLRETRY;
+ /* Extend and comment what program is known
+ * to use which _res.XXX member(s).
+