clamav: fix invalid zlib version error

ClamAV's configure script uses grep to check for bugy zlib version
1.2.1. Since current OpenWrt zlib version is 1.2.11 this check passes
and build fails. This patch will disable this unneeded check and make
sure we are looking for zlib on the right location.

clamdtop was beeing built without it's ncurses dependency. Build system
would link it to the host's ncurses making the program fail at run time.
This patch will disable building of optional clamdtop, otherwise we need
to add ncurses as a dependency and fix the search path.

Increase PKG_RELEASE to reflect changes.

Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>

diff --git a/net/clamav/Makefile b/net/clamav/Makefile
index 3cc1dfcf79d77928013feeb73900d038f5bc4a75..b4a9abc885baa1aefe59508e05500a47868440a7 100644 (file)
--- a/net/clamav/Makefile
+++ b/net/clamav/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=clamav
 PKG_VERSION:=0.99.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> \
@@ -72,6 +72,9 @@ define Build/Configure
                --with-group nogroup \
                --with-pcre="$(STAGING_DIR)/usr/" \
                --with-openssl="$(STAGING_DIR)/usr/" \
+               --with-zlib="$(STAGING_DIR)/usr/" \
+               --disable-zlib-vcheck \
+               --disable-clamdtop \
        )
 endef