jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

clamav: update to 0.99.0

Browse source
This commit is contained in:
Jürgen Buchmüller 2015-12-02 10:45:41 +01:00
parent 9706ff2d9d
commit da1a689b70
3 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/shlibs
View file

@ -2040,9 +2040,9 @@ libsfml-system.so.2.3 SFML-2.3_1
libsfml-window.so.2.3 SFML-2.3_1 libsfml-window.so.2.3 SFML-2.3_1
libsfml-audio.so.2.3 SFML-2.3_1 libsfml-audio.so.2.3 SFML-2.3_1
libsfml-graphics.so.2.3 SFML-2.3_1 libsfml-graphics.so.2.3 SFML-2.3_1
libclamav.so.6 clamav-0.98.6_1 libclamav.so.7 clamav-0.98.6_1
libclamunrar.so.6 clamav-0.98.6_1 libclamunrar.so.7 clamav-0.98.6_1
libclamunrar_iface.so.6 clamav-0.98.6_1 libclamunrar_iface.so.7 clamav-0.98.6_1
libqca.so.2 qca-qt5-2.1.0_1 libqca.so.2 qca-qt5-2.1.0_1
libqt5keychain.so.0 qtkeychain-qt5-0.4.0_1 libqt5keychain.so.0 qtkeychain-qt5-0.4.0_1
libphonon4qt5.so.4 phonon-qt5-4.8.3_1 libphonon4qt5.so.4 phonon-qt5-4.8.3_1

12
srcpkgs/clamav/patches/fix-mempool.patch Normal file
View file

@ -0,0 +1,12 @@
--- libclamav/readdb.c 2015-11-24 00:13:46.000000000 +0100
+++ libclamav/readdb.c 2015-12-02 10:42:08.374736882 +0100
@@ -4163,7 +4163,9 @@
/* use the tdb to track filetypes and check flevels */
memset(&tdb, 0, sizeof(tdb));
+#ifdef USE_MPOOL
tdb.mempool = engine->mempool;
+#endif
ret = init_tdb(&tdb, engine, attribs, passname);
free(attribs);
if(ret != CL_SUCCESS) {

22
srcpkgs/clamav/template
View file

@ -1,7 +1,8 @@
# Template file for 'clamav' # Template file for 'clamav'
pkgname=clamav pkgname=clamav
version=0.98.7 version=0.99.0
revision=5 revision=1
wrksrc=${pkgname}-${version%.*}
build_style=gnu-configure build_style=gnu-configure
configure_args="--sbindir=/usr/bin --with-pcre=/usr" configure_args="--sbindir=/usr/bin --with-pcre=/usr"
conf_files="/etc/clamd.conf /etc/freshclam.conf" conf_files="/etc/clamd.conf /etc/freshclam.conf"
@ -9,18 +10,23 @@ system_accounts="clamav"
clamav_homedir="/var/lib/${pkgname}" clamav_homedir="/var/lib/${pkgname}"
clamav_descr="ClamAV user" clamav_descr="ClamAV user"
hostmakedepends="pkg-config zip" hostmakedepends="pkg-config zip"
makedepends="libressl-devel libxml2-devel libcurl-devel ncurses-devel pcre-devel tcl-devel bzip2-devel zlib-devel" makedepends="libressl-devel libxml2-devel libcurl-devel ncurses-devel pcre-devel
tcl-devel bzip2-devel zlib-devel"
short_desc="Clam Anti-Virus scanner" short_desc="Clam Anti-Virus scanner"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>" maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2" license="GPL-2"
homepage="http://www.clamav.net/" homepage="http://www.clamav.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.gz" # Strangely the publish an archive without the subminor version
checksum=282417b707740de13cd8f18d4cbca9ddd181cf96b444db2cad98913a5153e272 distfiles="http://www.clamav.net/downloads/production/${wrksrc}.tar.gz"
checksum=d2792c8cfadd685fffc40b2199679628815df031fd3149ccf961649fc8787ea9
# http://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2805/steps/shell_3/logs/stdio
nocross=yes
CPPFLAGS="-Wno-unused-local-typedefs" CPPFLAGS="-Wno-unused-local-typedefs"
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-openssl=${XBPS_CROSS_BASE}/usr"
configure_args+=" --with-pcre=${XBPS_CROSS_BASE}/usr"
configure_args+=" --with-zlib=${XBPS_CROSS_BASE}/usr"
configure_args+=" --disable-mempool"
fi
do_configure() { do_configure() {
# Need to set PCRE_HOME to make --with-pcre=/usr work # Need to set PCRE_HOME to make --with-pcre=/usr work