diff options
author | Timo Teräs <timo.teras@iki.fi> | 2015-07-08 06:28:22 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2015-07-08 06:28:49 +0000 |
commit | 4d526b01a9cc3479c009e19113e45516812822a5 (patch) | |
tree | 7ddb919527142c67f3efed695ffc122d1ef5cbb0 | |
parent | eda97ba58d739a78737006295c03cbe3d77ebceb (diff) | |
download | alpine_aports-4d526b01a9cc3479c009e19113e45516812822a5.tar.bz2 alpine_aports-4d526b01a9cc3479c009e19113e45516812822a5.tar.xz alpine_aports-4d526b01a9cc3479c009e19113e45516812822a5.zip |
main/musl: apply dn_skiprr and syslog fix
-rw-r--r-- | main/musl/0002-ns_parse.c-fix-ns_skiprr.patch | 25 | ||||
-rw-r--r-- | main/musl/0003-reopen-syslog-socket-on-error.patch | 42 | ||||
-rw-r--r-- | main/musl/APKBUILD | 10 |
3 files changed, 76 insertions, 1 deletions
diff --git a/main/musl/0002-ns_parse.c-fix-ns_skiprr.patch b/main/musl/0002-ns_parse.c-fix-ns_skiprr.patch new file mode 100644 index 0000000000..f74d33226c --- /dev/null +++ b/main/musl/0002-ns_parse.c-fix-ns_skiprr.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 06bc5ba10113ab72ac8bf0b81defffa353146496 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yu Lu <pentium.luyu@gmail.com> | ||
3 | Date: Tue, 7 Jul 2015 10:34:02 +0300 | ||
4 | Subject: [PATCH] ns_parse.c: fix ns_skiprr | ||
5 | |||
6 | --- | ||
7 | src/network/ns_parse.c | 2 +- | ||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/src/network/ns_parse.c b/src/network/ns_parse.c | ||
11 | index 3ff33a8..d01da47 100644 | ||
12 | --- a/src/network/ns_parse.c | ||
13 | +++ b/src/network/ns_parse.c | ||
14 | @@ -95,7 +95,7 @@ int ns_skiprr(const unsigned char *ptr, const unsigned char *eom, ns_sect sectio | ||
15 | p += r; | ||
16 | } | ||
17 | } | ||
18 | - return ptr - p; | ||
19 | + return p - ptr; | ||
20 | bad: | ||
21 | errno = EMSGSIZE; | ||
22 | return -1; | ||
23 | -- | ||
24 | 2.4.5 | ||
25 | |||
diff --git a/main/musl/0003-reopen-syslog-socket-on-error.patch b/main/musl/0003-reopen-syslog-socket-on-error.patch new file mode 100644 index 0000000000..d89d6be22a --- /dev/null +++ b/main/musl/0003-reopen-syslog-socket-on-error.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 324dbe39c6941f9d37d438cc528a3dedbc89c636 Mon Sep 17 00:00:00 2001 | ||
2 | From: Rich Felker <dalias@aerifal.cx> | ||
3 | Date: Tue, 7 Jul 2015 10:35:50 +0300 | ||
4 | Subject: [PATCH] reopen syslog socket on error | ||
5 | |||
6 | --- | ||
7 | src/misc/syslog.c | 12 +++++++++++- | ||
8 | 1 file changed, 11 insertions(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/src/misc/syslog.c b/src/misc/syslog.c | ||
11 | index e026f9b..f98944f 100644 | ||
12 | --- a/src/misc/syslog.c | ||
13 | +++ b/src/misc/syslog.c | ||
14 | @@ -56,6 +56,14 @@ static void __openlog() | ||
15 | log_fd = fd; | ||
16 | } | ||
17 | |||
18 | +static int __reopenlog() | ||
19 | +{ | ||
20 | + close(log_fd); | ||
21 | + log_fd = -1; | ||
22 | + __openlog(); | ||
23 | + return log_fd; | ||
24 | +} | ||
25 | + | ||
26 | void openlog(const char *ident, int opt, int facility) | ||
27 | { | ||
28 | int cs; | ||
29 | @@ -107,7 +115,9 @@ static void _vsyslog(int priority, const char *message, va_list ap) | ||
30 | if (l2 >= sizeof buf - l) l = sizeof buf - 1; | ||
31 | else l += l2; | ||
32 | if (buf[l-1] != '\n') buf[l++] = '\n'; | ||
33 | - if (send(log_fd, buf, l, 0) < 0 && (log_opt & LOG_CONS)) { | ||
34 | + if (send(log_fd, buf, l, 0) < 0 | ||
35 | + && (__reopenlog() < 0 || send(log_fd, buf, l, 0) < 0) | ||
36 | + && (log_opt & LOG_CONS)) { | ||
37 | fd = open("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC); | ||
38 | if (fd >= 0) { | ||
39 | dprintf(fd, "%.*s", l-hlen, buf+hlen); | ||
40 | -- | ||
41 | 2.4.5 | ||
42 | |||
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD index b155b30962..c711edd46a 100644 --- a/main/musl/APKBUILD +++ b/main/musl/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: Timo Teräs <timo.teras@iki.fi> | 2 | # Maintainer: Timo Teräs <timo.teras@iki.fi> |
3 | pkgname=musl | 3 | pkgname=musl |
4 | pkgver=1.1.9 | 4 | pkgver=1.1.9 |
5 | pkgrel=2 | 5 | pkgrel=3 |
6 | pkgdesc="the musl c library (libc) implementation" | 6 | pkgdesc="the musl c library (libc) implementation" |
7 | url="http://www.musl-libc.org/" | 7 | url="http://www.musl-libc.org/" |
8 | arch="all" | 8 | arch="all" |
@@ -12,6 +12,8 @@ depends_dev="!uclibc-dev" | |||
12 | makedepends="$depends_dev" | 12 | makedepends="$depends_dev" |
13 | subpackages="$pkgname-dev $pkgname-utils $pkgname-dbg libc6-compat:compat" | 13 | subpackages="$pkgname-dev $pkgname-utils $pkgname-dbg libc6-compat:compat" |
14 | source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz | 14 | source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz |
15 | 0002-ns_parse.c-fix-ns_skiprr.patch | ||
16 | 0003-reopen-syslog-socket-on-error.patch | ||
15 | 17 | ||
16 | ldconfig | 18 | ldconfig |
17 | __stack_chk_fail_local.c | 19 | __stack_chk_fail_local.c |
@@ -129,18 +131,24 @@ compat() { | |||
129 | } | 131 | } |
130 | 132 | ||
131 | md5sums="14e8c5ac74f887d53256b3dcaf9b4aaa musl-1.1.9.tar.gz | 133 | md5sums="14e8c5ac74f887d53256b3dcaf9b4aaa musl-1.1.9.tar.gz |
134 | b468a4063182bc08d6d100075067d7fe 0002-ns_parse.c-fix-ns_skiprr.patch | ||
135 | eddb1f6cfca2a57ff5463bbcd70d95f1 0003-reopen-syslog-socket-on-error.patch | ||
132 | 830d01f7821b978df770b06db3790921 ldconfig | 136 | 830d01f7821b978df770b06db3790921 ldconfig |
133 | 0df687757221bbb0fc1aa67f1bd646f9 __stack_chk_fail_local.c | 137 | 0df687757221bbb0fc1aa67f1bd646f9 __stack_chk_fail_local.c |
134 | 57ef2c63b9ec6a2041694ace97d4ffa2 getconf.c | 138 | 57ef2c63b9ec6a2041694ace97d4ffa2 getconf.c |
135 | 2b941c4251cac44988a4abfc50e21267 getent.c | 139 | 2b941c4251cac44988a4abfc50e21267 getent.c |
136 | 45f92f8d59cf84d765de698a9578dbf4 iconv.c" | 140 | 45f92f8d59cf84d765de698a9578dbf4 iconv.c" |
137 | sha256sums="00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e musl-1.1.9.tar.gz | 141 | sha256sums="00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e musl-1.1.9.tar.gz |
142 | 8b16b8bb3eef89c799aed85caf3f495abd00bbbba1819a5feeede781040296da 0002-ns_parse.c-fix-ns_skiprr.patch | ||
143 | 2d50958ed69ccb4c67c5b7d8dc442e792efd80a2cd40e140ecfb237aff83b0a4 0003-reopen-syslog-socket-on-error.patch | ||
138 | b4a2c06db38742e8c42c3c9838b285a7d8cdac6c091ff3df5ff9a15f1e41b9c7 ldconfig | 144 | b4a2c06db38742e8c42c3c9838b285a7d8cdac6c091ff3df5ff9a15f1e41b9c7 ldconfig |
139 | 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c | 145 | 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c |
140 | d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c getconf.c | 146 | d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c getconf.c |
141 | 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe getent.c | 147 | 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe getent.c |
142 | f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 iconv.c" | 148 | f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 iconv.c" |
143 | sha512sums="a6f899814b728113d3ad1b9d03dfde4991af1d9cb85cf596583d6c98cfd596dc2523453ff9bd6e40daef9a63682bf39a66d88ddaa5b51bac72f52c9ff43b9590 musl-1.1.9.tar.gz | 149 | sha512sums="a6f899814b728113d3ad1b9d03dfde4991af1d9cb85cf596583d6c98cfd596dc2523453ff9bd6e40daef9a63682bf39a66d88ddaa5b51bac72f52c9ff43b9590 musl-1.1.9.tar.gz |
150 | 08e2ce562acef8dc4232461ffdbc1c948c19025495a8c59b1328f83cb2baf3ee5db67b7d0d54794aa639d008286bedb5453d9afbc7e6e56b2f64f95d9b76be85 0002-ns_parse.c-fix-ns_skiprr.patch | ||
151 | 51415ef29feca5393db27ad885a973ec7bc51a6e150c1392143b7b1021a9822e4b61595ab7c402305f4093944373effff59133d49e3f3f30c7a849cc1e7ff8ec 0003-reopen-syslog-socket-on-error.patch | ||
144 | 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f ldconfig | 152 | 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f ldconfig |
145 | 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c | 153 | 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c |
146 | 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d getconf.c | 154 | 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d getconf.c |