aboutsummaryrefslogtreecommitdiff
path: root/system/clamav
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2023-02-16 18:02:27 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-02-18 10:06:50 +0700
commitdf9e622049f699b521dd8fee218c90d39877860a (patch)
tree4ccf28317a779f5f1955c4efc7fc794115706ba4 /system/clamav
parent0e2c12297a751a866aa9dec6cc00f97db2ff9b49 (diff)
system/clamav: Updated for version 1.0.1.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/clamav')
-rw-r--r--system/clamav/README4
-rw-r--r--system/clamav/clamav.SlackBuild15
-rw-r--r--system/clamav/clamav.info16
3 files changed, 12 insertions, 23 deletions
diff --git a/system/clamav/README b/system/clamav/README
index 0c769baad8c6e..8019f79bc4234 100644
--- a/system/clamav/README
+++ b/system/clamav/README
@@ -25,7 +25,3 @@ for example:
Configuration
See README.SLACKWARE for configuration help.
-
-
-NOTE: as this needs a version of rust not yet shipped in Slackware
-15.0 a prebuilt one is downloaded and used for compilation.
diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild
index d04ed3dec5cd8..55d504f7556af 100644
--- a/system/clamav/clamav.SlackBuild
+++ b/system/clamav/clamav.SlackBuild
@@ -31,8 +31,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=clamav
-VERSION=${VERSION:-1.0.0}
-NEWRUST=${NEWRUST:-1.64.0}
+VERSION=${VERSION:-1.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -117,13 +116,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Unfortunately clamav requires a recent rust compiler, so check if we
-# don't have one available and in that case use a prebuilt one
-if [ $(rustc --version | cut -d\ -f2 | cut -d. -f2) -le 61 ]; then
- tar xf $CWD/newrust-$NEWRUST-$ARCH.tar.xz
- export HOME=$(pwd)/newrust
- export PATH=$(pwd)/newrust/bin:$PATH
- export LD_LIBRARY_PATH=$(pwd)/newrust/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+ export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+ export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
fi
# Specify the desired mirror in the update config file
diff --git a/system/clamav/clamav.info b/system/clamav/clamav.info
index e6cf759187d8b..bd3e8441128d9 100644
--- a/system/clamav/clamav.info
+++ b/system/clamav/clamav.info
@@ -1,14 +1,10 @@
PRGNAM="clamav"
-VERSION="1.0.0"
+VERSION="1.0.1"
HOMEPAGE="https://www.clamav.net/"
-DOWNLOAD="https://www.clamav.net/downloads/production/clamav-1.0.0.tar.gz \
- https://ponce.cc/slackware/sources/repo/newrust/newrust-1.64.0-i686.tar.xz"
-MD5SUM="f2a875c252bbfc2b29cafe4a23d2d5a3 \
- ae263ded5f7e8a142ae5ec0cca4e34ac"
-DOWNLOAD_x86_64="https://www.clamav.net/downloads/production/clamav-1.0.0.tar.gz \
- https://ponce.cc/slackware/sources/repo/newrust/newrust-1.64.0-x86_64.tar.xz"
-MD5SUM_x86_64="f2a875c252bbfc2b29cafe4a23d2d5a3 \
- 0b3c9fa23bbdd27225fbee38d9943058"
-REQUIRES=""
+DOWNLOAD="https://www.clamav.net/downloads/production/clamav-1.0.1.tar.gz"
+MD5SUM="a04c129b15af305c2af7d3573f134a73"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rust16"
MAINTAINER="Matteo Bernardini"
EMAIL="ponce@slackbuilds.org"