Hello, This patch adds spf commands to exim.
Best Regards
Index: Makefile =================================================================== RCS file: /cvs/ports/mail/exim/Makefile,v retrieving revision 1.121 diff -u -p -r1.121 Makefile --- Makefile 12 Feb 2019 11:48:33 -0000 1.121 +++ Makefile 25 Mar 2019 09:30:38 -0000 @@ -27,7 +27,8 @@ MASTER_SITES = https://ftp.exim.org/pub ftp://ftp.exim.org/pub/exim/exim4/ \ http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/ -LIB_DEPENDS-main = converters/libiconv devel/pcre +LIB_DEPENDS-main = converters/libiconv devel/pcre mail/libspf2 +RUN_DEPENDS-main = mail/libspf2 RUN_DEPENDS-eximon = ${PKGPATH},-main LIB_DEPENDS-eximon = devel/pcre Index: patches/patch-Local_Makefile =================================================================== RCS file: /cvs/ports/mail/exim/patches/patch-Local_Makefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-Local_Makefile --- patches/patch-Local_Makefile 19 Apr 2018 20:52:43 -0000 1.1 +++ patches/patch-Local_Makefile 25 Mar 2019 09:30:38 -0000 @@ -91,7 +91,7 @@ Index: Local/Makefile # 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. -@@ -635,16 +635,16 @@ FIXED_NEVER_USERS=root +@@ -640,16 +640,16 @@ FIXED_NEVER_USERS=root # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. @@ -112,7 +112,7 @@ Index: Local/Makefile # AUTH_TLS=yes # Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1 -@@ -689,7 +689,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -694,7 +694,7 @@ HEADERS_CHARSET="ISO-8859-1" # the Sieve filter support. For those OS where iconv() is known to be installed # as standard, the file in OS/Makefile-xxxx contains # @@ -121,7 +121,7 @@ Index: Local/Makefile # # If you are not using one of those systems, but have installed iconv(), you # need to uncomment that line above. In some cases, you may find that iconv() -@@ -758,11 +758,11 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -763,11 +763,11 @@ HEADERS_CHARSET="ISO-8859-1" # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) @@ -135,7 +135,7 @@ Index: Local/Makefile # Uncomment the first and either the second or the third of these if you # are using GnuTLS. If you have pkg-config, then the second, else the third. -@@ -847,7 +847,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -852,7 +852,7 @@ HEADERS_CHARSET="ISO-8859-1" # %s. This will be replaced by one of the strings "main", "panic", or "reject" # to form the final file names. Some installations may want something like this: @@ -144,7 +144,7 @@ Index: Local/Makefile # which results in files with names /var/log/exim_mainlog, etc. The directory # in which the log files are placed must exist; Exim does not try to create -@@ -919,7 +919,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -924,7 +924,7 @@ ZCAT_COMMAND=/usr/bin/zcat # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded # Perl costs quite a lot of resources. Only do this if you really need it. @@ -153,7 +153,20 @@ Index: Local/Makefile #------------------------------------------------------------------------------ -@@ -1047,7 +1047,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -985,9 +985,9 @@ ZCAT_COMMAND=/usr/bin/zcat + # installed on your system (www.libspf2.org). Depending on where it is installed + # you may have to edit the CFLAGS and LDFLAGS lines. + +-# SUPPORT_SPF=yes +-# CFLAGS += -I/usr/local/include +-# LDFLAGS += -lspf2 ++SUPPORT_SPF=yes ++CFLAGS += -I/usr/local/include ++LDFLAGS += -lspf2 + + + #------------------------------------------------------------------------------ +@@ -1052,7 +1052,7 @@ ZCAT_COMMAND=/usr/bin/zcat # group. Once you have installed saslauthd, you should arrange for it to be # started by root at boot time. @@ -162,7 +175,7 @@ Index: Local/Makefile #------------------------------------------------------------------------------ -@@ -1095,7 +1095,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -1100,7 +1100,7 @@ ZCAT_COMMAND=/usr/bin/zcat # aliases). The following setting can be changed to specify a different # location for the system alias file. @@ -171,7 +184,7 @@ Index: Local/Makefile #------------------------------------------------------------------------------ -@@ -1360,7 +1360,7 @@ EXIM_TMPDIR="/tmp" +@@ -1365,7 +1365,7 @@ EXIM_TMPDIR="/tmp" # (process id) to a file so that it can easily be identified. The path of the # file can be specified here. Some installations may want something like this: @@ -180,3 +193,31 @@ Index: Local/Makefile # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". +@@ -1437,3 +1437,27 @@ EXIM_TMPDIR="/tmp" + # ENABLE_DISABLE_FSYNC=yes + + # End of EDITME for Exim 4. ++EXIM_MONITOR=eximon.bin ++ BIN_DIRECTORY=/usr/local/bin ++ CONFIGURE_FILE=/etc/exim/configure ++ LOOKUP_INCLUDE= ++ LOOKUP_LIBS= ++ EXTRALIBS_EXIM=-L/usr/local/lib -liconv ++ CFLAGS=-O2 -pipe ++ INCLUDE=-I/usr/local/include ++EXIM_MONITOR=eximon.bin ++ BIN_DIRECTORY=/usr/local/bin ++ CONFIGURE_FILE=/etc/exim/configure ++ LOOKUP_INCLUDE= ++ LOOKUP_LIBS= ++ EXTRALIBS_EXIM=-L/usr/local/lib -liconv ++ CFLAGS=-O2 -pipe ++ INCLUDE=-I/usr/local/include ++EXIM_MONITOR=eximon.bin ++ BIN_DIRECTORY=/usr/local/bin ++ CONFIGURE_FILE=/etc/exim/configure ++ LOOKUP_INCLUDE= ++ LOOKUP_LIBS= ++ EXTRALIBS_EXIM=-L/usr/local/lib -liconv ++ CFLAGS=-O2 -pipe ++ INCLUDE=-I/usr/local/include Index: patches/patch-src_lookups_spf_c =================================================================== RCS file: patches/patch-src_lookups_spf_c diff -N patches/patch-src_lookups_spf_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_lookups_spf_c 25 Mar 2019 09:30:38 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +Index: src/lookups/spf.c +--- src/lookups/spf.c.orig ++++ src/lookups/spf.c +@@ -25,9 +25,6 @@ static void dummy(int x) { dummy2(x-1); } + #else + + #include "lf_functions.h" +-#ifndef HAVE_NS_TYPE +-#define HAVE_NS_TYPE +-#endif + #include <spf2/spf.h> + #include <spf2/spf_dns_resolv.h> + #include <spf2/spf_dns_cache.h> Index: patches/patch-src_spf_h =================================================================== RCS file: patches/patch-src_spf_h diff -N patches/patch-src_spf_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_spf_h 25 Mar 2019 09:30:38 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Index: src/spf.h +--- src/spf.h.orig ++++ src/spf.h +@@ -10,10 +10,6 @@ + + #ifdef SUPPORT_SPF + +-/* Yes, we do have ns_type. spf.h redefines it if we don't set this. Doh */ +-#ifndef HAVE_NS_TYPE +-# define HAVE_NS_TYPE +-#endif + #include <spf2/spf.h> + + #include <spf2/spf_dns_resolv.h>
smime.p7s
Description: S/MIME Cryptographic Signature