clamav: update to 0.100.2

1 files changed, 20 insertions, 20 deletions

diff --git a/clamav/build/clamav.SlackBuild b/clamav/build/clamav.SlackBuild
index 450ba110..20f74154 100755
--- a/clamav/build/clamav.SlackBuild
+++ b/clamav/build/clamav.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $Id$
 
-# Copyright 2006-2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2006-2018  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -151,6 +151,9 @@
 # 0.99.2-1:  05/aug/2017 by Eric Hameleers
 #            * Update. Adopted the enhancements from the SBo copy.
 #              Enable milter.
+# 0.100.2-1: 28/oct/2018 by Eric Hameleers
+#            * Update.
+#              Enable milter.
 # 
 # Run 'sh clamav.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -161,7 +164,7 @@
 # Set initial variables:
 
 PRGNAM=clamav
-VERSION=${VERSION:-"0.99.2"}
+VERSION=${VERSION:-"0.100.2"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -187,18 +190,11 @@ SRCURL="http://www.clamav.net/downloads/production/${PRGNAM}-${VERSION}.tar.gz"
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
-# Slackware 11 and up need other option (gcc > 3.3.x)
-if [ $(gcc -dumpversion | tr -d  '.' |cut -c 1-2) -gt 33 ]; then
-  MOPT=tune
-else
-  MOPT=cpu
-fi
-
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
   case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
+    i?86)    export ARCH=i586 ;;
     armv7hl) export ARCH=$MARCH ;;
     arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
@@ -207,7 +203,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 case "$ARCH" in
-  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -m${MOPT}=i686"
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
@@ -284,10 +280,6 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 touch $OUTPUT/patch-${PRGNAM}.log
 
-# Upstream fix:
-cat $SRCDIR/patches/bb111711-fix-zlib-version-check.patch | \
-  patch -p1 --verbose 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
-
 # Specify the desired mirror in the update config file
 # http://www.iana.org/cctld/cctld-whois.htm
 sed -i "s/^\#DatabaseMirror.*/DatabaseMirror db.${ISOCC}.clamav.net/" \
@@ -328,9 +320,17 @@ echo Building ...
 # the file properties collection and analysis feature
 # http://blog.clamav.net/2014/11/intro-to-collection-and-analysis-of.html
 if pkg-config --exists json-c ; then
-  with_jsonc="--with-libjson"
+  do_jsonc="--with-libjson"
+else
+  do_jsonc=""
+fi
+
+# Slackware 15.0 and newer have postfix by default, so include milter support
+# only if we detect its presence:
+if [ -f /usr/lib${LIBDIRSUFFIX}/libmilter.a ]; then
+   do_milter="--enable-milter"
 else
-  with_jsonc=""
+   do_milter="--disable-milter"
 fi
 
 # We need the "clamav" user and group to exist at the time of
@@ -352,13 +352,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --with-user=${CLAMUSR} --with-group=${CLAMGRP} \
   --with-dbdir=/usr/share/clamav \
-  $with_jsonc \
   --enable-id-check \
   --enable-clamdtop \
-  --enable-milter \
   --disable-check \
   --disable-static \
   --build=$TARGET \
+  $do_jsonc \
+  $do_milter \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
   # deprecated:
   #--with-libcurl --with-tcpwrappers \
@@ -459,7 +459,7 @@ EOINS
 
 # Add documentation:
 cp $SRCDIR/00README.slackware README.slackware
-DOCS="AUTHORS BUGS COPYING* ChangeLog FAQ INSTALL NEWS README UPGRADE \
+DOCS="COPYING* ChangeLog.md \
       docs/*.pdf docs/html examples \
       README.slackware"
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION