main/musl: cherry-pick linker error reporting fix

2 files changed, 73 insertions, 1 deletions

diff --git a/main/musl/0001-fix-regression-in-dynamic-linker-error-reporting.patch b/main/musl/0001-fix-regression-in-dynamic-linker-error-reporting.patch
new file mode 100644
index 0000000000..ef3a6a0bea
--- /dev/null
+++ b/main/musl/0001-fix-regression-in-dynamic-linker-error-reporting.patch
@@ -0,0 +1,68 @@
+From 9a4ad02214a859e93d2c980e4535378a6a74e3a6 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Sun, 29 Jun 2014 21:52:54 -0400
+Subject: [PATCH] fix regression in dynamic linker error reporting
+
+due to a mistake when refactoring the error printing for the dynamic
+linker (commit 7c73cacd09a51a87484db5689864743e4984a84d), all messages
+were suppressed and replaced by blank lines.
+---
+ src/ldso/dynlink.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
+index bc4f2f6..a08300d 100644
+--- a/src/ldso/dynlink.c
++++ b/src/ldso/dynlink.c
+@@ -290,8 +290,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
+ 		if (!astype) continue;
+ 		type = remap_rel(astype);
+ 		if (!type) {
+-			error(errbuf, sizeof errbuf,
+-				"Error relocating %s: unsupported relocation type %d",
++			error("Error relocating %s: unsupported relocation type %d",
+ 				dso->name, astype);
+ 			continue;
+ 		}
+@@ -304,8 +303,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
+ 			def = find_sym(ctx, name, type==REL_PLT);
+ 			if (!def.sym && (sym->st_shndx != SHN_UNDEF
+ 			    || sym->st_info>>4 != STB_WEAK)) {
+-				error(errbuf, sizeof errbuf,
+-					"Error relocating %s: %s: symbol not found",
++				error("Error relocating %s: %s: symbol not found",
+ 					dso->name, name);
+ 				continue;
+ 			}
+@@ -366,7 +364,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
+ 			if (stride<3) addend = reloc_addr[1];
+ 			if (runtime && def.dso->tls_id >= static_tls_cnt) {
+ 				struct td_index *new = malloc(sizeof *new);
+-				if (!new) error(errbuf, sizeof errbuf,
++				if (!new) error(
+ 					"Error relocating %s: cannot allocate TLSDESC for %s",
+ 					dso->name, sym ? name : "(local)" );
+ 				new->next = dso->td_index;
+@@ -839,8 +837,7 @@ static void load_deps(struct dso *p)
+ 			if (p->dynv[i] != DT_NEEDED) continue;
+ 			dep = load_library(p->strings + p->dynv[i+1], p);
+ 			if (!dep) {
+-				error(errbuf, sizeof errbuf,
+-					"Error loading shared library %s: %m (needed by %s)",
++				error("Error loading shared library %s: %m (needed by %s)",
+ 					p->strings + p->dynv[i+1], p->name);
+ 				continue;
+ 			}
+@@ -890,8 +887,7 @@ static void reloc_all(struct dso *p)
+ 
+ 		if (p->relro_start != p->relro_end &&
+ 		    mprotect(p->base+p->relro_start, p->relro_end-p->relro_start, PROT_READ) < 0) {
+-			error(errbuf, sizeof errbuf,
+-				"Error relocating %s: RELRO protection failed: %m",
++			error("Error relocating %s: RELRO protection failed: %m",
+ 				p->name);
+ 		}
+ 
+-- 
+2.0.1
+
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index cb0620472f..a9d5f34c7b 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=musl
 pkgver=1.1.3
-pkgrel=0
+pkgrel=1
 pkgdesc="the musl c library (libc) implementation"
 url="http://www.musl-libc.org/"
 arch="all"
@@ -13,6 +13,7 @@ makedepends="$depends_dev"
 install="$pkgname.post-upgrade"
 subpackages="$pkgname-dev $pkgname-utils $pkgname-dbg"
 source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz
+	0001-fix-regression-in-dynamic-linker-error-reporting.patch
 	1001-add-basic-dns-record-parsing-functions.patch
 	1002-reimplement-if_nameindex-and-getifaddrs-using-netlin.patch
 
@@ -116,6 +117,7 @@ utils() {
 }
 
 md5sums="1628bd4c86b14b90447e1dcf8421aed7  musl-1.1.3.tar.gz
+672514299b9b0f3fca1ba389c03b23a5  0001-fix-regression-in-dynamic-linker-error-reporting.patch
 a3810683ef61ac27e2f6ec9801280c81  1001-add-basic-dns-record-parsing-functions.patch
 83c3bd2a50b1de5ef948704d3f4e0583  1002-reimplement-if_nameindex-and-getifaddrs-using-netlin.patch
 013be8897f27c3909ada59c62020502f  ldconfig
@@ -125,6 +127,7 @@ cb82d21fed17a116b44b830adba71c5a  getconf.c
 2b941c4251cac44988a4abfc50e21267  getent.c
 45f92f8d59cf84d765de698a9578dbf4  iconv.c"
 sha256sums="4ef8a7559b947808d41dbea98e24d9f36be38326fb2754a91a35520b4ca4af9f  musl-1.1.3.tar.gz
+b41d785a8550843febd5e1b5aae55a4fc1847518fd52f76476a0643deb822ff0  0001-fix-regression-in-dynamic-linker-error-reporting.patch
 758390768b1bc4159d56908ca332b9640cd0552ed3b4b2b8d4a6d499c54c11a1  1001-add-basic-dns-record-parsing-functions.patch
 1c25880095e869b827f02997e864fdf4bf157a4e923e52d97dbd05e657aedb70  1002-reimplement-if_nameindex-and-getifaddrs-using-netlin.patch
 398dc26ec82cc6af056c738e8ac62da212ba978229d9839eb8b61f7ce536da4a  ldconfig
@@ -134,6 +137,7 @@ d9b644ec20bc33e81a7c52b9fcf7973d835923a69faf50f03db45534b811bd96  getopt_long.c
 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe  getent.c
 f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7  iconv.c"
 sha512sums="c580c700d609eced15dc398ff6dcbc2e38fab24eaa5ea80a58c3d41d9f749579cce328bbad149f2b5975533d6ec051e6cc08be3bea4d65e143fc850745bf24c2  musl-1.1.3.tar.gz
+c41219cfd0ee302ca0f8063102ec42cbaabf809ac7cc2ea3c7a7aa1d2aec246be843e6225eb23409e90710e4be0ebcc1c7f0bafaa4060e66f99c6c84f0f4956d  0001-fix-regression-in-dynamic-linker-error-reporting.patch
 dad965258daf69371b844f76bfe5a914b0eca0ca76f3fc340b8fd7acf598b5f87bbe6d68b1f43ed0293ee0ed3bfd85d5173ccc169aa6265646248d5b8a906708  1001-add-basic-dns-record-parsing-functions.patch
 72cf33738d2cf31f6ec02312bc494d754c17470b519172bb8bd7e2e29ac3b119023088a2b3fbc0dbc2fddd0078ccbae62096106cae361f8c31d6a9950043af25  1002-reimplement-if_nameindex-and-getifaddrs-using-netlin.patch
 33e13d2242063f3dc9ec199ae9528e469a52ccae4d3726faa3c866e0c7dcf546f69294f9c00307324cee05fd965f84350ae100b8b1138f9d9c8c916de04ab0d1  ldconfig