clamav: removed zlib dep (FS#1512), added zlib configure vcheck patch, removed tcp_wrappers configure switch, added llvm build fix

clamav/.md5sum

@@ -1,4 +1,5 @@
 61b51a04619aeafd965892a53f86d192  clamav-0.99.2.tar.gz
+607822a0b7b9b4fe272fbfbc087060ac  clamav-zlib-vcheck-fix.patch
 aaac6d51260a03830f04d561ea8dda37  clamd
 9d2a838b95ce45afbee5a17d5e61b5cd  clamd.conf
 c7d815c57b585a63815c1e1d626421fc  freshclam

clamav/.signature

@@ -1,9 +1,10 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31oKod7rhxOuidrBGDr5ikk85c4sujQ2RCoEaOd7w2N3o3T6LYpyic5HTXUQ0IHR8OHsv3/fC77hfgyS4DU7sAE=
-SHA256 (Pkgfile) = eeff2b300ab0d0a4d158ba3b3ddaf853a4fb8ee3bcdd23995a8ccf7a7d3bbfae
+RWSagIOpLGJF3/XF0ok2/oNZeItXaeuD9AyCLdC/v2PXbJW4EjCxaXU8IxOyE8JQjZGAvo29ZZBAOS0RvjINUGiShC6Kn27HRAk=
+SHA256 (Pkgfile) = 4bb2b184ea8b2ea34d524a2b936fb6a2033f0fea37a718aafcf9734326305f52
 SHA256 (.footprint) = 5a6e6fd8b949117f06753fe91716353218b5a6773deccef7a3c602ce31b14acc
 SHA256 (clamav-0.99.2.tar.gz) = 167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a
 SHA256 (clamd.conf) = e8a57ed7c3110fdda708f0b3f2fbfc97f944bc5e1987c40a164d864d5570bea5
 SHA256 (freshclam.conf) = 1374ba1986a7320ded85dcf6136741dc9fc8da7316d393ce4b29bac26a8a897e
 SHA256 (clamd) = b5de1447901943ac057b531c0b40e8bf21c4eb0d771fa27d6a6c8835c35ea2a7
 SHA256 (freshclam) = 9042b844cc26039986638779eec482a3e72b5156f60278890c6b61a283f71ac1
+SHA256 (clamav-zlib-vcheck-fix.patch) = 413cf61cd0d87d00968e27bc9b7d11da6a1683db046c03e1f6b256d365f98a2b

clamav/Pkgfile

@@ -1,21 +1,22 @@
 # Description: A GPL virus scanner
 # URL: http://www.clamav.net/
 # Maintainer: Matt Housh, jaeger at crux dot ninja
-# Depends on: zlib bzip2 libgmp curl
+# Depends on: bzip2 libgmp curl
 
 name=clamav
 version=0.99.2
-release=1
+release=2
 source=(http://www.clamav.net/downloads/production/$name-$version.tar.gz \
-	clamd.conf freshclam.conf clamd freshclam)
+	clamd.conf freshclam.conf clamd freshclam $name-zlib-vcheck-fix.patch)
 
 build() {
+	CXXFLAGS="${CXXFLAGS} -std=gnu++98"
 	cd $name-$version
+	patch -p1 -i $SRC/$name-zlib-vcheck-fix.patch
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-id-check \
-		--with-libcurl \
-		--with-tcpwrappers
+		--with-libcurl
 	make
 	make DESTDIR=$PKG install
 	mkdir -p $PKG/var/run/$name $PKG/var/log/$name

clamav/clamav-zlib-vcheck-fix.patch

@@ -0,0 +1,12 @@
+diff -urN clamav-0.99.2.orig/configure clamav-0.99.2/configure
+--- clamav-0.99.2.orig/configure	2016-04-22 11:19:50.000000000 -0500
++++ clamav-0.99.2/configure	2017-11-01 15:09:37.366024510 -0500
+@@ -18718,7 +18718,7 @@
+ 
+     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