Merge ~chrome/ubuntu/+source/exim4:redis into ubuntu/+source/exim4:ubuntu/devel

[Matjam]

This change adds support for exim4-heavy to uise the redis lookup.

I hope I've done all the things required for this to work? First time trying to make a merge request for ubuntu :P

[Matjam (chrome)]

I don't know how I ended up having additional changes there?

Ugh. I'm sorry ... I have no idea what I'm doing with launchpad.

Unmerged commits

2be577f... by Matjam on 2022-08-05

add support for redis lookup

a8a16ae... by Nathan Ollerenshaw <email address hidden> on 2022-08-05

enable support for the redis lookup in exim4-heavy

be6b2e6... by Christian Ehrhardt  on 2022-07-14

4.96-3ubuntu1 (patches applied)

Imported using git-ubuntu import.

cbf7375... by Christian Ehrhardt  on 2022-07-14

Add EXIM_DISTRIBUTION var to display it on the SMTP banner

Gbp-Pq: fix_smtp_banner.patch.

2ed54ff... by Christian Ehrhardt  on 2022-07-14

Allow one to use and switch between different local_scan functions

Gbp-Pq: 90_localscan_dlopen.dpatch.

d03065d... by Christian Ehrhardt  on 2022-07-14

[PATCH] Fix exit on attempt to rewrite a malformed address. Bug 2903

Gbp-Pq: 75_01-Fix-exit-on-attempt-to-rewrite-a-malformed-address.-.patch.

0638c96... by Christian Ehrhardt  on 2022-07-14

Point Debian users to Debian specific ML.

Gbp-Pq: 70_remove_exim-users_references.dpatch.

20c6973... by Christian Ehrhardt  on 2022-07-14

Stop using exim's -C option in utility scripts (exiwhat

Gbp-Pq: 67_unnecessaryCopt.diff.

e88bdd2... by Christian Ehrhardt  on 2022-07-14

Add a warning message to convert4r4

Gbp-Pq: 60_convert4r4.dpatch.

c52e680... by Christian Ehrhardt  on 2022-07-14

Exim's installation scripts install the binary as

Gbp-Pq: 35_install.dpatch.

diff --git a/OS/Makefile-Linux b/OS/Makefile-Linux
index dfb2fa8..eaf2bbc 100644
--- a/OS/Makefile-Linux
+++ b/OS/Makefile-Linux
@@ -31,9 +31,9 @@ XLFLAGS=-L$(X11)/lib
 X11_LD_LIB=$(X11)/lib
 
 EXIWHAT_PS_ARG=ax
-EXIWHAT_EGREP_ARG='/exim( |$$)'
+EXIWHAT_EGREP_ARG='/exim4( |$$)'
 EXIWHAT_MULTIKILL_CMD=killall
-EXIWHAT_MULTIKILL_ARG=exim
+EXIWHAT_MULTIKILL_ARG=exim4
 EXIWHAT_KILL_SIGNAL=-USR1
 
 # End
diff --git a/OS/eximon.conf-Default b/OS/eximon.conf-Default
index 2f874ef..1305ed6 100644
--- a/OS/eximon.conf-Default
+++ b/OS/eximon.conf-Default
@@ -5,7 +5,7 @@
 # The name of the eximon binary, usually the same as the eximon script,
 # with .bin stuck on the end.
 
-EXIMON_BINARY="${EXIMON_BINARY-$0.bin}"
+EXIMON_BINARY="/usr/libexec/exim4/${EXIMON_BINARY-${0##*/}.bin}"
 
 # The remaining parameters are values likely to be changed to suit the
 # user's taste. They are documented in the EDITME file.
diff --git a/README b/README
index d9379f7..5dc6d10 100644
--- a/README
+++ b/README
@@ -14,8 +14,16 @@ from Exim 3, though the basic structure and philosophy remains the same. The
 older book may be helpful for the background, but a lot of the detail has
 changed, so it is likely to be confusing to newcomers.
 
-There is a website at https://www.exim.org; this contains details of the
-mailing list [e-mail].
+Information about the way Debian has built the binary packages is
+obtainable in /usr/share/doc/exim4-base/README.Debian.gz, and there
+is a Debian-centered mailing list,
[e-mail]. Please ask Debian-specific
+questions there, and only write to the upstream exim-users mailing
+list if you are sure that your question is not Debian-specific. You
+can find the subscription web page on
+http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
+
+There is a website at https://www.exim.org/.
 
 A copy of the Exim FAQ should be available from the same source that you used
 to obtain the Exim distribution. Additional formats for the documentation
diff --git a/debian/EDITME.exim4-heavy.diff b/debian/EDITME.exim4-heavy.diff
index 26faf78..58fda6b 100644
--- a/debian/EDITME.exim4-heavy.diff
+++ b/debian/EDITME.exim4-heavy.diff
@@ -35,7 +35,8 @@
  LOOKUP_PASSWD=yes
 -# LOOKUP_PGSQL=yes
 +LOOKUP_PGSQL=yes
- # LOOKUP_REDIS=yes
+-# LOOKUP_REDIS=yes
++LOOKUP_REDIS=yes
 -# LOOKUP_SQLITE=yes
 +LOOKUP_SQLITE=yes
  # LOOKUP_SQLITE_PC=sqlite3
@@ -55,7 +56,7 @@
  
  
 +LOOKUP_INCLUDE=-I/usr/include/mysql -I`pg_config --includedir`
