kcgi: update to 0.10.10.

This commit is contained in:
Duncaen 2018-12-28 14:47:08 +01:00
parent 5e46c52caa
commit 3aff272ba4
2 changed files with 5 additions and 77 deletions

View file

@ -1,73 +0,0 @@
--- sandbox-seccomp-filter.c.orig
+++ sandbox-seccomp-filter.c
@@ -85,7 +85,9 @@
/* Load the syscall number for checking. */
BPF_STMT(BPF_LD+BPF_W+BPF_ABS,
offsetof(struct seccomp_data, nr)),
+#ifdef __NR_open /* not defined on AARCH64 */
SC_DENY(open, EACCES),
+#endif
SC_ALLOW(getpid),
SC_ALLOW(gettimeofday),
SC_ALLOW(clock_gettime),
@@ -106,18 +108,24 @@
SC_ALLOW(recvmsg),
#endif
SC_ALLOW(read),
+ SC_ALLOW(readv),
SC_ALLOW(write),
+ SC_ALLOW(writev),
SC_ALLOW(close),
#ifdef __NR_shutdown /* not defined on archs that go via socketcall(2) */
SC_ALLOW(shutdown),
#endif
SC_ALLOW(brk),
+#ifdef __NR_poll /* not defined on AARCH64 */
SC_ALLOW(poll),
+#endif
#ifdef __NR__newselect
SC_ALLOW(_newselect),
#else
+#ifdef __NR_select /* not defined on AARCH64 */
SC_ALLOW(select),
#endif
+#endif
SC_ALLOW(madvise),
#ifdef __NR_mmap2 /* EABI ARM only has mmap2() */
SC_ALLOW(mmap2),
@@ -150,7 +158,9 @@
/* Load the syscall number for checking. */
BPF_STMT(BPF_LD+BPF_W+BPF_ABS,
offsetof(struct seccomp_data, nr)),
+#ifdef __NR_open /* not defined on AARCH64 */
SC_DENY(open, EACCES),
+#endif
SC_ALLOW(getpid),
SC_ALLOW(gettimeofday),
SC_ALLOW(clock_gettime),
@@ -158,7 +168,9 @@
SC_ALLOW(time),
#endif
SC_ALLOW(read),
+ SC_ALLOW(readv),
SC_ALLOW(write),
+ SC_ALLOW(writev),
SC_ALLOW(close),
#ifdef __NR_fcntl64 /* only noted on arm */
SC_ALLOW(fcntl64),
@@ -167,11 +179,15 @@
SC_ALLOW(shutdown),
#endif
SC_ALLOW(brk),
+#ifdef __NR_poll /* not defined on AARCH64 */
SC_ALLOW(poll),
+#endif
#ifdef __NR__newselect
SC_ALLOW(_newselect),
#else
+#ifdef __NR_select /* not defined on AARCH64 */
SC_ALLOW(select),
+#endif
#endif
SC_ALLOW(madvise),
#ifdef __NR_mmap2 /* EABI ARM only has mmap2() */

View file

@ -1,17 +1,19 @@
# Template file for 'kcgi' # Template file for 'kcgi'
pkgname=kcgi pkgname=kcgi
version=0.10.8 version=0.10.10
revision=2 revision=1
build_style=configure build_style=configure
configure_args="PREFIX=/usr MANDIR=/usr/share/man SBINDIR=/usr/bin" configure_args="PREFIX=/usr MANDIR=/usr/share/man SBINDIR=/usr/bin"
make_cmd="bmake"
make_check_target="regress" make_check_target="regress"
hostmakedepends="bmake"
checkdepends="pkg-config libcurl-devel" checkdepends="pkg-config libcurl-devel"
short_desc="Minimal CGI library for web applications in C" short_desc="Minimal CGI library for web applications in C"
maintainer="Duncaen <duncaen@voidlinux.eu>" maintainer="Duncaen <duncaen@voidlinux.eu>"
license="ISC" license="ISC"
homepage="http://kristaps.bsd.lv/kcgi/" homepage="http://kristaps.bsd.lv/kcgi/"
distfiles="http://kristaps.bsd.lv/kcgi/snapshots/kcgi-${version}.tgz" distfiles="http://kristaps.bsd.lv/kcgi/snapshots/kcgi-${version}.tgz"
checksum=878c8134d48a3048ea0bc28315fe95698fb9c764023d9244610d7e481ef3734c checksum=ca254027809c3f4e730ec21fec92d76d709c2f2827aa7d1becc59572ead427a3
post_configure() { post_configure() {
local suffix local suffix
@ -21,7 +23,6 @@ post_configure() {
arm*) suffix="ARM" ;; arm*) suffix="ARM" ;;
aarch64*) suffix="AARCH64" ;; aarch64*) suffix="AARCH64" ;;
esac esac
echo "suffix $suffix <<<<<" >&2
[ -z "$suffix" ] \ [ -z "$suffix" ] \
&& sed -i "/AUDIT_ARCH_X86_64/d" config.h \ && sed -i "/AUDIT_ARCH_X86_64/d" config.h \
|| sed -i "s/AUDIT_ARCH_X86_64/AUDIT_ARCH_${suffix}/" config.h || sed -i "s/AUDIT_ARCH_X86_64/AUDIT_ARCH_${suffix}/" config.h