Hello community, here is the log from the commit of package amavisd-new for openSUSE:Factory checked in at 2011-11-05 10:53:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old) and /work/SRC/openSUSE:Factory/.amavisd-new.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "amavisd-new", Maintainer is "varkoly@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes 2011-11-02 11:42:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 2011-11-05 10:53:45.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 4 06:23:56 UTC 2011 - varkoly@suse.com + +- Add systemd scripts + +------------------------------------------------------------------- New: ---- amavisd-milter.sh amavisd.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amavisd-new.spec ++++++ --- /var/tmp/diff_new_pack.DLQFUN/_old 2011-11-05 11:00:16.000000000 +0100 +++ /var/tmp/diff_new_pack.DLQFUN/_new 2011-11-05 11:00:16.000000000 +0100 @@ -34,6 +34,10 @@ %if 0%{?suse_version} < 1120 Requires: lha %endif +%if 0%{?suse_version} > 1140 +BuildRequires: systemd +%{?systemd_requires} +%endif Recommends: unrar Recommends: clamav perl-spamassassin Recommends: perl-DBI @@ -51,6 +55,8 @@ Source2: rc.amavis Source3: amavisd-new-rpmlintrc Source4: amavisd-milter.tar.bz2 +Source5: amavisd.service +Source6: amavisd-milter.sh Patch1: activate_virus_scanner.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define avspool /var/spool/amavis @@ -131,6 +137,9 @@ ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis install -m 644 LDAP.schema $RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm +mkdir -p $RPM_BUILD_ROOT/lib/systemd/system +install -m 644 %{S:5} $RPM_BUILD_ROOT/lib/systemd/system/ +install -m 755 %{S:6} $RPM_BUILD_ROOT/usr/sbin/ cd amavisd-milter make install DESTDIR="$RPM_BUILD_ROOT" @@ -180,6 +189,10 @@ /var/adm/fillup-templates/sysconfig.amavis %{_sbindir}/* %{perl_vendorlib}/JpegTester.pm +%if 0%{?suse_version} >= 1140 +%config /lib/systemd/system/amavisd.service +/usr/sbin/amavisd-milter.sh +%endif %defattr(0750,%{avuser},%{avgroup}) %dir %{avspool} %dir %{avspool}/tmp ++++++ amavisd-milter.sh ++++++ #!/bin/bash . /etc/sysconfig/amavis AMAVIS_MILTER_BIN=/usr/sbin/amavisd-milter AMAVIS_MILTER_SOCK=local:/var/run/amavis/amavis-milter.sock case "$1" in start) if [ "$AMAVIS_SENDMAIL_MILTER" = "yes" ]; then startproc -u vscan $AMAVIS_MILTER_BIN -p $AMAVIS_MILTER_SOCK > /dev/null 2>&1 fi ;; stop) if [ "$AMAVIS_SENDMAIL_MILTER" = "yes" ]; then killproc -TERM $AMAVIS_MILTER_BIN fi ;; esac exit 0 ++++++ amavisd.service ++++++ # This file is part of package amavisd. # # Copyright (c) 2011 SuSE LINUX Products GmbH, Germany. # Author: Werner Fink # Please send feedback to http://www.suse.de/feedback # # Description: # # Used to start the amavisd # Amavisd-new is a high-performance interface between mailer (MTA) and # content checkers: virus scanners or SpamAssassin. It talks to the MTA # via (E)SMTP, LMTP, or by using helper programs. # [Unit] Description=Amavisd-new Virus Scanner interfac Requires=var-run.mount nss-lookup.target network.target remote-fs.target syslog.target time-sync.target After=var-run.mount nss-lookup.target network.target remote-fs.target syslog.target time-sync.target Wants=named.service clamd.service After=named.service clamd.service Before=mail-transfer-agent.target Conflicts= [Service] Type=forking PIDFile=/var/spool/amavis/amavisd.pid ExecStartPre=-/bin/echo 'Starting virus-scanner (amavisd-new):' EnvironmentFile=-/etc/sysconfig/amavisd ExecStartPre=/usr/sbin/amavisd-milter.sh start ExecStart=/usr/sbin/amavisd start ExecStartPost= ExecStartPost= ExecReload=/usr/sbin/postfix reload ExecReload=/usr/sbin/postfix flush ExecStop=/usr/sbin/amavisd stop ExecStopPost=/usr/sbin/amavisd-milter.sh stop [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org