rpms/amavisd-new/FC-5 README.quarantine, NONE, 1.1 amavisd.cron, NONE, 1.1 .cvsignore, 1.5, 1.6 amavisd-conf.patch, 1.3, 1.4 amavisd-new.spec, 1.6, 1.7 sources, 1.5, 1.6
Steven Pritchard (steve)
fedora-extras-commits at redhat.com
Sun Oct 15 00:23:28 UTC 2006
Author: steve
Update of /cvs/extras/rpms/amavisd-new/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32500
Modified Files:
.cvsignore amavisd-conf.patch amavisd-new.spec sources
Added Files:
README.quarantine amavisd.cron
Log Message:
Sync with devel.
--- NEW FILE README.quarantine ---
To enable quarantine support simply change the following line in
/etc/amavisd/amavisd.conf:
$QUARANTINEDIR = undef; # -Q
to
$QUARANTINEDIR = "$MYHOME/quarantine"; # -Q
then restart amavisd.
The following will make the change for you:
sed -i.orig -e '/\$QUARANTINEDIR =/s,undef,"$MYHOME/quarantine",' \
/etc/amavisd/amavisd.conf
PLEASE NOTE: This is intentionally a manual step. Before turning on
the quarantine feature of amavisd-new, be sure that there is a
sufficient amount of free space on /var/spool/amavisd/quarantine.
"Sufficient" depends entirely on your environment.
In the default configuration, files in the quarantine directory will
be automatically deleted by tmpwatch after 30 days. See
/etc/cron.daily/amavisd to adjust this behavior for your environment.
--- NEW FILE amavisd.cron ---
/usr/sbin/tmpwatch 24 /var/spool/amavisd/tmp
/usr/sbin/tmpwatch -d 720 /var/spool/amavisd/quarantine
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 1 Aug 2006 00:05:20 -0000 1.5
+++ .cvsignore 15 Oct 2006 00:23:28 -0000 1.6
@@ -1 +1 @@
-amavisd-new-2.4.2.tar.gz
+amavisd-new-2.4.3.tar.gz
amavisd-conf.patch:
Index: amavisd-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/amavisd-conf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amavisd-conf.patch 2 Aug 2006 16:44:07 -0000 1.3
+++ amavisd-conf.patch 15 Oct 2006 00:23:28 -0000 1.4
@@ -1,13 +1,13 @@
---- amavisd-new-2.4.2/amavisd.conf.orig 2006-06-27 06:31:50.000000000 -0500
-+++ amavisd-new-2.4.2/amavisd.conf 2006-07-31 17:31:00.000000000 -0500
+--- amavisd-new-2.4.3/amavisd.conf.orig 2006-10-01 19:02:13.000000000 -0500
++++ amavisd-new-2.4.3/amavisd.conf 2006-10-10 17:46:45.000000000 -0500
@@ -14,23 +14,23 @@
# @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code
$max_servers = 2; # num of pre-forked children (2..15 is common), -m
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
-+$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u
-+$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g
++$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u
++$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g
$mydomain = 'example.com'; # a convenient default for other settings
@@ -46,7 +46,7 @@
$mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
@addr_extension_virus_maps = ('virus');
-@@ -111,10 +111,10 @@
+@@ -115,10 +115,10 @@
# $notify_method = 'smtp:[127.0.0.1]:10025';
# $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter!
@@ -61,7 +61,7 @@
# $os_fingerprint_method = 'p0f:127.0.0.1:2345'; # to query p0f-analyzer.pl
-@@ -306,10 +306,10 @@
+@@ -318,10 +318,10 @@
# ['Sophos SAVI', \&sophos_savi ],
# ### http://www.clamav.net/
@@ -73,6 +73,6 @@
+ \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"],
+ qr/\bOK$/, qr/\bFOUND$/,
+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
- # # NOTE: the easiest is to run clamd under the same user as amavisd; match the
- # # socket name (LocalSocket) in clamav.conf to the socket name in this entry
- # # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],
+ # # NOTE: run clamd under the same user as amavisd, or run it under its own
+ # # uid such as clamav, add user clamav to the amavis group, and then add
+ # # AllowSupplementaryGroups to clamd.conf;
Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/amavisd-new.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amavisd-new.spec 2 Aug 2006 16:44:07 -0000 1.6
+++ amavisd-new.spec 15 Oct 2006 00:23:28 -0000 1.7
@@ -2,7 +2,7 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
-Version: 2.4.2
+Version: 2.4.3
Release: 2%{?prerelease:.%{prerelease}}%{?dist}
License: GPL
Group: Applications/System
@@ -12,6 +12,8 @@
Source2: amavis-clamd.conf
Source3: amavis-clamd.sysconfig
Source4: README.fedora
+Source5: README.quarantine
+Source6: amavisd.cron
Patch0: amavisd-conf.patch
Patch1: amavisd-init.patch
Patch2: amavisd-condrestart.patch
@@ -19,10 +21,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-root/
Requires: smtpdaemon
Requires: /usr/sbin/clamd, /etc/clamd.d
-Requires: tmpwatch
+Requires: /usr/sbin/tmpwatch, /etc/cron.daily
Requires: bzip2
Requires: gzip
-Requires: lha
+Requires: arj
Requires: cpio
Requires: freeze
Requires: lzop
@@ -65,7 +67,7 @@
(MTA) and one or more content checkers: virus scanners, and/or
Mail::SpamAssassin Perl module. It is written in Perl, assuring high
reliability, portability and maintainability. It talks to MTA via (E)SMTP
-or LMTP, or by using helper programs. No timing gaps exist in the design,
+or LMTP, or by using helper programs. No timing gaps exist in the design
which could cause a mail loss.
%prep
@@ -74,7 +76,7 @@
%patch1 -p1
%patch2 -p0
%patch3 -p0
-install -m644 %{SOURCE4} README_FILES/
+install -m644 %{SOURCE4} %{SOURCE5} README_FILES/
%build
@@ -101,7 +103,10 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.amavisd
-mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
+install -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/amavisd
+
+mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db,quarantine}
touch $RPM_BUILD_ROOT/var/spool/amavisd/clamd.sock
mkdir -p $RPM_BUILD_ROOT/var/run/amavisd/
@@ -135,16 +140,32 @@
%config(noreplace) %{_sysconfdir}/amavisd/amavisd.conf
%config(noreplace) %{_sysconfdir}/clamd.d/amavisd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/clamd.amavisd
+%config(noreplace) %{_sysconfdir}/cron.daily/amavisd
%{_sbindir}/amavisd
%{_sbindir}/clamd.amavisd
%{_bindir}/amavisd-*
%dir %attr(700,amavis,amavis) /var/spool/amavisd
%dir %attr(700,amavis,amavis) /var/spool/amavisd/tmp
%dir %attr(700,amavis,amavis) /var/spool/amavisd/db
+%dir %attr(700,amavis,amavis) /var/spool/amavisd/quarantine
%dir %attr(755,amavis,amavis) /var/run/amavisd
%ghost /var/spool/amavisd/clamd.sock
%changelog
+* Sat Oct 14 2006 Steven Pritchard <steve at kspei.com> 2.4.3-2
+- Fix permissions on the cron.daily script.
+
+* Tue Oct 10 2006 Steven Pritchard <steve at kspei.com> 2.4.3-1
+- Update to 2.4.3.
+- Add quarantine directory and instructions for enabling it.
+- Add tmpwatch cron script.
+
+* Thu Sep 28 2006 Steven Pritchard <steve at kspei.com> 2.4.2-4
+- Drop lha dependency and add arj.
+
+* Sun Sep 17 2006 Steven Pritchard <steve at kspei.com> 2.4.2-3
+- Rebuild.
+
* Wed Aug 02 2006 Steven Pritchard <steve at kspei.com> 2.4.2-2
- Fix path to clamd socket in amavisd-conf.patch.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 1 Aug 2006 00:05:20 -0000 1.5
+++ sources 15 Oct 2006 00:23:28 -0000 1.6
@@ -1 +1 @@
-d750176de7481498ebd1011e08a488da amavisd-new-2.4.2.tar.gz
+7c5f23b1cd523df31d10cf38150e8cea amavisd-new-2.4.3.tar.gz
More information about the fedora-extras-commits
mailing list