summaryrefslogtreecommitdiff
path: root/system/clamav
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2018-01-26 09:15:37 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-01-27 07:43:43 +0700
commit02b58fae37091fc43ee9c3e7747d8e8c29201adf (patch)
treef37e04b59aacf8cf4b66ff0379738844f26f8885 /system/clamav
parentb538d5eea15eb359de7188f70648dc149d02cc2c (diff)
downloadslackbuilds-02b58fae37091fc43ee9c3e7747d8e8c29201adf.tar.gz
system/clamav: Updated for version 0.99.3.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'system/clamav')
-rw-r--r--system/clamav/bb111711-fix-zlib-version-check.patch28
-rw-r--r--system/clamav/clamav.SlackBuild14
-rw-r--r--system/clamav/clamav.info6
3 files changed, 9 insertions, 39 deletions
diff --git a/system/clamav/bb111711-fix-zlib-version-check.patch b/system/clamav/bb111711-fix-zlib-version-check.patch
deleted file mode 100644
index c3135d46c7..0000000000
--- a/system/clamav/bb111711-fix-zlib-version-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f0bcd186190fe6e67b3f0eaaceb7a99aa6a98865 Mon Sep 17 00:00:00 2001
-From: Steven Morgan <stevmorg@cisco.com>
-Date: Thu, 5 Jan 2017 12:30:35 -0500
-Subject: [PATCH] bb111711 - fix zlib version check - patch by Daniel J. Luke.
-
----
- m4/reorganization/libs/libz.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/m4/reorganization/libs/libz.m4 b/m4/reorganization/libs/libz.m4
-index b5c74147b..f7b67ca10 100644
---- a/m4/reorganization/libs/libz.m4
-+++ b/m4/reorganization/libs/libz.m4
-@@ -29,9 +29,9 @@ then
- AC_MSG_ERROR([Please install zlib and zlib-devel packages])
- else
-
-- vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
-+ vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h`
- if test -z "$vuln"; then
-- vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`
-+ vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h`
- fi
-
- if test -n "$vuln"; then
---
-2.11.0
-
diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild
index b783811bf2..4a7b190e7d 100644
--- a/system/clamav/clamav.SlackBuild
+++ b/system/clamav/clamav.SlackBuild
@@ -1,6 +1,7 @@
#!/bin/sh
# Copyright (c) 2006,2007 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2011-2018 Matteo Bernardini <ponce@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,13 +28,13 @@
# No additional license terms added
PRGNAM=clamav
-VERSION=${VERSION:-0.99.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.99.3}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -48,8 +49,8 @@ OUTPUT=${OUTPUT:-/tmp}
# See http://www.iana.org/cctld/cctld-whois.htm for options
COUNTRY=${COUNTRY:-us}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -112,9 +113,6 @@ 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 {} \;
-# Patch from upstream
-patch -p1 < $CWD/bb111711-fix-zlib-version-check.patch
-
# Specify the desired mirror in the update config file
# http://www.iana.org/cctld/cctld-whois.htm
sed -i "s/^\#DatabaseMirror.*/DatabaseMirror db.${COUNTRY}.clamav.net/" \
diff --git a/system/clamav/clamav.info b/system/clamav/clamav.info
index f53c404f52..c0df141857 100644
--- a/system/clamav/clamav.info
+++ b/system/clamav/clamav.info
@@ -1,8 +1,8 @@
PRGNAM="clamav"
-VERSION="0.99.2"
+VERSION="0.99.3"
HOMEPAGE="http://www.clamav.net/"
-DOWNLOAD="http://www.clamav.net/downloads/production/clamav-0.99.2.tar.gz"
-MD5SUM="61b51a04619aeafd965892a53f86d192"
+DOWNLOAD="http://www.clamav.net/downloads/production/clamav-0.99.3.tar.gz"
+MD5SUM="5272f127312e987b3e10c155cf1d84df"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""