aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuniorJPDJ <git@juniorjpdj.pl>2021-05-08 00:21:16 +0200
committerTimo Teräs <timo.teras@iki.fi>2021-05-09 14:35:27 +0000
commit1e9cba35059e3bb4635f12ee7e10dfe687df31ad (patch)
tree0b8d0c1db2d86f091134a19ba13bfe0be18071f8
parent026d39c3bd07ef4576263255e34ae72d6c2b08fe (diff)
downloadaports-1e9cba35059e3bb4635f12ee7e10dfe687df31ad.tar.gz
aports-1e9cba35059e3bb4635f12ee7e10dfe687df31ad.tar.bz2
aports-1e9cba35059e3bb4635f12ee7e10dfe687df31ad.tar.xz
main/musl: epoll syscall cancelation point patch
-rw-r--r--main/musl/APKBUILD10
-rw-r--r--main/musl/syscall-cp-epoll.patch16
2 files changed, 23 insertions, 3 deletions
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index a3dc9a7dc2..943b295996 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.2.2
-pkgrel=2
+pkgrel=3
pkgdesc="the musl c library (libc) implementation"
url="https://musl.libc.org/"
arch="all"
@@ -22,6 +22,7 @@ commit="v1.2.2"
source="musl-$commit.tar.gz::https://git.musl-libc.org/cgit/musl/snapshot/$commit.tar.gz
0001-riscv64-define-ELF_NFPREG.patch
handle-aux-at_base.patch
+ syscall-cp-epoll.patch
ldconfig
__stack_chk_fail_local.c
@@ -166,11 +167,14 @@ compat() {
done
}
-sha512sums="7240550ab45cb6b410d65013c92f1f1de0f274322e7ba10e3cf9ce0464a1a833337c2fde39d2fc8c25af1d60599a5bb0ec0d9fb3723c098df3a72e82251bb3eb musl-v1.2.2.tar.gz
+sha512sums="
+7240550ab45cb6b410d65013c92f1f1de0f274322e7ba10e3cf9ce0464a1a833337c2fde39d2fc8c25af1d60599a5bb0ec0d9fb3723c098df3a72e82251bb3eb musl-v1.2.2.tar.gz
f036317426d54efb4df41c08664c8513d3991408b20f4c74220c8b0324d2e96a97094851ea225e363dd593828c2280e77422b0f4b924dbd106df45504723a00e 0001-riscv64-define-ELF_NFPREG.patch
a76f79b801497ad994746cf82bb6eaf86f9e1ae646e6819fbae8532a7f4eee53a96ac1d4e789ec8f66aea2a68027b0597f7a579b3369e01258da8accfce41370 handle-aux-at_base.patch
+d256ba7857c98d39b86aa73674eda5d45ab8134dde3fac2bc48ebb6ba9a824c20c43f2cdc6af54d2a45c162d1e4ec6517c36400992bba10496bcc51b374cbcd0 syscall-cp-epoll.patch
8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f ldconfig
062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c
0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d getconf.c
7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee getent.c
-9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c"
+9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c
+"
diff --git a/main/musl/syscall-cp-epoll.patch b/main/musl/syscall-cp-epoll.patch
new file mode 100644
index 0000000000..338620a373
--- /dev/null
+++ b/main/musl/syscall-cp-epoll.patch
@@ -0,0 +1,16 @@
+diff --git a/src/linux/epoll.c b/src/linux/epoll.c
+index deff5b10..93baa814 100644
+--- a/src/linux/epoll.c
++++ b/src/linux/epoll.c
+@@ -24,9 +24,9 @@ int epoll_ctl(int fd, int op, int fd2, struct epoll_event *ev)
+
+ int epoll_pwait(int fd, struct epoll_event *ev, int cnt, int to, const sigset_t *sigs)
+ {
+- int r = __syscall(SYS_epoll_pwait, fd, ev, cnt, to, sigs, _NSIG/8);
++ int r = __syscall_cp(SYS_epoll_pwait, fd, ev, cnt, to, sigs, _NSIG/8);
+ #ifdef SYS_epoll_wait
+- if (r==-ENOSYS && !sigs) r = __syscall(SYS_epoll_wait, fd, ev, cnt, to);
++ if (r==-ENOSYS && !sigs) r = __syscall_cp(SYS_epoll_wait, fd, ev, cnt, to);
+ #endif
+ return __syscall_ret(r);
+ }