commit amavisd-new for openSUSE:Factory
Hello community, here is the log from the commit of package amavisd-new for openSUSE:Factory checked in at 2016-01-23 01:16: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 2015-08-13 18:10:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 2016-01-23 01:17:01.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Jan 21 13:43:53 UTC 2016 - aj@ajaissle.de + +- Add amavisd-new-2.10.1-myhostname.patch: + $myhostname is set using POSIX::uname, but expects a FQDN. This + patch changes this behaviour to use Net::Domain::hostfqdn instead + +------------------------------------------------------------------- New: ---- amavisd-new-2.10.1-myhostname.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amavisd-new.spec ++++++ --- /var/tmp/diff_new_pack.aQM3lR/_old 2016-01-23 01:17:02.000000000 +0100 +++ /var/tmp/diff_new_pack.aQM3lR/_new 2016-01-23 01:17:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package amavisd-new # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,8 @@ Source5: amavis.service Source6: amavisd-milter.sh Patch1: activate_virus_scanner.diff +# PATCH-FIX-UPSTREAM -- detect myhostname via Net::Domain::hostfqdn() +Patch2: amavisd-new-2.10.1-myhostname.patch BuildRequires: sed BuildRequires: sendmail BuildRequires: sendmail-devel @@ -117,6 +119,7 @@ %prep %setup -q -a 4 %patch1 -p1 +%patch2 -p1 for i in $(find -maxdepth 1 -name "amavisd*" | sed s#./##); do if [[ $i == *patch ]] ; then continue; fi if [[ $i == *patch ]] ; then continue; fi ++++++ amavisd-new-2.10.1-myhostname.patch ++++++ diff -Ppru amavisd-new-2.10.1.orig/amavisd amavisd-new-2.10.1/amavisd --- amavisd-new-2.10.1.orig/amavisd 2014-10-26 01:06:00.000000000 +0200 +++ amavisd-new-2.10.1/amavisd 2016-01-10 20:29:35.271354344 +0100 @@ -235,7 +235,7 @@ BEGIN { MIME::Head MIME::Body MIME::Entity MIME::Parser MIME::Decoder MIME::Decoder::Base64 MIME::Decoder::Binary MIME::Decoder::QuotedPrint MIME::Decoder::NBit MIME::Decoder::UU MIME::Decoder::Gzip64 - Net::LibIDN Net::Server Net::Server::PreFork + Net::Domain Net::LibIDN Net::Server Net::Server::PreFork )); # with earlier versions of Perl one may need to add additional modules # to the list, such as: auto::POSIX::setgid auto::POSIX::setuid ... @@ -981,7 +981,8 @@ BEGIN { # $myhostname is used by SMTP server module in the initial SMTP welcome line, # in inserted Received: lines, Message-ID in notifications, log entries, ... - $myhostname = (POSIX::uname)[1]; # should be a FQDN ! + $ENV{'PATH'} = ""; + $myhostname = Net::Domain::hostfqdn(); # should be a FQDN ! $snmp_contact = ''; # a value of sysContact OID $snmp_location = ''; # a value of sysLocation OID
participants (1)
-
root@hilbert.suse.de