-+LOOKUP_LIBS=-lldap -llber -lmysqlclient -lpq -lsqlite3
++LOOKUP_LIBS=-lldap -llber -lmysqlclient -lpq -lsqlite3 -lhiredis
 +
  #------------------------------------------------------------------------------
  # Compiling the Exim monitor: If you want to compile the Exim monitor, a
diff --git a/debian/changelog b/debian/changelog
index fa53898..78b8c89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+exim4 (4.96-3ubuntu2) UNRELEASED; urgency=medium
+
+  * Add support for the redis lookup to exim4-heavy.
+    - added dev dependency for libhiredis-dev
+    - adjusted compiler flags to link the library.
+
+ -- Nathan Ollerenshaw <[e-mail]>  Fri, 05 Aug 2022 11:20:05 -0700
+
 exim4 (4.96-3ubuntu1) kinetic; urgency=medium
 
   * Merge with Debian unstable. (LP: #1971274) Remaining changes:
diff --git a/debian/control b/debian/control
index 0e9d567..e9bae6c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends:
  docbook-xsl,
  libdb5.3-dev,
  libgnutls28-dev (>= 3.5.7),
+ libhiredis-dev,
  libident-dev,
  libidn11-dev,
  libidn2-dev,
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3e6da91..2f0081c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -2,6 +2,11 @@ This document describes *changes* to previous versions, that might
 affect Exim's operation, with an unchanged configuration file.  For new
 options, and new features, see the NewStuff file next to this ChangeLog.
 
+JH/04 Bug 2903: avoid exit on an attempt to rewrite a malformed address.
+      Make the rewrite never match and keep the logging.  Trust the
+      admin to be using verify=header-syntax (to actually reject the message).
+
+
 Exim version 4.96
 -----------------
 
diff --git a/doc/exim.8 b/doc/exim.8
index 4b41796..98739d1 100644
--- a/doc/exim.8
+++ b/doc/exim.8
@@ -1,9 +1,9 @@
-.TH EXIM 8
+.TH EXIM4 8
 .SH NAME
-exim \- a Mail Transfer Agent
+exim4 \- a Mail Transfer Agent
 .SH SYNOPSIS
 .nf
-.B exim [options] arguments ...
+.B exim4 [options] arguments ...
 .B mailq [options] arguments ...
 .B rsmtp [options] arguments ...
 .B rmail [options] arguments ...
@@ -40,7 +40,7 @@ local message on the standard input, with the arguments specifying the
 recipients) is assumed. Thus, for example, if Exim is installed in
 \fI/usr/sbin\fP, you can send a message from the command line like this:
 .sp
-  /usr/sbin/exim -i <recipient-address(es)>
+  /usr/sbin/exim4 -i <recipient-address(es)>
   <message content, including all the header lines>
   CTRL-D
 .sp
@@ -125,8 +125,8 @@ ports, on multiple ports, and only on specific interfaces.
 .sp
 When a listening daemon
 is started without the use of \fB\-oX\fP (that is, without overriding the normal
-configuration), it writes its process id to a file called exim\-daemon.pid
-in Exim's spool directory. This location can be overridden by setting
+configuration), it writes its process id to a file called
+/run/exim4/exim.pid. This location can be overridden by setting
 PID_FILE_PATH in Local/Makefile. The file is written while Exim is still
 running as root.
 .sp
@@ -180,7 +180,7 @@ available to admin users.
 This option operates like \fB\-be\fP except that it must be followed by the name
 of a file. For example:
 .sp
-  exim \-bem /tmp/testmessage
+  exim4 \-bem /tmp/testmessage
 .sp
 The file is read as a message (as if receiving a locally\-submitted non\-SMTP
 message) before any of the test expansions are done. Thus, message\-specific
@@ -206,7 +206,7 @@ If you want to test a system filter file, use \fB\-bF\fP instead of \fB\-bf\fP. 
 can use both \fB\-bF\fP and \fB\-bf\fP on the same command, in order to test a system
 filter and a user filter in the same run. For example:
 .sp
-  exim \-bF /system/filter \-bf /user/filter </test/message
+  exim4 \-bF /system/filter \-bf /user/filter </test/message
 .sp
 This is helpful when the system filter adds header lines or sets filter
 variables that are used by the user filter.
@@ -258,8 +258,8 @@ This option runs a fake SMTP session as if from the given IP address, using the
 standard input and output. The IP address may include a port number at the end,
 after a full stop. For example:
 .sp
-  exim \-bh 10.9.8.7.1234
-  exim \-bh fe80::a00:20ff:fe86:a061.5678
+  exim4 \-bh 10.9.8.7.1234
+  exim4 \-bh fe80::a00:20ff:fe86:a061.5678
 .sp
 When an IPv6 address is given, it is converted into canonical form. In the case
 of the second example above, the value of \fI$sender_host_address\fP after
@@ -417,7 +417,7 @@ main configuration options to be written to the standard output. The values
 of one or more specific options can be requested by giving their names as
 arguments, for example:
 .sp
-  exim \-bP qualify_domain hold_domains
+  exim4 \-bP qualify_domain hold_domains
 .sp
 However, any option setting that is preceded by the word "hide" in the
 configuration file is not shown in full, except to an admin user. For other
