diff --git a/packages/rdrview/Makefile.patch b/packages/rdrview/Makefile.patch index 5dd147dcfc..19a544f6db 100644 --- a/packages/rdrview/Makefile.patch +++ b/packages/rdrview/Makefile.patch @@ -1,10 +1,12 @@ --- a/Makefile +++ b/Makefile -@@ -1,11 +1,11 @@ --SYSTEM = $(shell uname) --CC = gcc -+SYSTEM = Linux -+CC ?= gcc +@@ -2,14 +2,14 @@ + ifeq ($(SYSTEM), OpenBSD) + CC := egcc + else +- CC := gcc ++ CC ?= gcc + endif GIT_COMMIT = $(shell git rev-parse --short HEAD) -CFLAGS = -DNDEBUG -O2 -Wall -Wextra -fno-strict-aliasing @@ -17,7 +19,7 @@ ifeq ($(SYSTEM), Linux) LDLIBS += -lseccomp else ifeq ($(SYSTEM), FreeBSD) -@@ -14,7 +14,7 @@ +@@ -20,7 +20,7 @@ LDLIBS += -liconv endif diff --git a/packages/rdrview/add-seccomp-rules.patch b/packages/rdrview/add-seccomp-rules.patch deleted file mode 100644 index e9a5f6cfa4..0000000000 --- a/packages/rdrview/add-seccomp-rules.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://github.com/eafer/rdrview/pull/28 - -From bc65f4430b34a05499d12fb846f61f58297efb2e Mon Sep 17 00:00:00 2001 -From: Tee KOBAYASHI -Date: Mon, 7 Mar 2022 10:39:40 +0900 -Subject: [PATCH] Add seccomp rules for Android - ---- - src/sandbox.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/sandbox.c b/src/sandbox.c -index ee0f676..c46f0a2 100644 ---- a/src/sandbox.c -+++ b/src/sandbox.c -@@ -23,6 +23,10 @@ - - #include - -+#ifdef __ANDROID__ -+#include -+#endif -+ - static void do_start_sandbox(void) - { - scmp_filter_ctx ctx; -@@ -44,6 +48,12 @@ static void do_start_sandbox(void) - fail |= seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0); - fail |= seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap2), 0); - fail |= seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0); -+#ifdef __ANDROID__ -+ fail |= seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(madvise), 1, -+ SCMP_A2_32(SCMP_CMP_EQ, MADV_DONTNEED, 0)); -+ fail |= seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 1, -+ SCMP_A2_32(SCMP_CMP_MASKED_EQ, ~(PROT_READ|PROT_WRITE), 0)); -+#endif - - fail |= seccomp_load(ctx); - if (fail) diff --git a/packages/rdrview/build.sh b/packages/rdrview/build.sh index efe714af5d..93885306ef 100644 --- a/packages/rdrview/build.sh +++ b/packages/rdrview/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/eafer/rdrview TERMUX_PKG_DESCRIPTION="Command line tool to extract the main content from a webpage" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1:0.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1:0.1.1 TERMUX_PKG_SRCURL=https://github.com/eafer/rdrview/archive/refs/tags/v${TERMUX_PKG_VERSION#*:}.tar.gz -TERMUX_PKG_SHA256=6cb6688b3465f71ced13b889708cbd728193d7137f4108511a3fd2d4331d7f0c +TERMUX_PKG_SHA256=4655d77fd74f0cb89acf6f72a3be445265da6c948f30c29eb8ee2bb8d6df3f63 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_DEPENDS="libcurl, libiconv, libseccomp, libxml2"