From 833d0c6a93903a7755cde0169e8ed364785c5e26 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Fri, 20 Sep 2019 00:39:29 +0300 Subject: [PATCH] clamav: replace prefix paths with @TERMUX_PREFIX@ in config sources --- packages/clamav/build.sh | 6 +++--- packages/clamav/{clamd.conf => clamd.conf.in} | 10 +++++----- packages/clamav/{freshclam.conf => freshclam.conf.in} | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename packages/clamav/{clamd.conf => clamd.conf.in} (62%) rename packages/clamav/{freshclam.conf => freshclam.conf.in} (83%) diff --git a/packages/clamav/build.sh b/packages/clamav/build.sh index f09901097..9813f61f6 100644 --- a/packages/clamav/build.sh +++ b/packages/clamav/build.sh @@ -34,9 +34,9 @@ termux_step_pre_configure() { termux_step_post_make_install() { for conf in clamd.conf freshclam.conf; do - install -Dm600 \ - "$TERMUX_PKG_BUILDER_DIR"/$conf \ - "$TERMUX_PREFIX"/etc/clamav/$conf + sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \ + "$TERMUX_PKG_BUILDER_DIR"/$conf.in \ + > "$TERMUX_PREFIX"/etc/clamav/$conf done unset conf } diff --git a/packages/clamav/clamd.conf b/packages/clamav/clamd.conf.in similarity index 62% rename from packages/clamav/clamd.conf rename to packages/clamav/clamd.conf.in index c28c2997c..62904456d 100644 --- a/packages/clamav/clamd.conf +++ b/packages/clamav/clamd.conf.in @@ -4,11 +4,11 @@ ## ## Server configuration. -LocalSocket /data/data/com.termux/files/usr/var/run/clamd.sock +LocalSocket @TERMUX_PREFIX@/var/run/clamd.sock LocalSocketMode 600 -PidFile /data/data/com.termux/files/usr/var/run/clamd.pid -TemporaryDirectory /data/data/com.termux/files/usr/tmp -DatabaseDirectory /data/data/com.termux/files/usr/var/lib/clamav +PidFile @TERMUX_PREFIX@/var/run/clamd.pid +TemporaryDirectory @TERMUX_PREFIX@/tmp +DatabaseDirectory @TERMUX_PREFIX@/var/lib/clamav ## Scanner configuration. ExcludePath ^/proc/ @@ -30,6 +30,6 @@ Bytecode yes ## Logging. LogSyslog no LogVerbose no -LogFile /data/data/com.termux/files/usr/var/log/clamav/clamd.log +LogFile @TERMUX_PREFIX@/var/log/clamav/clamd.log LogTime yes LogRotate yes diff --git a/packages/clamav/freshclam.conf b/packages/clamav/freshclam.conf.in similarity index 83% rename from packages/clamav/freshclam.conf rename to packages/clamav/freshclam.conf.in index c76213104..319aed997 100644 --- a/packages/clamav/freshclam.conf +++ b/packages/clamav/freshclam.conf.in @@ -1,5 +1,5 @@ # Path to the database directory. -DatabaseDirectory /data/data/com.termux/files/usr/var/lib/clamav +DatabaseDirectory @TERMUX_PREFIX@/var/lib/clamav # database.clamav.net is now the primary domain name to be used world-wide. # Now that CloudFlare is being used as our Content Delivery Network (CDN),