@@ -445,7 +445,7 @@ written directly into the spool directory.
 .sp
 If \fB\-bP\fP is followed by a name preceded by +, for example,
 .sp
-  exim \-bP +local_domains
+  exim4 \-bP +local_domains
 .sp
 it searches for a matching named list of any type (domain, host, address, or
 local part) and outputs what it finds.
@@ -454,7 +454,7 @@ If one of the words \fBrouter\fP, \fBtransport\fP, or \fBauthenticator\fP is giv
 followed by the name of an appropriate driver instance, the option settings for
 that driver are output. For example:
 .sp
-  exim \-bP transport local_delivery
+  exim4 \-bP transport local_delivery
 .sp
 The generic driver options are output first, followed by the driver's private
 options. A list of the names of drivers of a particular type can be obtained by
@@ -539,7 +539,7 @@ This option is for testing retry rules, and it must be followed by up to three
 arguments. It causes Exim to look for a retry rule that matches the values
 and to write it to the standard output. For example:
 .sp
-  exim \-brt bach.comp.mus.example
+  exim4 \-brt bach.comp.mus.example
   Retry rule: *.comp.mus.example  F,2h,15m; F,4d,30m;
 .sp
  The first
@@ -552,7 +552,7 @@ rule is found that matches the host, one that matches the mail domain is
 sought. Finally, an argument that is the name of a specific delivery error, as
 used in setting up retry rules, can be given. For example:
 .sp
-  exim \-brt haydn.comp.mus.example quota_3d
+  exim4 \-brt haydn.comp.mus.example quota_3d
   Retry rule: *@haydn.comp.mus.example quota_3d  F,1h,15m
 .TP 10
 \fB\-brw\fP
@@ -655,7 +655,7 @@ doing such tests.
 .TP 10
 \fB\-bV\fP
 This option causes Exim to write the current version number, compilation
-number, and compilation date of the \fIexim\fP binary to the standard output.
+number, and compilation date of the \fIexim4\fP binary to the standard output.
 It also lists the DBM library that is being used, the optional modules (such as
 specific lookup types), the drivers that are included in the binary, and the
 name of the runtime configuration file that is in use.
@@ -683,7 +683,7 @@ If no arguments are given, Exim runs in an interactive manner, prompting with a
 right angle bracket for addresses to be verified.
 .sp
 Unlike the \fB\-be\fP test option, you cannot arrange for Exim to use the
-readline() function, because it is running as \fIexim\fP and there are
+readline() function, because it is running as \fIexim4\fP and there are
 security issues.
 .sp
 Verification differs from address testing (the \fB\-bt\fP option) in that routers
@@ -796,14 +796,14 @@ command line item. \fB\-D\fP can be used to set the value of a macro to the empt
 string, in which case the equals sign is optional. These two commands are
 synonymous:
 .sp
-  exim \-DABC  ...
-  exim \-DABC= ...
+  exim4 \-DABC  ...
+  exim4 \-DABC= ...
 .sp
 To include spaces in a macro definition item, quotes must be used. If you use
 quotes, spaces are permitted around the macro name and the equals sign. For
 example:
 .sp
-  exim '\-D ABC = something' ...
+  exim4 '\-D ABC = something' ...
 .sp
 \fB\-D\fP may be repeated up to 10 times on a command line.
 Only macro names up to 22 letters long can be set.
@@ -970,8 +970,8 @@ never provoke a bounce. An empty sender can be specified either as an empty
 string, or as a pair of angle brackets with nothing between them, as in these
 examples of shell commands:
 .sp
-  exim \-f '<>' user@domain
-  exim \-f "" user@domain
+  exim4 \-f '<>' user@domain
+  exim4 \-f "" user@domain
 .sp
 In addition, the use of \fB\-f\fP is not restricted when testing a filter file
 with \fB\-bf\fP or when testing or verifying addresses using the \fB\-bt\fP or
@@ -1388,12 +1388,12 @@ other circumstances, they are ignored unless the caller is trusted.
 The \fB\-oMa\fP option sets the sender host address. This may include a port
 number at the end, after a full stop (period). For example:
 .sp
-  exim \-bs \-oMa 10.9.8.7.1234
+  exim4 \-bs \-oMa 10.9.8.7.1234
 .sp
 An alternative syntax is to enclose the IP address in square brackets,
 followed by a colon and the port number:
 .sp
-  exim \-bs \-oMa [10.9.8.7]:1234
+  exim4 \-bs \-oMa [10.9.8.7]:1234
 .sp
 The IP address is placed in the \fI$sender_host_address\fP variable, and the
 port, if present, in \fI$sender_host_port\fP. If both \fB\-oMa\fP and \fB\-bh\fP
@@ -1627,22 +1627,22 @@ If other commandline options specify an action, a \fI\-qG<name>\fP option
 will specify a queue to operate on.
 For example:
 .sp
-  exim \-bp \-qGquarantine
+  exim4 \-bp \-qGquarantine
   mailq \-qGquarantine
-  exim \-qGoffpeak \-Rf @special.domain.example
+  exim4 \-qGoffpeak \-Rf @special.domain.example
 .TP 10
 \fB\-q\fP<\fIqflags\fP> <\fIstart id\fP> <\fIend id\fP>
 When scanning the queue, Exim can be made to skip over messages whose ids are
 lexically less than a given value by following the \fB\-q\fP option with a
 starting message id. For example:
 .sp
