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

Fixed FTBFS with spf2 and opendmarc 

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
This commit is contained in:
Jaroslav Škarvada 2020-04-29 19:21:40 +02:00
parent b21ff80453
commit 84e5a5c317
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
exim-4.93-config.patch
View File

@ -12,7 +12,7 @@ index ecd2083..cf1eeb2 100755
echo "" >>$mft echo "" >>$mft
cat $mftt >> $mft cat $mftt >> $mft
diff --git a/src/EDITME b/src/EDITME diff --git a/src/EDITME b/src/EDITME
index 83325ab..57d5eb9 100644 index 83325ab..4cc0c80 100644
--- a/src/EDITME --- a/src/EDITME
+++ b/src/EDITME +++ b/src/EDITME
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
@ -150,14 +150,15 @@ index 83325ab..57d5eb9 100644
# If you have content scanning you may wish to only include some of the scanner # If you have content scanning you may wish to only include some of the scanner
# interfaces. Uncomment any of these lines to remove that code. # interfaces. Uncomment any of these lines to remove that code.
@@ -592,12 +598,12 @@ @@ -592,12 +598,12 @@ DISABLE_MAL_MKS=yes
# Uncomment the following line to add DMARC checking capability, implemented # Uncomment the following line to add DMARC checking capability, implemented
# using libopendmarc libraries. You must have SPF and DKIM support enabled also. # using libopendmarc libraries. You must have SPF and DKIM support enabled also.
-# SUPPORT_DMARC=yes -# SUPPORT_DMARC=yes
+SUPPORT_DMARC=yes +SUPPORT_DMARC=yes
# CFLAGS += -I/usr/local/include # CFLAGS += -I/usr/local/include
# LDFLAGS += -lopendmarc -# LDFLAGS += -lopendmarc
+LDFLAGS += -lopendmarc
# Uncomment the following if you need to change the default. You can # Uncomment the following if you need to change the default. You can
# override it at runtime (main config option dmarc_tld_file) # override it at runtime (main config option dmarc_tld_file)
-# DMARC_TLD_FILE=/etc/exim/opendmarc.tlds -# DMARC_TLD_FILE=/etc/exim/opendmarc.tlds
@ -279,15 +280,18 @@ index 83325ab..57d5eb9 100644
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@@ -1029,7 +1050,7 @@ @@ -1029,9 +1035,9 @@ ZCAT_COMMAND=/usr/bin/zcat
# installed on your system (www.libspf2.org). Depending on where it is installed # installed on your system (www.libspf2.org). Depending on where it is installed
# you may have to edit the CFLAGS and LDFLAGS lines. # you may have to edit the CFLAGS and LDFLAGS lines.
-# SUPPORT_SPF=yes -# SUPPORT_SPF=yes
+SUPPORT_SPF=yes +SUPPORT_SPF=yes
# CFLAGS += -I/usr/local/include # CFLAGS += -I/usr/local/include
# LDFLAGS += -lspf2 -# LDFLAGS += -lspf2
+LDFLAGS += -lspf2
#------------------------------------------------------------------------------
@@ -1096,7 +1102,7 @@ ZCAT_COMMAND=/usr/bin/zcat @@ -1096,7 +1102,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# group. Once you have installed saslauthd, you should arrange for it to be # group. Once you have installed saslauthd, you should arrange for it to be
# started by root at boot time. # started by root at boot time.

4
exim.spec
View File

@ -172,7 +172,9 @@ cp exim_monitor/EDITME Local/eximon.conf
export PIE=-fPIE export PIE=-fPIE
export PIC=-fPIC export PIC=-fPIC
%endif %endif
make _lib=%{_lib} FULLECHO= LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-pie -Wl,-z,relro,-z,now}"
export LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-pie -Wl,-z,relro,-z,now}"
make _lib=%{_lib} FULLECHO=
%install %install
mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_sbindir}