From b08b9d694f1b743050faa8b17342fc2c04c0000a Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Fri, 22 Oct 2021 18:39:32 +0100 Subject: [PATCH] fix rinetd --- packages/rinetd/build.sh | 4 ++-- packages/rinetd/src-rinetd.h.patch | 28 +++++++++++++--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/packages/rinetd/build.sh b/packages/rinetd/build.sh index 0b99d97bd..0b8faa49c 100644 --- a/packages/rinetd/build.sh +++ b/packages/rinetd/build.sh @@ -3,6 +3,6 @@ TERMUX_PKG_DESCRIPTION="A user-mode TCP port redirection server" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1:0.73 -TERMUX_PKG_SRCURL=https://github.com/samhocevar/rinetd/archive/v${TERMUX_PKG_VERSION:2}.tar.gz -TERMUX_PKG_SHA256=62d3e5800299bb3940aea847ffd7662722deb5d4b85625fcfe8f7ebbc0424c80 +TERMUX_PKG_SRCURL=https://github.com/samhocevar/rinetd/releases/download/v${TERMUX_PKG_VERSION:2}/rinetd-${TERMUX_PKG_VERSION:2}.tar.bz2 +TERMUX_PKG_SHA256=24dd6ec1c4d353c33ced775a37566af9565b27e65f3e59939a8b2913a92c81d2 TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/rinetd/src-rinetd.h.patch b/packages/rinetd/src-rinetd.h.patch index 6f656f1ca..fd5720d35 100644 --- a/packages/rinetd/src-rinetd.h.patch +++ b/packages/rinetd/src-rinetd.h.patch @@ -1,15 +1,13 @@ -diff --git a/src/rinetd.h b/src/rinetd.h -index 79be926..95aff52 100644 ---- a/src/rinetd.h -+++ b/src/rinetd.h -@@ -16,8 +16,8 @@ static int const RINETD_BUFFER_SIZE = 16384; - static int const RINETD_LISTEN_BACKLOG = 128; - static int const RINETD_DEFAULT_UDP_TIMEOUT = 72; - --#define RINETD_CONFIG_FILE "/etc/rinetd.conf" --#define RINETD_PID_FILE "/var/run/rinetd.pid" -+#define RINETD_CONFIG_FILE "@TERMUX_PREFIX@/etc/rinetd.conf" -+#define RINETD_PID_FILE "@TERMUX_PREFIX@/var/run/rinetd.pid" - - /* Global configuration */ - +--- rinetd-0.73/src/rinetd.h ++++ rinetd-0.73.mod/src/rinetd.h +@@ -17,8 +17,8 @@ + static int const RINETD_LISTEN_BACKLOG = 128; + static int const RINETD_DEFAULT_UDP_TIMEOUT = 72; + +-#define RINETD_CONFIG_FILE "/etc/rinetd.conf" +-#define RINETD_PID_FILE "/var/run/rinetd.pid" ++#define RINETD_CONFIG_FILE "@TERMUX_PREFIX@/etc/rinetd.conf" ++#define RINETD_PID_FILE "@TERMUX_PREFIX@/var/run/rinetd.pid" + + /* Global configuration */ +