-  exim \-q 0t5C6f\-0000c8\-00
+  exim4 \-q 0t5C6f\-0000c8\-00
 .sp
 Messages that arrived earlier than 0t5C6f\-0000c8\-00 are not inspected. If a
 second message id is given, messages whose ids are lexically greater than it
 are also skipped. If the same id is given twice, for example,
 .sp
-  exim \-q 0t5C6f\-0000c8\-00 0t5C6f\-0000c8\-00
+  exim4 \-q 0t5C6f\-0000c8\-00 0t5C6f\-0000c8\-00
 .sp
 just one delivery process is started, for that message. This differs from
 \fB\-M\fP in that retry data is respected, and it also differs from \fB\-Mc\fP in
@@ -1658,7 +1658,7 @@ starting a queue runner process at intervals specified by the given time value. 
 single daemon process handles both functions. A common way of starting up a
 combined daemon at system boot time is to use a command such as
 .sp
-  /usr/exim/bin/exim \-bd \-q30m
+  /usr/sbin/exim4 \-bd \-q30m
 .sp
 Such a daemon listens for incoming SMTP calls, and also starts a queue runner
 process every 30 minutes.
@@ -1689,7 +1689,7 @@ regular expression; otherwise it is a literal string.
 If you want to do periodic queue runs for messages with specific recipients,
 you can combine \fB\-R\fP with \fB\-q\fP and a time value. For example:
 .sp
-  exim \-q25m \-R @special.domain.example
+  exim4 \-q25m \-R @special.domain.example
 .sp
 This example does a queue run for messages with recipients in the given domain
 every 25 minutes. Any additional flags that are specified with \fB\-q\fP are
@@ -1805,6 +1805,26 @@ under most shells.
 .sp
 .
 .SH "SEE ALSO"
+.BR exicyclog (8),
+.BR exigrep (8),
+.BR exim_checkaccess (8),
+.BR exim_convert4r4 (8),
+.BR exim_db (8),
+.BR exim_dbmbuild (8),
+.BR exim_lock (8),
+.BR eximon (8),
+.BR exinext (8),
+.BR exiqgrep (8),
+.BR exiqsumm (8),
+.BR exiwhat (8),
+.BR update\-exim4.conf (8),
+.BR update\-exim4defaults (8),
+/usr/share/doc/exim4\-base/,
+/usr/share/doc/exim4\-base/README.Debian.[gz|html].
 .rs
 .sp
 The full Exim specification, the Exim book, and the Exim wiki.
+
+.SH AUTHOR
+This manual page was provided with the upstream Exim source package.
+It was enhanced for the Debian GNU/Linux system.
diff --git a/scripts/Configure-config.h b/scripts/Configure-config.h
index 75d366f..d9b13c7 100755
--- a/scripts/Configure-config.h
+++ b/scripts/Configure-config.h
@@ -23,6 +23,13 @@
 if [ "$1" != "" ] ; then MAKE=$1 ; fi
 if [ "$MAKE" = "" ] ; then MAKE=make ; fi
 
+# exporting distribution to use it in smtp banner
+if test -x /usr/bin/lsb_release && lsb_release -si; then
+	export EXIM_DISTRIBUTION=\"$(lsb_release -si)\"
+else
+	export EXIM_DISTRIBUTION=\"\"
+fi
+
 $MAKE buildconfig || exit 1
 
 # BEWARE: tab characters needed in the following sed command. They have had
