From a8e2028e72c717a1f56af691ab6efc057619db4b Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann Date: May 11 2021 21:21:32 +0000 Subject: Update 2021-05-11 --- diff --git a/.files b/.files index 26ec6c1..fbe6e04 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 7d350c2..99da8a8 100644 --- a/.rev +++ b/.rev @@ -601,4 +601,12 @@ Please forward to Factory and 13.1 859752 + + c8d769102485c1add6818bf6102a997d + 2.12.1 + + RBrownSUSE + + 876592 + diff --git a/amavis.service b/amavis.service index 2a0e063..6f6cb39 100644 --- a/amavis.service +++ b/amavis.service @@ -35,11 +35,9 @@ ProtectHome=yes NoNewPrivileges=yes ExecStartPre=-/bin/echo 'Starting virus-scanner (amavisd-new):' EnvironmentFile=-/etc/sysconfig/amavis -ExecStartPre=/usr/sbin/amavisd-milter.sh start ExecStart=/usr/sbin/amavisd -P '' foreground ExecReload=/usr/sbin/amavisd -P '' reload ExecStop=/usr/sbin/amavisd -P '' stop -ExecStopPost=/usr/sbin/amavisd-milter.sh stop [Install] WantedBy=multi-user.target diff --git a/amavisd-milter-1.6.1.tar.gz b/amavisd-milter-1.6.1.tar.gz deleted file mode 120000 index bf08432..0000000 --- a/amavisd-milter-1.6.1.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreiguoc7hfxppjtzyxe73jmxqfx6kj6bg7fitpnlox4ubu77oy3hsqi \ No newline at end of file diff --git a/amavisd-milter.sh b/amavisd-milter.sh deleted file mode 100644 index 180766a..0000000 --- a/amavisd-milter.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -. /etc/sysconfig/amavis -AMAVIS_MILTER_BIN=/usr/sbin/amavisd-milter -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 -s $AMAVIS_MILTER_SOCK \ - -p $AMAVIS_MILTER_PID > /dev/null 2>&1 - fi - ;; - stop) - if [ "$AMAVIS_SENDMAIL_MILTER" = "yes" ]; then - killproc -TERM $AMAVIS_MILTER_BIN - fi - ;; -esac -exit 0 diff --git a/amavisd-new-no-berkeleydb.patch b/amavisd-new-no-berkeleydb.patch new file mode 100644 index 0000000..d798c1a --- /dev/null +++ b/amavisd-new-no-berkeleydb.patch @@ -0,0 +1,11 @@ +--- a/amavisd.conf 2021-02-25 10:30:28.234737601 +0100 ++++ b/amavisd.conf 2021-02-25 10:31:25.883474087 +0100 +@@ -44,7 +44,7 @@ $do_syslog = 1; # log via s + $syslog_facility = 'mail'; # Syslog facility as a string + # e.g.: mail, daemon, user, local0, ... local7 + +-$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny) ++# $enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny) + # $enable_zmq = 1; # enable use of ZeroMQ (SNMP and nanny) + $nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed + $enable_dkim_verification = 1; # enable DKIM signatures verification diff --git a/amavisd-new.changes b/amavisd-new.changes index 40d101a..a0ce9e3 100644 --- a/amavisd-new.changes +++ b/amavisd-new.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Feb 24 21:42:51 UTC 2021 - Arjen de Korte + +- Package amavisd-milter in a separate package +- Add perl(Convert::BinHex) to required packages +- Disable BerkeleyDB in configuration + + amavisd-new-no-berkeleydb.patch + +------------------------------------------------------------------- Wed Dec 30 14:16:06 UTC 2020 - Arjen de Korte - update to version 2.12.1 diff --git a/amavisd-new.spec b/amavisd-new.spec index 8ded06c..45603b9 100644 --- a/amavisd-new.spec +++ b/amavisd-new.spec @@ -31,17 +31,15 @@ URL: https://gitlab.com/amavis/amavis/ Source0: https://gitlab.com/amavis/amavis/-/archive/v%{version}/amavis-v%{version}.tar.bz2 Source1: sysconfig.amavis Source3: amavisd-new-rpmlintrc -Source4: amavisd-milter-1.6.1.tar.gz Source5: amavis.service -Source6: amavisd-milter.sh %if 0%{?suse_version} <= 1500 Source10: system-user-vscan.conf %endif Patch1: activate_virus_scanner.diff # PATCH-FIX-UPSTREAM -- detect myhostname via Net::Domain::hostfqdn() Patch2: amavisd-new-2.10.1-myhostname.patch -BuildRequires: sendmail -BuildRequires: sendmail-devel +# PATCH-FIX-OPENSUSE -- amavisd-new-no-berkeleydb.patch +Patch3: amavisd-new-no-berkeleydb.patch %if 0%{?suse_version} > 1500 BuildRequires: group(vscan) BuildRequires: user(vscan) @@ -53,6 +51,7 @@ Requires: smtp_daemon Requires: perl(Archive::Zip) >= 1.14 Requires: perl(Compress::Raw::Zlib) >= 2.017 Requires: perl(Compress::Zlib) >= 1.35 +Requires: perl(Convert::BinHex) Requires: perl(Digest::MD5) >= 2.22 Requires: perl(MIME::Base64) Requires: perl(MIME::Parser) @@ -90,8 +89,7 @@ Recommends: perl(Mail::SpamAssassin) Recommends: perl(Net::LDAP) Suggests: perl(DBD::mysql) Suggests: perl(DBI) -Provides: amavisd-milter = 1.6.1 -Obsoletes: amavisd-milter < 1.6.1 +BuildArch: noarch %{?systemd_ordering} %description @@ -127,14 +125,11 @@ This package provides the system user 'vscan'. %endif %prep -%setup -q -n amavis-v%{version} -a 4 -%patch1 -p1 -%patch2 -p1 +%autosetup -n amavis-v%{version} -p1 for i in $(find -maxdepth 1 -name "amavisd*" | sed s#./##); do if [[ $i == *patch ]] ; then continue; fi 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|^# \$MYHOME =.*|\$MYHOME = '%{avspool}';|g; \ s|/var/amavis/db|%{avdb}|g; \ @@ -149,9 +144,6 @@ done # Create vscan user %sysusers_generate_pre %{SOURCE10} vscan %endif -cd amavisd-milter* -%configure --localstatedir="%{avspool}" -%make_build # --------------------------------------------------------------------------- @@ -180,9 +172,6 @@ install -m 644 JpegTester.pm %{buildroot}/%{perl_vendorlib}/JpegTester.pm mkdir -p %{buildroot}%{_unitdir} install -m 644 %{SOURCE5} %{buildroot}%{_unitdir} ln -s service %{buildroot}/%{_sbindir}/rcamavis -install -m 755 %{SOURCE6} %{buildroot}%{_sbindir}/ -cd amavisd-milter* -%make_install %if 0%{?suse_version} <= 1500 %pre -n system-user-vscan -f vscan.pre @@ -223,7 +212,6 @@ fi %{_sbindir}/* %{perl_vendorlib}/JpegTester.pm %{_unitdir}/amavis.service -%{_sbindir}/amavisd-milter.sh %defattr(0750,vscan,vscan,0750) %dir %{avspool}/tmp %dir %{avspool}/db @@ -238,7 +226,6 @@ fi %doc amavisd.conf-* %doc MANIFEST TODO %doc test-messages -%{_mandir}/man8/amavisd-milter* %if 0%{?suse_version} <= 1500 %files -n system-user-vscan