From c3dfeac2bf1a3e8c88d78c3a64e9516189c5816e Mon Sep 17 00:00:00 2001 From: Giovanni Bottaro Date: Wed, 28 Jun 2023 17:15:39 +0000 Subject: [PATCH 2/2] Enable openDMARC support at build time --- PKGBUILD | 12 ++++++++++-- exim.Makefile | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index c161023..c8b5c22 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,10 +12,11 @@ arch=('x86_64') url='https://www.exim.org/' license=('GPL') backup=('etc/mail/aliases' 'etc/mail/exim.conf' 'etc/logrotate.d/exim') -depends=('gdbm' 'libldap' 'libidn' 'libidn2' 'libnsl' 'libspf2' 'libxcrypt' 'openssl' 'pam' 'pcre2' 'sqlite') +depends=('gdbm' 'libldap' 'libidn' 'libidn2' 'libnsl' 'libspf2' 'libxcrypt' 'opendmarc' 'openssl' 'pam' 'pcre2' 'publicsuffix-list' 'sqlite') provides=('smtp-server' 'smtp-forwarder') conflicts=('smtp-server' 'smtp-forwarder') source=("https://ftp.exim.org/pub/exim/exim4/exim-$pkgver.tar.bz2"{,.asc} + exim-4.96-opendmarc-1.4-build-fix.patch aliases exim.logrotate exim.Makefile @@ -28,9 +29,10 @@ source=("https://ftp.exim.org/pub/exim/exim4/exim-$pkgver.tar.bz2"{,.asc} exim.tmpfiles) sha512sums=('675dcb13dac449edede61926e7af6dcc3ff3a455c053d413a35c873b926dfc4d63540ba7d52347516c6a9b4b60a3627b449685210ddfba0a4c61ec7a0a0b8333' 'SKIP' + '4811a549d5b6608491c455717d0323be48f71db3a94e8f58ddbdbe3a22aab1d62e4a606f645eaffc38f7a1a6b8b13b0ac435083a4b6b2c95ec894547efc41be7' '6494d9aae71a630935f3946a136855aadede54fd10b7b3cd7df47972d320ae142410076871e839f6caca8e02ec136604464b0b9c593721db243d8edf75c2f17f' 'd8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81' - '6e93e8154e9a19c79b72072cfa79e37ed742998fca823bfe87169a038c93e9ab0c11124633ca8c85d5b9ed6195ffb03ccc564f5cda3f1063f5ff62eda8157751' + 'f200be86240a3f608e2d3c1371f41e2bb4105ba559539049e112772d0184efd292798223559065b3a01577630d66b6d8cf63492ee5185332e6f3fa2038f24ab0' 'dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f' 'b3c3b18652df435cb87d647cfd4f19e182fbf12b0b56f9c91f72b27ae5a819fb3d8c4c25445c5a3c184f70a0c181925fabda891f2057b8a917070d6c40529b8d' '11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a' @@ -43,6 +45,12 @@ validpgpkeys=('C693A034E1ED6EE954CAE2DA13DAD99C7E41519C' # Phil Pennock 'A986F3A6BD6377D8730958DEBCE58C8CE41F32DF') # Jeremy Harris +prepare() { + cd $pkgname-$pkgver + + patch -p1 < ../exim-4.96-opendmarc-1.4-build-fix.patch +} + build() { cd $pkgname-$pkgver diff --git a/exim.Makefile b/exim.Makefile index 9a3bd74..393dff2 100644 --- a/exim.Makefile +++ b/exim.Makefile @@ -608,12 +608,12 @@ DISABLE_MAL_MKS=yes # using libopendmarc libraries. You must have SPF and DKIM support enabled also. # Library version libopendmarc-1.4.1-1.fc33.x86_64 (on Fedora 33) is known broken; # 1.3.2-3 works. I seems that the OpenDMARC project broke their API. -# SUPPORT_DMARC=yes +SUPPORT_DMARC=yes # CFLAGS += -I/usr/local/include -# LDFLAGS += -lopendmarc +LDFLAGS += -lopendmarc # Uncomment the following if you need to change the default. You can # override it at runtime (main config option dmarc_tld_file) -# DMARC_TLD_FILE=/etc/exim/opendmarc.tlds +DMARC_TLD_FILE=/usr/share/publicsuffix/public_suffix_list.dat # Uncomment the following line to add ARC (Authenticated Received Chain) # support. You must have SPF and DKIM support enabled also. -- 2.41.0