Merge remote-tracking branch 'origin/f28'

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>

exim-4.92-greylist-conf.patch

@@ -6,7 +6,7 @@ index 9242bac..439287a 100644
  # manual for details. The lists above are used in the access control lists for
  # checking incoming messages. The names of these ACLs are defined here:
  
-++acl_smtp_mail =        acl_check_mail
++acl_smtp_mail =         acl_check_mail
  acl_smtp_rcpt =         acl_check_rcpt
  .ifdef _HAVE_PRDR
  acl_smtp_data_prdr =    acl_check_prdr

exim.spec

@@ -14,7 +14,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Provides: MTA smtpd smtpdaemon server(smtp)
@@ -314,10 +314,11 @@ chmod 600 $RPM_BUILD_ROOT/etc/pki/tls/{certs,private}/exim.pem
 # generate alternatives ghosts
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 for i in %{_sbindir}/sendmail %{_bindir}/{mailq,runq,rsmtp,rmail,newaliases} \
-	/usr/lib/sendmail %{_sysconfdir}/pam.d/smtp %{_mandir}/man1/mailq.1.gz
+	/usr/lib/sendmail %{_sysconfdir}/pam.d/smtp
 do
 	touch $RPM_BUILD_ROOT$i
 done
+gzip < /dev/null > $RPM_BUILD_ROOT%{_mandir}/man1/mailq.1.gz
 
 %if %{with clamav}
 # Munge the clamav init and config files from clamav-devel. This really ought
@@ -356,6 +357,9 @@ install -m755 %{SOURCE22} $RPM_BUILD_ROOT/%_sysconfdir/cron.daily/greylist-tidy.
 install -m644 %{SOURCE23} $RPM_BUILD_ROOT/%_sysconfdir/exim/trusted-configs
 touch $RPM_BUILD_ROOT/%_var/spool/exim/db/greylist.db
 
+%check
+build-`scripts/os-type`-`scripts/arch-type`/exim -C src/configure.default -bV
+
 %pre
 %{_sbindir}/groupadd -g 93 exim 2>/dev/null
 %{_sbindir}/useradd -d %{_var}/spool/exim -s /sbin/nologin -G mail -M -r -u 93 -g exim exim 2>/dev/null
@@ -573,6 +577,11 @@ test "$1"  = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Sat Mar  2 2019 Tim Landscheidt <tim@tim-landscheidt.de> - 4.92-3
+- Fix syntax error in exim.conf (#1679274)
+- Use properly compressed empty mailq.1.gz as ghost file
+- Add basic check that configuration file is valid
+
 * Wed Feb 20 2019 Marcel Härry <mh+fedora@scrit.ch> - 4.92-2
 - Enable proxy and socks support
   Resolves: rhbz#1542870