main/musl: cherry-pick upstream fixes

make previous commits the upstream versions, and add few
additional fixes

1 files changed, 33 insertions, 9 deletions

diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 4c2639e6c1..d508467df6 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.11
-pkgrel=1
+pkgrel=2
 pkgdesc="the musl c library (libc) implementation"
 url="http://www.musl-libc.org/"
 arch="all"
@@ -12,8 +12,14 @@ depends_dev="!uclibc-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev $pkgname-utils $pkgname-dbg libc6-compat:compat"
 source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz
-	arm-aeabi-mem.patch
-	no-utf8-code-units-locale.patch
+	0001-remove-use-of-buggy-.SECONDARY-special-target-in-mak.patch
+	0002-implement-arm-eabi-mem-functions.patch
+	0003-fix-fclose-of-permanent-stdin-out-err-streams.patch
+	0004-make-nl_langinfo-CODESET-always-return-UTF-8.patch
+	0005-fix-breakage-in-nl_langinfo-from-previous-commit.patch
+	0006-remove-unused-and-invalid-C-version-of-sigsetjmp.patch
+	0007-fix-missing-earlyclobber-flag-in-i386-a_ctz_64-asm.patch
+	0008-fix-uninitialized-scopeid-in-lookups-from-hosts-file.patch
 
 	ldconfig
 	__stack_chk_fail_local.c
@@ -130,24 +136,42 @@ compat() {
 }
 
 md5sums="48be0777e32f374d387e9cf85e36ec4d  musl-1.1.11.tar.gz
-930d8a21b9a16e1f0f1ff8c2b05848cf  arm-aeabi-mem.patch
-90d102fea2868796f5dec59d99b4b192  no-utf8-code-units-locale.patch
+df95d85134e21b7cd0711aa3edec4a14  0001-remove-use-of-buggy-.SECONDARY-special-target-in-mak.patch
+31462dce2f13f68868cf2dc61e05c6da  0002-implement-arm-eabi-mem-functions.patch
+45e86522164079c6067994f78c8491e9  0003-fix-fclose-of-permanent-stdin-out-err-streams.patch
+edd5e3088b1ad3c1a38d3078a5feadc8  0004-make-nl_langinfo-CODESET-always-return-UTF-8.patch
+0b50a3d050c997ad732eedb328559183  0005-fix-breakage-in-nl_langinfo-from-previous-commit.patch
+b6f8dbcfe6fb6e25ae30a16bf6485795  0006-remove-unused-and-invalid-C-version-of-sigsetjmp.patch
+554812ae180748662f3f5eb0c136e928  0007-fix-missing-earlyclobber-flag-in-i386-a_ctz_64-asm.patch
+a68989df58c9af8ded55aeaace6f3993  0008-fix-uninitialized-scopeid-in-lookups-from-hosts-file.patch
 830d01f7821b978df770b06db3790921  ldconfig
 0df687757221bbb0fc1aa67f1bd646f9  __stack_chk_fail_local.c
 57ef2c63b9ec6a2041694ace97d4ffa2  getconf.c
 2b941c4251cac44988a4abfc50e21267  getent.c
 45f92f8d59cf84d765de698a9578dbf4  iconv.c"
 sha256sums="bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f  musl-1.1.11.tar.gz
