Changes - j0ke.net Open Build Service

Changes of Revision 13

[-] [+]	Changed	amavisd-new.spec
@@ -10,6 +10,7 @@ # norootforbuild +%define qdir /var/qmail Name: amavisd-new BuildRequires: krb5 sendmail sendmail-devel @@ -28,6 +29,7 @@ Source2: rc.amavis Source3: README.SuSE Source4: RELEASE_NOTES.2.6.1 +Source5: %{name}-supervise.tar.bz2 Patch0: amavisd-new-suse.dif Patch1: amavisd-new-conf-qmail.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,6 +38,20 @@ %define miltersockdir /var/run/amavis %define avuser vscan %define avgroup vscan + + +%package supervise +Group: System/Security +Summary: Supervise scripts for amavisd-new qmail integration +Conflicts: qmail-scanner +Obsoletes: qmail-scanner +Requires: qmail + +%description supervise +This package includes supervise scripts for amavisd-new qmail integration + + + # --------------------------------------------------------------------------- %prep @@ -85,6 +101,15 @@ mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib} install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm +mkdir -p $RPM_BUILD_ROOT%{qdir} +tar xfj %{S:5} -C $RPM_BUILD_ROOT%{qdir} +# add qmqpservers to qmail environment +mkdir -p $RPM_BUILD_ROOT%{qdir}/control +echo "127.10.10.10" > $RPM_BUILD_ROOT%{qdir}/control/qmqpservers +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/tcprules.d +echo '127.10.10.10:allow,RELAYCLIENT="",QMAILQUEUE="bin/qmail-queue"' > $RPM_BUILD_ROOT%{_sysconfdir}/tcprules.d/tcp.amavis +echo ':deny' >> $RPM_BUILD_ROOT%{_sysconfdir}/tcprules.d/tcp.amavis + %pre /usr/sbin/groupadd -r %{avgroup} 2> /dev/null \|\| : /usr/sbin/useradd -r -o -g %{avgroup} -u 65 -s /bin/false -c "Vscan account" -d %{avspool} %{avuser} 2> /dev/null \|\| : @@ -129,6 +154,25 @@ %restart_on_update amavis %{insserv_cleanup} +%post supervise +if [ "$1" == 1 ]; then + + if [ -f /usr/bin/tcprules -a -f %{_sysconfdir}/tcprules.d/tcp.amavis ] ; then + /usr/bin/tcprules %{_sysconfdir}/tcprules.d/tcp.amavis.cdb %{_sysconfdir}/tcprules.d/tcp.amavis.tmp < %{_sysconfdir}/tcprules.d/tcp.amavis + fi + +# Make start + pushd /service + ln -s %{qdir}/supervise/amavis + popd +fi + +%postun supervise +if [ "$1" = 0 ]; then + rm -f /service/amavis* +fi + + %clean rm -rf $RPM_BUILD_ROOT @@ -154,6 +198,17 @@ %doc README.SuSE %doc RELEASE_NOTES.2.6.1 +%files supervise +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tcprules.d/tcp.amavis +%attr(0644,root,qmail) %{qdir}/control/qmqpservers +%attr(1700,qmaill,qmail) %dir %{qdir}/supervise/amavis +%attr(0700,qmaill,qmail) %dir %{qdir}/supervise/amavis/env +%attr(0700,qmaill,qmail) %dir %{qdir}/supervise/amavis/log +%attr(0700,qmaill,qmail) %dir %{qdir}/supervise/amavis/supervise +%attr(0751,qmaill,qmail) %{qdir}/supervise/amavis/run +%attr(0751,qmaill,qmail) %{qdir}/supervise/amavis/log/run + + %description Amavisd-new is a high-performance interface between mailer (MTA) and content checkers: virus scanners or SpamAssassin. It talks to the MTA
[-] [+]	Changed	amavisd-new-conf-qmail.patch ^
@@ -1,6 +1,21 @@ --- amavisd.conf.orig 2008-07-10 06:50:12.000000000 +0200 -+++ amavisd.conf 2008-07-10 07:07:03.000000000 +0200 -@@ -94,9 +94,9 @@ ++++ amavisd.conf 2008-07-12 15:20:23.000000000 +0200 +@@ -58,8 +58,12 @@ + $unix_socketname = "$MYHOME/amavisd.sock"; # amavisd-release or amavis-milter + # option(s) -p overrides $inet_socket_port and $unix_socketname + +-$protocol = 'QMQPqq'; # suggested protocol to use on all input sockets +-$inet_socket_port = 10628; # accept connections on this local TCP port(s) ++$protocol = 'QMQPqq'; # suggested protocol to use on all input sockets ++$inet_socket_port = [10024, 10628]; # accept connections on this local TCP port(s) ++$inet_qmqpqq_port = 10628; # accept QMQPqq on this local TCP port ++$inet_smtp_port = 10024; # accept SMTP/LMTP on this local TCP port ++$inet_socket_bind = 127.10.10.10; # limit socket bind to loopback interface ++@inet_acl = qw( 127.10.10.10 ); # allow SMTP access only from localhost IP + + $policy_bank{'MYNETS'} = { # mail originating from @mynetworks + originating => 1, # is true in MYNETS by default, but let's make it explicit +@@ -94,9 +98,9 @@ auth_required_release => 0, # do not require secret_id for amavisd-release }; @@ -13,7 +28,7 @@ $sa_dsn_cutoff_level = 10; # spam level beyond which a DSN is not sent $sa_crediblefrom_dsn_cutoff_level = 18; # likewise, but for a likely valid From # $sa_quarantine_cutoff_level = 25; # spam level beyond which quarantine is off -@@ -149,16 +149,16 @@ +@@ -149,16 +153,16 @@ # OTHER MORE COMMON SETTINGS (defaults may suffice): @@ -38,7 +53,7 @@ # $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl -@@ -360,15 +360,15 @@ +@@ -360,15 +364,15 @@ # ['Sophos SAVI', \&sophos_savi ], # ### http://www.clamav.net/
	Added	amavisd-new-supervise.tar.bz2 ^