New version

Resolves: rhbz#2119687

exim-4.96-config.patch

@@ -12,7 +12,7 @@ index ed77b6a..b9eb64d 100755
    echo "" >>$mft
    cat $mftt >> $mft
 diff --git a/src/EDITME b/src/EDITME
-index 53022e5..cf0b33e 100644
+index 53022e5..32d9b7d 100644
 --- a/src/EDITME
 +++ b/src/EDITME
 @@ -99,7 +99,7 @@
@@ -105,10 +105,11 @@ index 53022e5..cf0b33e 100644
 -# LOOKUP_MYSQL=yes
 -# LOOKUP_MYSQL_PC=mariadb
 -# LOOKUP_NIS=yes
+-# LOOKUP_NISPLUS=yes
 +LOOKUP_MYSQL=2
 +LOOKUP_MYSQL_PC=mariadb
 +LOOKUP_NIS=yes
- # LOOKUP_NISPLUS=yes
++LOOKUP_NISPLUS=yes
 +CFLAGS+=-I/usr/include/nsl -I/usr/include/tirpc
 +LIBS+=-L/usr/$(_lib)/nsl
 +

exim-4.96-no-gsasl.patch

@@ -0,0 +1,15 @@
+diff --git a/src/EDITME b/src/EDITME
+index 2893392..5de1f03 100644
+--- a/src/EDITME
++++ b/src/EDITME
+@@ -764,8 +764,8 @@ AUTH_CRAM_MD5=yes
+ AUTH_CYRUS_SASL=yes
+ AUTH_DOVECOT=yes
+ # AUTH_EXTERNAL=yes
+-AUTH_GSASL=yes
+-AUTH_GSASL_PC=libgsasl
++# AUTH_GSASL=yes
++# AUTH_GSASL_PC=libgsasl
+ # AUTH_HEIMDAL_GSSAPI=yes
+ # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
+ # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5

exim-clamav-tmpfiles.conf

@@ -1 +1 @@
-D /run/clamd.exim 0750 exim exim -
+D /var/run/clamd.exim 0750 exim exim -

exim.spec

@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.96
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Url: https://www.exim.org/
 
@@ -22,7 +22,7 @@ Requires(preun): %{_sbindir}/alternatives systemd
 Requires(postun): %{_sbindir}/alternatives systemd
 Requires(pre): %{_sbindir}/groupadd, %{_sbindir}/useradd
 %if %{with clamav}
-BuildRequires: clamd
+BuildRequires: clamav-devel
 %endif
 Source: https://ftp.exim.org/pub/exim/exim4/exim-%{version}.tar.xz
 Source1: https://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.xz.asc
@@ -46,53 +46,31 @@ Patch0: exim-4.96-config.patch
 Patch1: exim-4.94-libdir.patch
 Patch2: exim-4.96-dlopen-localscan.patch
 Patch3: exim-4.96-pic.patch
+Patch4: exim-4.96-no-gsasl.patch
 # https://bugs.exim.org/show_bug.cgi?id=2728
-Patch4: exim-4.96-opendmarc-1.4-build-fix.patch
+Patch5: exim-4.96-opendmarc-1.4-build-fix.patch
 # https://bugs.exim.org/show_bug.cgi?id=2899
-Patch5: exim-4.96-build-fix.patch
+Patch6: exim-4.96-build-fix.patch
 
 Requires: /etc/pki/tls/certs /etc/pki/tls/private
 Requires: /etc/aliases
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Recommends: publicsuffix-list
-BuildRequires: gcc
-BuildRequires: libdb-devel
-BuildRequires: openssl-devel
-BuildRequires: openldap-devel
-BuildRequires: pam-devel
-BuildRequires: pcre2-devel
-BuildRequires: sqlite-devel
-BuildRequires: cyrus-sasl-devel
-BuildRequires: libspf2-devel
-BuildRequires: libopendmarc-devel
-BuildRequires: openldap-devel
-BuildRequires: openssl-devel
-BuildRequires: mariadb-connector-c-devel
-BuildRequires: libpq-devel
-BuildRequires: libXaw-devel
-BuildRequires: libXmu-devel
-BuildRequires: libXext-devel
-BuildRequires: libX11-devel
-BuildRequires: libSM-devel
+BuildRequires: gcc libdb-devel openssl-devel openldap-devel pam-devel
+BuildRequires: pcre2-devel sqlite-devel cyrus-sasl-devel
+BuildRequires: libspf2-devel libopendmarc-devel
+BuildRequires: openldap-devel openssl-devel mariadb-connector-c-devel libpq-devel
+BuildRequires: libXaw-devel libXmu-devel libXext-devel libX11-devel libSM-devel
 BuildRequires: perl-devel
 BuildRequires: perl-generators
-BuildRequires: libICE-devel
-BuildRequires: libXpm-devel
-BuildRequires: libXt-devel
-BuildRequires: perl(ExtUtils::Embed)
+BuildRequires: libICE-devel libXpm-devel libXt-devel perl(ExtUtils::Embed)
 # mariadb-devel for mariadb pkgconfig
-BuildRequires: systemd-units
-BuildRequires: libgsasl-devel
-BuildRequires: mariadb-devel
+BuildRequires: systemd-units mariadb-devel
 # Workaround for NIS removal from glibc, bug 1534920
