mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-28 10:02:43 +01:00
system/clamav: Fix test for zlib > 1.2.9.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
eceb36293e
commit
e694d6df2e
2 changed files with 34 additions and 1 deletions
28
system/clamav/bb111711-fix-zlib-version-check.patch
Normal file
28
system/clamav/bb111711-fix-zlib-version-check.patch
Normal file
|
@ -0,0 +1,28 @@
|
|||
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
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
PRGNAM=clamav
|
||||
VERSION=${VERSION:-0.99.2}
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
@ -112,6 +112,9 @@ 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/" \
|
||||
|
@ -142,6 +145,8 @@ sed \
|
|||
-e "s/^\#ExitOnOOM/ExitOnOOM/" \
|
||||
-i etc/clamd.conf.sample
|
||||
|
||||
autoreconf -fi
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
./configure \
|
||||
|
|
Loading…
Reference in a new issue