cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to exim-4.94, from Renaud Allard.

Browse Source 
rather than patching to remove CFLAGS unsupported by gcc 4.2, just pass in
CFLAGS via MAKE_FLAGS instead (also pass in CC).
This commit is contained in:
sthen 2020-06-02 12:44:19 +00:00
parent 8dc608a62c
commit fc58edad0a
5 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/exim/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.130 2020/01/09 20:43:15 sthen Exp $
# $OpenBSD: Makefile,v 1.131 2020/06/02 12:44:19 sthen Exp $
COMMENT-main = flexible mail transfer agent
COMMENT-eximon = X11 monitor tool for Exim MTA
VERSION = 4.93.0.4
VERSION = 4.94
DISTNAME = exim-${VERSION}
PKGNAME-main = exim-${VERSION}
FULLPKGNAME-eximon = exim-eximon-${VERSION}
@ -35,7 +35,7 @@ LIB_DEPENDS-main = converters/libiconv \
RUN_DEPENDS-eximon = ${PKGPATH},-main
LIB_DEPENDS-eximon = devel/pcre
MAKE_FLAGS += FULLECHO=
MAKE_FLAGS += FULLECHO= CC="${CC}" CFLAGS="${CFLAGS}"
PSEUDO_FLAVORS = no_eximon
FLAVORS = mysql postgresql sqlite3 ldap sasl

4
mail/exim/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (exim-4.93.0.4.tar.gz) = qHtu9QY5JoD6R+sSGbbDxbEwy5o8bw4MTsht2jD6dkM=
SIZE (exim-4.93.0.4.tar.gz) = 2480960
SHA256 (exim-4.94.tar.gz) = X+Rdm8+mfZR9cHr8MWzTbFMUcPaLJAk0Ia26Sq+BC9k=
SIZE (exim-4.94.tar.gz) = 2515734

34
mail/exim/patches/patch-Local_Makefile
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Local_Makefile,v 1.3 2019/12/10 23:21:37 sthen Exp $
$OpenBSD: patch-Local_Makefile,v 1.4 2020/06/02 12:44:19 sthen Exp $
Index: Local/Makefile
--- Local/Makefile.orig
+++ Local/Makefile
@@ -100,7 +100,7 @@
@@ -99,7 +99,7 @@
# /usr/local/sbin. The installation script will try to create this directory,
# and any superior directories, if they do not exist.
@ -12,7 +12,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
@@ -115,7 +115,7 @@ BIN_DIRECTORY=/usr/exim/bin
# don't exist. It will also install a default runtime configuration if this
# file does not exist.
@ -21,7 +21,7 @@ Index: Local/Makefile
# It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
# In this case, Exim will use the first of them that exists when it is run.
@@ -133,7 +133,7 @@ CONFIGURE_FILE=/usr/exim/configure
@@ -132,7 +132,7 @@ CONFIGURE_FILE=/usr/exim/configure
# deliveries. (Local deliveries run as various non-root users, typically as the
# owner of a local mailbox.) Specifying these values as root is not supported.
@ -30,7 +30,7 @@ Index: Local/Makefile
# If you specify EXIM_USER as a name, this is looked up at build time, and the
# uid number is built into the binary. However, you can specify that this
@@ -211,11 +211,11 @@ SPOOL_DIRECTORY=/var/spool/exim
@@ -210,11 +210,11 @@ SPOOL_DIRECTORY=/var/spool/exim
# If you are buliding with TLS, the library configuration must be done:
# Uncomment this if you are using OpenSSL
@ -44,7 +44,7 @@ Index: Local/Makefile
# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
# Uncomment this if you are using GnuTLS
@@ -338,7 +338,7 @@ TRANSPORT_SMTP=yes
@@ -337,7 +337,7 @@ TRANSPORT_SMTP=yes
# This one is special-purpose, and commonly not required, so it is not
# included by default.
@ -53,7 +53,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
@@ -347,9 +347,9 @@ TRANSPORT_SMTP=yes
@@ -346,9 +346,9 @@ TRANSPORT_SMTP=yes
# MBX, is included only when requested. If you do not know what this is about,
# leave these settings commented out.
@ -66,7 +66,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
@@ -407,17 +407,17 @@ LOOKUP_DBM=yes
@@ -406,17 +406,17 @@ LOOKUP_DBM=yes
LOOKUP_LSEARCH=yes
LOOKUP_DNSDB=yes
@ -88,7 +88,7 @@ Index: Local/Makefile
# LOOKUP_PGSQL=yes
# LOOKUP_REDIS=yes
# LOOKUP_SQLITE=yes
@@ -509,7 +509,7 @@ SUPPORT_DANE=yes
@@ -508,7 +508,7 @@ SUPPORT_DANE=yes
# and the MIME ACL. Please read the documentation to learn more about these
# features.
@ -97,7 +97,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.
@@ -752,18 +752,18 @@ FIXED_NEVER_USERS=root
@@ -758,18 +758,18 @@ 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.
@ -121,7 +121,7 @@ Index: Local/Makefile
# Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
# requires multiple pkg-config files to work with Exim, so the second example
@@ -807,7 +807,7 @@ HEADERS_CHARSET="ISO-8859-1"
@@ -816,7 +816,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
#
@ -130,7 +130,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()
@@ -896,7 +896,7 @@ HEADERS_CHARSET="ISO-8859-1"
@@ -905,7 +905,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:
@ -139,7 +139,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
@@ -968,7 +968,7 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -977,7 +977,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.
@ -148,7 +148,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
@@ -1029,9 +1029,9 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -1038,9 +1038,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.
@ -160,7 +160,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
@@ -1096,7 +1096,7 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -1105,7 +1105,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.
@ -169,7 +169,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
@@ -1144,7 +1144,7 @@ ZCAT_COMMAND=/usr/bin/zcat
@@ -1153,7 +1153,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# aliases). The following setting can be changed to specify a different
# location for the system alias file.
@ -178,7 +178,7 @@ Index: Local/Makefile
#------------------------------------------------------------------------------
@@ -1409,7 +1409,7 @@ EXIM_TMPDIR="/tmp"
@@ -1418,7 +1418,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:

14
mail/exim/patches/patch-OS_Makefile-OpenBSD
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-OS_Makefile-OpenBSD,v 1.7 2019/12/27 22:31:01 sthen Exp $
Index: OS/Makefile-OpenBSD
--- OS/Makefile-OpenBSD.orig
+++ OS/Makefile-OpenBSD
@@ -5,7 +5,7 @@ CHGRP_COMMAND=/usr/sbin/chgrp
CHMOD_COMMAND=/bin/chmod
CC=cc
-CFLAGS=-O2 -Wall -Wno-parentheses -Wno-self-assign -Wno-logical-op-parentheses
+CFLAGS=-O2 -Wall -Wno-parentheses
CFLAGS += -DTAINT_CHECK_SLOW
LIBS=-lm

4
mail/exim/patches/patch-src_lookups_spf_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_lookups_spf_c,v 1.2 2019/12/10 23:21:37 sthen Exp $
$OpenBSD: patch-src_lookups_spf_c,v 1.3 2020/06/02 12:44:19 sthen Exp $
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); }
@@ -24,9 +24,6 @@ static void dummy(int x) { dummy2(x-1); }
#else
#include "lf_functions.h"