diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-09-05 10:30:19 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-09-05 10:31:57 +0000 |
| commit | 3e4dc327b193eb85e43c466be9f13d3a82101f1a (patch) | |
| tree | 2506ecc90a837a57331e0ac19ce77c61ae975bf5 | |
| parent | 4c92984f66134124e9ce621b443dc00844e3cfe7 (diff) | |
| download | aports-3e4dc327b193eb85e43c466be9f13d3a82101f1a.tar.bz2 aports-3e4dc327b193eb85e43c466be9f13d3a82101f1a.tar.xz | |
main/musl: fix nl_langinfo(CODESET) to not return UTF-8-CODE-UNITS
The return value is used often as argument to iconv where it's
not recognized. Revert back to return UTF8 which works.
| -rw-r--r-- | main/musl/APKBUILD | 6 | ||||
| -rw-r--r-- | main/musl/no-utf8-code-units-locale.patch | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD index de3321b752..18b8d40dc2 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=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" 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 ldconfig __stack_chk_fail_local.c @@ -131,6 +132,7 @@ compat() { md5sums="48be0777e32f374d387e9cf85e36ec4d musl-1.1.11.tar.gz 930d8a21b9a16e1f0f1ff8c2b05848cf arm-aeabi-mem.patch +90d102fea2868796f5dec59d99b4b192 no-utf8-code-units-locale.patch 830d01f7821b978df770b06db3790921 ldconfig 0df687757221bbb0fc1aa67f1bd646f9 __stack_chk_fail_local.c 57ef2c63b9ec6a2041694ace97d4ffa2 getconf.c @@ -138,6 +140,7 @@ md5sums="48be0777e32f374d387e9cf85e36ec4d musl-1.1.11.tar.gz 45f92f8d59cf84d765de698a9578dbf4 iconv.c" sha256sums="bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f musl-1.1.11.tar.gz b62f3bf892a4a7ea52a717a8ac39d417210599e0f603e73d122a42b87eb71af8 arm-aeabi-mem.patch +719cfed74ca5f5de3f687c973d300b23d249aed27ddc2e03d4f5c0792fe99947 no-utf8-code-units-locale.patch b4a2c06db38742e8c42c3c9838b285a7d8cdac6c091ff3df5ff9a15f1e41b9c7 ldconfig 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c getconf.c @@ -145,6 +148,7 @@ d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c getconf.c f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 iconv.c" sha512sums="573131fe7a2c5a9c9bf796a5fc02e6ec093148648b9b43dc13d9c85e5777b1691499af6f673075a0d2b4b36c788b4dd7d72eb450c6ec3a586901bd410ee1ea6d musl-1.1.11.tar.gz 7662df3bb3e15fa1b96370a3abbc7f17aa0246f651fa4f21c3b974ad5d6fde84d74be9a3d16976dd861839bf7785f727de5d41bb8c96ac23c38ef8b59fd82be2 arm-aeabi-mem.patch +b7da0458213ab172bad8663f24901c4fc81db641543f9653d5cfcefc44f5db7f87f4d6c7b9b2ebe8f650b618b47a89d3627c754f5961aa499f51bb7faaf320e7 no-utf8-code-units-locale.patch 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f ldconfig 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d getconf.c diff --git a/main/musl/no-utf8-code-units-locale.patch b/main/musl/no-utf8-code-units-locale.patch new file mode 100644 index 0000000000..78e31b9f0e --- /dev/null +++ b/main/musl/no-utf8-code-units-locale.patch @@ -0,0 +1,15 @@ +Temporary fix for https://github.com/voidlinux/void-packages/issues/2425 + +@dalias affirmed that returning UTF-8 even when requesting C locale is just fine. + +--- a/src/locale/langinfo.c 2015-09-01 08:41:59.830797631 +0200 ++++ b/src/locale/langinfo.c 2015-09-01 08:42:15.324966247 +0200 +@@ -34,7 +34,7 @@ char *__nl_langinfo_l(nl_item item, loca + const char *str; + + if (item == CODESET) +- return MB_CUR_MAX==1 ? "UTF-8-CODE-UNITS" : "UTF-8"; ++ return "UTF-8"; + + switch (cat) { + case LC_NUMERIC: |