[clamav/el6] Ship local copy of virus database; it was removed by accident from 0.97.5 tarball

Robert Scheck robert at fedoraproject.org
Sat Jun 30 23:47:25 UTC 2012


commit df3eb6be0d66e27aa8e51e09d87d08abd8a98c74
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 1 01:47:19 2012 +0200

    Ship local copy of virus database; it was removed by accident from 0.97.5 tarball

 .gitignore  |    5 ++---
 clamav.spec |    8 ++++++++
 sources     |    4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 916d9f6..23e3e8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-/clamav-0.97.2-norar.tar.xz
-/clamav-0.97.3.tar.gz
 /clamd-wrapper.tar.bz2
-/clamav-0.97.3-norar.tar.xz
 /clamav-0.97.5-norar.tar.xz
+/main-54.cvd
+/daily-15050.cvd
diff --git a/clamav.spec b/clamav.spec
index ee10cb8..2bc1881 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -22,6 +22,10 @@ Source8: freshclam.logrotate
 Source9: clamd.logrotate
 Source10: clamav-milter.sysconfig
 
+# Temporary workaround for broken 0.97.5 tarball
+Source11: http://db.local.clamav.net/main-54.cvd
+Source12: http://db.local.clamav.net/daily-15050.cvd
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz
@@ -228,6 +232,9 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log
 install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/
 install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/
 
+install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd
+install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd
+
 %post
 /sbin/ldconfig
 
@@ -383,6 +390,7 @@ rm -rf %{buildroot}
 - Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection
 - Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection
 - Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection
+- Ship local copy of virus database; it was removed by accident from 0.97.5 tarball
 
 * Thu Jan 19 2012 Nick Bebout <nb at fedoraproject.org> - 0.97.3-4
 - Split files out into SCM instead of in the spec
diff --git a/sources b/sources
index ec6a603..78cc194 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f8e88e6adc82349e5babfa6ee7bb98fa  clamav-0.97.5-norar.tar.xz
-e809f74ed139df2e4af3fafbca32f678  clamd-wrapper.tar.bz2
+eb12490fda87d602e476d4b163f8a34b  main-54.cvd
+d41d8cd98f00b204e9800998ecf8427e  daily-15050.cvd


More information about the scm-commits mailing list