diff --git a/testing/gmid/APKBUILD b/testing/gmid/APKBUILD index da3d79f2c4cee0dbbcc37ee5316194ec188e9519..1615a4d94a9a0ba15eb2168dddde143d7984edfe 100644 --- a/testing/gmid/APKBUILD +++ b/testing/gmid/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Maxim Karasev <begs@disroot.org> # Maintainer: Maxim Karasev <begs@disroot.org> pkgname=gmid -pkgver=1.6.2 +pkgver=1.7.1 pkgrel=0 pkgdesc="Fast, small, and secure Gemini server" url="https://www.omarpolo.com/pages/gmid.html" @@ -14,7 +14,6 @@ source="https://git.omarpolo.com/gmid/snapshot/gmid-$pkgver.tar.gz $pkgname.confd $pkgname.initd $pkgname.conf - ppc64le-seccomp-fix.patch " build() { @@ -38,9 +37,8 @@ package() { } sha512sums=" -053e2f95449d71c72052c422b1c51657ad48f662422a121452618c69e6bac9b23bbaa2b35b52d314eb7614b9a0f413504c87cd431bc756d455dd198c79270da8 gmid-1.6.2.tar.gz -49e49769d522ead56731d6545931a4c53c2ca213d4aed09bb2ef4df92377e3a04aaab37446c9774424644facc7c0e9ce30c409d9b2e82bd71a21107155cd6cc2 gmid.confd -56911453907ea4740d38f4397a399c5e01a75b7c6e191b21c05ed95a32b40dac4185e7aea917dcf13a43700b04ecc0d18ea652bf8c84f22f99cb57bd1dd60652 gmid.initd +450614dab361d1a55a8a5d089ca681f00845efa86c59e89c84044cf62b7856061e190b5e4580043e42a7b2e58e0bf098c5b67ec511c036ca1361531117a11e05 gmid-1.7.1.tar.gz +b05d3685b66547d171a8feeb47518a9e27226a709a0a4d5a77e2cd51d7026ef4d3e0fc9e00a53e9fa58908b717df0bc0954452ab44d2158c949cdfec10b8cba5 gmid.confd +9d5c2fc00f08ab4fe187bfbd09d386b9daab39b7c984b0a2e6043ce0a66baf9b8a3d6609f8c4c41ed97e1e7161511ab7a7edea0e477bfce5eab10fcf10df27ba gmid.initd bac0bd87a9341af0363dd144c0863965989f9693ce820a539d6ebb523626bc4d6673dae2aa7c885f200b60fd26a0073c44a2e61839dac2c1e626ae1b514d165f gmid.conf -edc909c4361d3ec261eee066dcf1e2a282d08150b29b92498d580313962ff2f4435104b34b2fadea130b8896691f3a0f5b5fb8a7eb09642ab8ec608cb1074575 ppc64le-seccomp-fix.patch " diff --git a/testing/gmid/gmid.confd b/testing/gmid/gmid.confd index d83844a5879222fc2a8cb64116950429fc424a39..09a1b3c12c399f529cf208da456d5cc2d8faad95 100644 --- a/testing/gmid/gmid.confd +++ b/testing/gmid/gmid.confd @@ -1 +1,2 @@ gmid_config_file="/etc/gmid.conf" +gmid_pid_file="/run/gmid.pid" diff --git a/testing/gmid/gmid.initd b/testing/gmid/gmid.initd index 91e142ba016218c42576b0e73388c3e9538b9938..6ff1812f1dce8134857b01fbf6e2fd72b168b8ab 100644 --- a/testing/gmid/gmid.initd +++ b/testing/gmid/gmid.initd @@ -12,7 +12,7 @@ description_configtest="Run gmid's internal config check." description_reload="Reload the gmid configuration without losing connections." supervisor=supervise-daemon command=/usr/bin/gmid -command_args="-c $gmid_config_file -f" +command_args="-c \"$gmid_config_file\" -P \"$gmid_pid_file\" -f" depend() { need net @@ -34,7 +34,7 @@ stop_pre() { reload() { configtest || return 1 ebegin "Refreshing gmid's configuration" - start-stop-daemon --signal SIGHUP --name gmid + start-stop-daemon --signal SIGHUP --pid "$gmid_pid_file" eend $? "Failed to reload gmid" } diff --git a/testing/gmid/ppc64le-seccomp-fix.patch b/testing/gmid/ppc64le-seccomp-fix.patch deleted file mode 100644 index 8b6f687ae32505d34c309df7a6d1da1c9c5fa59e..0000000000000000000000000000000000000000 --- a/testing/gmid/ppc64le-seccomp-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b24021d4a27ec5311490ee51b42dc2dacb18aa23 Mon Sep 17 00:00:00 2001 -From: Omar Polo <op@omarpolo.com> -Date: Sat, 3 Jul 2021 17:38:50 +0000 -Subject: fix seccomp filter for ppc64le - -before we matched ppc64le as ppc64 (which is big ending I presume), so -the seccomp filter would always kill gmid - -#4 related ---- - sandbox.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/sandbox.c b/sandbox.c -index 8b1244b..17f246d 100644 ---- a/sandbox.c -+++ b/sandbox.c -@@ -196,7 +196,11 @@ sandbox_logger_process(void) - #elif defined(__or1k__) - # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC - #elif defined(__powerpc64__) --# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 -+# if (BYTE_ORDER == LITTLE_ENDIAN) -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE -+# else -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 -+# endif - #elif defined(__powerpc__) - # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC - #elif defined(__riscv) --- -cgit v1.2.3 -