Mailinglist Archive: opensuse-commit (705 mails)
| < Previous | Next > |
commit clamav
- From: root@xxxxxxx (h_root)
- Date: Fri, 7 Jul 2006 03:42:43 +0200 (CEST)
- Message-id: <20060707014243.DFACA94280@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package clamav
checked in at Fri Jul 7 03:42:43 CEST 2006.
--------
--- clamav/clamav.changes 2006-05-02 11:32:12.000000000 +0200
+++ clamav/clamav.changes 2006-07-06 16:03:11.000000000 +0200
@@ -1,0 +2,15 @@
+Thu Jul 6 16:02:15 CEST 2006 - max@xxxxxxx
+
+- Bugfix release 0.88.3:
+ - fix possible false matches of alternatives
+ - Large binhex files were not being handled gracefully.
+ - fix zero allocation warning
+- Added bc and pkgconfig to BuildRequires to fix curl version
+ detection.
+- Prevent a file conflict on the database files when main and db
+ packages of different versions are installed.
+- Renamed clamav.conf to clamd.conf for SLES9.
+- Added the db subpackage to SLES9.
+- Bugzilla: 190647
+
+-------------------------------------------------------------------
Old:
----
clamav-0.88.2.tar.bz2
clamav-etc.patch
New:
----
clamav-0.88.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clamav.spec ++++++
--- /var/tmp/diff_new_pack.BZF66x/_old 2006-07-07 03:34:46.000000000 +0200
+++ /var/tmp/diff_new_pack.BZF66x/_new 2006-07-07 03:34:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package clamav (Version 0.88.2)
+# spec file for package clamav (Version 0.88.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,7 +13,7 @@
Name: clamav
BuildRequires: curl-devel gmp-devel tcpd-devel
Summary: Antivirus Toolkit
-Version: 0.88.2
+Version: 0.88.3
Release: 1
License: GPL
Group: Productivity/Security
@@ -24,7 +24,6 @@
Source1: clamav-rcclamd
Source2: clamav-rcfreshclam
Patch1: %name-conf.patch
-Patch2: %name-etc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -42,11 +41,10 @@
Tomasz Kojm
Nigel Horne
-%if %suse_version != 910
%package db
Group: Productivity/Security
Summary: Virus Database for ClamAV
-Requires: clamav
+Prereq: clamav
%description db
This package contains a snapshot of the virus description database for
@@ -60,13 +58,9 @@
Tomasz Kojm
Nigel Horne
-%endif
%prep
%setup -q
%patch1
-%if %suse_version == 910
-%patch2
-%endif
%build
%if %suse_version >= 1010
@@ -94,14 +88,15 @@
%makeinstall
mkdir -p %buildroot/etc/init.d
-%if %suse_version == 910
-mv %buildroot/etc/clamd.conf %buildroot/etc/clamav.conf
-%endif
install -m755 %{SOURCE1} %buildroot/etc/init.d/clamd
ln -s /etc/init.d/clamd %buildroot/usr/sbin/rcclamd
install -m755 %{SOURCE2} %buildroot/etc/init.d/freshclam
ln -s /etc/init.d/freshclam %buildroot/usr/sbin/rcfreshclam
touch %buildroot/var/lib/clamav/{clamd,freshclam}.pid
+for f in %buildroot/var/lib/clamav/*.cvd; do
+ mv $f $f.dist
+ touch $f
+done
%clean
rm -rf %buildroot
@@ -111,32 +106,43 @@
%config(noreplace) %_sysconfdir/*.conf
%config %attr(744,root,root)/etc/init.d/*
%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README TODO UPGRADE
-%doc docs/*.pdf
+%doc docs/*.pdf docs/html
%doc %_mandir/*/*
-%doc docs/html
%_bindir/*
+
+%_sbindir/*
%_includedir/*
%_libdir/lib*
%_libdir/pkgconfig/libclamav.pc
-
-%_sbindir/*
%defattr(-,vscan,vscan)
%dir /var/lib/clamav
%ghost /var/lib/clamav/*.pid
-%if %suse_version != 910
%ghost /var/lib/clamav/*.cvd
%files db
%defattr(-,vscan,vscan)
%dir /var/lib/clamav
-%endif
-/var/lib/clamav/*.cvd
+/var/lib/clamav/*.cvd.dist
%pre
/usr/sbin/groupadd -r vscan 2> /dev/null || :
/usr/sbin/useradd -r -o -g vscan -u 65 -s /bin/false -c "Vscan account" -d /var/spool/amavis vscan 2> /dev/null || :
/usr/sbin/usermod vscan -g vscan 2> /dev/null || :
+%triggerpostun -- %name < 0.88.3
+# Move clamav.conf to clamd.conf when updating from an old version
+# and inform the admin about the rename.
+cd /etc
+if test -e clamav.conf.rpmsave -a ! -e clamd.conf.rpmnew; then
+ mv clamd.conf clamd.conf.rpmnew
+ mv clamav.conf.rpmsave clamd.conf
+ cat > clamav.conf <<-EOF
+ # clamd.conf has been renamed to clamav.conf.
+ # This file can be removed.
+ EOF
+ %restart_on_update clamd
+fi
+
%preun
%stop_on_removal clamd freshclam
@@ -144,7 +150,37 @@
%restart_on_update clamd freshclam
%insserv_cleanup
+%post db
+# determine the version number of a given database file
+getversion() {
+ if test -f $1; then
+ /usr/bin/sigtool -i $1 | sed -n '/^Version: /s///gp'
+ else
+ # a non-existing file is assumed to have version 0
+ echo 0
+ fi
+}
+cd /var/lib/clamav
+for distfile in {main,daily}.cvd.dist; do
+ datafile=${distfile%.dist}
+ if test $(getversion $distfile) -gt $(getversion $datafile); then
+ cp -a $distfile $datafile
+ fi
+done
+
%changelog -n clamav
+* Thu Jul 06 2006 - max@xxxxxxx
+- Bugfix release 0.88.3:
+- fix possible false matches of alternatives
+- Large binhex files were not being handled gracefully.
+- fix zero allocation warning
+- Added bc and pkgconfig to BuildRequires to fix curl version
+ detection.
+- Prevent a file conflict on the database files when main and db
+ packages of different versions are installed.
+- Renamed clamav.conf to clamd.conf for SLES9.
+- Added the db subpackage to SLES9.
+- Bugzilla: 190647
* Tue May 02 2006 - max@xxxxxxx
- New version: 0.88.2
- Fixes a buffer overflow in freshclam's get_database function
++++++ clamav-0.88.2.tar.bz2 -> clamav-0.88.3.tar.bz2 ++++++
clamav/clamav-0.88.2.tar.bz2 clamav/clamav-0.88.3.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit-help@xxxxxxxxxxxx
| < Previous | Next > |