rpms/exim
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reintroduced opendmarc-1.4 build fix

Browse Source 
The opendmarc-1.4 was pushed to f34, thus we need the fix.
Also synced changelog with the f35.

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
This commit is contained in:
Jaroslav Škarvada 2021-05-24 12:02:23 +02:00
parent 566176665d
commit dfe5f0fc79
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
exim-4.94.2-opendmarc-1.4-build-fix.patch Normal file
View File

@ -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)

8
exim.spec
View File

@ -12,7 +12,7 @@
Summary: The exim mail transfer agent Summary: The exim mail transfer agent
Name: exim Name: exim
Version: 4.94.2 Version: 4.94.2
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Url: https://www.exim.org/ Url: https://www.exim.org/
@ -46,6 +46,8 @@ Patch0: exim-4.94.2-config.patch
Patch1: exim-4.94-libdir.patch Patch1: exim-4.94-libdir.patch
Patch2: exim-4.94-dlopen-localscan.patch Patch2: exim-4.94-dlopen-localscan.patch
Patch3: exim-4.85-pic.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/pki/tls/certs /etc/pki/tls/private
Requires: /etc/aliases Requires: /etc/aliases
@ -160,6 +162,7 @@ greylisting unconditional.
%patch1 -p1 -b .libdir %patch1 -p1 -b .libdir
%patch2 -p1 -b .dl %patch2 -p1 -b .dl
%patch3 -p1 -b .fpic %patch3 -p1 -b .fpic
%patch4 -p1 -b .opendmarc-1.4-build-fix
cp src/EDITME Local/Makefile cp src/EDITME Local/Makefile
sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' 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 %{_sysconfdir}/cron.daily/greylist-tidy.sh
%changelog %changelog
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.94.2-2
- Perl 5.34 rebuild
* Tue May 4 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.94.2-1 * Tue May 4 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.94.2-1
- New version - New version
Resolves: rhbz#1956859 Resolves: rhbz#1956859