-BuildRequires: libnsl2-devel
-BuildRequires: libtirpc-devel
-BuildRequires: gnupg2
-BuildRequires: grep
+BuildRequires: libnsl2-devel libtirpc-devel
+BuildRequires: gnupg2 grep
 %if 0%{?rhel} == 8
 BuildRequires:  epel-rpm-macros >= 8-5
 %endif
-BuildRequires: make
 
 %description
 Exim is a message transfer agent (MTA) developed at the University of
@@ -130,7 +108,7 @@ interface.
 %if %{with clamav}
 %package clamav
 Summary: Clam Antivirus scanner dæmon configuration for use with Exim
-Requires: clamd exim
+Requires: clamav-server exim
 Obsoletes: clamav-exim <= 0.86.2
 
 %description clamav
@@ -179,7 +157,15 @@ greylisting unconditional.
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1
+%setup -q
+
+%patch0 -p1 -b .config
+%patch1 -p1 -b .libdir
+%patch2 -p1 -b .dl
+%patch3 -p1 -b .fpic
+%patch4 -p1 -b .no-gsasl
+%patch5 -p1 -b .opendmarc-1.4-build-fix
+%patch6 -p1 -b .build-fix
 
 cp src/EDITME Local/Makefile
 sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
@@ -301,7 +287,7 @@ gzip < /dev/null > $RPM_BUILD_ROOT%{_mandir}/man1/mailq.1.gz
 # Munge the clamav init and config files from clamav-devel. This really ought
 # to be a subpackage of clamav, but this hack will have to do for now.
 function clamsubst() {
-	 sed -e "s!<SERVICE>!$3!g;s!<USER>!$4!g;""$5" %{_docdir}/clamd/"$1" >"$RPM_BUILD_ROOT$2"
+	 sed -e "s!<SERVICE>!$3!g;s!<USER>!$4!g;""$5" %{_datadir}/clamav/template/"$1" >"$RPM_BUILD_ROOT$2"
 }
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d
@@ -497,59 +483,26 @@ fi
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.96-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jun 28 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.96-1
+* Fri Aug 19 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.96-1
 - New version
-  Resolves: rhbz#2101104
+  Resolves: rhbz#2119687
 
-* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.95-4
-- Perl 5.36 rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.95-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Nov 12 2021 Björn Esser <besser82@fedoraproject.org> - 4.95-2
-- Rebuild(libnsl2)
-- Drop support for NISPLUS, as libnsl2 >= 2.0.0 does not support it anymore
-
-* Mon Oct  4 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.95-1
+* Thu Jun 23 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.95-1
 - New version
-  Resolves: rhbz#2008452
+  Resolves: rhbz#2100385
 
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 4.94.2-4
-- Rebuilt with OpenSSL 3.0.0
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.94.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.94.2-2
-- Perl 5.34 rebuild
+* Mon Aug  2 2021 Marcel Härry <mh+fedora@scrit.ch> - 4.94.2-2
+- Fix dmarc checks - fixes bz#1989089
 
 * Tue May  4 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.94.2-1
 - New version
-  Resolves: rhbz#1956859
 
-* Thu Mar 25 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.94-7
+* Mon Apr 12 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.94-3
+- Release bump to fix greylisting
+
+* Thu Mar 25 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.94-2
 - Fixed cname handling in TLS certificate verification
-  Resolves: rhbz#1942582
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.94-6
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 4.94-5
-- rebuild for libpq ABI fix rhbz#1908268
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.94-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.94-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.94-2
-- Perl 5.32 rebuild
+  Resolves: rhbz#1942583
 
 * Mon Jun  1 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.94-1
 - New version
@@ -559,46 +512,20 @@ fi
 - Used better workaround for rhbz#1791878
   Resolves: rhbz#1842633
 
-* Fri May 15 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.93-8
+* Fri May 15 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.93-3
 - Fixed out-of-bounds read in the SPA authenticator
   Resolves: CVE-2020-12783
 
-* Wed Apr 29 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.93-7
-- Improved the spec file not to override LDFLAGS
+* Wed Apr 29 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.93-2
+- Enabled spf2 and opendmarc support
+  Resolves: rhbz#1829076
 
-* Wed Apr 29 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.93-6
-- Updated config to explictly link with spf2 and opendmarc
-- Fixed bogus date in changelog
+* Fri Mar 20 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.93-1
+- Rebased to 4.93
+  Resolves: rhbz#1827425
 
-* Wed Apr 29 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.93-5
-- Bump for rebuild with the fixed clamd requirement
-  Resolves: rhbz#1801329
-
-* Fri Mar 20 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.93-4
-- Workaround for upgrade conflict
-  Resolves: rhbz#1791878
-
-* Thu Feb 20 2020 Tom Hughes <tom@compton.nu> - 4.93-3
-- Enable SPF and DMARC support
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.93-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Jan 12 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.93-1
-- New version
-  Resolves: rhbz#1782320
-- Consolidated and simplified patches
-- Dropped dane-enable patch (not needed)
-
-* Thu Jan  2 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 4.92.3-5
-- Fixed FTBFS due to changes in clamav package
-  Resolves: rhbz#1787285
-
-* Fri Nov 22 2019 Felix Schwarz <fschwarz@fedoraproject.org> - 4.92.3-4
-- enable GPG-based source file verification
-
-* Thu Oct 10 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 4.92.3-3
-- Enabled local_scan
+* Tue Nov 19 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 4.92.3-3
+- Temporaly disabled gsasl support due to rhbz#1741538
 
 * Thu Oct 10 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 4.92.3-2
 - Dropped sysvinit artifacts