skylime pkgsrc exim changes october 14q2

exim-4.84nb1-skylime-with-redis-proxy-and-queueruns-fixed.diff

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 3705b5e..c9dd297 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.133 2014/06/14 10:18:05 wiedi Exp $
 
-DISTNAME=      exim-4.82.1
+DISTNAME=      exim-4.84
 PKGREVISION=   1
 CATEGORIES=    mail net
 MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/ \
@@ -36,8 +36,8 @@ PKG_GECOS.${EXIM_USER}=       Exim mail server user
 PKG_HOME.${EXIM_USER}= ${VARBASE}/mail
 PKG_SHELL.${EXIM_USER}=        ${NOLOGIN}
 
-FILES_SUBST+=          EXIM_GROUP=${EXIM_GROUP:Q}
-FILES_SUBST+=          EXIM_USER=${EXIM_USER:Q}
+FILES_SUBST+=          EXIM_GROUP=${EXIM_GROUP}
+FILES_SUBST+=          EXIM_USER=${EXIM_USER}
 
 PKG_SYSCONFSUBDIR=     exim
 EXAMPLESDIR=           ${PREFIX}/share/examples/exim
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index e62f5e4..c36ef01 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.58 2014/05/29 09:27:37 adam Exp $
+$NetBSD: distinfo,v 1.60 2014/08/17 08:16:58 adam Exp $
 
-SHA1 (exim-4.82.1.tar.bz2) = bfb5ae3ab2444d494cdee650983a35dcc10243f5
-RMD160 (exim-4.82.1.tar.bz2) = 2caa80ed8b5fef07fd0449dc5ac7958681466a2d
-Size (exim-4.82.1.tar.bz2) = 1722912 bytes
+SHA1 (exim-4.84.tar.bz2) = ffd59975821edc14abfe06c7b9715aedccfc998c
+RMD160 (exim-4.84.tar.bz2) = 4b4ba43ec21bb13b54373082ff5b3b3399318316
+Size (exim-4.84.tar.bz2) = 1761790 bytes
 SHA1 (patch-aa) = 24a12631b7df17930349b8a0d03adc80d27efbe2
 SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691
 SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf
 SHA1 (patch-ag) = dd93bb718c996f18b4e985806eb6d4ff5f25a67f
-SHA1 (patch-lookups_Makefile) = 57a8ab00e5f3c6891c74fdfe457adc1d73bc06ce
+SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5
+SHA1 (patch-src_lookups_redis.c) = f60eb8b1d87a7fccaf9de38f012b3c804846f908
diff --git a/mail/exim/files/smf/manifest.xml b/mail/exim/files/smf/manifest.xml
index 6821cf8..ead3180 100644
--- a/mail/exim/files/smf/manifest.xml
+++ b/mail/exim/files/smf/manifest.xml
@@ -18,7 +18,7 @@
             <method_credential user="@EXIM_USER@" group="@EXIM_GROUP@"/>
         </method_context>
 
-        <exec_method type="method" name="start" exec="@PREFIX@/sbin/exim -C %{config_file} -bdf" timeout_seconds="60"/>
+        <exec_method type="method" name="start" exec="@PREFIX@/sbin/exim -C %{config_file} -bdf -q30m" timeout_seconds="60"/>
 
         <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60"/>
 
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index cc1590c..0639dfe 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -6,9 +6,10 @@ PKG_SUPPORTED_OPTIONS+=        exim-appendfile-mbx exim-auth-dovecot exim-build-eximon
 PKG_SUPPORTED_OPTIONS+=        exim-content-scan exim-lookup-cdb exim-lookup-dnsdb
 PKG_SUPPORTED_OPTIONS+=        exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
 PKG_SUPPORTED_OPTIONS+=        exim-lookup-pgsql exim-lookup-redis exim-lookup-sqlite
