Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package amavisd-new for openSUSE:Factory checked in at 2021-03-05 13:47:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old) and /work/SRC/openSUSE:Factory/.amavisd-new.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amavisd-new" Fri Mar 5 13:47:09 2021 rev:73 rq:876592 version:2.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes 2021-01-02 21:31:09.831444669 +0100 +++ /work/SRC/openSUSE:Factory/.amavisd-new.new.2378/amavisd-new.changes 2021-03-05 13:49:40.243861868 +0100 @@ -1,0 +2,8 @@ +Wed Feb 24 21:42:51 UTC 2021 - Arjen de Korte <[email protected]> + +- Package amavisd-milter in a separate package +- Add perl(Convert::BinHex) to required packages +- Disable BerkeleyDB in configuration + + amavisd-new-no-berkeleydb.patch + +------------------------------------------------------------------- Old: ---- amavisd-milter-1.6.1.tar.gz amavisd-milter.sh New: ---- amavisd-new-no-berkeleydb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amavisd-new.spec ++++++ --- /var/tmp/diff_new_pack.koh4Af/_old 2021-03-05 13:49:41.171862712 +0100 +++ /var/tmp/diff_new_pack.koh4Af/_new 2021-03-05 13:49:41.175862715 +0100 @@ -31,17 +31,15 @@ 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: 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(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 @@ %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 @@ # Create vscan user %sysusers_generate_pre %{SOURCE10} vscan %endif -cd amavisd-milter* -%configure --localstatedir="%{avspool}" -%make_build # --------------------------------------------------------------------------- @@ -180,9 +172,6 @@ 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 @@ %{_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 @@ %doc amavisd.conf-* %doc MANIFEST TODO %doc test-messages -%{_mandir}/man8/amavisd-milter* %if 0%{?suse_version} <= 1500 %files -n system-user-vscan ++++++ amavis.service ++++++ --- /var/tmp/diff_new_pack.koh4Af/_old 2021-03-05 13:49:41.219862755 +0100 +++ /var/tmp/diff_new_pack.koh4Af/_new 2021-03-05 13:49:41.219862755 +0100 @@ -35,11 +35,9 @@ 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 ++++++ amavisd-new-no-berkeleydb.patch ++++++ --- 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
