Import of pkgsrc-2016Q3

mail/exim/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.140 2015/06/12 10:50:18 wiz Exp $
+# $NetBSD: Makefile,v 1.148 2016/07/09 06:38:29 wiz Exp $
 
-DISTNAME=	exim-4.85
-PKGREVISION=	2
+DISTNAME=	exim-4.87
+PKGREVISION=	3
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/

mail/exim/distinfo

@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.61 2015/02/14 07:33:19 adam Exp $
+$NetBSD: distinfo,v 1.65 2016/04/09 10:49:39 adam Exp $
 
-SHA1 (exim-4.85.tar.bz2) = 6b40d5a6ae59f86b4780ad50aaf0d930330d7b67
-RMD160 (exim-4.85.tar.bz2) = 334e5eeb9242b3fff49bd581b8cb22c12c0e8215
-Size (exim-4.85.tar.bz2) = 1784150 bytes
-SHA1 (patch-aa) = 24a12631b7df17930349b8a0d03adc80d27efbe2
+SHA1 (exim-4.87.tar.bz2) = ca1c1aba63be80ca70ccfdc704ba9b899b77ec22
+RMD160 (exim-4.87.tar.bz2) = 4a2cc7c35d02bff5cdd175d8dd0538f1fef5af43
+SHA512 (exim-4.87.tar.bz2) = 2b0d5c82133315c444e29abd182e0866482c904db1abe5ffe9a3008c2174f52eca850a433c069b4102874dc32bbe4af112beac94ffa154f1c06615c24deb47a4
+Size (exim-4.87.tar.bz2) = 1801422 bytes
+SHA1 (patch-aa) = 4df21c2497e9fee8dfbcd4386bb1b70d69ca2932
 SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691
 SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf
-SHA1 (patch-ag) = dd93bb718c996f18b4e985806eb6d4ff5f25a67f
 SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5

mail/exim/files/smf/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
     <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
 
         <create_default_instance enabled="false"/>
@@ -31,7 +31,6 @@
             <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/configure" />
         </property_group>
         
-        <stability value="Evolving"/>
 
         <template>
             <common_name>

mail/exim/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2014/04/02 17:36:00 wiedi Exp $
+# $NetBSD: options.mk,v 1.22 2016/06/11 00:37:24 wiedi Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.exim
 PKG_SUPPORTED_OPTIONS=	exim-appendfile-maildir exim-appendfile-mailstore
@@ -77,7 +77,7 @@ LOOKUP_LIBS+=-lpq
 .endif
 
 .if !empty(PKG_OPTIONS:Mexim-lookup-redis)
-LOCAL_MAKEFILE_OPTIONS+=EXPERIMENTAL_REDIS=YES
+LOCAL_MAKEFILE_OPTIONS+=LOOKUP_REDIS=YES
 LOOKUP_LIBS+=-lhiredis
 .  include "../../databases/hiredis/buildlink3.mk"
 .endif

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.24 2016/01/10 20:55:56 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.

mail/exim/patches/patch-ag

@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2012/06/11 11:41:25 adam Exp $
-
---- src/spam.h.orig	2006-04-28 11:32:23.000000000 +0100
-+++ src/spam.h
-@@ -10,7 +10,7 @@
- #ifdef WITH_CONTENT_SCAN
- 
- /* timeout for reading and writing spamd */
--#define SPAMD_TIMEOUT 120
-+#define SPAMD_TIMEOUT 240
- 
- /* maximum length of the spam bar */
- #define MAX_SPAM_BAR_CHARS 50