diff options
| author | emmett1 <emmett1.2miligrams@protonmail.com> | 2025-03-05 07:36:14 +0800 |
|---|---|---|
| committer | emmett1 <emmett1.2miligrams@protonmail.com> | 2025-03-05 07:36:14 +0800 |
| commit | 20c42905dc7176289ee3abb927d8f6aec9aed7cc (patch) | |
| tree | 1d61d06d249690b3e08fa3ed7ea12869ac6d25be | |
| parent | 470811bb10b21e4508deff506d0ea02eca1f405d (diff) | |
| download | alicelinux-20c42905dc7176289ee3abb927d8f6aec9aed7cc.tar.gz alicelinux-20c42905dc7176289ee3abb927d8f6aec9aed7cc.zip | |
musl: added default-locpath.patch
| -rw-r--r-- | repos/core/musl/.checksum | 1 | ||||
| -rw-r--r-- | repos/core/musl/abuild | 3 | ||||
| -rw-r--r-- | repos/core/musl/default-locpath.patch | 14 |
3 files changed, 17 insertions, 1 deletions
diff --git a/repos/core/musl/.checksum b/repos/core/musl/.checksum index bff70281..afbdd254 100644 --- a/repos/core/musl/.checksum +++ b/repos/core/musl/.checksum @@ -1,6 +1,7 @@ 8471ed3317ec31cd92b0c6055407115bc7377aaad8da552ffbe6655871c9840b 0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch 18d1d243e0d7a479bc795d8af152d5f43b8f53f09da038d8e46ca2ac9207ecf4 0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch 936eb5830af322af38a1d08d02cc1d31ae95efdbc2e381b0e5fa6e91eebe693e cdefs.h +bfb4a93ede1bacfa7c7c78aaaf80372223effcea7bbc52aeffca655dd0922159 default-locpath.patch ae7b2598293d87cff4fc4e8bed5faabe486615ad7484a08d6dfea807786af895 elfutils-0.190-relr.patch 676213e6d717200470f5f8b2c30c171e47e20eebfa669891afe43c514e1b72b5 getconf.1 9949f50c6d3b639a65986fd8a0cd44e9b9ea886ae137ba53e300f20545ee3118 getconf.c diff --git a/repos/core/musl/abuild b/repos/core/musl/abuild index 9f9dacdc..a85c86b3 100644 --- a/repos/core/musl/abuild +++ b/repos/core/musl/abuild @@ -1,6 +1,6 @@ name=musl version=1.2.5 -release=2 +release=3 source="https://www.musl-libc.org/releases/musl-$version.tar.gz getconf.c getconf.1 @@ -11,6 +11,7 @@ source="https://www.musl-libc.org/releases/musl-$version.tar.gz queue.h cdefs.h elfutils-0.190-relr.patch + default-locpath.patch 0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch 0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch" keep_static=1 diff --git a/repos/core/musl/default-locpath.patch b/repos/core/musl/default-locpath.patch new file mode 100644 index 00000000..a6080d44 --- /dev/null +++ b/repos/core/musl/default-locpath.patch @@ -0,0 +1,14 @@ +--- a/src/locale/locale_map.c 2024-05-12 20:33:15.000000000 +0100 ++++ b/src/locale/locale_map.c 2024-05-20 22:53:02.685916344 +0100 +@@ -64,7 +64,10 @@ + if (!strcmp(val, p->name)) return p; + + if (!libc.secure) path = getenv("MUSL_LOCPATH"); +- /* FIXME: add a default path? */ ++ if (!path) { ++ // Provided by musl-locales ++ path = "/usr/share/i18n/locales/musl"; ++ } + + if (path) for (; *path; path=z+!!*z) { + z = __strchrnul(path, ':'); |