Followup-For: Bug #792162 attached is a filtered diff of /etc/mail between installations of -2 and -3 in a pbuilder chroot
Andreas
diff -ur /tmp/pbuilder/build/17461/etc/mail/sendmail.cf /tmp/pbuilder/build/7573/etc/mail/sendmail.cf --- /tmp/pbuilder/build/17461/etc/mail/sendmail.cf 2015-07-20 12:39:51.875344086 +0200 +++ /tmp/pbuilder/build/7573/etc/mail/sendmail.cf 2015-07-20 12:40:23.679394196 +0200 @@ -21,7 +21,7 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### built by root@myhost on Mon Jul 20 10:32:11 UTC 2015 +##### built by root@myhost on Mon Jul 20 10:31:56 UTC 2015 ##### in / ##### using /usr/share/sendmail/cf/ as configuration include directory ##### @@ -87,7 +87,7 @@ # override file safeties - setting this option compromises system security, # addressing the actual file configuration problem is preferred # need to set this before any file actions are encountered in the cf file -O DontBlameSendmail= ,AssumeSafeChown,ForwardFileInGroupWritableDirPath,GroupWritableForwardFileSafe,GroupWritableIncludeFileSafe,IncludeFileInGroupWritableDirPath,DontWarnForwardFileInUnsafeDirPath,TrustStickyBit,NonRootSafeAddr,GroupWritableIncludeFile,GroupReadableaDefaultAuthInfoFile +O DontBlameSendmail= ,AssumeSafeChown,ForwardFileInGroupWritableDirPath,GroupWritableForwardFileSafe,GroupWritableIncludeFileSafe,IncludeFileInGroupWritableDirPath,DontWarnForwardFileInUnsafeDirPath,TrustStickyBit,NonRootSafeAddr,GroupWritableIncludeFile,GroupReadableDefaultAuthInfoFile # default LDAP map specification # need to set this now before any LDAP maps are defined @@ -168,7 +168,7 @@ Kaccess hash -T<TMPF> /etc/mail/access # Configuration version number -DZ8.14.9/Debian-2 +DZ8.14.9/Debian-3 ############### @@ -1780,12 +1780,15 @@ # SHdrToL R$+ $: $>AddDomain $1 add local domain if needed -R$* < @ *LOCAL* > $* $: $1 < @ $j . > $2 +R$* $: $>MasqHdr $1 do all-masquerading # # Common code to add local domain name (only if always-add-domain) # SAddDomain +R$* < @ $* > $* $@ $1 < @ $2 > $3 already fully qualified + +R$+ $@ $1 < @ *LOCAL* > add local qualification Mlocal, P=/usr/sbin/sensible-mda, F=lsDFMAw5:/|@qPn9S, S=EnvFromL/HdrFromL, R=EnvToL/HdrToL, T=DNS/RFC822/X-Unix, @@ -1870,19 +1873,19 @@ R$+ $: $>MasqSMTP $1 R$+ $: $>MasqHdr $1 -Msmtp, P=[IPC], F=mDFMuX, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Msmtp, P=[IPC], F=mDFMuX, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP/HdrFromSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Mesmtp, P=[IPC], F=mDFMuXa, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Mesmtp, P=[IPC], F=mDFMuXa, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP/HdrFromSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Msmtp8, P=[IPC], F=mDFMuX8, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Msmtp8, P=[IPC], F=mDFMuX8, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP/HdrFromSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Mdsmtp, P=[IPC], F=mDFMuXa%, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Mdsmtp, P=[IPC], F=mDFMuXa%, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP/HdrFromSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Mrelay, P=[IPC], F=mDFMuXa8, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=2040, +Mrelay, P=[IPC], F=mDFMuXa8, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP/MasqRelay, E=\r\n, L=2040, T=DNS/RFC822/SMTP, A=TCP $h @@ -1987,13 +1990,14 @@ # include(`/etc/mail/m4/dialup.m4')dnl # include(`/etc/mail/m4/provider.m4')dnl # dnl # -# dnl # Default Mailer setup -# MAILER_DEFINITIONS -# MAILER(`local')dnl -# MAILER(`smtp')dnl -# # dnl # Masquerading options # FEATURE(`always_add_domain')dnl # MASQUERADE_AS(`myhost.domain.example.com')dnl # FEATURE(`allmasquerade')dnl # FEATURE(`masquerade_envelope')dnl +# dnl # +# dnl # Default Mailer setup +# MAILER_DEFINITIONS +# MAILER(`local')dnl +# MAILER(`smtp')dnl +# Only in /tmp/pbuilder/build/17461/etc/mail: sendmail.cf.errors diff -ur /tmp/pbuilder/build/17461/etc/mail/sendmail.mc /tmp/pbuilder/build/7573/etc/mail/sendmail.mc --- /tmp/pbuilder/build/17461/etc/mail/sendmail.mc 2015-07-20 12:39:51.871344080 +0200 +++ /tmp/pbuilder/build/7573/etc/mail/sendmail.mc 2015-07-20 12:40:23.675394190 +0200 @@ -97,13 +97,14 @@ include(`/etc/mail/m4/dialup.m4')dnl include(`/etc/mail/m4/provider.m4')dnl dnl # -dnl # Default Mailer setup -MAILER_DEFINITIONS -MAILER(`local')dnl -MAILER(`smtp')dnl - dnl # Masquerading options FEATURE(`always_add_domain')dnl MASQUERADE_AS(`myhost.domain.example.com')dnl FEATURE(`allmasquerade')dnl FEATURE(`masquerade_envelope')dnl +dnl # +dnl # Default Mailer setup +MAILER_DEFINITIONS +MAILER(`local')dnl +MAILER(`smtp')dnl +