summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/exim-html/Makefile4
-rw-r--r--mail/exim-html/PLIST4
-rw-r--r--mail/exim-html/distinfo10
-rw-r--r--mail/exim/Makefile5
-rw-r--r--mail/exim/distinfo12
-rw-r--r--mail/exim/patches/patch-aa15
6 files changed, 26 insertions, 24 deletions
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 649e244f56f..30779cd3a09 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2015/02/14 07:33:19 adam Exp $
+# $NetBSD: Makefile,v 1.29.8.1 2016/03/03 20:22:52 bsiegert Exp $
-DISTNAME= exim-html-4.85
+DISTNAME= exim-html-4.86.2
CATEGORIES= mail net
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
diff --git a/mail/exim-html/PLIST b/mail/exim-html/PLIST
index 128ff88241e..9dadcade8c2 100644
--- a/mail/exim-html/PLIST
+++ b/mail/exim-html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2013/10/30 07:30:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.13.18.1 2016/03/03 20:22:52 bsiegert Exp $
share/doc/exim/html/spec_html/ch-access_control_lists.html
share/doc/exim/html/spec_html/ch-adding_a_local_scan_function_to_exim.html
share/doc/exim/html/spec_html/ch-adding_new_drivers_or_lookup_types.html
@@ -57,6 +57,7 @@ share/doc/exim/html/spec_html/ch-the_queryprogram_router.html
share/doc/exim/html/spec_html/ch-the_redirect_router.html
share/doc/exim/html/spec_html/ch-the_smtp_transport.html
share/doc/exim/html/spec_html/ch-the_spa_authenticator.html
+share/doc/exim/html/spec_html/ch-the_tls_authenticator.html
share/doc/exim/html/spec_html/ch-using_exim_as_a_nonqueueing_client.html
share/doc/exim/html/spec_html/ch-variable_index.html
share/doc/exim/html/spec_html/ch01.html
@@ -119,6 +120,7 @@ share/doc/exim/html/spec_html/ch57.html
share/doc/exim/html/spec_html/ch58.html
share/doc/exim/html/spec_html/ch59.html
share/doc/exim/html/spec_html/ch60.html
+share/doc/exim/html/spec_html/ch61.html
share/doc/exim/html/spec_html/filter.html
share/doc/exim/html/spec_html/filter_ch-exim_filter_files.html
share/doc/exim/html/spec_html/filter_ch-forwarding_and_filtering_in_exim.html
diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo
index 1eb9c077e5e..2695d1ae310 100644
--- a/mail/exim-html/distinfo
+++ b/mail/exim-html/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2015/11/03 23:27:05 agc Exp $
+$NetBSD: distinfo,v 1.24.2.1 2016/03/03 20:22:52 bsiegert Exp $
-SHA1 (exim-html-4.85.tar.bz2) = f3952d9fee9b64aec0269da978a54c2c8de74833
-RMD160 (exim-html-4.85.tar.bz2) = 2901f7a96e30e445ece41fb8b3319a28f1a0f997
-SHA512 (exim-html-4.85.tar.bz2) = 8214576300827f79c0880e2d2163f71d7f1b3fe2aff714b591a011e48816965de5a773c3509137b085fec3d4d2128931f8398768c24dad6c92b7df27cbcafe74
-Size (exim-html-4.85.tar.bz2) = 467069 bytes
+SHA1 (exim-html-4.86.2.tar.bz2) = 9b55e69787cf1f9ef233fd762736bb4541773bb4
+RMD160 (exim-html-4.86.2.tar.bz2) = bf077ceaed3c0763d0ef93e2a7ee455a714db195
+SHA512 (exim-html-4.86.2.tar.bz2) = 593df23914939f8fa76c15a2ab7fc197efa05fcbb984179c9dc2c7d535fe2bef1394c07bc8449f2219f54615ff2f4ee13b76409d89b846dc71e54880681c913e
+Size (exim-html-4.86.2.tar.bz2) = 466139 bytes
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 116a51c5735..0cdd6c5d1fe 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.141 2015/10/10 01:58:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.141.2.1 2016/03/03 20:22:52 bsiegert Exp $
-DISTNAME= exim-4.85
-PKGREVISION= 3
+DISTNAME= exim-4.86.2
CATEGORIES= mail net
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index c0b8dc523ce..9f4fe499858 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.62 2015/11/03 23:27:05 agc Exp $
+$NetBSD: distinfo,v 1.62.2.1 2016/03/03 20:22:52 bsiegert Exp $
-SHA1 (exim-4.85.tar.bz2) = 6b40d5a6ae59f86b4780ad50aaf0d930330d7b67
-RMD160 (exim-4.85.tar.bz2) = 334e5eeb9242b3fff49bd581b8cb22c12c0e8215
-SHA512 (exim-4.85.tar.bz2) = 2c5846528ee98e4aff5dbabe49dfa5ba6753fa64154b9671a7849db8a17773917fe13bcb9e5f732c43d7479debfadd8012b8650823eb12504a6b1b28be456161
-Size (exim-4.85.tar.bz2) = 1784150 bytes
-SHA1 (patch-aa) = 24a12631b7df17930349b8a0d03adc80d27efbe2
+SHA1 (exim-4.86.2.tar.bz2) = 539cb2edc784d439cae8f95940e9eff847e2695d
+RMD160 (exim-4.86.2.tar.bz2) = 06790977ad50fb19548826631df904d6bda62a83
+SHA512 (exim-4.86.2.tar.bz2) = 5869a7ae8fd66819f654f6617c7e77075a24b110074317b77135b8cc86f12632e79758d41819c6e91871e0145adaba4b91651f5c6c1d2ebd17927f0198876231
+Size (exim-4.86.2.tar.bz2) = 1799316 bytes
+SHA1 (patch-aa) = 4df21c2497e9fee8dfbcd4386bb1b70d69ca2932
SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691
SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf
SHA1 (patch-ag) = dd93bb718c996f18b4e985806eb6d4ff5f25a67f
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index 0c65753d9e5..5956a198a1a 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.23 2012/06/11 11:41:25 adam Exp $
+$NetBSD: patch-aa,v 1.23.30.1 2016/03/03 20:22:52 bsiegert Exp $
---- Local/Makefile.pkgsrc.orig 2012-06-11 11:27:45.000000000 +0000
+--- Local/Makefile.pkgsrc.orig 2016-01-10 20:50:29.000000000 +0000
+++ Local/Makefile.pkgsrc
@@ -98,7 +98,7 @@
# /usr/local/sbin. The installation script will try to create this directory,
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.23 2012/06/11 11:41:25 adam Exp $
#------------------------------------------------------------------------------
-@@ -578,15 +578,15 @@ FIXED_NEVER_USERS=root
+@@ -628,16 +628,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.
@@ -72,10 +72,11 @@ $NetBSD: patch-aa,v 1.23 2012/06/11 11:41:25 adam Exp $
-# AUTH_SPA=yes
+AUTH_PLAINTEXT=yes
+AUTH_SPA=yes
+ # AUTH_TLS=yes
#------------------------------------------------------------------------------
-@@ -764,7 +764,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -822,7 +822,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:
@@ -84,7 +85,7 @@ $NetBSD: patch-aa,v 1.23 2012/06/11 11:41:25 adam Exp $
# 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
-@@ -1016,13 +1016,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -1080,13 +1080,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
# haven't got Perl, Exim will still build and run; you just won't be able to
# use those utilities.
@@ -105,7 +106,7 @@ $NetBSD: patch-aa,v 1.23 2012/06/11 11:41:25 adam Exp $
#------------------------------------------------------------------------------
-@@ -1222,7 +1222,7 @@ TMPDIR="/tmp"
+@@ -1286,7 +1286,7 @@ 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:
@@ -114,7 +115,7 @@ $NetBSD: patch-aa,v 1.23 2012/06/11 11:41:25 adam Exp $
# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
# using the name "exim-daemon.pid".
-@@ -1294,3 +1294,10 @@ TMPDIR="/tmp"
+@@ -1358,3 +1358,10 @@ TMPDIR="/tmp"
# ENABLE_DISABLE_FSYNC=yes
# End of EDITME for Exim 4.