From 661523e29e1f0357b2d77c0792e6d27a17517d48 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Thu, 8 Dec 2022 20:18:52 +0100 Subject: system/clamav: Updated for version 1.0.0. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- system/clamav/clamav.SlackBuild | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'system/clamav/clamav.SlackBuild') diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild index ad2f16f49d9ff..d04ed3dec5cd8 100644 --- a/system/clamav/clamav.SlackBuild +++ b/system/clamav/clamav.SlackBuild @@ -31,14 +31,15 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=clamav -VERSION=${VERSION:-0.105.1} +VERSION=${VERSION:-1.0.0} +NEWRUST=${NEWRUST:-1.64.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -109,7 +110,6 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $TARBALL cd $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-vendor.tar.xz chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -117,14 +117,14 @@ 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 {} \; -mkdir .cargo -cat <>.cargo/config.toml -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOT +# 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 +fi # Specify the desired mirror in the update config file # http://www.iana.org/cctld/cctld-whois.htm -- cgit v1.2.3