Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.9.git;a=commitdiff;h=6a9b65cd6951d134a901e9d9411089194e68dd47
commit 6a9b65cd6951d134a901e9d9411089194e68dd47 Author: kikadf <[email protected]> Date: Sat Nov 29 14:09:33 2014 +0100 clamav-0.98.5-1arcturus1-x86_64 * Version bump * Fix CVE-2013-6497, CVE-2014-9050 diff --git a/source/apps-extra/clamav/FrugalBuild b/source/apps-extra/clamav/FrugalBuild index efb732b..e4fde47c2f 100644 --- a/source/apps-extra/clamav/FrugalBuild +++ b/source/apps-extra/clamav/FrugalBuild @@ -4,7 +4,7 @@ options+=('asneeded') pkgname=clamav -pkgver=0.98.1 +pkgver=0.98.5 pkgrel=1arcturus1 pkgdesc="Clam AntiVirus is a GPL anti-virus toolkit for UNIX" depends=('gmp>=5.0.1' 'bzip2' 'curl>=7.19.0') @@ -14,8 +14,8 @@ groups=('apps-extra') archs=('i686' 'x86_64') Finclude sourceforge source=($source clamav-0.95-cliopts.patch llvm-glibc.patch clamav.service freshclam.service) -sha1sums=('9f04c0e81463c36f7e58d18f16d1b88f3332dcb8' \ - 'a9d3c548a23935a31f783a0aeec3373c784fd40c' \ +sha1sums=('5f5e45735819e3ca61610899b779172a5639f70f' \ + '507c7b8dbda905d8be2c6f94718803451771b153' \ '79080dd02903aa0463a1e837e8c0afaa9cf4348b' \ 'f50298cd957cd322c9a47384bbec0076fe059490' \ 'acc22c8def14d7dea1c781da347f5765196726b9') @@ -26,13 +26,13 @@ Finclude systemd build() { Fbuild --disable-clamav --sysconfdir=/etc - Fsed '^Example' '# Example' $Fdestdir/etc/{clamd,freshclam}.conf.sample - Fsed '^#LogFile' 'LogFile' $Fdestdir/etc/clamd.conf.sample - Fsed '/tmp/clamd.log' '/var/log/clamd.log' $Fdestdir/etc/clamd.conf.sample - Fsed '^#DatabaseDirectory' 'DatabaseDirectory' $Fdestdir/etc/{clamd,freshclam}.conf.sample - Fsed '/usr/share/clamav' '/var/lib/clamav' $Fdestdir/etc/{clamd,freshclam}.conf.sample - Fsed '/var/log/' '/var/log/clamav/' $Fdestdir/etc/{clamd,freshclam}.conf.sample - Fsed '/var/run/' '/var/run/clamav/' $Fdestdir/etc/{clamd,freshclam}.conf.sample + Fsed '^Example' '# Example' $Fdestdir/etc/{clamd,freshclam}.conf.sample + Fsed '^#LogFile' 'LogFile' $Fdestdir/etc/clamd.conf.sample + Fsed '/tmp/clamd.log' '/var/log/clamd.log' $Fdestdir/etc/clamd.conf.sample + Fsed '^#DatabaseDirectory' 'DatabaseDirectory' $Fdestdir/etc/{clamd,freshclam}.conf.sample + Fsed '/usr/share/clamav' '/var/lib/clamav' $Fdestdir/etc/{clamd,freshclam}.conf.sample + Fsed '/var/log/' '/var/log/clamav/' $Fdestdir/etc/{clamd,freshclam}.conf.sample + Fsed '/var/run/' '/var/run/clamav/' $Fdestdir/etc/{clamd,freshclam}.conf.sample Frm /usr/share/clamav Fmkdir /var/{log,lib}/clamav chown 26.26 $Fdestdir/var/{log,lib}/clamav || Fdie diff --git a/source/apps-extra/clamav/clamav-0.95-cliopts.patch b/source/apps-extra/clamav/clamav-0.95-cliopts.patch index e2bb19b..40232be 100644 --- a/source/apps-extra/clamav/clamav-0.95-cliopts.patch +++ b/source/apps-extra/clamav/clamav-0.95-cliopts.patch @@ -1,13 +1,12 @@ -Index: clamav-0.96.1/shared/optparser.c -=================================================================== ---- clamav-0.96.1.orig/shared/optparser.c -+++ clamav-0.96.1/shared/optparser.c -@@ -242,7 +242,7 @@ const struct clam_option __clam_options[ +diff -Naur clamav-0.98.5/shared/optparser.c clamav-0.98.5.NEW/shared/optparser.c +--- clamav-0.98.5/shared/optparser.c 2014-11-13 23:30:44.000000000 +0100 ++++ clamav-0.98.5.NEW/shared/optparser.c 2014-11-24 11:09:59.060484469 +0100 +@@ -272,7 +272,7 @@ - { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, + { "AllowAllMatchScan", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_CLAMD, "Permit use of the ALLMATCHSCAN command.", "yes" }, -- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, -+ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, +- { "Foreground", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, ++ { "Foreground", "nofork", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, - { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, + { "Debug", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
