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 b3ea5247f5a7aa1e621feffac99a3fefd566b493..0a3b4113d5f6abc7df1d4b1b67420655727dcc2c 100755 (executable)
--- 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 9c8b9df7b15314f2887b895820d6ff1767929821..7f54b8f6c25c964fef230f93500b4718168673aa 100644 (file)
--- 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 ea9076a00e520429cb08ad67bea553f33b7df09f..cc8e656ec2542a20252309e6f7a4d55fb6e78a24 100644 (file)
--- 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 79f9c3555add821f53835d26ebdd0b85eae47170..eac4b8d1be7a40d287a4bbb0411472a1fd1ac845 100644 (file)
--- 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