-b62f3bf892a4a7ea52a717a8ac39d417210599e0f603e73d122a42b87eb71af8  arm-aeabi-mem.patch
-719cfed74ca5f5de3f687c973d300b23d249aed27ddc2e03d4f5c0792fe99947  no-utf8-code-units-locale.patch
+68bea76fece3285f6e648cb86fb2bf80d099543332494d5c74fc1b419218dc93  0001-remove-use-of-buggy-.SECONDARY-special-target-in-mak.patch
+2cc704dac5f566bff09228a571012d75fad99852357b2c303526155bb599a137  0002-implement-arm-eabi-mem-functions.patch
+4d0fb3496d33ed1d376a9a1aec565d7d71c5d2764048668258fc5e3f995b9d2c  0003-fix-fclose-of-permanent-stdin-out-err-streams.patch
+f743049757fdfb0d67620ae2783370372a0720509d18c9551b47220f21066bbd  0004-make-nl_langinfo-CODESET-always-return-UTF-8.patch
+d15e48f74f760651394dd460ebbb3356c42e56027b2708992b4db7c92e1c40a2  0005-fix-breakage-in-nl_langinfo-from-previous-commit.patch
+2310fba590d57cd7193048d49c0bbab0fffe81fd2266d26bc750f9ed96787c27  0006-remove-unused-and-invalid-C-version-of-sigsetjmp.patch
+47f4d1049658bbe3b59f17b0b7f16c901f2de14c89eb9640b5c98d4ff4fd9813  0007-fix-missing-earlyclobber-flag-in-i386-a_ctz_64-asm.patch
+f1e47791bb59bbfcb07a6f4b8c4bb9d1680acdaa00ad202b9e03a218b25fe288  0008-fix-uninitialized-scopeid-in-lookups-from-hosts-file.patch
 b4a2c06db38742e8c42c3c9838b285a7d8cdac6c091ff3df5ff9a15f1e41b9c7  ldconfig
 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da  __stack_chk_fail_local.c
 d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c  getconf.c
 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe  getent.c
 f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7  iconv.c"
 sha512sums="573131fe7a2c5a9c9bf796a5fc02e6ec093148648b9b43dc13d9c85e5777b1691499af6f673075a0d2b4b36c788b4dd7d72eb450c6ec3a586901bd410ee1ea6d  musl-1.1.11.tar.gz
-7662df3bb3e15fa1b96370a3abbc7f17aa0246f651fa4f21c3b974ad5d6fde84d74be9a3d16976dd861839bf7785f727de5d41bb8c96ac23c38ef8b59fd82be2  arm-aeabi-mem.patch
-b7da0458213ab172bad8663f24901c4fc81db641543f9653d5cfcefc44f5db7f87f4d6c7b9b2ebe8f650b618b47a89d3627c754f5961aa499f51bb7faaf320e7  no-utf8-code-units-locale.patch
+4b3bfb0b3a6e5c72dad3813a9606d646077ef4e5d3cf68c8d8a03a4e026f2f4d5f96155ccf5ba8ff170ff529d3d78432bcdc9f164941b140beac240feff6c835  0001-remove-use-of-buggy-.SECONDARY-special-target-in-mak.patch
+663817a4b9ef9cde4cf45485ac974c1775da1854769d168fde98d8982498e7eed05b72e840613996c577e9097a4697fe39079f06038dd7bb4ba1f812cecdc8df  0002-implement-arm-eabi-mem-functions.patch
+a7d63a7d70aa71104ccef9c530cdd5b76d1cf5f6f372ec56ac5d636b1ccbcf2c3f639712ba96e98068f1fb6511b7d8dbd251df23e3b8e3c09ee7538eaa2dbc0b  0003-fix-fclose-of-permanent-stdin-out-err-streams.patch
+64e74b1c042a032657ffba29f4a933fbb47d2108281957812e05a6cdd2d3431e79d1ed4ad7c0a4acbd281593cc63a31a5c482163f890e0fbba8f20c1c507928f  0004-make-nl_langinfo-CODESET-always-return-UTF-8.patch
+d1ad5d8ee7f9dbb337d7df6a2d851b47db51ae42df6c3219e1657c9a73b6b36ba72fe4f55d8685c19024f21b9ae3da2336e1800e3b3c67238f5d74bae1280827  0005-fix-breakage-in-nl_langinfo-from-previous-commit.patch
+ef12fed5f595ebfafe948225eab7fde24ff11384ddd3f5542a092df264a6d6459fc3d0998e5ed98b290139371164fa022250faf6122049ef1f62e37692435bfd  0006-remove-unused-and-invalid-C-version-of-sigsetjmp.patch
+5dff942055f916ea45a19063d647187ce79aca8a2cbc64e5fa19ae15b13dab866db5a2916077172eadc77df353f2dbc5e5850164456d3a46738d7e7f85486af2  0007-fix-missing-earlyclobber-flag-in-i386-a_ctz_64-asm.patch
+828ded1a37a6818b28a944b4eda5d2a5e06615b3c21eaeebf600b66e304efd4c2883e755adcee735cc9a19d24acc49de6a8f997e9804a54c463491cbe41c5d53  0008-fix-uninitialized-scopeid-in-lookups-from-hosts-file.patch
 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f  ldconfig
 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b  __stack_chk_fail_local.c
 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d  getconf.c