diff --git a/.gitattributes b/.gitattributes index f4178ea..5e6b4ae 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,5 +22,5 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns -daily-15055.cvd filter=lfs diff=lfs merge=lfs -text +daily-16364.cvd filter=lfs diff=lfs merge=lfs -text main-54.cvd filter=lfs diff=lfs merge=lfs -text diff --git a/clamav.changes b/clamav.changes index 21bc964..1ebaf64 100644 --- a/clamav.changes +++ b/clamav.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Jan 5 01:53:56 UTC 2013 - andreas.stieger@gmx.de + +- update daily.cvd to ver. 16364 + released on 04 Jan 2013 20:37 :0500 (sig count: 492103) +- add cvd signature verification to %check section +- make Release field of clamav-db package contain cvd file versions + ------------------------------------------------------------------- Fri Sep 28 09:30:25 UTC 2012 - max@suse.com diff --git a/clamav.spec b/clamav.spec index 7fe3929..786c082 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,7 +1,7 @@ # # spec file for package clamav # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,6 +45,7 @@ BuildRequires: bzip2 Summary: Antivirus Toolkit License: GPL-2.0 Group: Productivity/Security +# version updates should also fetch the current cvd files for the db subpackage Version: 0.97.6 Release: 0 Url: http://www.clamav.net @@ -60,9 +61,11 @@ Source3: clamav-updateclamconf Source4: clamav-rpmlintrc Source5: clamav-rcmilter # http://db.local.clamav.net/main.cvd -Source6: main-54.cvd +%define main_cvd_version 54 +Source6: main-%{main_cvd_version}.cvd # http://db.local.clamav.net/daily.cvd -Source7: daily-15055.cvd +%define daily_cvd_version 16364 +Source7: daily-%{daily_cvd_version}.cvd Patch1: clamav-conf.patch Patch2: clamav-sles9.patch Patch3: clamav-gcc47.patch @@ -86,6 +89,8 @@ PreReq: clamav sed /bin/cp /usr/bin/awk /bin/rm %if 0%{?suse_version} > 1120 BuildArch: noarch %endif +Version: %{version} +Release: %{main_cvd_version}.%{daily_cvd_version}.. %description db This package contains a snapshot of the virus description database for @@ -138,11 +143,6 @@ CFLAGS="$CFLAGS -D_FFR_QUARANTINE -D_FFR_SMFI_OPENSOCKET" make %{?jobs:-j%jobs} -%check -%if !0%{?qemu_user_space_build:1} -VALGRIND_GENSUP=1 make check -%endif - %install %makeinstall ln -sf docs/html/{clamdoc,index}.html @@ -170,6 +170,21 @@ rm %buildroot/%_libdir/*.la # Remove bogus dependencies from libclamav.pc sed -i 's/^Libs: .*/Libs: -lclamav/' %buildroot%_libdir/pkgconfig/libclamav.pc +%check + +# signature check using installed clamav sigtool +LD_LIBRARY_PATH="%buildroot%{_libdir}" "%buildroot%{_bindir}/sigtool" --info %buildroot/var/lib/clamav/main.cvd.dist +LD_LIBRARY_PATH="%buildroot%{_libdir}" "%buildroot%{_bindir}/sigtool" --info %buildroot/var/lib/clamav/daily.cvd.dist + +# Check that cvd version matches versions declared in package +test "$(head -c512 %SOURCE6 | cut -d: -f3)" = "%{main_cvd_version}" +test "$(head -c512 %SOURCE7 | cut -d: -f3)" = "%{daily_cvd_version}" + +# regressoin tests +%if !0%{?qemu_user_space_build:1} +VALGRIND_GENSUP=1 make check +%endif + %files %defattr(-,root,root,-) %config(noreplace) %_sysconfdir/*.conf diff --git a/daily-15055.cvd b/daily-15055.cvd deleted file mode 100644 index 98c14c9..0000000 --- a/daily-15055.cvd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c33f5ae2805a5ce6b30dc391b2b455d1e6fc30607e4c56f5358031fd2630b9bd -size 5204809 diff --git a/daily-16364.cvd b/daily-16364.cvd new file mode 100644 index 0000000..d703250 --- /dev/null +++ b/daily-16364.cvd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e3034771c13110364b0c3b80159d3d86f539aef0583a7894586fa1770e0652b +size 11969872