Hello community, here is the log from the commit of package amavisd-new for openSUSE:Factory checked in at 2014-01-08 20:05:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old) and /work/SRC/openSUSE:Factory/.amavisd-new.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amavisd-new" Changes: -------- --- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes 2013-11-15 13:12:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 2014-01-08 20:05:52.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Jan 1 13:17:13 UTC 2014 - [email protected] + +- add some recommended decoders (bnc#754852) +- fixed amavisd-milter invocation (bnc#809969) +- correctly set clamd socket to (/var/run/clamav/clamd-socket) + (bnc#844575) +- some spec file cleanup including using optflags for native code + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amavisd-new.spec ++++++ --- /var/tmp/diff_new_pack.24zt2z/_old 2014-01-08 20:05:54.000000000 +0100 +++ /var/tmp/diff_new_pack.24zt2z/_new 2014-01-08 20:05:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package amavisd-new # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,28 @@ # +%define avspool /var/spool/amavis +%define avdb /var/spool/amavis/db +%define avquarantine /var/spool/amavis/virusmails +%define logmsg logger -t %{name}/rpm +%define avuser vscan +%define avgroup vscan Name: amavisd-new +Version: 2.8.1 +Release: 0 Summary: High-Performance E-Mail Virus Scanner License: GPL-2.0+ Group: Productivity/Networking/Security -Version: 2.8.1 -Release: 0 Url: http://www.ijs.si/software/amavisd/ +Source0: amavisd-new-%{version}.tar.gz +Source1: sysconfig.amavis +Source2: rc.amavis +Source3: amavisd-new-rpmlintrc +Source4: amavisd-milter.tar.bz2 +Source5: amavis.service +Source6: amavisd-milter.sh +Patch1: activate_virus_scanner.diff +BuildRequires: sed BuildRequires: sendmail BuildRequires: sendmail-devel Requires: bzip2 @@ -44,6 +59,11 @@ Requires: sharutils Requires: smtp_daemon Requires: zoo +PreReq: coreutils +PreReq: net-tools +PreReq: pwdutils +PreReq: %insserv_prereq +PreReq: util-linux %if 0%{?suse_version} < 1120 Requires: lha %endif @@ -57,27 +77,12 @@ Recommends: perl-ldap Recommends: perl-Authen-SASL Recommends: perl-Mail-ClamAV +Recommends: p7zip +Recommends: binutils Recommends: %{name}-docs = %{version} Provides: amavisd-milter = 1.5.0 Obsoletes: amavisd-milter <= 1.5.0 -PreReq: coreutils net-tools sed pwdutils -PreReq: %insserv_prereq -PreReq: util-linux -Source0: amavisd-new-%{version}.tar.gz -Source1: sysconfig.amavis -Source2: rc.amavis -Source3: amavisd-new-rpmlintrc -Source4: amavisd-milter.tar.bz2 -Source5: amavis.service -Source6: amavisd-milter.sh -Patch1: activate_virus_scanner.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define avspool /var/spool/amavis -%define avdb /var/spool/amavis/db -%define avquarantine /var/spool/amavis/virusmails -%define logmsg logger -t %{name}/rpm -%define avuser vscan -%define avgroup vscan %description Amavisd-new is a high-performance interface between mailer (MTA) and @@ -100,7 +105,7 @@ content checkers: virus scanners or SpamAssassin. It talks to the MTA via (E)SMTP, LMTP. -This package contains the documentation and Relase-Notes. +This package contains the documentation and Release-Notes. %prep %setup -q -a 4 @@ -110,62 +115,63 @@ if [[ $i == *patch ]] ; then continue; fi if [[ $i == *spec ]] ; then continue; fi if [[ $i == amavisd-milter ]] ; then continue; fi + echo "patching file $i" sed -i "s|\$daemon_user = 'vscan';|\$daemon_user = '%{avuser}';|g; \ s|\$daemon_group = 'vscan';|\$daemon_group = '%{avgroup}';|g; \ s|^# \$MYHOME =.*|\$MYHOME = '%{avspool}';|g; \ s|/var/amavis/db|%{avdb}|g; \ s|/var/virusmails|%{avquarantine}|g; \ - s|/var/amavis/amavisd.sock|%{avspool}/amavisd.sock|g; \ - s|/var/run/clamav/clamd|/var/lib/clamav/clamd-socket|g" $i + s|/var/amavis/amavisd.sock|%{avspool}/amavisd.sock|g" $i done # --------------------------------------------------------------------------- %build cd amavisd-milter -%configure --localstatedir="/var/spool/amavis" -make +export CFLAGS="%{optflags}" +%configure --localstatedir="%{avspool}" +make %{?_smp_mflags} # --------------------------------------------------------------------------- %install -mkdir -p $RPM_BUILD_ROOT%{avquarantine} -mkdir -p $RPM_BUILD_ROOT%{avspool}/{tmp,var} -mkdir -p $RPM_BUILD_ROOT%{avdb} -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema -mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib} -mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d -install -m 644 $RPM_SOURCE_DIR/sysconfig.amavis $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 755 amavisd $RPM_BUILD_ROOT/%{_sbindir}/amavisd -install -m 755 amavisd-agent $RPM_BUILD_ROOT/%{_sbindir}/amavisd-agent -install -m 755 amavisd-nanny $RPM_BUILD_ROOT/%{_sbindir}/amavisd-nanny -install -m 755 amavisd-release $RPM_BUILD_ROOT/%{_sbindir}/amavisd-release -install -m 755 p0f-analyzer.pl $RPM_BUILD_ROOT/%{_sbindir}/p0f-analyzer.pl -install -m 644 amavisd.conf $RPM_BUILD_ROOT/etc/amavisd.conf -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 %{buildroot}%{avquarantine} +mkdir -p %{buildroot}%{avspool}/{tmp,var} +mkdir -p %{buildroot}%{avdb} +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}/var/adm/fillup-templates +mkdir -p %{buildroot}/etc/openldap/schema +mkdir -p %{buildroot}%{perl_vendorlib} +mkdir -p %{buildroot}/usr/lib/tmpfiles.d +install -m 644 $RPM_SOURCE_DIR/sysconfig.amavis %{buildroot}/var/adm/fillup-templates +install -m 755 amavisd %{buildroot}/%{_sbindir}/amavisd +install -m 755 amavisd-agent %{buildroot}/%{_sbindir}/amavisd-agent +install -m 755 amavisd-nanny %{buildroot}/%{_sbindir}/amavisd-nanny +install -m 755 amavisd-release %{buildroot}/%{_sbindir}/amavisd-release +install -m 755 p0f-analyzer.pl %{buildroot}/%{_sbindir}/p0f-analyzer.pl +install -m 644 amavisd.conf %{buildroot}/etc/amavisd.conf +install -m 644 LDAP.schema %{buildroot}/etc/openldap/schema/amavisd-new.schema +install -m 644 JpegTester.pm %{buildroot}/%{perl_vendorlib}/JpegTester.pm %if 0%{?suse_version} > 1140 -mkdir -p $RPM_BUILD_ROOT%{_unitdir} -install -m 644 %{S:5} $RPM_BUILD_ROOT%{_unitdir} +mkdir -p %{buildroot}%{_unitdir} +install -m 644 %{S:5} %{buildroot}%{_unitdir} %endif %if 0%{?suse_version} < 1230 -mkdir -p $RPM_BUILD_ROOT/etc/init.d -install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/amavis -ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis +mkdir -p %{buildroot}/etc/init.d +install -m 755 %{S:2} %{buildroot}/etc/init.d/amavis +ln -s ../../etc/init.d/amavis %{buildroot}/%{_sbindir}/rcamavis %else -ln -s ../../sbin/service $RPM_BUILD_ROOT/%{_sbindir}/rcamavis +ln -s ../../sbin/service %{buildroot}/%{_sbindir}/rcamavis %endif -install -m 755 %{S:6} $RPM_BUILD_ROOT/usr/sbin/ +install -m 755 %{S:6} %{buildroot}%{_sbindir}/ cd amavisd-milter -make install DESTDIR="$RPM_BUILD_ROOT" +make install DESTDIR="%{buildroot}" %pre -/usr/sbin/groupadd -r %{avgroup} 2> /dev/null || : +%{_sbindir}/groupadd -r %{avgroup} 2> /dev/null || : %{logmsg} "Added group %{avgroup} for package %{name}" -/usr/sbin/useradd -r -o -g %{avgroup} -u 65 -s /bin/false -c "Vscan account" -d %{avspool} %{avuser} 2> /dev/null || : -/usr/sbin/usermod %{avuser} -g %{avgroup} 2> /dev/null || : +%{_sbindir}/useradd -r -o -g %{avgroup} -u 65 -s /bin/false -c "Vscan account" -d %{avspool} %{avuser} 2> /dev/null || : +%{_sbindir}/usermod %{avuser} -g %{avgroup} 2> /dev/null || : %{logmsg} "Added user %{avuser} for package %{name}" %if 0%{?suse_version} > 1140 %service_add_pre amavis.service @@ -178,6 +184,7 @@ %if 0%{?suse_version} > 1140 %service_del_preun amavis.service %endif +exit 0 %post %if 0%{?suse_version} < 1230 @@ -216,7 +223,7 @@ %files %defattr(-,root,root) -%doc AAAREADME.first LICENSE INSTALL +%doc AAAREADME.first LICENSE %doc LDAP.ldif %dir /etc/openldap %dir /etc/openldap/schema @@ -231,7 +238,7 @@ %{perl_vendorlib}/JpegTester.pm %if 0%{?suse_version} > 1140 %{_unitdir}/amavis.service -/usr/sbin/amavisd-milter.sh +%{_sbindir}/amavisd-milter.sh %endif %defattr(0750,%{avuser},%{avgroup}, 0750) %dir %{avspool} ++++++ amavis.service ++++++ --- /var/tmp/diff_new_pack.24zt2z/_old 2014-01-08 20:05:54.000000000 +0100 +++ /var/tmp/diff_new_pack.24zt2z/_new 2014-01-08 20:05:54.000000000 +0100 @@ -25,7 +25,7 @@ Type=forking PIDFile=/var/spool/amavis/amavisd.pid ExecStartPre=-/bin/echo 'Starting virus-scanner (amavisd-new):' -EnvironmentFile=-/etc/sysconfig/amavisd +EnvironmentFile=-/etc/sysconfig/amavis ExecStartPre=/usr/sbin/amavisd-milter.sh start ExecStart=/usr/sbin/amavisd start ExecStartPost= ++++++ amavisd-milter.sh ++++++ --- /var/tmp/diff_new_pack.24zt2z/_old 2014-01-08 20:05:54.000000000 +0100 +++ /var/tmp/diff_new_pack.24zt2z/_new 2014-01-08 20:05:54.000000000 +0100 @@ -2,12 +2,14 @@ . /etc/sysconfig/amavis AMAVIS_MILTER_BIN=/usr/sbin/amavisd-milter -AMAVIS_MILTER_SOCK=local:/var/run/amavis/amavis-milter.sock +AMAVIS_MILTER_SOCK=local:/var/spool/amavis/amavis-milter.sock +AMAVIS_MILTER_PID=/var/spool/amavis/amavisd-milter.pid case "$1" in start) if [ "$AMAVIS_SENDMAIL_MILTER" = "yes" ]; then - startproc -u vscan $AMAVIS_MILTER_BIN -p $AMAVIS_MILTER_SOCK > /dev/null 2>&1 + startproc -u vscan $AMAVIS_MILTER_BIN -s $AMAVIS_MILTER_SOCK \ + -p $AMAVIS_MILTER_PID > /dev/null 2>&1 fi ;; stop) ++++++ rc.amavis ++++++ --- /var/tmp/diff_new_pack.24zt2z/_old 2014-01-08 20:05:54.000000000 +0100 +++ /var/tmp/diff_new_pack.24zt2z/_new 2014-01-08 20:05:54.000000000 +0100 @@ -26,7 +26,10 @@ AMAVIS_SYSCONFIG=/etc/sysconfig/amavis AMAVIS_CONF=/etc/amavisd.conf AMAVIS_PID=/var/spool/amavis/amavisd.pid -AMAVIS_MILTER_SOCK=local:/var/run/amavis/amavis-milter.sock +AMAVIS_MILTER_PID=/var/spool/amavis/amavisd-milter.pid +AMAVIS_MILTER_SOCK=local:/var/spool/amavis/amavis-milter.sock +# Use local TCP socket +# AMAVIS_MILTER_SOCK=inet:10024@localhost # it's like checkproc, but works for scripts too: checkproc_script() @@ -84,9 +87,9 @@ # Shell functions sourced from /etc/rc.status . /etc/rc.status - + # First reset status of this service -rc_reset +rc_reset case "$1" in start) @@ -107,8 +110,9 @@ rc_status -v if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then rc_reset - echo -n "Starting amavis-milter:" - startproc -u vscan $AMAVIS_MILTER_BIN -p $AMAVIS_MILTER_SOCK > /dev/null 2>&1 + echo -n "Starting amavisd-milter:" + startproc -u vscan $AMAVIS_MILTER_BIN -s $AMAVIS_MILTER_SOCK \ + -p $AMAVIS_MILTER_PID > /dev/null 2>&1 rc_status -v fi ;; @@ -131,22 +135,22 @@ try-restart) $0 status >/dev/null && $0 restart rc_status - ;; + ;; restart) $0 stop - $0 start + $0 start rc_status ;; force-reload) echo -n "Reload virus-scanner (amavisd-new): " $AMAVISD_BIN reload 2>/dev/null rc_status -v - ;; + ;; reload) echo -n "Reload virus-scanner (amavisd-new): " $AMAVISD_BIN reload 2>/dev/null rc_status -v - ;; + ;; status) echo -n "Checking for service amavis (amavisd-new): " checkproc_script -p $AMAVIS_PID $AMAVISD_BIN -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
