diff --git a/exim-4.91-dane-enable.patch b/exim-4.91-dane-enable.patch new file mode 100644 index 0000000..34bb7f3 --- /dev/null +++ b/exim-4.91-dane-enable.patch @@ -0,0 +1,13 @@ +diff --git a/src/EDITME b/src/EDITME +index ec04a22..38f0881 100644 +--- a/src/EDITME ++++ b/src/EDITME +@@ -370,7 +370,7 @@ PCRE_CONFIG=yes + # Uncomment the following line to add DANE support + # Note: Enabling this unconditionally overrides DISABLE_DNSSEC + # For DANE under GnuTLS we need an additional library. See TLS_LIBS below. +-# SUPPORT_DANE=yes ++SUPPORT_DANE=yes + + #------------------------------------------------------------------------------ + # Additional libraries and include directories may be required for some diff --git a/exim-4.89-support-proxies.patch b/exim-4.91-support-proxies.patch similarity index 73% rename from exim-4.89-support-proxies.patch rename to exim-4.91-support-proxies.patch index 39cb66c..d20a8bd 100644 --- a/exim-4.89-support-proxies.patch +++ b/exim-4.91-support-proxies.patch @@ -1,6 +1,8 @@ ---- a/src/EDITME 2018-02-07 09:39:41.449345768 +0100 -+++ b/src/EDITME 2018-02-07 09:40:08.993393374 +0100 -@@ -942,12 +942,12 @@ +diff --git a/src/EDITME b/src/EDITME +index 6f8e99f..ec04a22 100644 +--- a/src/EDITME ++++ b/src/EDITME +@@ -965,12 +965,12 @@ SUPPORT_PAM=yes # If you may want to use outbound (client-side) proxying, using Socks5, # uncomment the line below. @@ -15,4 +17,3 @@ #------------------------------------------------------------------------------ - diff --git a/exim.spec b/exim.spec index 262527a..03dd5e2 100644 --- a/exim.spec +++ b/exim.spec @@ -15,7 +15,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.91 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -67,7 +67,8 @@ Patch23: exim-4.91-smarthost-config.patch Patch26: exim-4.85-pic.patch Patch27: exim-4.90.1-environment.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1542870 -Patch34: exim-4.89-support-proxies.patch +Patch34: exim-4.91-support-proxies.patch +Patch35: exim-4.91-dane-enable.patch Requires: /etc/pki/tls/certs /etc/pki/tls/private Requires: /etc/aliases @@ -226,6 +227,7 @@ greylisting unconditional. %patch26 -p1 -b .fpic %patch27 -p1 -b .environment %patch34 -p1 -b .proxy +%patch35 -p1 -b .dane-enable cp src/EDITME Local/Makefile sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile @@ -618,6 +620,11 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Wed Mar 27 2019 Jaroslav Škarvada - 4.91-3 +- Enabled DANE support + Resolves: rhbz#1693202 +- De-fuzzified support-proxies patch + * Wed Feb 20 2019 Marcel Härry - 4.91-2 - Enable proxy and socks support Resolves: rhbz#1542870