-PKG_SUPPORTED_OPTIONS+=        exim-lookup-whoson exim-old-demime exim-router-iplookup
-PKG_SUPPORTED_OPTIONS+=        exim-tcp-wrappers exim-tls exim-transport-lmtp gdbm
-PKG_SUPPORTED_OPTIONS+=        inet6 opendmarc saslauthd spf readline
+PKG_SUPPORTED_OPTIONS+=        exim-lookup-whoson exim-old-demime exim-proxy
+PKG_SUPPORTED_OPTIONS+=        exim-router-iplookup exim-tcp-wrappers exim-tls
+PKG_SUPPORTED_OPTIONS+=        exim-transport-lmtp gdbm inet6 opendmarc saslauthd spf
+PKG_SUPPORTED_OPTIONS+=        readline
 
 PKG_SUGGESTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
 PKG_SUGGESTED_OPTIONS+=        exim-appendfile-mbx exim-content-scan
@@ -98,6 +99,10 @@ LOOKUP_LIBS+=-lwhoson
 LOCAL_MAKEFILE_OPTIONS+=WITH_OLD_DEMIME=YES
 .endif
 
+.if !empty(PKG_OPTIONS:Mexim-proxy)
+LOCAL_MAKEFILE_OPTIONS+=EXPERIMENTAL_PROXY=YES
+.endif
+
 .if !empty(PKG_OPTIONS:Mexim-router-iplookup)
 LOCAL_MAKEFILE_OPTIONS+=ROUTER_IPLOOKUP=yes
 .endif
diff --git a/mail/exim/patches/patch-lookups_Makefile b/mail/exim/patches/patch-lookups_Makefile
index a612a4c..24cd80b 100644
--- a/mail/exim/patches/patch-lookups_Makefile
+++ b/mail/exim/patches/patch-lookups_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-lookups_Makefile,v 1.2 2014/04/02 17:36:00 wiedi Exp $
+$NetBSD: patch-lookups_Makefile,v 1.3 2014/07/23 14:09:52 adam Exp $
 
 Avoid use of non-portable "local" keyword.
 
---- scripts/lookups-Makefile.orig      2013-10-25 00:46:27.000000000 +0000
+--- scripts/lookups-Makefile.orig      2014-07-21 14:28:07.000000000 +0000
 +++ scripts/lookups-Makefile
-@@ -61,16 +61,16 @@ fi
+@@ -87,16 +87,16 @@ fi
  # command-line, not just check the Makefile.
  
  want_dynamic() {
@@ -25,7 +25,7 @@ Avoid use of non-portable "local" keyword.
    env | grep -q "^$re"
    if [ $? -eq 0 ]; then return 0; fi
    grep -q "^[ $tab]*$re" "$defs_source"
-@@ -78,8 +78,8 @@ want_at_all() {
+@@ -104,8 +104,8 @@ want_at_all() {
  
  # Adapted want_at_all above to work for EXPERIMENTAL features
  want_experimental() {
@@ -36,7 +36,7 @@ Avoid use of non-portable "local" keyword.
    env | grep -q "^$re"
    if [ $? -eq 0 ]; then return 0; fi
    grep -q "^[ $tab]*$re" "$defs_source"
-@@ -91,8 +91,7 @@ MODS=""
+@@ -117,8 +117,7 @@ MODS=""
  OBJ=""
  
  emit_module_rule() {
@@ -45,4 +45,4 @@ Avoid use of non-portable "local" keyword.
 +  lookup_name="$1"
    if [ "${lookup_name%:*}" = "$lookup_name" ]
    then
-     mod_name=$(echo $lookup_name | tr A-Z a-z)
+     # Square brackets are redundant but benign for POSIX compliant tr,
diff --git a/mail/exim/patches/patch-src_lookups_redis.c b/mail/exim/patches/patch-src_lookups_redis.c
new file mode 100644
index 0000000..c491c87
--- /dev/null
+++ b/mail/exim/patches/patch-src_lookups_redis.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/lookups/redis.c.orig   2014-05-26 19:14:16.000000000 +0000
++++ src/lookups/redis.c
+@@ -211,7 +211,7 @@ perform_redis_search(uschar *command, us
+ 
+                break;
+        case REDIS_REPLY_INTEGER:
+-               ttmp = (redis_reply->integer == 1) ? US"true" : US"false";
++               ttmp = (redis_reply->integer != 0) ? US"true" : US"false";
+                result = string_cat(result, &ssize, &offset, US ttmp, Ustrlen(ttmp));
+                break;
+        case REDIS_REPLY_STRING:

mk.conf

PKG_OPTIONS.exim+=      spf exim-lookup-sqlite exim-lookup-redis exim-proxy