Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2015-09-16 10:36:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postfix" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2015-08-13 18:10:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2015-09-16 10:36:50.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 12 10:51:51 UTC 2015 - [email protected] + +- boo#934060: Remove quirky hostname logic from config.postfix + * /etc/hostname doesn't contain anything useful + * linux.local is no good either + * postfix will use `hostname`.localdomain as fallback + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix-SuSE.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/config.postfix new/postfix-SuSE/config.postfix --- old/postfix-SuSE/config.postfix 2015-01-22 10:35:38.000000000 +0100 +++ new/postfix-SuSE/config.postfix 2015-08-12 12:50:59.000000000 +0200 @@ -275,7 +275,9 @@ $PCONF -e "sender_canonical_maps = hash:/etc/postfix/sender_canonical" $PCONF -e "masquerade_exceptions = root" $PCONF -e "masquerade_classes = envelope_sender, header_sender, header_recipient" - $PCONF -e "myhostname = $FQHOSTNAME" + if [ -n "${FQHOSTNAME}" ]; then + $PCONF -e "myhostname = $FQHOSTNAME" + fi $PCONF -e "delay_warning_time = 1h" $PCONF -e 'message_strip_characters = \0' @@ -779,7 +781,8 @@ gen_amavisd_cf(){ cp /etc/amavisd.conf /etc/amavisd.conf.back export FQHOSTNAME - perl -e 'use strict; + if [ -n "${FQHOSTNAME}" ]; then + perl -e 'use strict; open(ACF,"</etc/amavisd.conf") || die "unable to open /etc/amavisd.conf: $!"; my @CONF = (); @@ -805,6 +808,7 @@ print OUT @CONF; close(OUT); ' + fi } gen_master_cf(){ @@ -1266,16 +1270,9 @@ # We may need TIMEZONE for chroot setup test -s $r/etc/sysconfig/clock && . $r/etc/sysconfig/clock - -# Try to get a valid hostname... +# Do not try to get a valid hostname as per boo#934060 if [ -z "$POSTFIX_MYHOSTNAME" ]; then - test -s "$r/$RUN/dhcp-hostname" && . "$r/$RUN/dhcp-hostname" - case $FQHOSTNAME in *.*) ;; *) unset FQHOSTNAME ;; esac - test -z "$FQHOSTNAME" -a -s $r/etc/HOSTNAME && read -t 1 FQHOSTNAME < $r/etc/HOSTNAME - # check whether hostname contains at least one dot... - echo $FQHOSTNAME | grep "\." >/dev/null || FQHOSTNAME="" - # still no valid hostname? :-( set hostname to linux.local - test -z "$FQHOSTNAME" && FQHOSTNAME=linux.local + FQHOSTNAME= else FQHOSTNAME=$POSTFIX_MYHOSTNAME fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/tags new/postfix-SuSE/tags --- old/postfix-SuSE/tags 1970-01-01 01:00:00.000000000 +0100 +++ new/postfix-SuSE/tags 2015-08-12 12:50:59.000000000 +0200 @@ -0,0 +1,12 @@ +!_TAG_FILE_SORTED 2 /0=unsorted, 1=sorted, 2=foldcase/ +cpifnewer /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^cpifnewer(){$/;" f language:Sh +gen_amavisd_cf /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^gen_amavisd_cf(){$/;" f language:Sh +gen_CA /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^gen_CA() {$/;" f language:Sh +gen_main_cf /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^gen_main_cf(){$/;" f language:Sh +gen_master_cf /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^gen_master_cf(){$/;" f language:Sh +get_alias_maps /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^get_alias_maps(){$/;" f language:Sh +mkchroot /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^mkchroot(){$/;" f language:Sh +restore_cf /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^restore_cf() {$/;" f language:Sh +update_cf /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^update_cf() {$/;" f language:Sh +update_db /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^update_db() {$/;" f language:Sh +warn_user /home/jkeil/obs/home:jkeil:branches:postfix:boo_934060/postfix/postfix-SuSE/config.postfix /^warn_user(){$/;" f language:Sh
