diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-02-16 09:57:05 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-02-16 09:57:24 +0200 |
| commit | e904ef5e1b8a63c19b09d751f031c81c7d92e9e4 (patch) | |
| tree | dbd45f0f50db98c0c2fd12b264d90029a5ea4afb /main/musl | |
| parent | 4b6acde7cfad625dfb0a6cdb998c23a0a4e01f98 (diff) | |
| download | aports-e904ef5e1b8a63c19b09d751f031c81c7d92e9e4.tar.bz2 aports-e904ef5e1b8a63c19b09d751f031c81c7d92e9e4.tar.xz | |
main/musl: fix fputs regression
Diffstat (limited to 'main/musl')
| -rw-r--r-- | main/musl/APKBUILD | 6 | ||||
| -rw-r--r-- | main/musl/fix-fputs.patch | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD index 457f6a41c3..e5ac6481e2 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.13 -pkgrel=0 +pkgrel=1 pkgdesc="the musl c library (libc) implementation" url="http://www.musl-libc.org/" arch="all" @@ -12,6 +12,7 @@ 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 + fix-fputs.patch ldconfig __stack_chk_fail_local.c @@ -128,18 +129,21 @@ compat() { } md5sums="b8cb33a04ab461b55edcc807abf82241 musl-1.1.13.tar.gz +796a4dab96dc5c1c182a7b6e44f563fb fix-fputs.patch 830d01f7821b978df770b06db3790921 ldconfig 0df687757221bbb0fc1aa67f1bd646f9 __stack_chk_fail_local.c 57ef2c63b9ec6a2041694ace97d4ffa2 getconf.c 2b941c4251cac44988a4abfc50e21267 getent.c 45f92f8d59cf84d765de698a9578dbf4 iconv.c" sha256sums="bbacdc64f557d0c4857f7d2daf592c32c29aec1babbb94fcf01a2e05bed15013 musl-1.1.13.tar.gz +990d71f2efacede62b54225c773b1245b38fae9d5bd59971984bbd173cfb5e9c fix-fputs.patch b4a2c06db38742e8c42c3c9838b285a7d8cdac6c091ff3df5ff9a15f1e41b9c7 ldconfig 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c getconf.c 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe getent.c f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 iconv.c" sha512sums="d5f4a6fdb6a2cdbd7ab1ad5a8d91b1c690b3bd31d9049dfc022067019bba11952e375374eed982a0ddac7347d17f9ff2300178c4d5f27bdd8480933cc6e67802 musl-1.1.13.tar.gz +1fb5708a0dd8938622c0a1c8f933f79da1de94d37952d555930152d52d5405f1e744e502bdf9e22cd4d16293dcfb685707f323f6ac2af5ef4eb6b6897ac4d182 fix-fputs.patch 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f ldconfig 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d getconf.c diff --git a/main/musl/fix-fputs.patch b/main/musl/fix-fputs.patch new file mode 100644 index 0000000000..da9e4a0929 --- /dev/null +++ b/main/musl/fix-fputs.patch @@ -0,0 +1,12 @@ +diff --git a/src/stdio/fputs.c b/src/stdio/fputs.c +index 4737f44..c419923 100644 +--- a/src/stdio/fputs.c ++++ b/src/stdio/fputs.c +@@ -3,6 +3,7 @@ + + int fputs(const char *restrict s, FILE *restrict f) + { ++ if (!*s) return 0; + return (int)fwrite(s, strlen(s), 1, f) - 1; + } + |