diff --git a/scripts/exim_install b/scripts/exim_install
index 1e88050..e287d5e 100755
--- a/scripts/exim_install
+++ b/scripts/exim_install
@@ -221,6 +221,8 @@ while [ $# -gt 0 ]; do
     version=exim-`$exim 2>/dev/null | \
       awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
 
+    version=exim
+
     if [ "${version}" = "exim-${EXE}" ]; then
       echo $com ""
       echo $com "*** Could not run $exim to find version number ***"
@@ -370,10 +372,8 @@ done
 
 
 
-# If there is no configuration file, install the default, modifying it to refer
-# to the configured system aliases file. If there is no setting for
-# SYSTEM_ALIASES_FILE, use the traditional /etc/aliases. If the file does not
-# exist, install a default (dummy) for that too.
+# Install default configuration file
+# This is a local Debian modification.
 
 # However, if CONFIGURE_FILE specifies a list of files, skip this code.
 
@@ -396,7 +396,7 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
   ${real} ${MKDIR} -p `${DIRNAME} ${CONFIGURE_FILE}`
 
   echo sed -e '\\'
-  echo "  \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'\"" '\\'
+  echo "  \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/aliases'\"" '\\'
   echo "  ../src/configure.default > \${CONFIGURE_FILE}"
 
   # I can't find a way of writing this using the ${real} feature because
@@ -405,7 +405,7 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
 
   if [ "$real" = "" ] ; then
     sed -e \
-      "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'" \
+      "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/aliases'" \
       ../src/configure.default > ${CONFIGURE_FILE}
   else
     true
diff --git a/src/EDITME b/src/EDITME
index 53022e5..60734c3 100644
--- a/src/EDITME
+++ b/src/EDITME
@@ -873,6 +873,21 @@ HEADERS_CHARSET="ISO-8859-1"
 
 
 #------------------------------------------------------------------------------
+# On systems which support dynamic loading of shared libraries, Exim can
+# load a local_scan function specified in its config file instead of having
+# to be recompiled with the desired local_scan function. For a full
+# description of the API to this function, see the Exim specification.
+
+DLOPEN_LOCAL_SCAN=yes
+
+# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
+# linker flags.  Without it, the loaded .so won't be able to access any
+# functions from exim.
+
+LDFLAGS += -rdynamic
+CFLAGS += -fvisibility=hidden
+
+#------------------------------------------------------------------------------
 # The default distribution of Exim contains only the plain text form of the
 # documentation. Other forms are available separately. If you want to install
 # the documentation in "info" format, first fetch the Texinfo documentation
diff --git a/src/config.h.defaults b/src/config.h.defaults
index 25ab755..83f6908 100644
--- a/src/config.h.defaults
+++ b/src/config.h.defaults
@@ -33,6 +33,8 @@ Do not put spaces between # and the 'define'.
 
 #define AUTH_VARS                     4
 
+#define DLOPEN_LOCAL_SCAN
+
 #define BIN_DIRECTORY
 
 #define CONFIGURE_FILE
@@ -232,4 +234,6 @@ for EXIM_ARITH_MAX and _MIN in OS/oh.h-FOO */
 #define SC_EXIM_ARITH "%" SCNi64		/* scanf incl. 0x prefix */
 #define SC_EXIM_DEC   "%" SCNd64		/* scanf decimal */
 
+#define EXIM_DISTRIBUTION
+
 /* End of config.h.defaults */
diff --git a/src/convert4r4.src b/src/convert4r4.src
index 47987fc..d6c520b 100755
--- a/src/convert4r4.src
+++ b/src/convert4r4.src
@@ -666,6 +666,32 @@ return defined $main{$_[0]} && $main{$_[0]} eq "true";
 
 print STDERR "Runtime configuration file converter for Exim release 4.\n";
 
+if( !defined $ENV{"CONVERT4R4"} || $ENV{"CONVERT4R4"} ne "I understand this is an unsupported tool" ) {
+
+  print STDERR <<EOF;
+convert4r4 on Debian GNU/Linux deprecated
+
+This tool is unsupported by upstream and discouraged by the Debian Exim 4
+maintainers. It has multiple known bugs, and you need to manually
+review its output after using it anyway. Please seriously consider complete
+manual regeneration of the Exim 4 configuration, preferably by using the new
+Debconf interface to Exim 4.
+
+If you decide to ignore this advice and to use this script anyway,
+setting the environment variable CONVERT4R4 to the value
+\"I understand this is an unsupported tool\"
+will allow you to run the script. If you find bugs, you get to keep
+the pieces. Please do not file bugs against this script in the Debian
+BTS without providing a patch fixing the bugs, and please do not
+expect the upstream exim-users mailing list to answer questions.
+
+Kind regards
+the Debian Exim4 Maintainers
+EOF
+
+  exit 1;
+}
+
 $transport_start = $director_start = $router_start = $retry_start
   = $rewrite_start = $auth_start = 999999;
 
diff --git a/src/exicyclog.src b/src/exicyclog.src
index 20bf9fc..75df6c6 100644
--- a/src/exicyclog.src
+++ b/src/exicyclog.src
@@ -149,12 +149,12 @@ done
 
 st='	 '
 exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
 
-spool_directory=`$exim_path -C $config -bP spool_directory | sed 's/.*=[  ]*//'`
+spool_directory=`$exim_path -bP spool_directory | sed 's/.*=[  ]*//'`
 
 if [ "$log_file_path" = "" ] ; then
-  log_file_path=`$exim_path -C $config -bP log_file_path | sed 's/.*=[  ]*//'`
+  log_file_path=`$exim_path -bP log_file_path | sed 's/.*=[  ]*//'`
 fi
 
 # If log_file_path contains only "syslog" then no Exim log files are in use.
diff --git a/src/exim.h b/src/exim.h
index 61642b5..fe38d4e 100644
--- a/src/exim.h
+++ b/src/exim.h
@@ -651,6 +651,10 @@ default to EDQUOT if it exists, otherwise ENOSPC. */
 # define EXIM_GROUPLIST_SIZE NGROUPS_MAX
 #endif
 
+#ifndef EXIM_DISTRIBUTION
+  #define EXIM_DISTRIBUTION ""
+#endif
+
 /* Linux has TCP_CORK, FreeBSD has TCP_NOPUSH; they do pretty much the same */
 
 #ifdef TCP_CORK
diff --git a/src/exim_checkaccess.src b/src/exim_checkaccess.src
index 360f307..d79afe8 100755
--- a/src/exim_checkaccess.src
+++ b/src/exim_checkaccess.src
@@ -52,7 +52,7 @@ done
 # a tab to keep the tab in one place.
 
 exim_path=`perl -ne 'chop;if (/^\s*exim_path\s*=\s*(.*)/){print "$1\n";last;}' $config`
-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
 
 
 #########################################################################
diff --git a/src/eximon.src b/src/eximon.src
index 6293a7c..ab1d24c 100644
--- a/src/eximon.src
+++ b/src/eximon.src
@@ -79,10 +79,10 @@ config=${EXIMON_EXIM_CONFIG-$config}
 
 st='	 '
 EXIM_PATH=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
-if test "$EXIM_PATH" = ""; then EXIM_PATH=BIN_DIRECTORY/exim; fi
+if test "$EXIM_PATH" = ""; then EXIM_PATH=BIN_DIRECTORY/exim4; fi
 
-SPOOL_DIRECTORY=`$EXIM_PATH -C $config -bP spool_directory | sed 's/.*=[  ]*//'`
-LOG_FILE_PATH=`$EXIM_PATH -C $config -bP log_file_path | sed 's/.*=[  ]*//'`
+SPOOL_DIRECTORY=`$EXIM_PATH -bP spool_directory | sed 's/.*=[  ]*//'`
+LOG_FILE_PATH=`$EXIM_PATH -bP log_file_path | sed 's/.*=[  ]*//'`
 
 # If log_file_path is "syslog" then logging is only to syslog, and the monitor
 # is unable to display a log tail unless EXIMON_LOG_FILE_PATH is set to tell
diff --git a/src/eximstats.src b/src/eximstats.src
index 5e1a084..ae60bef 100644
--- a/src/eximstats.src
+++ b/src/eximstats.src
@@ -501,6 +501,10 @@ To install these, download and unpack them, then use the normal perl installatio
  make test
  make install
 
+On B<Debian GNU/Linux> you can use
+C<apt-get install libgd-perl libgd-text-perl libgd-graph-perl>
+instead.
+
 =item B<-chartdir>I <dir>
 
 Create the charts in the directory <dir>
@@ -533,8 +537,7 @@ about how to create charts from the tables.
 
 =head1 AUTHOR
 
-There is a website at https://www.exim.org - this contains details of the
-mailing list [e-mail].
+There is a website at https://www.exim.org/.
 
 =head1 TO DO
 
diff --git a/src/exinext.src b/src/exinext.src
index 9138018..6de020d 100644
--- a/src/exinext.src
+++ b/src/exinext.src
@@ -97,9 +97,9 @@ if [ "$exim_path" = "" ]; then
   exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
 fi
 
-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
-spool_directory=`$exim_path $eximmacdef -C $config -bP spool_directory | sed 's/.*=[  ]*//'`
-qualify_domain=`$exim_path $eximmacdef -C $config -bP qualify_domain | sed 's/.*=[  ]*//'`
+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
+spool_directory=`$exim_path $eximmacdef -bP spool_directory | sed 's/.*=[  ]*//'`
+qualify_domain=`$exim_path $eximmacdef -bP qualify_domain | sed 's/.*=[  ]*//'`
 
 # Now do the job. Perl uses $ so frequently that we don't want to have to
 # escape them all from the shell, so pass in shell variable values as
@@ -144,7 +144,7 @@ perl - $exim_path "$eximmacdef" $argone $spool_directory $qualify_domain $config
   # Run Exim to get a list of hosts for the given domain; for
   # each one construct the appropriate retry key.
 
-  open(LIST, "$exim -C $config -v -bt $address |") ||
+  open(LIST, "$exim -v -bt $address |") ||
     die "can't run exim to route $address";
 
   while (<LIST>)
@@ -181,7 +181,7 @@ perl - $exim_path "$eximmacdef" $argone $spool_directory $qualify_domain $config
 
   # Run exim_dumpdb to get out the retry data and pick off what we want
 
-  open(DATA, "${exim}_dumpdb $spool retry |") ||
+  open(DATA, "/usr/sbin/exim_dumpdb $spool retry |") ||
     die "can't run exim_dumpdb";
 
   while (<DATA>)
diff --git a/src/exiqgrep.src b/src/exiqgrep.src
index 0661c57..119403f 100644
--- a/src/exiqgrep.src
+++ b/src/exiqgrep.src
@@ -26,7 +26,7 @@ use Getopt::Std;
 use File::Basename;
 
 # Have this variable point to your exim binary.
-my $exim = 'BIN_DIRECTORY/exim';
+my $exim = 'BIN_DIRECTORY/exim4';
 my $eargs = '-bpu';
 my %id;
 my %opt;
diff --git a/src/exiwhat.src b/src/exiwhat.src
index a1f748e..365ac37 100644
--- a/src/exiwhat.src
+++ b/src/exiwhat.src
@@ -98,9 +98,9 @@ fi
 
 st='	 '
 exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
-spool_directory=`$exim_path -C $config -bP spool_directory | sed "s/.*=[ ]*//"`
-process_log_path=`$exim_path -C $config -bP process_log_path | sed "s/.*=[ ]*//"`
+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
+spool_directory=`$exim_path -bP spool_directory | sed "s/.*=[ ]*//"`
+process_log_path=`$exim_path -bP process_log_path | sed "s/.*=[ ]*//"`
 
 # The file that Exim writes when sent the SIGUSR1 signal is specified by
 # the process_log_path option. If that is not defined, Exim uses the file
diff --git a/src/globals.c b/src/globals.c
index ff246fe..4e67859 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -117,6 +117,10 @@ int     dsn_ret                = 0;
 const pcre2_code  *regex_DSN         = NULL;
 uschar *dsn_advertise_hosts    = NULL;
 
+#ifdef DLOPEN_LOCAL_SCAN
+uschar *local_scan_path        = NULL;
+#endif
+
 #ifndef DISABLE_TLS
 BOOL    gnutls_compat_mode     = FALSE;
 BOOL    gnutls_allow_auto_pkcs11 = FALSE;
@@ -918,7 +922,7 @@ const uschar *event_name         = NULL;	/* event name variable */
 
 
 gid_t   exim_gid               = EXIM_GID;
-uschar *exim_path              = US BIN_DIRECTORY "/exim"
+uschar *exim_path              = US BIN_DIRECTORY "/exim4"
                         "\0<---------------Space to patch exim_path->";
 uid_t   exim_uid               = EXIM_UID;
 int     expand_level	       = 0;		/* Nesting depth, indent for debug */
@@ -1480,7 +1484,7 @@ int     smtp_accept_reserve    = 0;
 uschar *smtp_active_hostname   = NULL;
 int	smtp_backlog_monitor   = 0;
 uschar *smtp_banner            = US"$smtp_active_hostname ESMTP "
-                             "Exim $version_number $tod_full"
+                             "Exim $version_number " EXIM_DISTRIBUTION " $tod_full"
                              "\0<---------------Space to patch smtp_banner->";
 int     smtp_ch_index          = 0;
 uschar *smtp_cmd_argument      = NULL;
diff --git a/src/globals.h b/src/globals.h
index fe099e4..f275a0f 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -155,6 +155,10 @@ extern int      dsn_ret;               /* DSN ret type*/
 extern const pcre2_code  *regex_DSN;         /* For recognizing DSN settings */
 extern uschar  *dsn_advertise_hosts;   /* host for which TLS is advertised */
 
+#ifdef DLOPEN_LOCAL_SCAN
+extern uschar *local_scan_path;        /* Path to local_scan() library */
+#endif
+
 /* Input-reading functions for messages, so we can use special ones for
 incoming TCP/IP. */
 
diff --git a/src/local_scan.c b/src/local_scan.c
index 7a3bae7..7568ee4 100644
--- a/src/local_scan.c
+++ b/src/local_scan.c
@@ -7,58 +7,133 @@
 /* See the file NOTICE for conditions of use and distribution. */
 
 
-/******************************************************************************
-This file contains a template local_scan() function that just returns ACCEPT.
-If you want to implement your own version, you should copy this file to, say
-Local/local_scan.c, and edit the copy. To use your version instead of the
-default, you must set
-
-HAVE_LOCAL_SCAN=yes
-LOCAL_SCAN_SOURCE=Local/local_scan.c
-
-in your Local/Makefile. This makes it easy to copy your version for use with
-subsequent Exim releases.
-
-For a full description of the API to this function, see the Exim specification.
-******************************************************************************/
-
-
 /* This is the only Exim header that you should include. The effect of
 including any other Exim header is not defined, and may change from release to
 release. Use only the documented interface! */
 
 #include "local_scan.h"
 
+#ifdef DLOPEN_LOCAL_SCAN
+#include <dlfcn.h>
+static int (*local_scan_fn)(int fd, uschar **return_text) = NULL;
+static int load_local_scan_library(void);
+#endif
 
-/* This is a "do-nothing" version of a local_scan() function. The arguments
-are:
-
-  fd             The file descriptor of the open -D file, which contains the
-                   body of the message. The file is open for reading and
-                   writing, but modifying it is dangerous and not recommended.
-
-  return_text    A pointer to an unsigned char* variable which you can set in
-                   order to return a text string. It is initialized to NULL.
-
-The return values of this function are:
-
-  LOCAL_SCAN_ACCEPT
-                 The message is to be accepted. The return_text argument is
-                   saved in $local_scan_data.
+int
+local_scan(int fd, uschar **return_text)
+{
 
-  LOCAL_SCAN_REJECT
-                 The message is to be rejected. The returned text is used
-                   in the rejection message.
+#ifdef DLOPEN_LOCAL_SCAN
+/* local_scan_path is defined AND not the empty string */
+if (local_scan_path && *local_scan_path)
+  {
+  if (!local_scan_fn)
+    {
+    if (!load_local_scan_library())
+      {
+        char *base_msg , *error_msg , *final_msg ;
+        int final_length = -1 ;
+
+        base_msg=US"Local configuration error - local_scan() library failure\n";
+        error_msg = dlerror() ;
+
+        final_length = strlen(base_msg) + strlen(error_msg) + 1 ;
+        final_msg = (char*)malloc( final_length*sizeof(char) ) ;
+        *final_msg = '\0' ;
+
+        strcat( final_msg , base_msg ) ;
+        strcat( final_msg , error_msg ) ;
+
+        *return_text = final_msg ;
+      return LOCAL_SCAN_TEMPREJECT;
+      }
+    }
+    return local_scan_fn(fd, return_text);
+  }
+else
+#endif
+  return LOCAL_SCAN_ACCEPT;
+}
 
-  LOCAL_SCAN_TEMPREJECT
-                 This specifies a temporary rejection. The returned text
-                   is used in the rejection message.
-*/
+#ifdef DLOPEN_LOCAL_SCAN
 
-int
-local_scan(int fd, uschar **return_text)
+static int load_local_scan_library(void)
 {
-return LOCAL_SCAN_ACCEPT;
+/* No point in keeping local_scan_lib since we'll never dlclose() anyway */
+void *local_scan_lib = NULL;
+int (*local_scan_version_fn)(void);
+int vers_maj;
+int vers_min;
+
+local_scan_lib = dlopen(local_scan_path, RTLD_NOW);
+if (!local_scan_lib)
+  {
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - "
+    "message temporarily rejected");
+  return FALSE;
+  }
+
+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major");
+if (!local_scan_version_fn)
+  {
+  dlclose(local_scan_lib);
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
+    "local_scan_version_major() function - message temporarily rejected");
+  return FALSE;
+  }
+
+/* The major number is increased when the ABI is changed in a non
+   backward compatible way. */
+vers_maj = local_scan_version_fn();
+
+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor");
+if (!local_scan_version_fn)
+  {
+  dlclose(local_scan_lib);
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
+    "local_scan_version_minor() function - message temporarily rejected");
+  return FALSE;
+  }
+
+/* The minor number is increased each time a new feature is added (in a
+   way that doesn't break backward compatibility) -- Marc */
+vers_min = local_scan_version_fn();
+
+
+if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR)
+  {
+  dlclose(local_scan_lib);
+  local_scan_lib = NULL;
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major"
+    "version number, you need to recompile your module for this version"
+    "of exim (The module was compiled for version %d.%d and this exim provides"
+    "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR,
+    LOCAL_SCAN_ABI_VERSION_MINOR);
+  return FALSE;
+  }
+else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR)
+  {
+  dlclose(local_scan_lib);
+  local_scan_lib = NULL;
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor"
+    "version number, you need to recompile your module for this version"
+    "of exim (The module was compiled for version %d.%d and this exim provides"
+    "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR,
+    LOCAL_SCAN_ABI_VERSION_MINOR);
+  return FALSE;
+  }
+
+local_scan_fn = dlsym(local_scan_lib, "local_scan");
+if (!local_scan_fn)
+  {
+  dlclose(local_scan_lib);
+  log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
+    "local_scan() function - message temporarily rejected");
+  return FALSE;
+  }
+return TRUE;
 }
 
+#endif /* DLOPEN_LOCAL_SCAN */
+
 /* End of local_scan.c */
diff --git a/src/local_scan.h b/src/local_scan.h
index c609a27..2ef3d72 100644
--- a/src/local_scan.h
+++ b/src/local_scan.h
@@ -27,6 +27,7 @@ settings, and the store functions. */
 
 #include <stdarg.h>
 #include <sys/types.h>
+#pragma GCC visibility push(default)
 #include "config.h"
 #include "mytypes.h"
 #include "store.h"
@@ -166,6 +167,9 @@ extern header_line *header_list;       /* First header */
 extern BOOL    host_checking;          /* Set when checking a host */
 extern uschar *interface_address;      /* Interface for incoming call */
 extern int     interface_port;         /* Port number for incoming call */
+#ifdef DLOPEN_LOCAL_SCAN
+extern uschar *local_scan_path;
+#endif
 extern uschar *message_id;             /* Internal id of message being handled */
 extern uschar *received_protocol;      /* Name of incoming protocol */
 extern int     recipients_count;       /* Number of recipients */
@@ -236,4 +240,6 @@ extern pid_t    child_open_exim2_function(int *, uschar *, uschar *, const uscha
 extern pid_t    child_open_function(uschar **, uschar **, int, int *, int *, BOOL, const uschar *);
 #endif
 
+#pragma GCC visibility pop
+
 /* End of local_scan.h */
diff --git a/src/readconf.c b/src/readconf.c
index 06bc50f..6ecb0af 100644
--- a/src/readconf.c
+++ b/src/readconf.c
@@ -212,6 +212,9 @@ static optionlist optionlist_config[] = {
   { "local_from_prefix",        opt_stringptr,   {&local_from_prefix} },
   { "local_from_suffix",        opt_stringptr,   {&local_from_suffix} },
   { "local_interfaces",         opt_stringptr,   {&local_interfaces} },
+#ifdef DLOPEN_LOCAL_SCAN
+  { "local_scan_path",          opt_stringptr,   &local_scan_path },
+#endif
 #ifdef HAVE_LOCAL_SCAN
   { "local_scan_timeout",       opt_time,        {&local_scan_timeout} },
 #endif
diff --git a/src/rewrite.c b/src/rewrite.c
index 005dc51..aca9cc3 100644
--- a/src/rewrite.c
+++ b/src/rewrite.c
@@ -495,15 +495,14 @@ while (*s)
 
   if (!recipient)
     {
-    /* Handle unparesable addresses in the header. Slightly ugly because a
+    /* Log unparesable addresses in the header. Slightly ugly because a
     null output from the extract can also result from a header without an
-    address, "To: undisclosed recpients:;" being the classic case. */
+    address, "To: undisclosed recpients:;" being the classic case. Ignore
+    this one and carry on. */
 
     if ((rewrite_rules || routed_old) && Ustrcmp(errmess, "empty address") != 0)
-      {
       log_write(0, LOG_MAIN, "rewrite: %s", errmess);
-      exim_exit(EXIT_FAILURE);
-      }
+
     loop_reset_point = store_reset(loop_reset_point);
     continue;
     }
diff --git a/src/string.c b/src/string.c
index a5161bb..4fb9f45 100644
--- a/src/string.c
+++ b/src/string.c
@@ -418,6 +418,7 @@ return ss;
 
 #if (defined(HAVE_LOCAL_SCAN) || defined(EXPAND_DLFUNC)) \
 	&& !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY)
+#pragma GCC visibility push(default)
 /*************************************************
 *            Copy and save string                *
 *************************************************/
@@ -463,6 +464,7 @@ string_copyn_function(const uschar * s, int n)
 {
 return string_copyn(s, n);
 }
+#pragma GCC visibility pop
 #endif