I've had this sitting in my tree for a while.. OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile 12 Jun 2013 20:36:33 -0000 1.93
+++ Makefile 22 Aug 2013 17:09:25 -0000
@@ -3,8 +3,7 @@
CATEGORIES = mail
COMMENT-main = flexible mail transfer agent
COMMENT-eximon = X11 monitor tool for Exim MTA
-VERSION = 4.77
-REVISION = 4
+VERSION = 4.80.1
DISTNAME = exim-${VERSION}
PKGNAME-main = exim-${VERSION}
FULLPKGNAME-eximon = exim-eximon-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/exim/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo 19 Oct 2011 23:06:57 -0000 1.21
+++ distinfo 22 Aug 2013 17:09:25 -0000
@@ -1,5 +1,2 @@
-MD5 (exim-4.77.tar.gz) = 3B8p9odVbw8OmPveGfmO9A==
-RMD160 (exim-4.77.tar.gz) = 6/kbDf+blCKW24umVAhj5qFROtY=
-SHA1 (exim-4.77.tar.gz) = LBumuPYntxs7WPwMxW45RZDc0dw=
-SHA256 (exim-4.77.tar.gz) = FkmActgsdNKf6eCctG+QYN4b0MtXIczAcZkK9hLumjw=
-SIZE (exim-4.77.tar.gz) = 2035914
+SHA256 (exim-4.80.1.tar.gz) = LKwFziel1bQJzlZXlXBHIz02+TltAgPSQKW3rtKpad4=
+SIZE (exim-4.80.1.tar.gz) = 2107974
Index: files/Makefile
===================================================================
RCS file: /cvs/ports/mail/exim/files/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- files/Makefile 19 Oct 2011 23:06:57 -0000 1.15
+++ files/Makefile 22 Aug 2013 17:09:25 -0000
@@ -248,11 +248,19 @@ SUPPORT_MBX=yes
#------------------------------------------------------------------------------
# See below for dynamic lookup modules.
-# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/
+#
# If not using package management but using this anyway, then think about how
# you perform upgrades and revert them. You should consider the benefit of
# embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can
# maintain two concurrent sets of modules.
+#
+# *BEWARE*: ability to modify the files in LOOKUP_MODULE_DIR is equivalent to
+# the ability to modify the Exim binary, which is often setuid root! The Exim
+# developers only intend this functionality be used by OS software packagers
+# and we suggest that such packagings' integrity checks should be paranoid
+# about the permissions of the directory and the files within.
+
+# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/
# To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for
# your platform. Eg:
@@ -279,6 +287,10 @@ SUPPORT_MBX=yes
# the dynamic library and not the exim binary will be linked against the
# library.
# NOTE: LDAP cannot be built as a module!
+#
+# If your system has pkg-config then the _INCLUDE/_LIBS setting can be
+# handled for you automatically by also defining the _PC variable to reference
+# the name of the pkg-config package, if such is available.
LOOKUP_DBM=yes
LOOKUP_LSEARCH=yes
@@ -295,6 +307,7 @@ LOOKUP_NIS=yes
LOOKUP_PASSWD=yes
# LOOKUP_PGSQL=yes
# LOOKUP_SQLITE=yes
+# LOOKUP_SQLITE_PC=sqlite3
# LOOKUP_WHOSON=yes
# These two settings are obsolete; all three lookups are compiled when
@@ -329,9 +342,12 @@ LOOKUP_PASSWD=yes
# In either case you must specify the library link info here. If the
# PCRE header files are not in the standard search path you must also
# modify the INCLUDE path (above)
-# The default setting of PCRE_LIBS should work on the vast majority of
-# systems
+#
+# Use PCRE_CONFIG to query the pcre-config command (first found in $PATH)
+# to find the include files and libraries, else use PCRE_LIBS and set INCLUDE
+# too if needed.
+PCRE_CONFIG=yes
PCRE_LIBS=-lpcre
@@ -342,6 +358,8 @@ PCRE_LIBS=-lpcre
# don't need to set LOOKUP_INCLUDE if the relevant directories are already
# specified in INCLUDE. The settings below are just examples; -lpq is for
# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite.
+#
+# You do not need to use this for any lookup information added via pkg-config.
# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I
/usr/local/pgsql/include
# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
@@ -398,6 +416,11 @@ WITH_OLD_DEMIME=yes
# experimental-spec.txt. "Experimental" means that the way these features are
# implemented may still change. Backward compatibility is not guaranteed.
+# Uncomment the following line to add support for talking to dccifd. This
+# defaults the socket path to /usr/local/dcc/var/dccifd.
+
+# EXPERIMENTAL_DCC=yes
+
# Uncomment the following lines to add SPF support. You need to have libspf2
# installed on your system (www.libspf2.org). Depending on where it is
installed
# you may have to edit the CFLAGS and LDFLAGS lines.
@@ -424,6 +447,11 @@ WITH_OLD_DEMIME=yes
# CFLAGS += -I/opt/brightmail/bsdk-6.0/include
# LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib
+# Uncomment the following line to add OCSP stapling support in TLS, if Exim
+# was built using OpenSSL.
+
+# EXPERIMENTAL_OCSP=yes
+
###############################################################################
@@ -553,6 +581,10 @@ FIXED_NEVER_USERS=root
AUTH_CRAM_MD5=yes
# AUTH_CYRUS_SASL=yes
AUTH_DOVECOT=yes
+# AUTH_GSASL=yes
+# AUTH_GSASL_PC=libgsasl
+# AUTH_HEIMDAL_GSSAPI=yes
+# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
AUTH_PLAINTEXT=yes
AUTH_SPA=yes
@@ -560,9 +592,13 @@ AUTH_SPA=yes
#------------------------------------------------------------------------------
# If you specified AUTH_CYRUS_SASL above, you should ensure that you have the
# Cyrus SASL library installed before trying to build Exim, and you probably
-# want to uncomment the following line:
+# want to uncomment the first line below.
+# Similarly for GNU SASL, unless pkg-config is used via AUTH_GSASL_PC.
+# Ditto for AUTH_HEIMDAL_GSSAPI(_PC).
# AUTH_LIBS=-lsasl2
+# AUTH_LIBS=-lgsasl
+# AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1
-lwind -lroken -lcrypt
#------------------------------------------------------------------------------
@@ -655,11 +691,14 @@ HAVE_ICONV=yes
# This setting is required for any TLS support (either OpenSSL or GnuTLS)
SUPPORT_TLS=yes
-# Uncomment this setting if you are using OpenSSL
+# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
+# USE_OPENSSL_PC=openssl
TLS_LIBS=-lssl -lcrypto
-# Uncomment these settings if you are using GnuTLS
+# 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.
# USE_GNUTLS=yes
+# USE_GNUTLS_PC=gnutls
# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
# If you are running Exim as a server, note that just building it with TLS
@@ -670,6 +709,11 @@ TLS_LIBS=-lssl -lcrypto
# if you are running Exim only as a client, building it with TLS support
# is all you need to do.
+# If you are using pkg-config then you should not need to worry where the
+# libraries and headers are installed, as the pkg-config .pc specification
+# should include all -L/-I information necessary. If not using pkg-config
+# then you might need to specify the locations too.
+
# Additional libraries and include files are required for both OpenSSL and
# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed
# with all your other libraries. If they are in a special directory, you may
@@ -948,6 +992,10 @@ SYSTEM_ALIASES_FILE=/etc/mail/aliases
# dynamic loading library is not otherwise included.
+#------------------------------------------------------------------------------
+# Uncomment this setting to include IPv6 support.
+
+# HAVE_IPV6=yes
###############################################################################
# THINGS YOU ALMOST NEVER NEED TO MENTION #
@@ -1162,6 +1210,12 @@ TMPDIR="/tmp"
# PERL_CCOPTS=
# PERL_LIBS=
+
+#------------------------------------------------------------------------------
+# If you wish to disable valgrind in the binary, define NVALGRIND=1.
+# This should not be needed.
+
+# NVALGRIND=1
#------------------------------------------------------------------------------
# Identifying the daemon: When an Exim daemon starts up, it writes its pid
Index: patches/patch-OS_Makefile-Default
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-OS_Makefile-Default,v
retrieving revision 1.7
diff -u -p -r1.7 patch-OS_Makefile-Default
--- patches/patch-OS_Makefile-Default 15 Dec 2009 11:32:18 -0000 1.7
+++ patches/patch-OS_Makefile-Default 22 Aug 2013 17:09:25 -0000
@@ -1,7 +1,8 @@
---- OS/Makefile-Default.orig Fri Feb 10 15:33:26 2006
-+++ OS/Makefile-Default Wed Jan 30 23:03:20 2008
-@@ -73,7 +73,7 @@ PERL_COMMAND=/usr/bin/perl
-
+$OpenBSD$
+--- OS/Makefile-Default.orig Thu Oct 25 04:37:38 2012
++++ OS/Makefile-Default Thu Aug 22 18:09:11 2013
+@@ -71,7 +71,7 @@ PERL_COMMAND=/usr/bin/perl
+
# CC contains the name of the C compiler to be used.
-CC=gcc
@@ -9,12 +10,12 @@
# CFLAGS contains flags to be passed to the compiler. Nothing is defaulted
-@@ -86,7 +86,7 @@ CC=gcc
+@@ -84,7 +84,7 @@ CC=gcc
# here; instead each OS-dependent Makefile contains a default setting if one
# is needed.
-
+
-# LFLAGS=
+LFLAGS=-L$(LOCALBASE)/lib
-
-
+
+
# PCRE_LIBS contains the library to be linked for PCRE
Index: patches/patch-scripts_exim_install
===================================================================
RCS file: /cvs/ports/mail/exim/patches/patch-scripts_exim_install,v
retrieving revision 1.10
diff -u -p -r1.10 patch-scripts_exim_install
--- patches/patch-scripts_exim_install 10 Sep 2007 20:08:16 -0000 1.10
+++ patches/patch-scripts_exim_install 22 Aug 2013 17:09:25 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-scripts_exim_install,v 1.10 2007/09/10 20:08:16 fkr Exp $
---- scripts/exim_install.orig Thu Aug 30 16:31:06 2007
-+++ scripts/exim_install Fri Sep 7 16:07:28 2007
-@@ -217,7 +217,7 @@ while [ $# -gt 0 ]; do
+$OpenBSD$
+--- scripts/exim_install.orig Thu Oct 25 04:37:38 2012
++++ scripts/exim_install Thu Aug 22 18:09:11 2013
+@@ -216,7 +216,7 @@ while [ $# -gt 0 ]; do
# The exim binary is handled specially
Index: patches/patch-src_dkim_c
===================================================================
RCS file: patches/patch-src_dkim_c
diff -N patches/patch-src_dkim_c
--- patches/patch-src_dkim_c 26 Oct 2012 08:50:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_dkim_c,v 1.1 2012/10/26 08:50:01 sthen Exp $
---- src/dkim.c.orig Mon Oct 10 06:18:13 2011
-+++ src/dkim.c Fri Oct 26 09:39:14 2012
-@@ -42,6 +42,9 @@ int dkim_exim_query_dns_txt(char *name, char *answer)
- "%.*s", (int)len, (char *)((rr->data)+rr_offset));
- rr_offset+=len;
- answer_offset+=len;
-+ if (answer_offset >= PDKIM_DNS_TXT_MAX_RECLEN) {
-+ return PDKIM_FAIL;
-+ }
- }
- }
- else return PDKIM_FAIL;
Index: patches/patch-src_pdkim_pdkim_h
===================================================================
RCS file: patches/patch-src_pdkim_pdkim_h
diff -N patches/patch-src_pdkim_pdkim_h
--- patches/patch-src_pdkim_pdkim_h 26 Oct 2012 08:50:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_pdkim_pdkim_h,v 1.1 2012/10/26 08:50:01 sthen Exp $
---- src/pdkim/pdkim.h.orig Mon Oct 10 06:18:13 2011
-+++ src/pdkim/pdkim.h Fri Oct 26 09:39:14 2012
-@@ -27,8 +27,8 @@
-
- /* --------------------------------------------------------------------------
*/
- /* Length of the preallocated buffer for the "answer" from the dns/txt
-- callback function. */
--#define PDKIM_DNS_TXT_MAX_RECLEN 4096
-+ callback function. This should match the maximum RDLENGTH from DNS. */
-+#define PDKIM_DNS_TXT_MAX_RECLEN (1 << 16)
-
- /* --------------------------------------------------------------------------
*/
- /* Function success / error codes */
