kore: update to 4.1.0.

This commit is contained in:
Helmut Pozimski 2021-01-24 11:39:09 +01:00
parent ea7fc9a0fb
commit 6168fd002c
2 changed files with 15 additions and 20 deletions

View file

@ -425,19 +425,17 @@ index 0000000..b935864
+#define __NR_pidfd_open 434 +#define __NR_pidfd_open 434
+#define __NR_clone3 435 +#define __NR_clone3 435
+ +
diff --git src/seccomp.c src/seccomp.c --- src/seccomp.c.orig 2021-01-24 11:27:12.401550281 +0100
index 505ac0b..14074db 100644 +++ src/seccomp.c 2021-01-24 11:30:18.102787637 +0100
--- src/seccomp.c @@ -460,13 +460,19 @@
+++ src/seccomp.c
@@ -426,11 +426,19 @@ seccomp_register_violation(pid_t pid)
int idx;
struct kore_worker *kw;
struct iovec iov; struct iovec iov;
+#if defined(__powerpc__) #if defined(__arm__)
struct pt_regs regs;
+#elif defined(__powerpc__)
+ unsigned long regs[32]; + unsigned long regs[32];
+#else #else
struct user_regs_struct regs; struct user_regs_struct regs;
+#endif #endif
long sysnr; long sysnr;
const char *name; const char *name;
@ -449,15 +447,12 @@ index 505ac0b..14074db 100644
iov.iov_len = sizeof(regs); iov.iov_len = sizeof(regs);
if (ptrace(PTRACE_GETREGSET, pid, 1, &iov) == -1) if (ptrace(PTRACE_GETREGSET, pid, 1, &iov) == -1)
@@ -442,6 +450,8 @@ seccomp_register_violation(pid_t pid) @@ -478,6 +484,8 @@
sysnr = regs.orig_ax;
#elif SECCOMP_AUDIT_ARCH == AUDIT_ARCH_AARCH64
sysnr = regs.regs[8]; sysnr = regs.regs[8];
#elif SECCOMP_AUDIT_ARCH == AUDIT_ARCH_ARM
sysnr = regs.uregs[7];
+#elif defined(__powerpc__) +#elif defined(__powerpc__)
+ sysnr = regs[0]; + sysnr = regs[0];
#else #else
#error "platform not yet supported" #error "platform not supported"
#endif #endif
--
2.28.0

View file

@ -1,6 +1,6 @@
# Template file for 'kore' # Template file for 'kore'
pkgname=kore pkgname=kore
version=4.0.1 version=4.1.0
revision=1 revision=1
# arch specific seccomp stuff # arch specific seccomp stuff
archs="x86_64* aarch64* ppc64*" archs="x86_64* aarch64* ppc64*"
@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="ISC" license="ISC"
homepage="https://kore.io" homepage="https://kore.io"
distfiles="https://kore.io/releases/kore-${version}.tar.gz" distfiles="https://kore.io/releases/kore-${version}.tar.gz"
checksum=bc8bf755133faf67755c3a4ea53db49f208986efeed734ce6be562a3e5a81057 checksum=b7d73b005fde0ea01c356a54e4bbd8a209a4dff9cf315802a127ce7267efbe61
disable_parallel_build=yes disable_parallel_build=yes
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then if [ "$XBPS_TARGET_LIBC" = "musl" ]; then