- [milter] create the milter-logfile in the %%post scriptlet
- [milter] reverted the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration
This commit is contained in:
parent
f43d7660f4
commit
9a13698dc7
27
clamav.spec
27
clamav.spec
@ -1,4 +1,4 @@
|
|||||||
## $Id: clamav.spec,v 1.25 2005/07/25 17:56:56 ensc Exp $
|
## $Id: clamav.spec,v 1.26 2005/07/28 15:35:10 ensc Exp $
|
||||||
|
|
||||||
## This package understands the following switches:
|
## This package understands the following switches:
|
||||||
## --without milter ... deactivate the -milter subpackage
|
## --without milter ... deactivate the -milter subpackage
|
||||||
@ -22,7 +22,7 @@
|
|||||||
Summary: End-user tools for the Clam Antivirus scanner
|
Summary: End-user tools for the Clam Antivirus scanner
|
||||||
Name: clamav
|
Name: clamav
|
||||||
Version: 0.86.2
|
Version: 0.86.2
|
||||||
Release: %release_func 3
|
Release: %release_func 4
|
||||||
|
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Applications/File
|
Group: Applications/File
|
||||||
@ -39,6 +39,7 @@ Source8: clamav-notify-servers
|
|||||||
Patch20: clamav-0.70-user.patch
|
Patch20: clamav-0.70-user.patch
|
||||||
Patch21: clamav-0.70-path.patch
|
Patch21: clamav-0.70-path.patch
|
||||||
Patch22: clamav-0.80-initoff.patch
|
Patch22: clamav-0.80-initoff.patch
|
||||||
|
Patch23: clamav-0.86.2-timeout.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
Requires: clamav-lib = %{version}-%{release}
|
Requires: clamav-lib = %{version}-%{release}
|
||||||
Requires: data(clamav)
|
Requires: data(clamav)
|
||||||
@ -100,11 +101,9 @@ Provides: init(clamav-milter)
|
|||||||
%{!?_without_milter:BuildRequires: sendmail-devel}
|
%{!?_without_milter:BuildRequires: sendmail-devel}
|
||||||
Requires: sendmail
|
Requires: sendmail
|
||||||
Requires(pre): %_initrddir
|
Requires(pre): %_initrddir
|
||||||
Requires(postun): %_initrddir
|
Requires(postun): %_initrddir initscripts
|
||||||
Requires(post): chkconfig
|
Requires(post): chkconfig coreutils
|
||||||
Requires(preun): chkconfig
|
Requires(preun): chkconfig initscripts
|
||||||
Requires(preun): initscripts
|
|
||||||
Requires(postun): initscripts
|
|
||||||
Requires(pre): fedora-usermgmt >= 0.7
|
Requires(pre): fedora-usermgmt >= 0.7
|
||||||
Requires(postun): fedora-usermgmt >= 0.7
|
Requires(postun): fedora-usermgmt >= 0.7
|
||||||
|
|
||||||
@ -167,6 +166,7 @@ THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL!
|
|||||||
%patch20 -p1 -b .user
|
%patch20 -p1 -b .user
|
||||||
%patch21 -p1 -b .path
|
%patch21 -p1 -b .path
|
||||||
%patch22 -p1 -b .initoff
|
%patch22 -p1 -b .initoff
|
||||||
|
%patch23 -p1 -b .timeout
|
||||||
|
|
||||||
perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
|
perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
|
||||||
s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
|
s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
|
||||||
@ -177,6 +177,7 @@ perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
|
|||||||
|
|
||||||
perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf
|
perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf
|
||||||
|
|
||||||
|
|
||||||
## ------------------------------------------------------------
|
## ------------------------------------------------------------
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -321,6 +322,11 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || :
|
|||||||
|
|
||||||
%post milter
|
%post milter
|
||||||
/sbin/chkconfig --add clamav-milter
|
/sbin/chkconfig --add clamav-milter
|
||||||
|
test -e %milterlog || {
|
||||||
|
touch %milterlog
|
||||||
|
chmod 0620 %milterlog
|
||||||
|
chown root:%milteruser %milterlog
|
||||||
|
}
|
||||||
|
|
||||||
%preun milter
|
%preun milter
|
||||||
test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || :
|
test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || :
|
||||||
@ -422,6 +428,13 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || :
|
|||||||
%endif # _without_milter
|
%endif # _without_milter
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 29 2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.86.2-4
|
||||||
|
- [milter] create the milter-logfile in the %%post scriptlet
|
||||||
|
- [milter] reverted the change of the default child_timeout value; it
|
||||||
|
was set to 5 minutes in 0.86.2 which conflicts with the internal
|
||||||
|
mode where a timeout must not be set. So, the clamav-milter would
|
||||||
|
not run with the default configuration
|
||||||
|
|
||||||
* Thu Jul 28 2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.86.2-3
|
* Thu Jul 28 2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.86.2-3
|
||||||
- Fixed calculation of sleep duration; on some systems/IPs, `hostid`
|
- Fixed calculation of sleep duration; on some systems/IPs, `hostid`
|
||||||
results in a negative number which is retained by the bash
|
results in a negative number which is retained by the bash
|
||||||
|
Loading…
Reference in New Issue
Block a user