From dfe5f0fc79952503ca3eec836ce1cc3c67fa5c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 24 May 2021 12:02:23 +0200 Subject: [PATCH] Reintroduced opendmarc-1.4 build fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The opendmarc-1.4 was pushed to f34, thus we need the fix. Also synced changelog with the f35. Signed-off-by: Jaroslav Škarvada --- exim-4.94.2-opendmarc-1.4-build-fix.patch | 11 +++++++++++ exim.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 exim-4.94.2-opendmarc-1.4-build-fix.patch diff --git a/exim-4.94.2-opendmarc-1.4-build-fix.patch b/exim-4.94.2-opendmarc-1.4-build-fix.patch new file mode 100644 index 0000000..73dea10 --- /dev/null +++ b/exim-4.94.2-opendmarc-1.4-build-fix.patch @@ -0,0 +1,11 @@ +--- a/src/dmarc.c ++++ b/src/dmarc.c +@@ -446,7 +446,7 @@ if (!dmarc_abort && !sender_host_authenticated) + vs == PDKIM_VERIFY_INVALID ? DMARC_POLICY_DKIM_OUTCOME_TMPFAIL : + DMARC_POLICY_DKIM_OUTCOME_NONE; + libdm_status = opendmarc_policy_store_dkim(dmarc_pctx, US sig->domain, +- dkim_result, US""); ++ sig->selector, dkim_result, US""); + DEBUG(D_receive) + debug_printf("DMARC adding DKIM sender domain = %s\n", sig->domain); + if (libdm_status != DMARC_PARSE_OKAY) diff --git a/exim.spec b/exim.spec index 8ebbd0d..83b3cfd 100644 --- a/exim.spec +++ b/exim.spec @@ -12,7 +12,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.94.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Url: https://www.exim.org/ @@ -46,6 +46,8 @@ Patch0: exim-4.94.2-config.patch Patch1: exim-4.94-libdir.patch Patch2: exim-4.94-dlopen-localscan.patch Patch3: exim-4.85-pic.patch +# https://bugs.exim.org/show_bug.cgi?id=2728 +Patch4: exim-4.94.2-opendmarc-1.4-build-fix.patch Requires: /etc/pki/tls/certs /etc/pki/tls/private Requires: /etc/aliases @@ -160,6 +162,7 @@ greylisting unconditional. %patch1 -p1 -b .libdir %patch2 -p1 -b .dl %patch3 -p1 -b .fpic +%patch4 -p1 -b .opendmarc-1.4-build-fix cp src/EDITME Local/Makefile sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile @@ -477,6 +480,9 @@ fi %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Fri May 21 2021 Jitka Plesnikova - 4.94.2-2 +- Perl 5.34 rebuild + * Tue May 4 2021 Jaroslav Škarvada - 4.94.2-1 - New version Resolves: rhbz#1956859