From 35d3af6e9ad602d939aa1e7868740375e66fa402 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 21 Aug 2019 21:39:17 +0200 Subject: [PATCH 1/5] mpd: mark service scripts as config files --- packages/mpd/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 44e5e1e04..3e5c55125 100644 --- a/packages/mpd/build.sh +++ b/packages/mpd/build.sh @@ -18,7 +18,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dpcre=disabled -Dsndio=disabled " -TERMUX_PKG_CONFFILES="etc/mpd.conf" +TERMUX_PKG_CONFFILES="etc/mpd.conf var/service/mpd/run var/service/mpd/log/run" termux_step_pre_configure() { # Certain packages are not safe to build on device because their From dd61f3014ee5ef12eb503e5a08c7dc84d9dddf4d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 21 Aug 2019 21:41:36 +0200 Subject: [PATCH 2/5] tor: mark service scripts as config files --- packages/tor/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tor/build.sh b/packages/tor/build.sh index 0dc5c57a9..0fe380bff 100644 --- a/packages/tor/build.sh +++ b/packages/tor/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://www.torproject.org/dist/tor-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=b5a2cbf0dcd3f1df2675dbd5ec10bbe6f8ae995c41b68cebe2bc95bffc90696e TERMUX_PKG_DEPENDS="libevent, openssl, liblzma, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-zstd --disable-unittests" -TERMUX_PKG_CONFFILES="etc/tor/torrc" +TERMUX_PKG_CONFFILES="etc/tor/torrc var/service/tor/run var/service/tor/log/run" termux_step_pre_configure() { export LIBS="-llog" From 43a6823be5fd27ca1081f0abb90b2e10ff13d7c1 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 21 Aug 2019 21:42:14 +0200 Subject: [PATCH 3/5] openssh: mark service scripts as config files --- packages/openssh/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index 9f1fe6c0a..6b26f57e3 100644 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -41,7 +41,7 @@ ac_cv_func_bzero=yes " TERMUX_PKG_MAKE_INSTALL_TARGET="install-nokeys" TERMUX_PKG_RM_AFTER_INSTALL="bin/slogin share/man/man1/slogin.1" -TERMUX_PKG_CONFFILES="etc/ssh/ssh_config etc/ssh/sshd_config" +TERMUX_PKG_CONFFILES="etc/ssh/ssh_config etc/ssh/sshd_config var/service/sshd/run var/service/sshd/log/run" termux_step_pre_configure() { # Certain packages are not safe to build on device because their From 8834a4dd600ec52ec8007ed335223026525a9620 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 22 Aug 2019 21:35:26 +0200 Subject: [PATCH 4/5] busybox: mark service files for ftpd and telnetd as conffiles --- packages/busybox/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index 28423b692..f79e00151 100644 --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -2,13 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://busybox.net/ TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.30.1 -TERMUX_PKG_REVISION=8 +TERMUX_PKG_REVISION=9 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc TERMUX_PKG_BUILD_IN_SRC=true - # We replace env in the old coreutils package: TERMUX_PKG_CONFLICTS="coreutils (<< 8.25-4)" +TERMUX_PKG_CONFFILES="var/service/telnetd/run var/service/telnetd/log/run var/service/ftpd/run var/service/ftpd/log/run" termux_step_pre_configure() { # Certain packages are not safe to build on device because their @@ -72,9 +72,9 @@ termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/var/service cd $TERMUX_PREFIX/var/service mkdir -p ftpd/log telnetd/log - echo '#!/bin/sh' > ftpd/run + echo "#!$TERMUX_PREFIX/bin/sh" > ftpd/run echo 'exec busybox tcpsvd -vE 0.0.0.0 8021 ftpd /data/data/com.termux/files/home' >> ftpd/run - echo '#!/bin/sh' > telnetd/run + echo "#!$TERMUX_PREFIX/bin/sh" > telnetd/run echo 'exec busybox telnetd -F' >> telnetd/run chmod +x */run touch telnetd/down ftpd/down From 6c0f16353cadf87582646f7de2a6caa74739d594 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 22 Aug 2019 21:38:35 +0200 Subject: [PATCH 5/5] transmission: mark service scripts as config files --- packages/mpd/build.sh | 2 +- packages/openssh/build.sh | 2 +- packages/tor/build.sh | 2 +- packages/transmission/build.sh | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 3e5c55125..5c71605f9 100644 --- a/packages/mpd/build.sh +++ b/packages/mpd/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.musicpd.org TERMUX_PKG_DESCRIPTION="Music player daemon" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.21.13 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=0c71ff34aa4def30cd931977cbfe3deb6ec815a726b8c5343f1b8e5707136ebf TERMUX_PKG_DEPENDS="libc++, libcurl, libid3tag, libopus, libpulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib" diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index 6b26f57e3..e579d279c 100644 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.openssh.com/ TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=8.0p1 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SHA256=bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68 TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, termux-auth, krb5, zlib" diff --git a/packages/tor/build.sh b/packages/tor/build.sh index 0fe380bff..4bee10626 100644 --- a/packages/tor/build.sh +++ b/packages/tor/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="The Onion Router anonymizing overlay network" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_VERSION=0.4.0.5 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://www.torproject.org/dist/tor-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=b5a2cbf0dcd3f1df2675dbd5ec10bbe6f8ae995c41b68cebe2bc95bffc90696e TERMUX_PKG_DEPENDS="libevent, openssl, liblzma, zlib" diff --git a/packages/transmission/build.sh b/packages/transmission/build.sh index 360f2c856..1d56b394f 100644 --- a/packages/transmission/build.sh +++ b/packages/transmission/build.sh @@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="Easy, lean and powerful BitTorrent client" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_DEPENDS="libevent, openssl, libcurl" TERMUX_PKG_VERSION=2.94 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/transmission/transmission/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=440c2fd0f89b1ab59d8a4b79ecd7bffd61bc000e36fb5b6c8e88142a4fadbb1f TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-gtk --enable-lightweight --cache-file=termux_configure.cache" +TERMUX_PKG_CONFFILES="var/service/transmission/run var/service/transmission/log/run" termux_step_pre_configure() { ./autogen.sh