Re: [change] mail/exim add spf commands
On 2019/03/28 08:58, Renaud Allard wrote: > Is there any chance for this change to be in 6.5? > > Yes there is a chance. But since my time for reviewing diffs is limited it is better spent actually looking at them rather than reading and answering questions about whether there is a chance.
Re: [change] mail/exim add spf commands
Is there any chance for this change to be in 6.5? smime.p7s Description: S/MIME Cryptographic Signature
Re: [change] mail/exim add spf commands
On 3/25/19 8:55 PM, Stuart Henderson wrote:
like opendmarc: one dep per line, and you have libspf2 without an
accompanying WANTLIB. if you didn't get a 'NOT NEEDED' error then it's
because of ...
+RUN_DEPENDS-main = mail/libspf2
... you shouldn't have the same thing in RUN_DEPENDS and LIB_DEPENDS
I have put 1 dep per line, including the older ones. I hope the
*_DEPENDS and WANTLIB are now correct. It builds, installs and runs fine.
Try it without CFLAGS here. If it fails then pass it in via the ports Makefile
somehow (as -I${LOCALBASE}/include, don't hardcode /usr/local).
I removed the CFLAGS
Also needs a REVISION bump.
REVISION=1
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 - 1.121
+++ Makefile 26 Mar 2019 06:29:31 -
@@ -4,6 +4,7 @@ COMMENT-main = flexible mail transfer a
COMMENT-eximon = X11 monitor tool for Exim MTA
VERSION = 4.92
+REVISION = 1
DISTNAME = exim-${VERSION}
PKGNAME-main = exim-${VERSION}
FULLPKGNAME-eximon = exim-eximon-${VERSION}
@@ -19,7 +20,7 @@ MAINTAINER = Renaud Allard https://ftp.exim.org/pub/exim/exim4/ \
@@ -27,7 +28,9 @@ 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
+LIB_DEPENDS-main += devel/pcre
+LIB_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 - 1.1
+++ patches/patch-Local_Makefile 26 Mar 2019 06:29:31 -
@@ -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- 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,19 @@ 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
++SUPPORT_SPF=yes
+ # CFLAGS += -I/usr/local/include
+-# LDFLAGS += -lspf2
++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 +174,7 @@ Index: Local/Makefile
Re: [change] mail/exim add spf commands
On 2019/03/25 10:41, Renaud Allard wrote:
> 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 - 1.121
> +++ Makefile 25 Mar 2019 09:30:38 -
> @@ -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
like opendmarc: one dep per line, and you have libspf2 without an
accompanying WANTLIB. if you didn't get a 'NOT NEEDED' error then it's
because of ...
> +RUN_DEPENDS-main = mail/libspf2
... you shouldn't have the same thing in RUN_DEPENDS and LIB_DEPENDS
> +@@ -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
Try it without CFLAGS here. If it fails then pass it in via the ports Makefile
somehow (as -I${LOCALBASE}/include, don't hardcode /usr/local).
> + # 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
This chunk shouldn't be in the patch.
Also needs a REVISION bump.
[change] mail/exim add spf commands
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 - 1.121
+++ Makefile 25 Mar 2019 09:30:38 -
@@ -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 - 1.1
+++ patches/patch-Local_Makefile 25 Mar 2019 09:30:38 -
@@ -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- 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.
