From: Todd Lyons <tlyons@exim.org>
Date: Thu, 3 Oct 2013 23:11:04 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.exim.org/home/git/exim
X-Git-Tag: exim-4_82_RC3~15
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/b9cd8f911c670fdcd58e7b1484f46f8112b35559?hp=39d16d738122fd008efb87326058dd34cfa6ff1e

Merge branch 'master' of ssh://git.exim.org/home/git/exim
---

diff --git a/doc/doc-docbook/OS-Fixups b/doc/doc-docbook/OS-Fixups
index b3ea5247f..0a3b4113d 100755
--- a/doc/doc-docbook/OS-Fixups
+++ b/doc/doc-docbook/OS-Fixups
@@ -20,8 +20,13 @@ s{"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"}
 sub filter_linux
 {
 # SUSE 10 with extra pkgs
-s{"http://docbook.sourceforge.net/release/xsl/current/}
- {"/usr/share/xml/docbook/stylesheet/nwalsh/1.71.1/};
+-d "/usr/share/xml/docbook/stylesheet/nwalsh/1.71.1/" &&
+  s{"http://docbook.sourceforge.net/release/xsl/current/}
+   {"/usr/share/xml/docbook/stylesheet/nwalsh/1.71.1/};
+# Ubuntu/Debian with standard docbook-xsl pkgs
+-d "/usr/share/xml/docbook/stylesheet/docbook-xsl/" &&
+  s{"http://docbook.sourceforge.net/release/xsl/current/}
+   {"/usr/share/xml/docbook/stylesheet/docbook-xsl/};
 s{"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"}
  {"/usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd"};
 }
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 9c8b9df7b..7f54b8f6c 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -157,6 +157,8 @@ Version 4.82
 25. Experimental TPDA (Transport Post Delivery Action) function added.
     Patch provided by Axel Rau.
 
+26. Experimental Redis lookup added. Patch provided by Warren Baker.
+
 
 Version 4.80
 ------------
diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS
index ea9076a00..cc8e656ec 100644
--- a/src/ACKNOWLEDGMENTS
+++ b/src/ACKNOWLEDGMENTS
@@ -87,6 +87,7 @@ Justo Alonso              Suggested patch for maildir++ maildirsize file support
 Anton Altaparmakov        Patches to get cyrus_sasl fully working
 Simon Arlott              Patch for $dnslist_matched.
 Claus Assmann             Example code for OpenSSL CRL support
+Warren Baker              Experimental Redis lookup.
 Robert Bannocks           Patch for LDAP reference problem on Solaris
 Ian Bell                  Analysis of a bug and an infelicity in clock tick code
                           Patch for ${quote_local_part
diff --git a/src/scripts/source_checks b/src/scripts/source_checks
index 79f9c3555..eac4b8d1b 100644
--- a/src/scripts/source_checks
+++ b/src/scripts/source_checks
@@ -10,7 +10,7 @@ do
   perl -e '$/= undef; while (<>) { print $1 if /(?<='$table'\[\])\s*=\s*{\n(([^}].*\n)+)/m }' \
   | awk '/{ (US)?"/ {print $2}' \
   | awk -F\" '{print $2}' \
-  | LANG=C sort -c \
+  | LC_ALL=C sort -c \
   || exit 1
 done <<-END
 	readconf.c	optionlist_config
@@ -36,7 +36,7 @@ do
   < $file \
   perl -e '$/= undef; while (<>) { print $1 if /(?<='$table'\[\])\s*=\s*{\s?(([^}]*)+)}/m }' \
   | awk -F\" '/"/ {print $2}' \
-  | LANG=C sort -c \
+  | LC_ALL=C sort -c \
   || exit 1
 
 done <<-END