add drone build

.drone.yml

@@ -0,0 +1,32 @@
+---
+kind: pipeline
+type: docker
+name: deb-build
+
+steps:
+
+ - name: build
+   image: ubuntu:22.04
+   commands:
+    - apt -y update
+    - apt -y install build-essential debhelper libssl-dev libpam-dev
+    - ./configure.sh
+    - make deb
+
+ - name: upload artifact
+   image: git.burble.dn42/burble.dn42/drone-gitea-pkg-plugin:latest
+   settings:
+     token:
+       from_secret: TOKEN
+     version: VERSION
+     artifact: emailrelay_2.5_amd64.deb
+     package: emailrelay
+     owner: burble.dn42
+     
+---
+kind: secret
+name: TOKEN
+get:
+  path: burble.dn42/kv/data/drone/git.burble.dn42
+  name: artifact-token
+  

.readthedocs.yaml

@@ -0,0 +1,15 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html
+
+# Required
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+sphinx:
+  configuration: doc/conf.py
+

AUTHORS

@@ -1,13 +1,28 @@
 AUTHORS
 =======
-Graeme Walker <graeme_walker@users.sourceforge.net>
+
+Source files
+------------
+* Graeme Walker <graeme_walker@users.sourceforge.net>
+
+except where stated otherwise
 
 Binary distributions
 --------------------
-Binary distributions of E-MailRelay may include code from:
+Binary distributions of E-MailRelay might include copyrighted code from:
 * OpenSSL Toolkit (http://www.openssl.org)
-* MinGW (http://www.mingw.org)
-* Trolltech Qt (http://trolltech.com)
+* mbedTLS (http://tls.mbed.org)
+* Qt (http://qt.io)
+* Microsoft (http://microsoft.com)
+* Free Software Foundation (fsf.org)
+
+These parts are distributed under license; please refer to their
+websites for further details.
 
 This product includes software developed by the OpenSSL Project
-for use in the OpenSSL Toolkit. (http://www.openssl.org/)
+for use in the OpenSSL Toolkit (http://www.openssl.org/).
+
+Translations
+------------
+Thanks to Per-Arne Christensen for the Norwegian translation of
+the GUI.

ChangeLog

@@ -1,6 +1,181 @@
 E-MailRelay Change Log
 ======================
 
+2.4 -> 2.5
+----------
+* Multiple configurations in one process.
+* SMTP PIPELINING (RFC-2920).
+* SMTP CHUNKING/8BITMIME 'BDAT' extension (RFC-3030), disabled by default.
+* SMTP SMTPUTF8 extension (RFC-6531), disabled by default.
+* No 7-bit/8-bit check on received message content (see NEWS file).
+* New built-in filters: "deliver:", "split:", "copy:", "mx:", "msgid:".
+* New built-in address verifier: "account:"
+* No ".local" files (see NEWS file).
+* PAM authentication is now enabled with "--server-auth=pam:" not "/pam".
+* Client authentication details can be given directly from the command-line.
+* Multiple "client" authentication secrets, selected by a new envelope field.
+* Main binary can act as a simple submission tool ("configure --enable-submission").
+
+2.3 -> 2.4
+----------
+* Multiple "--filter" and "--client-filter" options allowed.
+* TLS key and certificate files can be specified separately.
+* Finer control when using "--anonymous" (eg. "--anonymous=server").
+* The "auth-config" options can distinguish between TLS and non-TLS authentication.
+* Hourly log file rotation using "%h" (eg. "--log-file=log.%d.%h").
+* Listening file descriptors can be inherited from the parent process (see "--interface").
+* Listening ports on Windows use exclusive binding.
+* The Linux event loop uses "epoll" by default rather than "select".
+* Some support for message routing (see NEWS).
+* Fix of error handling in network client filters ("--client-filter=net:...") [bug-id #50].
+
+2.2 -> 2.3
+----------
+* Unix domain sockets supported (eg. "--interface=/tmp/smtp.s").
+* Windows event log not used for verbose logging (prefer "--log-file").
+* New admin "forward" command to trigger forwarding without waiting.
+* Optional base64 encoding of passwords in secrets files ("plain:b").
+* Support for MbedTLS version 3.
+
+2.1 -> 2.2
+----------
+* Connections from IPv4 'private use' addresses are allowed by default (see "--remote-clients").
+* Interface names can be used with "--interface" (eg. "--interface=eth0").
+* New "--server-tls-connection" option for server-side implicit TLS.
+* New "--forward-to-some" option to permit some message recipients to be rejected.
+* New "--log-address" option to aid adaptive firewalling.
+* Dynamic log file rolling when using "--log-file=%d".
+* Choice of syslog 'facility' on Linux with "--syslog=local0" etc.
+* Pipelined SMTP QUIT commands sent by broken clients are tolerated.
+* Better handling of overly-verbose or unkillable "--filter" scripts.
+* Optional epoll event loop on Linux ("configure --enable-epoll").
+* Some internationalisation support (see NEWS file).
+* Support for Windows XP restored when built with mingw-w64.
+* C++ 2011 compiler is required.
+
+2.0.1 -> 2.1
+------------
+* Backwards compatibility features for 1.9-to-2.0 transition removed.
+* Better handling of too-many-connections on Windows.
+* New "--idle-timeout" option for server-side connections.
+* Support for RFC-5782 DNSBL blocking ("--dnsbl").
+* Filter scripts are given the path of the envelope file in argv2.
+* Message files can be edited by "--client-filter" scripts.
+* Better support for CRAM-SHAx authentication.
+* New "--client-auth-config" and "--server-auth-config" options.
+* New "--show" option on windows to better control the user interface style.
+* The "--pop" option always requires "--pop-auth".
+* No message is spooled if all its envelope recipients are local-mailboxes.
+* TLS cipher name added to "Received" line as per RFC-8314 4.3.
+* Certificate contents are not logged.
+* Timestamp parts of spool filenames no longer limited to six digits.
+
+2.0 -> 2.0.1
+------------
+* Make PLAIN client authentication work against servers with broken 334 responses.
+
+1.9.2 -> 2.0
+------------
+* Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see "--interface").
+* Server process is not blocked during "--filter" or "--address-verifier" execution, if multi-threaded.
+* Support for the "mbedTLS" TLS library as an alternative to OpenSSL ("configure --with-mbedtls").
+* TLS server certificates specified with new "--server-tls-certificate" option, not "--server-tls".
+* TLS servers enable client certificate verification with "--server-tls-verify", not "--tls-config".
+* TLS clients can verify server certificates with "--client-tls-verify" and "--client-tls-verify-name".
+* The "--tls-config" option works differently (see NEWS file).
+* New "--client-tls-server-name" option for server name identification (SNI).
+* New "--client-tls-required" option to force client connections to use TLS.
+* New "--server-tls-required" option to force remote SMTP clients to use STARTTLS.
+* New "--forward-on-disconnect" option replaces "--poll=0".
+* The "--anonymous" option now suppresses the "Received" line, whatever the "--domain".
+* The second field in the secrets file indicates the password encoding, not AUTH mechanism.
+* The "--verifier" option is now "--address-verifier", with simplified command-line parameters.
+* Command-line file paths can use "@app" as a prefix to be relative to the executable directory.
+* Command-line file paths can be relative to the startup cwd even when daemonised.
+* Filter exit codes between 104 and 107 are interpreted differently (see NEWS file).
+* Message rejection reasons passed back to the submitting SMTP client are much less verbose.
+* Forwarding events are queued up if the forwarding client is still busy from last time.
+* The bind address for outgoing connections is no longer taken from first unqualified "--interface" address [bug-id #27].
+* The SMTP client protocol tries more than one authentication mechanism.
+* Some support for XOAUTH2 client-side authentication.
+* Client protocol sends QUIT with a socket shutdown().
+* The Windows commdlg list-view widget is used for the server status pages.
+* The Windows connection-lookup feature is withdrawn ("--peer-lookup").
+* Several build-time configure options like "--disable-pop" are withdrawn.
+* C++ 2011 is preferred, and required for multi-threading.
+* Support for very old versions of Windows is dropped.
+
+1.9.1 -> 1.9.2
+--------------
+* Fixed a leak in the event-loop garbage collection.
+* A local hostname that fails to resolve is not an error.
+* A warning is emitted if there is more than one client authentication secret.
+* Multiple "--interface" options are allowed separately on the command-line.
+* Added a new "--client-interface" option.
+* The "Received" line is formatted as per RFC-3848 ("with ESMTPSA").
+* The LOGIN and PLAIN mechanisms in the secrets file are now equivalent.
+* The Windows service wrapper can use a configuration file to locate the startup batch file.
+* Simplified the implementation of the GUI installation program.
+* Reworded the "read error: disconnected" log message.
+* Less verbose logging of "no more messages to send".
+* Qt4 or Qt5 selected by the "configure" script.
+* Improved the RPM spec file.
+
+1.9 -> 1.9.1
+------------
+* Updated OpenSSL from 1.0.1e to 1.0.1g in the Windows build.
+
+1.8.2 -> 1.9
+------------
+* Added negotiated TLS/SSL for POP (ie. "STLS").
+* The first two fields in the secrets files are reordered (with backwards compatibility).
+* Added Linux PAM authentication ("configure --with-pam" and then "--server-auth=/pam").
+* Optional protocol-specific "--interface" qualifiers, eg. "--interface smtp=127.0.0.1,pop=192.168.1.1".
+* Outgoing client connection bound with the first "--interface" or "--interface client=..." address.
+* Support for SMTP-over-TLS on outgoing client connection ("--client-tls-connection") (cf. "STARTTLS")
+* Support for SOCKS 4a on outgoing client connection, eg. "--forward-to example.com:25@127.0.0.1:9050".
+* TLS configuration options ("--tls-config=...") for SSLv2/3 fallback etc.
+* No "Received" line added if "--anonymous" and an empty "--domain" name.
+* Error text for "all recipients rejected" is now more accurately "one or more recipients rejected".
+* New behaviour for "--client-filter" exit values of 100 and over.
+* New commands on the admin interface, "failures" and "unfail-all".
+* Shorter descriptions in the usage help unless "--verbose".
+* New default spool directory location on windows, now under "system32".
+* Windows project files for MSVC 2012 included.
+* Removed support for Windows NT and Windows 9x.
+* Better support for Windows Vista and Windows 7.
+* Removed Windows "--icon" option.
+* Removed "--enable-fhs" option for "configure" (see INSTALL document for equivalent usage).
+* Added "--log-file" option to redirect stderr.
+* Added Windows "--peer-lookup" option.
+* Fix for MD5 code in 64-bit builds.
+
+1.8.1 -> 1.8.2
+--------------
+* Fix namespaces for gcc 3.4.
+
+1.8 -> 1.8.1
+------------
+* Changed the definition of "--as-proxy" to use "--poll 0" rather than "--immediate" [bug-id 1961652].
+* Fixed stalling bug when using server-side TLS/SSL ("--server-tls") [bug-id 1961655].
+* Improved Debian packaging for Linux ("make deb").
+
+1.7 -> 1.8
+----------
+* Speed optimisations (as identified by KCachegrind/valgrind in KDevelop).
+* Build-time size optimisations (eg. "./configure --disable-exec --enable-small-exceptions ...").
+* Build-time options to reduce runtime library dependencies (eg. "./configure --disable-dns --disable-identity").
+* New switch to limit the size of submitted messages ("--size").
+* New semantics for "--poll 0", providing a good alternative to "--immediate" when proxying.
+* SMTP client protocol emits a RSET after a rejected recipient as a workround for broken server protocols.
+* SMTP client protocol continues if the server advertises AUTH but the client has no authentication secrets.
+* When a message cannot be forwarded the offending SMTP protocol response number, if any, is put in the envelope file.
+* A warning is printed if logging is requested but both stderr and syslog are disabled.
+* A cross-compiling toolchain builder script added for running on mips-based routers ("extra/mips").
+* New example scripts for SMTP multicasting and editing envelope files.
+* Improved native support for Mac OS X (10.5) with graphical installation from disk image.
+* Compatibility with gcc 2.95 restored.
+
 1.6 -> 1.7
 ----------
 * TLS/SSL support for SMTP using OpenSSL ("./configure --with-openssl" with "--client-tls" and "--server-tls").

INSTALL

@@ -1,78 +1,80 @@
-Introduction
-============
+Installation Instructions
+*************************
 
-   With the exception of this introduction section this document contains generic 
-installation instructions for doing a GNU-style
-"./configure; make; sudo make install" installation from source under Linux,
-FreeBSD etc. Windows specific installation instructions are in a separate 
-document, "doc/windows.txt".
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
-   The E-MailRelay "configure" script provides a few extra confiruation switches, 
-which are shown in the output of "./configure --help". The most important of 
-these is "--enable-fhs", which overrides all other directory modifiers, forcing 
-compliance with the File Hierarchy Standard.
-
-   There are also a set of variables which can be defined on the "configure" 
-command line for controlling all the installation directories in more detail, 
-augmenting the standard command-line switches like "--sbindir" and 
-"--libexecdir". For more information refer to the E-MailRelay reference document
-under "Files and directories".
-
-   If compiling with something other than "gcc" then check for any 
-compiler-specific help in the relevant "lib/<compiler>" directory.
-
-   If you want to install a package rather than running "make install" you could 
-try building an RPM pacakge with "rpmbuild" using the RPM spec file provided in 
-the distribution, and if necessary then making a ".deb" package from that using
-"alien".
-
-   Finally, you could try running the configuration GUI program "emailrelay-gui"
-(if available) after doing the installation to help with the initial 
-configuration.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
 
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
 
-  5. You can remove the program binaries and object files from the
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -81,62 +83,119 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
 Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -149,25 +208,80 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
      CPU-COMPANY-SYSTEM
 
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
+where SYSTEM can have one of these forms:
 
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
 
 Sharing Defaults
 ================
@@ -180,19 +294,56 @@ default values for variables like `CC', `cache_file', and `prefix'.
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
 
-Operation Controls
+Defining Variables
 ==================
 
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
    `configure' recognizes the following options to control how it
 operates.
 
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
 `--help'
-     Print a summary of the options to `configure', and exit.
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
 
 `--quiet'
 `--silent'
@@ -205,8 +356,15 @@ operates.
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
 
-`configure' also accepts some other, not widely useful, options.
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.

LICENSE

@@ -1,93 +1,5 @@
 Licenses
 ========
-
-Source distributions
---------------------
-Permission to copy E-MailRelay is under the terms of the GPLv3 license. The text
-of the license is in the file "COPYING".
-
-Binary distributions
---------------------
-Binary distributions of E-MailRelay may also include code from:
-* OpenSSL Toolkit (http://www.openssl.org)
-* MinGW (http://www.mingw.org)
-* Trolltech Qt (http://trolltech.com)
-
-OpenSSL
--------
-This product includes software developed by the OpenSSL Project
-for use in the OpenSSL Toolkit. (http://www.openssl.org/)
-
-OpenSSL is dual-licensed, including the following:
-
-  /* ====================================================================
-   * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
-   *
-   * Redistribution and use in source and binary forms, with or without
-   * modification, are permitted provided that the following conditions
-   * are met:
-   *
-   * 1. Redistributions of source code must retain the above copyright
-   *    notice, this list of conditions and the following disclaimer.
-   *
-   * 2. Redistributions in binary form must reproduce the above copyright
-   *    notice, this list of conditions and the following disclaimer in
-   *    the documentation and/or other materials provided with the
-   *    distribution.
-   *
-   * 3. All advertising materials mentioning features or use of this
-   *    software must display the following acknowledgment:
-   *    "This product includes software developed by the OpenSSL Project
-   *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-   *
-   * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-   *    endorse or promote products derived from this software without
-   *    prior written permission. For written permission, please contact
-   *    openssl-core@openssl.org.
-   *
-   * 5. Products derived from this software may not be called "OpenSSL"
-   *    nor may "OpenSSL" appear in their names without prior written
-   *    permission of the OpenSSL Project.
-   *
-   * 6. Redistributions of any form whatsoever must retain the following
-   *    acknowledgment:
-   *    "This product includes software developed by the OpenSSL Project
-   *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-   *
-   * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
-   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-   * OF THE POSSIBILITY OF SUCH DAMAGE.
-   * ====================================================================
-   *
-   * This product includes cryptographic software written by Eric Young
-   * (eay@cryptsoft.com).  This product includes software written by Tim
-   * Hudson (tjh@cryptsoft.com).
-   *
-   */
-
-MinGW
------
-The MinGW runtime that is included in the Windows binary distributions of
-E-MailRelay is uncopyrighted and in the public domain.
-
-Trolltech Qt
-------------
-The Qt runtime that is included in the Windows binary distributions of
-E-MailRelay is dual-licensed, including the GPLv2 (see http://www.gnu.org).
-E-MailRelay is not a derived work and so the terms of the GPLv2 only apply to 
-the Qt runtime files within the E-MailRelay binary distribution.
-
-The Qt GUI Toolkit is Copyright (C) 1994-2006 Trolltech ASA.
-
-Qt source code is available from the Trolltech web site,
-http://trolltech.com.
-
+The GPLv3 license (GPL-3.0-or-later) is used for E-MailRelay source code
+(see COPYING), except for a few files using the GNU All-permissive
+license (FSFAP).

Makefile.am

@@ -1,9 +1,9 @@
 #
-## Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
 ## 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or 
+## the Free Software Foundation, either version 3 of the License, or
 ## (at your option) any later version.
 ## 
 ## This program is distributed in the hope that it will be useful,
@@ -14,8 +14,146 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-EXTRA_DIST = emailrelay.spec ChangeLog README.windows LICENSE
-SUBDIRS = src bin lib etc doc test
-e_doc_DATA = NEWS README ChangeLog
+#
+# Makefile.am
+#
+# Top-level makefile
+#
+# Additional pseudo-targets:
+#	* rpm - builds an rpm package using rpmbuild
+#	* deb - builds a deb package using debhelper
+#	* cmake - generates cmake files under ./build/
+#	* tidy - runs cmake-tidy
+#	* format - runs cmake-format
+#
+# Eg:
+#	$ dnf install g++ make automake openssl-devel pam-devel rpm-build # rpm
+#	$ ./bootstrap
+#	$ ./configure.sh
+#	$ make
+#	$ sudo make rpm
+#
+# or:
+#	$ apt install g++ make automake libssl-dev libpam0g-dev debhelper # deb
+#	$ ./bootstrap
+#	$ ./configure.sh
+#	$ make
+#	$ sudo make deb
+#
+# and possibly:
+#	$ make cmake ; make -C build
+#	$ make tidy TIDY=clang-tidy-10
+#	$ make format FORMAT=clang-format-10
+#	$ make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-testing
+#
+
+EXTRA_DIST = \
+	emailrelay.spec \
+	configure.sh \
+	ChangeLog \
+	LICENSE \
+	VERSION \
+	README.md \
+	README.rst \
+	bootstrap \
+	autogen.sh \
+	winbuild.bat \
+	winbuild.pl \
+	runperl.bat \
+	.readthedocs.yaml
+
+SUBDIRS = libexec bin src etc doc debian test m4 bsd po unity
+
+# work-round PKG_CHECK_MODULES if no pkg-config
+ACLOCAL_AMFLAGS = -I m4
+
+e_doc_DATA = COPYING AUTHORS INSTALL NEWS README ChangeLog
+
 uninstall-local:
-	-rmdir $(DESTDIR)$(e_docdir) 2>/dev/null
+	-for try in 1 2 3 4 ; do echo "$(e_pamdir)/" "$(e_initdir)/" "$(e_sysconfdir)/" "$(e_examplesdir)/" "$(e_libexecdir)/" "$(e_spooldir)/" "$(e_docdir)/" "$(pkgdatadir)/" | tr ' ' '\n' | grep "/emailrelay/" | while read d ; do rmdir "$(DESTDIR)/$$d" 2>/dev/null ; done ; done
+
+RPM_ROOT ?= ${HOME}/rpmbuild
+#ARCH ?= $(shell arch)
+ARCH ?= x86_64
+RPM=$(RPM_ROOT)/RPMS/$(ARCH)/emailrelay-$(VERSION)-1.$(ARCH).rpm
+TAR=emailrelay-$(VERSION).tar.gz
+ZIP=emailrelay-$(VERSION)-src.zip
+DEB=emailrelay_$(VERSION)_$(ARCH).deb
+
+.PHONY: strip
+strip:
+	$(MAKE) -C src/main strip
+
+.PHONY: rpm
+rpm: $(RPM)
+
+$(RPM): dist
+	-rm -rf $(RPM_ROOT)/BUILD/emailrelay-$(VERSION)-1.$(ARCH)
+	test ! -d $(RPM_ROOT)/BUILD/emailrelay-$(VERSION)-1.$(ARCH)
+	-mkdir -p $(RPM_ROOT)/BUILD $(RPM_ROOT)/SOURCES $(RPM_ROOT)/SPECS 2>/dev/null
+	cp $(TAR) $(RPM_ROOT)/SOURCES/emailrelay-$(VERSION)-src.tar.gz
+	cp $(top_srcdir)/emailrelay.spec $(RPM_ROOT)/SPECS/
+	-chown root:root $(RPM_ROOT)/SPECS/emailrelay.spec
+	-rm -f $(RPM)
+	test ! -f $(RPM)
+	rpmbuild -ba $(RPM_ROOT)/SPECS/emailrelay.spec
+	test -f $(RPM)
+
+.PHONY: deb
+deb: $(DEB)
+
+$(DEB): dist
+	-mv emailrelay-$(VERSION) emailrelay-$(VERSION).old.$$$$ || true
+	tar -xzf $(TAR)
+	cd emailrelay-$(VERSION) && fakeroot debian/rules binary # or dpkg-buildpackage -b --jobs=10
+	mkdir emailrelay-$(VERSION)/debian/source
+
+.PHONY: deb-src
+deb-src: dist
+	-mv emailrelay-$(VERSION) emailrelay-$(VERSION).old.$$$$ || true
+	tar -xzf $(TAR)
+	mkdir emailrelay-$(VERSION)/debian/source
+	echo 1.0 > emailrelay-$(VERSION)/debian/source/format
+	dpkg-source --build emailrelay-$(VERSION)
+
+.PHONY: tidy
+tidy:
+	$(MAKE) -C unity tidy
+
+.PHONY: unity
+unity:
+	$(MAKE) -C unity programs
+
+.PHONY: format
+format:
+	$(MAKE) -C src format
+
+.PHONY: cmake
+cmake:
+	@chmod +x libexec/make2cmake || true
+	libexec/make2cmake
+	test -d build || mkdir build
+	cd build && cmake -DCMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
+	@echo now run make from the '"build"' directory
+
+.PHONY: tar
+tar: $(TAR)
+
+$(TAR):
+	$(MAKE) dist
+
+.PHONY: zip
+zip: $(ZIP)
+
+$(ZIP): $(TAR)
+	-mkdir zip.d 2>/dev/null
+	-@rm -rf zip.d/* 2>/dev/null
+	tar -C zip.d --strip-components=1 -xzf $(TAR)
+	sh -c "cd zip.d && zip -r ../$(ZIP) ."
+
+.PHONY: mbedtls
+mbedtls:
+	test -d mbedtls || git clone https://salsa.debian.org/debian/mbedtls.git
+	make -C mbedtls/library WINDOWS=0
+	-@echo now run ./configure.sh
+

NEWS

@@ -1 +1,178 @@
-no news is good news
+News
+====
+
+Overview
+--------
+The E-MailRelay 2.5 release is no longer just a store-and-forward SMTP relay or
+proxy; it can do routing (improved from 2.4), client account selection and
+message delivery, making it more useful as a general-purpose MTA. Routing and
+client account selection are activated by having an external filter script to
+edit e-mail message envelope files.
+
+Multiple configurations
+-----------------------
+In previous releases E-MailRelay runs with one spool directory and typically
+one SMTP server and one SMTP client doing store-and-forward. In this release
+one E-MailRelay process can have multiple configurations, each with their own
+independent spool directory, SMTP server and SMTP client. Everything still
+runs single-threaded (except as documented in "developer.txt").
+
+Refer to the reference document for more details.
+
+More built-in filters and address verifiers
+-------------------------------------------
+E-MailRelay allows filters that are not simple scripts by using command-line
+options like "--filter=exit:99" and "--filter=spam:localhost:783", with a
+small number of special prefixes like "exit:", "net:", "file:" and "spam:".
+
+In this release there are more built-in filters and address verifiers, including
+"deliver:", "split:", "mx:", "copy:" and "msgid:" filters and the "account:"
+address verifier.
+
+Refer to the reference document for more details.
+
+Delivery
+--------
+E-MailRelay can now act as a Message Delivery Agent (MDA) so it can deliver
+e-mail messages to local mailboxes according to the e-mail addressees.
+
+A mailbox is a simple sub-directory of some delivery base directory, defaulting
+to the spool directory. So Alice's mailbox might be the "alice" sub-directory
+"/var/spool/emailrelay/alice", containing envelope and content files. Or it
+can have its own "maildir" structure, "/var/spool/emailrelay/alice/new,cur,tmp",
+in which case the content file will be delivered to the "cur" directory and
+there will be no envelope file.
+
+Refer to the reference document for more details.
+
+Client account selection
+------------------------
+This release allows for multiple client accounts to be used for SMTP
+authentication when forwarding. A new "ClientAccountSelector" field in the
+envelope file must match against the fifth field of a "client" line in the
+secrets file. A filter should be used to fill in the selector field in the
+envelope, typically based on the message addressing.
+
+When the account changes from one message to the next the SMTP connection is
+dropped and re-connected. It is necessary to drop the connection because some
+common SMTP servers do not allow re-authentication within an existing SMTP
+connection.
+
+Client rows in the client secrets file can now have a fifth field for the
+selector, but this raises a backwards compatibility issue because in previous
+releases the fifth column (and beyond) in a client secrets file is ignored and
+might be a comment without a leading '#' character. In upgrading, the first word
+of the comment would be treated as a selector and the "client" row would be
+effectively disabled resulting in a failure of message forwarding. Therefore,
+fifth fields in the secrets file that start with '#' are treated as comments
+(extending to the end of the line) and lines in the secrets file with six or
+more fields result in a warning. It follows that filters should not generate
+selectors starting with a '#' character.
+
+Local files
+-----------
+In previous releases ".local" message files were created for messages with local
+recipients (as determined by an address verifier) in order to create a separate
+path for messages sent to the local postmaster. These files are no longer
+created because E-MailRelay can now run multiple filters in a chain and it is
+easy enough to write a filter to separate out these messages.
+
+7BIT/8BITMIME
+-------------
+Previous versions of E-MailRelay test message content when a message is received
+and populate the "Content" field of the envelope file as either "7bit" or
+"8bit". However, the SMTP client code has always largely ignored this field and
+it would attempt to forward 8-bit messages to a remote server that did not
+advertise 8BITMIME, albeit with a warning in the log.
+
+In this release E-MailRelay no longer tests messages for eight-bit content,
+so the envelope "Content" field will always be "8bit". If this is not the
+desired behaviour then a filter script should be used to test for seven-bit or
+eight-bit content and edit the "Content" value in the envelope file accordingly.
+
+If necessary the SMTP client can now be made to behave more strictly so that it
+does not try to forward eight-bit messages to seven-bit servers (see
+"--client-smtp-config").
+
+PIPELINING
+----------
+This release adds support for the PIPELINING SMTP extension.
+
+Previous releases allow pipelining of the SMTP QUIT command but otherwise
+require SMTP requests and responses in turn (as per RFC-5321 2.1). In this
+release the SMTP server code allows all SMTP commands to be pipelined, whether
+or not the PIPELINING extension is advertised. The PIPELINING advertisement can
+be disabled with the new "--server-smtp-config" command-line option.
+
+The response batching behaviour described by RFC-2920 is not implemented.
+
+The SMTP client code uses pipelining only for MAIL-FROM and RCPT-TO SMTP
+commands when talking to a remote server that supports the PIPELINING extension.
+This can be disabled using the "--client-smtp-config" command-line option so
+then each MAIL-FROM or RCPT-TO request waits for a response before continuing.
+
+CHUNKING/BINARYMIME and SMTPUTF8
+--------------------------------
+This release adds support for the CHUNKING+BINARYMIME and SMTPUTF8 extensions
+to SMTP, although they are disabled by default.
+
+It is important to note that if CHUNKING+BINARYMIME or SMTPUTF8 support is
+enabled in the E-MailRelay server then the destination next-hop server must
+also support these extensions. If the remote server does not support these
+extensions then messages may fail immediately when they are forwarded.
+
+In principle filter scripts can be used to convert BINARYMIME and SMTPUTF8
+messages to non-BINARYMIME and non-SMTPUTF8 forms (RFC-3030 calls these
+"gateway transformations"), but it might be easier to leave these extensions
+disabled in the E-MailRelay server if there is any doubt about the capabilities
+of the next-hop server.
+
+In previous releases address verifiers only need to deal with printable ASCII
+addresses because of the character-set retrictions imposed by the SMTP protocol.
+But if the the SMTPUTF8 extension is enabled in the E-MailRelay server then the
+addresses passed to any address verifier script might contain UTF-8 characters
+and this might require changes to the script.
+
+In passing, note that recipient addresses given to address verifier scripts are
+as they appear on the wire, so a badly-behaved SMTP client might send addresses
+containing double-quotes and backslash escapes that are semantically redundant.
+For example, a message submitted to "\A\l\i\c\e"@example.com will have that
+address passed to the verifier with all the redundant double quotes and
+backslashes present. Normalising an address by removing quotes and backslashes
+is reasonably easy in ASCII but might be more tricky with UTF-8.
+
+Another corner case with SMTPUTF8 is that the remote client might use the VRFY
+SMTP command without the optional SMTPUTF8 parameter. In principle a UTF-8
+address verifier script should not then return UTF-8 results, but in practice
+the script has no way of knowning whether the SMTPUTF8 parameter was used. If
+necessary the VRFY command can be disabled by using "--anonymous".
+
+Hashed passwords
+----------------
+Hashed passwords created by "emailrelay-passwd" that use the SHA-1 or SHA-256
+hashing algorithm will no longer work when E-MailRelay is built using the latest
+versions of the OpenSSL and MbedTLS libraries. Both libraries have stopped
+exposing the relevant state variables used within their hashing functions. MD5
+hashed passwords will still work.
+
+Code size
+---------
+The source code now contains a lot of conditional compilation directives like
+"#ifndef G_LIB_SMALL" that reduce the size of the built binaries.
+
+The Windows build and the build of the GUI on Linux are not affected because
+they are built without the "G_LIB_SMALL" switch.
+
+These extra directives make the code rather ugly so they can be removed if
+necessary by running:
+
+	libexec/reduce.sh --undo
+
+Filter-copy utility
+-------------------
+The emailrelay-filter-copy utility was included in previous releases as a
+set-user-id file program to copy e-mail message files into sub-directories for
+"--pop-by-name" access. This can now be done by the built-in "copy:pop" filter,
+albeit with minor differences in behaviour, so emailrelay-filter-copy has been
+removed.
+

README

@@ -1,126 +1,139 @@
 E-MailRelay Readme
 ==================
 
-Abstract
---------
-E-MailRelay is a simple SMTP proxy and store-and-forward message transfer agent 
-(MTA). When running as a proxy all e-mail messages can be passed through a 
-user-defined program, such as a spam filter, which can drop, re-address or edit 
-messages as they pass through. When running as a store-and-forward MTA incoming 
-messages are stored in a local spool directory, and then forwarded to the next 
-SMTP server on request. 
+Introduction
+------------
+E-MailRelay is a lightweight SMTP store-and-forward mail server with POP access
+to spooled messages. It can be used as a personal internet mail server with
+SpamAssassin spam filtering and DNSBL connection blocking. Forwarding can be
+to a fixed smarthost or using DNS MX routing. External scripts can be used for
+address validation and e-mail message processing.
 
-Because of its functional simplicity E-MailRelay is easy to configure, often
-only requiring the address of the target SMTP server to be put on the command 
-line.
-
-E-MailRelay can also run as a POP3 server. Messages received over SMTP can be
-automatically dropped into several independent POP3 mailboxes.
-
-C++ source code is available for Linux, FreeBSD, MacOS X etc, and Windows.
-Distribution is under the GNU General Public License V3.
+E-MailRelay runs as a single process using the same non-blocking i/o model as
+Squid and nginx giving excellent scalability and resource usage.
 
 Quick start
 -----------
-To use E-MailRelay in store-and-forward mode use the "--as-server" switch to 
-start the storage daemon in the background, and then trigger delivery of spooled
-messages by running with the "--as-client" switch and the address of the target
-host.
+E-MailRelay can be run straight from the command-line, and on Windows you can
+run "emailrelay.exe" or "emailrelay-textmode.exe" from the zip file without
+going through the installation process.
 
-For example, to start a storage daemon listening on port 10025 use a command like
-this:
+To use E-MailRelay in store-and-forward mode use the "--as-server" option to
+start the storage daemon in the background, and then do delivery of spooled
+messages by running with "--as-client".
+
+For example, to start a storage daemon in the background listening on port 10025
+use a command like this:
 
 	emailrelay --as-server --port 10025 --spool-dir /tmp
 
-And then to forward the spooled mail to "smarthost" run something like this:
+On Windows use "c:/temp" for testing, rather than "/tmp".
 
-	emailrelay --as-client smarthost:smtp --spool-dir /tmp
+Or to run it in the foreground:
 
-To get behaviour more like a proxy you can add the "--poll" switch so that
-messages are forwarded continuously rather than on-demand. This example starts a 
-store-and-forward server that forwards spooled-up e-mail every hour:
+	emailrelay --log --no-daemon --port 10025 --spool-dir /tmp
 
-	emailrelay --as-server --poll 3600 --forward-to smarthost:smtp
+And then to forward the spooled mail to "smtp.example.com" run something
+like this:
 
-For a proxy server that forwards each message as it is being received, without 
-any delay, you can use the "--as-proxy" mode:
+	emailrelay --as-client smtp.example.com:25 --spool-dir /tmp
 
-	emailrelay --as-proxy smarthost:smtp
+To forward continuously you can add the "--poll" and "--forward-to" options to
+the server command-line:
 
-If you want to edit or filter e-mail as it passes through the proxy then specify
-your pre-processor program with the "--filter" switch, something like this:
+For example, this starts a server that also forwards spooled-up e-mail every
+minute:
 
-	emailrelay --as-proxy smarthost:smtp --filter /usr/local/bin/addsig
+	emailrelay --as-server --poll 60 --forward-to smtp.example.com:25
 
-To run E-MailRelay as a POP server without SMTP use "--pop" and "--no-smtp":
+Or for a server that forwards each message as soon as it has been received, you
+can use "--forward-on-disconnect":
 
-	emailrelay --pop --no-smtp --log --close-stderr
+	emailrelay --as-server --forward-on-disconnect --forward-to smtp.example.com:25
 
-The "emailrelay-submit" utility can be used to put messages straight into the
-spool directory so that the POP clients can fetch them.
+To edit or filter e-mail as it passes through the server specify your filter
+program with the "--filter" option, something like this:
 
-Note that by default E-MailRelay will always reject connections from remote 
-machines. To allow connections from anywhere use the "--remote-clients" switch,
-but please consider the implications if your machine is connected to the 
-internet.
+	emailrelay --as-server --filter /tmp/set-from.js
+
+Look for example filter scripts in the "examples" directory.
+
+E-MailRelay can also be used as a personal internet mail server:
+
+Use "--remote-clients" ("-r") to allow connections from outside the local
+network, define your domain name with "--domain" and use an address verifier as
+a first line of defense against spammers:
+
+	emailrelay --as-server -v -r --domain=example.com --address-verifier=account:
+
+Then enable POP access to the incoming e-mails with "--pop", "--pop-port" and
+"--pop-auth":
+
+	emailrelay ... --pop --pop-port 10110 --pop-auth /etc/emailrelay.auth
+
+Set up the POP account with a user-id and password in the "--pop-auth" secrets
+file. The secrets file should contain a single line of text like this:
+
+	server plain <userid> <password>
 
 For more information on the command-line options refer to the reference guide
 or run:
 
 	emailrelay --help --verbose
 
+Autostart
+---------
+To install E-MailRelay on Windows run the "emailrelay-setup" program and choose
+the automatic startup option on the last page so that E-MailRelay runs as a
+Windows service. Use the Windows "Services" utility to configure the E-MailRelay
+service as automatic or manual startup.
+
+To install E-MailRelay on Linux from a RPM package:
+
+	sudo rpm -i emailrelay*.rpm
+
+Or from a DEB package:
+
+	sudo dpkg -i emailrelay*.deb
+
+To get the E-MailRelay server to start automatically you should check the
+configuration file "/etc/emailrelay.conf" is as you want it and then run the
+following commands to activate the "systemd" service:
+
+	systemctl enable emailrelay
+	systemctl start emailrelay
+	systemctl status emailrelay
+
+On other Linux systems try some combination of these commands to set up and
+activate the E-MailRelay service:
+
+	cp /usr/lib/emailrelay/init/emailrelay /etc/init.d/
+	update-rc.d emailrelay enable
+	rc-update add emailrelay
+	invoke-rc.d emailrelay start
+	service emailrelay start
+	tail /var/log/messages
+	tail /var/log/syslog
+
+On BSD systems add this line to /etc/rc.conf:
+
+	emailrelay_enable="YES"
+
 Documentation
 -------------
 The following documentation is provided:
-* README             -- this document
-* COPYING            -- the GNU General Public License
-* INSTALL            -- build & install instructions (including the GNU text)
-* AUTHORS            -- authors, credits and additional copyrights
-* copyright          -- main copyright and GPL reference 
-* userguide.txt      -- user guide
-* reference.txt      -- reference document
-* ChangeLog          -- change log for releases
+* README -- this document
+* COPYING -- the GNU General Public License
+* INSTALL -- generic build & install instructions
+* AUTHORS -- authors, credits and additional copyrights
+* userguide.txt -- user guide
+* reference.txt -- reference document
+* ChangeLog -- change log for releases
 
-Source code documentation will be generated when building from source if 
+Source code documentation will be generated when building from source if
 "doxygen" is available.
 
-Configurations
---------------
-Recent releases were developed on Ubuntu Linux 7.10 using:
-* linux 2.6.22
-* gcc 4.1.3
-* autoconf 2.61
-
-and on Windows NT4 SP6 using:
-* MSVC 6.0 SP3
-
-The code was originally developed on SuSE Linux 7.1 using:
-* linux 2.4.10
-* gcc 2.95.3
-* glibc 2.2.4 (libc.so.6)
-* autoconf 2.52
-
-and on Windows 98 using:
-* MSVC 6.0
-
-Versions of the code have also been built successfully on:
-* MacOS X 10.3.9
-* FreeBSD on Intel hardware
-* Linux on Alpha hardware (Debian 2.2)
-* Linux on Sparc hardware
-* Linux on RS6000 PPC hardware
-* Solaris 8 using gcc on Sparc hardware
-* Solaris 8 using WorkShop 5.0
-* Linux using intel c++ 6.0
-* Windows NT 4.0 using MSVC 6.0
-* Windows NT 4.0 using Cygwin (DLL 1.3.22) and gcc 3.2
-* Windows NT 4.0 using MinGW 2.0.0 and gcc 3.2
-* Windows XP using MinGW 3.1.0 gcc 3.4.2
-
-
 Feedback
 --------
-Please feel free to e-mail the author at 
-"mailto:graeme_walker@users.sourceforge.net" or the SourceForge mailing list
-"mailto:emailrelay-help@lists.sourceforge.net".
-
+To give feedback, including reviews, bug reports and feature requests, please
+use the SourceForge project website at https://sourceforge.net/p/emailrelay

README.md

@@ -0,0 +1,153 @@
+E-MailRelay Readme
+==================
+
+Introduction
+------------
+E-MailRelay is a lightweight [SMTP][] store-and-forward mail server with [POP][] access
+to spooled messages. It can be used as a personal internet mail server with
+SpamAssassin spam filtering and [DNSBL][] connection blocking. Forwarding can be
+to a fixed smarthost or using DNS MX routing. External scripts can be used for
+address validation and e-mail message processing.
+
+![whatisit.png](whatisit.png)
+
+E-MailRelay runs as a single process using the same non-blocking i/o model as
+Squid and nginx giving excellent scalability and resource usage.
+
+Quick start
+-----------
+E-MailRelay can be run straight from the command-line, and on Windows you can
+run `emailrelay.exe` or `emailrelay-textmode.exe` from the zip file without
+going through the installation process.
+
+To use E-MailRelay in store-and-forward mode use the `--as-server` option to
+start the storage daemon in the background, and then do delivery of spooled
+messages by running with `--as-client`.
+
+![serverclient.png](serverclient.png)
+
+For example, to start a storage daemon in the background listening on port 10025
+use a command like this:
+
+        emailrelay --as-server --port 10025 --spool-dir /tmp
+
+On Windows use `c:/temp` for testing, rather than `/tmp`.
+
+Or to run it in the foreground:
+
+        emailrelay --log --no-daemon --port 10025 --spool-dir /tmp
+
+And then to forward the spooled mail to `smtp.example.com` run something
+like this:
+
+        emailrelay --as-client smtp.example.com:25 --spool-dir /tmp
+
+To forward continuously you can add the `--poll` and `--forward-to` options to
+the server command-line:
+
+![forwardto.png](forwardto.png)
+
+For example, this starts a server that also forwards spooled-up e-mail every
+minute:
+
+        emailrelay --as-server --poll 60 --forward-to smtp.example.com:25
+
+Or for a server that forwards each message as soon as it has been received, you
+can use `--forward-on-disconnect`:
+
+        emailrelay --as-server --forward-on-disconnect --forward-to smtp.example.com:25
+
+To edit or filter e-mail as it passes through the server specify your filter
+program with the `--filter` option, something like this:
+
+        emailrelay --as-server --filter /tmp/set-from.js
+
+Look for example filter scripts in the `examples` directory.
+
+E-MailRelay can also be used as a personal internet mail server:
+
+![mailserver.png](mailserver.png)
+
+Use `--remote-clients` (`-r`) to allow connections from outside the local
+network, define your domain name with `--domain` and use an address verifier as
+a first line of defense against spammers:
+
+        emailrelay --as-server -v -r --domain=example.com --address-verifier=account:
+
+Then enable POP access to the incoming e-mails with `--pop`, `--pop-port` and
+`--pop-auth`:
+
+        emailrelay ... --pop --pop-port 10110 --pop-auth /etc/emailrelay.auth
+
+Set up the POP account with a user-id and password in the `--pop-auth` secrets
+file. The secrets file should contain a single line of text like this:
+
+        server plain <userid> <password>
+
+For more information on the command-line options refer to the reference guide
+or run:
+
+        emailrelay --help --verbose
+
+Autostart
+---------
+To install E-MailRelay on Windows run the `emailrelay-setup` program and choose
+the automatic startup option on the last page so that E-MailRelay runs as a
+Windows service. Use the Windows `Services` utility to configure the E-MailRelay
+service as automatic or manual startup.
+
+To install E-MailRelay on Linux from a RPM package:
+
+        sudo rpm -i emailrelay*.rpm
+
+Or from a DEB package:
+
+        sudo dpkg -i emailrelay*.deb
+
+To get the E-MailRelay server to start automatically you should check the
+configuration file `/etc/emailrelay.conf` is as you want it and then run the
+following commands to activate the `systemd` service:
+
+        systemctl enable emailrelay
+        systemctl start emailrelay
+        systemctl status emailrelay
+
+On other Linux systems try some combination of these commands to set up and
+activate the E-MailRelay service:
+
+        cp /usr/lib/emailrelay/init/emailrelay /etc/init.d/
+        update-rc.d emailrelay enable
+        rc-update add emailrelay
+        invoke-rc.d emailrelay start
+        service emailrelay start
+        tail /var/log/messages
+        tail /var/log/syslog
+
+On BSD systems add this line to /etc/rc.conf:
+
+        emailrelay_enable="YES"
+
+Documentation
+-------------
+The following documentation is provided:
+
+* README \-\- this document
+* COPYING \-\- the GNU General Public License
+* INSTALL \-\- generic build & install instructions
+* AUTHORS \-\- authors, credits and additional copyrights
+* userguide.txt \-\- user guide
+* reference.txt \-\- reference document
+* ChangeLog \-\- change log for releases
+
+Source code documentation will be generated when building from source if
+`doxygen` is available.
+
+Feedback
+--------
+To give feedback, including reviews, bug reports and feature requests, please
+use the SourceForge project website at https://sourceforge.net/p/emailrelay
+
+[DNSBL]: https://en.wikipedia.org/wiki/DNSBL
+[POP]: https://en.wikipedia.org/wiki/Post_Office_Protocol
+[SMTP]: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
+

README.rst

@@ -0,0 +1,194 @@
+******
+Readme
+******
+
+Introduction
+============
+E-MailRelay is a lightweight SMTP_ store-and-forward mail server with POP_ access
+to spooled messages. It can be used as a personal internet mail server with
+SpamAssassin spam filtering and DNSBL_ connection blocking. Forwarding can be
+to a fixed smarthost or using DNS MX routing. External scripts can be used for
+address validation and e-mail message processing.
+
+.. image:: whatisit.png
+   :alt: whatisit.png
+
+
+E-MailRelay runs as a single process using the same non-blocking i/o model as
+Squid and nginx giving excellent scalability and resource usage.
+
+Quick start
+===========
+E-MailRelay can be run straight from the command-line, and on Windows you can
+run *emailrelay.exe* or *emailrelay-textmode.exe* from the zip file without
+going through the installation process.
+
+To use E-MailRelay in store-and-forward mode use the *--as-server* option to
+start the storage daemon in the background, and then do delivery of spooled
+messages by running with *--as-client*.
+
+.. image:: serverclient.png
+   :alt: serverclient.png
+
+
+For example, to start a storage daemon in the background listening on port 10025
+use a command like this:
+
+::
+
+    emailrelay --as-server --port 10025 --spool-dir /tmp
+
+On Windows use *c:/temp* for testing, rather than */tmp*.
+
+Or to run it in the foreground:
+
+::
+
+    emailrelay --log --no-daemon --port 10025 --spool-dir /tmp
+
+And then to forward the spooled mail to *smtp.example.com* run something
+like this:
+
+::
+
+    emailrelay --as-client smtp.example.com:25 --spool-dir /tmp
+
+To forward continuously you can add the *--poll* and *--forward-to* options to
+the server command-line:
+
+.. image:: forwardto.png
+   :alt: forwardto.png
+
+
+For example, this starts a server that also forwards spooled-up e-mail every
+minute:
+
+::
+
+    emailrelay --as-server --poll 60 --forward-to smtp.example.com:25
+
+Or for a server that forwards each message as soon as it has been received, you
+can use *--forward-on-disconnect*:
+
+::
+
+    emailrelay --as-server --forward-on-disconnect --forward-to smtp.example.com:25
+
+To edit or filter e-mail as it passes through the server specify your filter
+program with the *--filter* option, something like this:
+
+::
+
+    emailrelay --as-server --filter /tmp/set-from.js
+
+Look for example filter scripts in the *examples* directory.
+
+E-MailRelay can also be used as a personal internet mail server:
+
+.. image:: mailserver.png
+   :alt: mailserver.png
+
+
+Use *--remote-clients* (\ *-r*\ ) to allow connections from outside the local
+network, define your domain name with *--domain* and use an address verifier as
+a first line of defense against spammers:
+
+::
+
+    emailrelay --as-server -v -r --domain=example.com --address-verifier=account:
+
+Then enable POP access to the incoming e-mails with *--pop*, *--pop-port* and
+\ *--pop-auth*\ :
+
+::
+
+    emailrelay ... --pop --pop-port 10110 --pop-auth /etc/emailrelay.auth
+
+Set up the POP account with a user-id and password in the *--pop-auth* secrets
+file. The secrets file should contain a single line of text like this:
+
+::
+
+    server plain <userid> <password>
+
+For more information on the command-line options refer to the reference guide
+or run:
+
+::
+
+    emailrelay --help --verbose
+
+
+Autostart
+=========
+To install E-MailRelay on Windows run the *emailrelay-setup* program and choose
+the automatic startup option on the last page so that E-MailRelay runs as a
+Windows service. Use the Windows *Services* utility to configure the E-MailRelay
+service as automatic or manual startup.
+
+To install E-MailRelay on Linux from a RPM package:
+
+::
+
+    sudo rpm -i emailrelay*.rpm
+
+Or from a DEB package:
+
+::
+
+    sudo dpkg -i emailrelay*.deb
+
+To get the E-MailRelay server to start automatically you should check the
+configuration file */etc/emailrelay.conf* is as you want it and then run the
+following commands to activate the *systemd* service:
+
+::
+
+    systemctl enable emailrelay
+    systemctl start emailrelay
+    systemctl status emailrelay
+
+On other Linux systems try some combination of these commands to set up and
+activate the E-MailRelay service:
+
+::
+
+    cp /usr/lib/emailrelay/init/emailrelay /etc/init.d/
+    update-rc.d emailrelay enable
+    rc-update add emailrelay
+    invoke-rc.d emailrelay start
+    service emailrelay start
+    tail /var/log/messages
+    tail /var/log/syslog
+
+On BSD systems add this line to /etc/rc.conf:
+
+::
+
+    emailrelay_enable="YES"
+
+
+Documentation
+=============
+The following documentation is provided:
+
+* README -- this document
+* COPYING -- the GNU General Public License
+* INSTALL -- generic build & install instructions
+* AUTHORS -- authors, credits and additional copyrights
+* userguide.txt -- user guide
+* reference.txt -- reference document
+* ChangeLog -- change log for releases
+
+Source code documentation will be generated when building from source if
+*doxygen* is available.
+
+Feedback
+========
+To give feedback, including reviews, bug reports and feature requests, please
+use the SourceForge project website at https://sourceforge.net/p/emailrelay
+
+.. _DNSBL: https://en.wikipedia.org/wiki/DNSBL
+.. _POP: https://en.wikipedia.org/wiki/Post_Office_Protocol
+.. _SMTP: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
+

README.windows

@@ -1 +0,0 @@
-See doc/windows.txt

VERSION

@@ -0,0 +1 @@
+2.5

acinclude.m4

@@ -1,398 +0,0 @@
-dnl Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-dnl 
-dnl This program is free software: you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation, either version 3 of the License, or 
-dnl (at your option) any later version.
-dnl 
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl ===
-
-dnl socketlen_t
-dnl
-AC_DEFUN([ACLOCAL_TYPE_SOCKLEN_T],
-[AC_CACHE_CHECK([for socklen_t],[aclocal_type_socklen_t],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[[#include <sys/types.h>
-#include <sys/socket.h>]],
-		[[socklen_t len = 42; return len;]])],
-		aclocal_type_socklen_t=yes,
-		aclocal_type_socklen_t=no )
-])
-	if test $aclocal_type_socklen_t = yes; then
-		AC_DEFINE(HAVE_SOCKLEN_T, 1,[Define to 1 if socklen_t type definition in sys/socket.h])
-	else
-		AC_DEFINE(HAVE_SOCKLEN_T, 0,[Define to 1 if socklen_t type definition in sys/socket.h])
-	fi
-])
-
-dnl ipv6
-dnl
-AC_DEFUN([ACLOCAL_CHECK_IPV6],
-[AC_CACHE_CHECK([for ipv6],[aclocal_ipv6],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[[#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>]],
-		[[sockaddr_in6 * p = 0;]])],
-		aclocal_ipv6=yes ,
-		aclocal_ipv6=no )
-])
-	if test $aclocal_ipv6 = yes; then
-		AC_DEFINE(HAVE_IPV6,1,[Define to 1 if ipv6 is available])
-	else
-		AC_DEFINE(HAVE_IPV6,0,[Define to 1 if ipv6 is available])
-	fi
-])
-
-dnl getipnodebyname for ipv6 rfc2553
-dnl
-AC_DEFUN([ACLOCAL_CHECK_GETIPNODEBYNAME],
-[AC_CACHE_CHECK([for getipnodebyname],[aclocal_getipnodebyname],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[[#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>]],
-		[[int i=0; getipnodebyname("",AF_INET6,AI_DEFAULT,&i);]])],
-		aclocal_getipnodebyname=yes ,
-		aclocal_getipnodebyname=no )
-])
-	if test $aclocal_getipnodebyname = yes; then
-		AC_DEFINE(HAVE_GETIPNODEBYNAME,1,[Define to 1 if getipnodebyname() is available])
-	else
-		AC_DEFINE(HAVE_GETIPNODEBYNAME,0,[Define to 1 if getipnodebyname() is available])
-	fi
-])
-
-dnl check for sin6_len in sockaddr_in6
-dnl
-AC_DEFUN([ACLOCAL_CHECK_SIN6_LEN],
-[AC_CACHE_CHECK([for sin6_len],[aclocal_sin6_len],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[[#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>]],
-		[[struct sockaddr_in6 s; s.sin6_len = 1;]])],
-		aclocal_sin6_len=yes ,
-		aclocal_sin6_len=no )
-])
-	if test $aclocal_sin6_len = yes; then
-		AC_DEFINE(HAVE_SIN6_LEN,1,[Define to 1 if sockaddr_in6 has a sin6_len member])
-	else
-		AC_DEFINE(HAVE_SIN6_LEN,0,[Define to 1 if sockaddr_in6 has a sin6_len member])
-	fi
-])
-
-dnl setgroups
-dnl
-AC_DEFUN([ACLOCAL_CHECK_SETGROUPS],
-[AC_CACHE_CHECK([for setgroups],[aclocal_setgroups],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[[#include <sys/types.h>
-#include <unistd.h>
-#include <grp.h>]],
-		[[setgroups(0,0) ;]])],
-		aclocal_setgroups=yes ,
-		aclocal_setgroups=no )
-])
-	if test $aclocal_setgroups = yes; then
-		AC_DEFINE(HAVE_SETGROUPS,1,[Define to 1 if setgroups is available])
-	else
-		AC_DEFINE(HAVE_SETGROUPS,0,[Define to 1 if setgroups is available])
-	fi
-])
-
-dnl gmtime_r
-dnl
-AC_DEFUN([ACLOCAL_CHECK_GMTIME_R],
-[AC_CACHE_CHECK([for gmtime_r],[aclocal_gmtime_r],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[[#include <time.h>]],
-		[[gmtime_r((time_t*)0,(struct tm*)0) ;]])],
-		aclocal_gmtime_r=yes ,
-		aclocal_gmtime_r=no )
-])
-	if test $aclocal_gmtime_r = yes; then
-		AC_DEFINE(HAVE_GMTIME_R,1,[Define to 1 if gmtime_r in time.h])
-	else
-		AC_DEFINE(HAVE_GMTIME_R,0,[Define to 1 if gmtime_r in time.h])
-	fi
-])
-
-dnl localtime_r
-dnl
-AC_DEFUN([ACLOCAL_CHECK_LOCALTIME_R],
-[AC_CACHE_CHECK([for localtime_r],[aclocal_localtime_r],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[[#include <time.h>]],
-		[[localtime_r((time_t*)0,(struct tm*)0) ;]])],
-		aclocal_localtime_r=yes ,
-		aclocal_localtime_r=no )
-])
-	if test $aclocal_localtime_r = yes; then
-		AC_DEFINE(HAVE_LOCALTIME_R,1,[Define to 1 if localtime_r in time.h])
-	else
-		AC_DEFINE(HAVE_LOCALTIME_R,0,[Define to 1 if localtime_r in time.h])
-	fi
-])
-
-dnl buggy ctime
-dnl sunpro5 ctime + unistd.h doesnt compile -- fix with time.h first
-dnl
-AC_DEFUN([ACLOCAL_CHECK_BUGGY_CTIME],
-[AC_CACHE_CHECK([for buggy ctime],[aclocal_buggy_ctime],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[[#include <ctime>
-#include <unistd.h>]],
-		[[ ]])] ,
-		aclocal_buggy_ctime=no ,
-		aclocal_buggy_ctime=yes )
-])
-	if test $aclocal_buggy_ctime = yes; then
-		AC_DEFINE(HAVE_BUGGY_CTIME,1,[Define to 1 if <ctime> requires <time.h>])
-	else
-		AC_DEFINE(HAVE_BUGGY_CTIME,0,[Define to 1 if <ctime> requires <time.h>])
-	fi
-])
-
-dnl compiler name and version 
-dnl used for -Ilib/<version> -- only needed for pre 3.0 
-dnl gcc -- maps gcc2.96 onto gcc2.95
-dnl
-AC_DEFUN([ACLOCAL_COMPILER_VERSION],
-[
-changequote(<<,>>)
-	COMPILER_VERSION=`$CXX --version 2>/dev/null | sed q | sed 's/[^0-9 .]*//g;s/\./ /g;s/^ *//;s/ /./;s/ .*//;s/^/gcc/' | sed 's/gcc2.96/gcc2.95/'`
-	if test -z "${COMPILER_VERSION}"
-	then
-		COMPILER_VERSION=`$CXX -V 2>&1 | sed q | grep WorkShop | sed 's/[^0-9]*//;s/[ \.].*//;s/^/sunpro/'`
-	fi
-changequote([,])
-	AC_SUBST(COMPILER_VERSION)
-])
-
-dnl enable-debug
-dnl
-AC_DEFUN([ENABLE_DEBUG],
-[
-if test "$enable_debug" = "yes"
-then
-	AC_DEFINE(_DEBUG,1,[Define to enable extra debug messages at compile-time])
-fi
-])
-
-dnl enable-gui
-dnl
-AC_DEFUN([ENABLE_GUI],
-[
-qt4="no"
-qt4moc="no"
-if test "$enable_gui" = "no"
-then
-	AC_DEFINE(HAVE_GUI,0,[Define to 1 to enable gui code])
-else
-    PKG_CHECK_MODULES(QT,QtGui >= 4.0.1,[qt4=yes],[AC_MSG_RESULT([no])])
-	if test "$qt4" = "yes"
-	then
-		MOC="${e_qtmoc}"
-		AC_PATH_PROG(MOC,moc)
-		AC_MSG_CHECKING([moc is for qt 4])
-		if test x$GREP = x ; then GREP=grep ; fi
-		if test -x "$MOC" -a "`$MOC -v 2>&1 | $GREP 'Qt 4'`" != "" ; then
-			AC_MSG_RESULT([yes])
-			qt4moc="yes"
-		else
-			AC_MSG_RESULT([no])
-		fi
-	else
-		QT_LIBS=""
-		AC_SUBST(QT_LIBS)
-	fi
-fi
-if test "$qt4moc" = "yes"
-then
-	AC_DEFINE(HAVE_GUI,1,[Define to 1 to enable gui code])
-else
-	AC_DEFINE(HAVE_GUI,0,[Define to 1 to enable gui code])
-fi
-AC_SUBST(MOC)
-AM_CONDITIONAL(GUI,test x$enable_gui != xno -a x$qt4moc = xyes )
-])
-
-dnl enable-ipv6
-dnl
-AC_DEFUN([ENABLE_IPV6],
-[
-if test "$enable_ipv6" = "yes"
-then
-	if test "$aclocal_ipv6" != "yes"
-	then
-		AC_MSG_WARN([ignoring --enable-ipv6])
-		IP="ipv4"
-	else
-		IP="ipv6"
-	fi
-else
-	IP="ipv4"
-fi
-AC_SUBST(IP)
-])
-
-dnl with-openssl
-dnl
-AC_DEFUN([WITH_OPENSSL],
-if test "$with_openssl" != "no"
-then
-[AC_CACHE_CHECK([for openssl],[aclocal_openssl],
-[
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-		[[#include <openssl/ssl.h>]],
-		[[SSL_CTX * p = 0 ; return 1;]])],
-		aclocal_openssl=yes,
-		aclocal_openssl=no )
-])
-    if test "$aclocal_openssl" = "yes"
-	then
-		AC_DEFINE(HAVE_OPENSSL,1,[Define to 1 to enable tls/ssh code using openssl])
-		SSL_LIBS="-lssl -lcrypto"
-		SSL="openssl"
-	else
-		if test "$with_openssl" = "yes"
-		then
-			AC_MSG_WARN([ignoring --with-openssl, check config.log and try setting CFLAGS])
-		fi
-		AC_DEFINE(HAVE_OPENSSL,0,[Define to 1 to enable tls/ssh code using openssl])
-		SSL_LIBS=""
-		SSL="none"
-	fi
-else
-	AC_DEFINE(HAVE_OPENSSL,0,[Define to 1 to enable tls/ssh code using openssl])
-	SSL_LIBS=""
-	SSL="none"
-fi
-AC_SUBST(SSL_LIBS)
-AC_SUBST(SSL)
-])
-
-dnl enable-static-linking
-dnl
-dnl TODO remove -ldl
-dnl
-AC_DEFUN([ENABLE_STATIC_LINKING],
-[
-if test "$enable_static_linking" = "yes"
-then
-	STATIC_START="-Xlinker -Bstatic"
-	STATIC_END="-Xlinker -Bdynamic -ldl"
-else
-	STATIC_START=""
-	STATIC_END=""
-fi
-AC_SUBST(STATIC_START)
-AC_SUBST(STATIC_END)
-])
-
-dnl with-workshop
-dnl
-AC_DEFUN([WITH_WORKSHOP],
-[
-if test "$with_workshop" = "yes"
-then
-	chmod +x lib/sunpro5/xar
-	AR="`pwd`/lib/sunpro5/xar --cxx \"$CXX\""
-	AC_SUBST(AR)
-fi
-])
-
-dnl with-doxygen
-dnl
-AC_DEFUN([WITH_DOXYGEN],
-[
-if test "$with_doxygen" != ""
-then
-	if test "$with_doxygen" = "yes" -a "$HAVE_DOXYGEN" != "yes"
-	then
-		AC_MSG_WARN([ignoring --with-doxygen])
-	else
-		HAVE_DOXYGEN="$with_doxygen"
-		AC_SUBST(HAVE_DOXYGEN)
-	fi
-fi
-])
-
-dnl with-man2html
-dnl
-AC_DEFUN([WITH_MAN2HTML],
-[
-if test "$with_man2html" != ""
-then
-	if test "$with_man2html" = "yes" -a "$HAVE_MAN2HTML" != "yes"
-	then
-		AC_MSG_WARN([ignoring --with-man2html])
-	else
-		HAVE_MAN2HTML="$with_man2html"
-		AC_SUBST(HAVE_MAN2HTML)
-	fi
-fi
-])
-
-dnl enable-fhs
-dnl
-AC_DEFUN([ENABLE_FHS],
-[
-if test "$enable_fhs" = "yes"
-then
-	FHS_COMPLIANCE
-fi
-])
-
-dnl fhs
-dnl
-AC_DEFUN([FHS_COMPLIANCE],
-[
-	# tweaks for fhs compliance...
-	#
-	prefix='/usr'
-	exec_prefix='/usr'
-	#
-	sbindir='/usr/sbin'
-	libexecdir='/usr/lib'
-	localstatedir='/var'
-	mandir='/usr/share/man'
-	datadir='/usr/share'
-	sysconfdir='/etc'
-	#
-	# not used by emailrelay
-	#bindir=
-	#sharedstatedir=
-	#libdir=
-	#includedir=
-	#oldincludedir=
-	#infodir=
-	#
-	# emailrelay-specific
-	e_libexecdir="$libexecdir/$PACKAGE"
-	e_docdir="$datadir/doc/$PACKAGE"
-	e_initdir="/etc/init.d"
-	e_spooldir="$localstatedir/spool/$PACKAGE"
-	e_examplesdir="$libexecdir/$PACKAGE/examples"
-	e_sysconfdir="$sysconfdir"
-])
-

autogen.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# autogen.sh
+#
+# Autogenerates stuff.
+#
+aclocal -I .
+autoconf
+autoheader
+automake -ac -Woverride -Wportability

bin/Makefile.am

@@ -1,9 +1,9 @@
 #
-## Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
 ## 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or 
+## the Free Software Foundation, either version 3 of the License, or
 ## (at your option) any later version.
 ## 
 ## This program is distributed in the hope that it will be useful,
@@ -15,31 +15,76 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-EXTRA_DIST = emailrelay.sh_ doxygen.sh_ txt2html.sh_ txt2mu.sh_ mu2html.sh_ mu2docbook.sh_ expand.sh_ emailrelay-notify.sh_ emailrelay-resubmit.sh_ emailrelay-deliver.sh_ emailrelay-process.sh_ emailrelay-runperl.js emailrelay-resubmit.js emailrelay-submit.sh_
-work_scripts = doxygen.sh txt2mu.sh mu2html.sh mu2docbook.sh expand.sh txt2html.sh emailrelay.sh
-noinst_SCRIPTS = emailrelay-runperl.js emailrelay-resubmit.js $(work_scripts)
-e_init_SCRIPTS = emailrelay
-e_examples_DATA = emailrelay-process.sh emailrelay-notify.sh emailrelay-deliver.sh emailrelay-resubmit.sh emailrelay-submit.sh
+example_scripts_static = \
+	emailrelay-bcc-check.pl \
+	emailrelay-check-ipaddress.pl \
+	emailrelay-dkim-signer.pl \
+	emailrelay-ldap-verify.py \
+	emailrelay-multicast.sh \
+	emailrelay-rot13.pl \
+	emailrelay-sendmail.pl
 
-CLEANFILES = $(e_init_SCRIPTS) $(e_examples_DATA) $(work_scripts)
+example_scripts_js = \
+	emailrelay-check-ipaddress.js \
+	emailrelay-set-message-id.js \
+	emailrelay-set-from.js \
+	emailrelay-set-from.pl \
+	emailrelay-edit-content.js \
+	emailrelay-edit-envelope.js \
+	emailrelay-resubmit.js \
+	emailrelay-service-install.js
 
-SUFFIXES = .sh_ .sh
+example_scripts_in = \
+	emailrelay-notify.sh.in \
+	emailrelay-resubmit.sh.in \
+	emailrelay-submit.sh.in
 
-.sh_.sh:
-	cat $(srcdir)/../bin/$*.sh_ | sed "s%__SPOOL_DIR__%${e_spooldir}%g;s%__SBIN_DIR__%${sbindir}%g;"'s/\[:digit:\]/0-9/g;s/\[:space:\]/ \\t/g' > $*.tmp && mv $*.tmp $*.sh 
-	chmod ugo+x $*.sh
+example_scripts_out = \
+	emailrelay-notify.sh \
+	emailrelay-resubmit.sh \
+	emailrelay-submit.sh \
+	emailrelay
 
-emailrelay: emailrelay.sh
-	cp emailrelay.sh emailrelay
-	chmod ugo+x emailrelay
+init_script_in = \
+	emailrelay.sh.in
 
-install-data-local: install-e_examplesDATA install-e_initSCRIPTS
-	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-notify.sh
-	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-resubmit.sh
-	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-deliver.sh
-	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-submit.sh
-	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-process.sh
+init_script_out = \
+	emailrelay
 
-uninstall-local:
-	-rmdir $(DESTDIR)$(e_examplesdir) 2>/dev/null
+EXTRA_DIST = \
+	$(example_scripts_static) \
+	$(example_scripts_js) \
+	$(example_scripts_in) \
+	$(init_script_in)
+
+e_examples_DATA = \
+	$(example_scripts_js)
+
+e_examples_SCRIPTS = \
+	$(example_scripts_out) \
+	$(example_scripts_static)
+
+e_init_SCRIPTS = \
+	$(init_script_out)
+
+CLEANFILES = \
+	$(example_scripts_out)
+
+do_sed = sed -e "s%__SPOOL_DIR__%${e_spooldir}%g" -e "s%__SBIN_DIR__%${sbindir}%g" -e "s%__SYSCONF_DIR__%${e_sysconfdir}%g" -e "s%__LIB_DIR__%${e_libdir}%g" -e "s%__RUN_DIR__%${e_rundir}%g"
+
+emailrelay-notify.sh: emailrelay-notify.sh.in
+	$(do_sed) < $(srcdir)/emailrelay-notify.sh.in > emailrelay-notify.sh
+	chmod +x emailrelay-notify.sh
+
+emailrelay-resubmit.sh: emailrelay-resubmit.sh.in
+	$(do_sed) < $(srcdir)/emailrelay-resubmit.sh.in > emailrelay-resubmit.sh
+	chmod +x emailrelay-resubmit.sh
+
+emailrelay-submit.sh: emailrelay-submit.sh.in
+	$(do_sed) < $(srcdir)/emailrelay-submit.sh.in > emailrelay-submit.sh
+	chmod +x emailrelay-submit.sh
+
+emailrelay: emailrelay.sh.in
+	$(do_sed) < $(srcdir)/emailrelay.sh.in > emailrelay
+	chmod +x emailrelay
 

bin/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,9 +19,65 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -35,33 +91,76 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = bin
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(e_initdir)" \
-	"$(DESTDIR)$(e_examplesdir)"
-e_initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(e_init_SCRIPTS) $(noinst_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-e_examplesDATA_INSTALL = $(INSTALL_DATA)
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(e_examplesdir)" \
+	"$(DESTDIR)$(e_initdir)" "$(DESTDIR)$(e_examplesdir)"
+SCRIPTS = $(e_examples_SCRIPTS) $(e_init_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(e_examples_DATA)
+am__extra_recursive_targets = extra-recursive
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+ARFLAGS = @ARFLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -69,10 +168,9 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILER_VERSION = @COMPILER_VERSION@
-CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -83,16 +181,22 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
+GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
+GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
+GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
+GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
+GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
+GCONFIG_WINDMC = @GCONFIG_WINDMC@
+GCONFIG_WINDRES = @GCONFIG_WINDRES@
 GREP = @GREP@
 GZIP = @GZIP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_MAN2HTML = @HAVE_MAN2HTML@
+HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-IP = @IP@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -101,25 +205,26 @@ MAINT = @MAINT@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MOC = @MOC@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SSL = @SSL@
-SSL_LIBS = @SSL_LIBS@
-STATIC_END = @STATIC_END@
-STATIC_START = @STATIC_START@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -140,13 +245,18 @@ datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+e_bsdinitdir = @e_bsdinitdir@
 e_docdir = @e_docdir@
 e_examplesdir = @e_examplesdir@
+e_icondir = @e_icondir@
 e_initdir = @e_initdir@
-e_libexecdir = @e_libexecdir@
-e_qtmoc = @e_qtmoc@
+e_libdir = @e_libdir@
+e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
+e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -164,44 +274,93 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = emailrelay.sh_ doxygen.sh_ txt2html.sh_ txt2mu.sh_ mu2html.sh_ mu2docbook.sh_ expand.sh_ emailrelay-notify.sh_ emailrelay-resubmit.sh_ emailrelay-deliver.sh_ emailrelay-process.sh_ emailrelay-runperl.js emailrelay-resubmit.js emailrelay-submit.sh_
-work_scripts = doxygen.sh txt2mu.sh mu2html.sh mu2docbook.sh expand.sh txt2html.sh emailrelay.sh
-noinst_SCRIPTS = emailrelay-runperl.js emailrelay-resubmit.js $(work_scripts)
-e_init_SCRIPTS = emailrelay
-e_examples_DATA = emailrelay-process.sh emailrelay-notify.sh emailrelay-deliver.sh emailrelay-resubmit.sh emailrelay-submit.sh
-CLEANFILES = $(e_init_SCRIPTS) $(e_examples_DATA) $(work_scripts)
-SUFFIXES = .sh_ .sh
+example_scripts_static = \
+	emailrelay-bcc-check.pl \
+	emailrelay-check-ipaddress.pl \
+	emailrelay-dkim-signer.pl \
+	emailrelay-ldap-verify.py \
+	emailrelay-multicast.sh \
+	emailrelay-rot13.pl \
+	emailrelay-sendmail.pl
+
+example_scripts_js = \
+	emailrelay-check-ipaddress.js \
+	emailrelay-set-message-id.js \
+	emailrelay-set-from.js \
+	emailrelay-set-from.pl \
+	emailrelay-edit-content.js \
+	emailrelay-edit-envelope.js \
+	emailrelay-resubmit.js \
+	emailrelay-service-install.js
+
+example_scripts_in = \
+	emailrelay-notify.sh.in \
+	emailrelay-resubmit.sh.in \
+	emailrelay-submit.sh.in
+
+example_scripts_out = \
+	emailrelay-notify.sh \
+	emailrelay-resubmit.sh \
+	emailrelay-submit.sh \
+	emailrelay
+
+init_script_in = \
+	emailrelay.sh.in
+
+init_script_out = \
+	emailrelay
+
+EXTRA_DIST = \
+	$(example_scripts_static) \
+	$(example_scripts_js) \
+	$(example_scripts_in) \
+	$(init_script_in)
+
+e_examples_DATA = \
+	$(example_scripts_js)
+
+e_examples_SCRIPTS = \
+	$(example_scripts_out) \
+	$(example_scripts_static)
+
+e_init_SCRIPTS = \
+	$(init_script_out)
+
+CLEANFILES = \
+	$(example_scripts_out)
+
+do_sed = sed -e "s%__SPOOL_DIR__%${e_spooldir}%g" -e "s%__SBIN_DIR__%${sbindir}%g" -e "s%__SYSCONF_DIR__%${e_sysconfdir}%g" -e "s%__LIB_DIR__%${e_libdir}%g" -e "s%__RUN_DIR__%${e_rundir}%g"
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .sh_ .sh
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  bin/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bin/Makefile
-.PRECIOUS: Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bin/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu bin/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -211,50 +370,110 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-e_examplesSCRIPTS: $(e_examples_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	@list='$(e_examples_SCRIPTS)'; test -n "$(e_examplesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(e_examplesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(e_examplesdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(e_examplesdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(e_examplesdir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-e_examplesSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(e_examples_SCRIPTS)'; test -n "$(e_examplesdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	dir='$(DESTDIR)$(e_examplesdir)'; $(am__uninstall_files_from_dir)
 install-e_initSCRIPTS: $(e_init_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(e_initdir)" || $(MKDIR_P) "$(DESTDIR)$(e_initdir)"
-	@list='$(e_init_SCRIPTS)'; for p in $$list; do \
+	@list='$(e_init_SCRIPTS)'; test -n "$(e_initdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(e_initdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(e_initdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(e_initSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(e_initdir)/$$f'"; \
-	    $(e_initSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(e_initdir)/$$f"; \
-	  else :; fi; \
-	done
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(e_initdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(e_initdir)$$dir" || exit $$?; \
+	     } \
+	; done
 
 uninstall-e_initSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(e_init_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(e_initdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(e_initdir)/$$f"; \
-	done
+	@list='$(e_init_SCRIPTS)'; test -n "$(e_initdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	dir='$(DESTDIR)$(e_initdir)'; $(am__uninstall_files_from_dir)
 install-e_examplesDATA: $(e_examples_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(e_examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(e_examplesdir)"
-	@list='$(e_examples_DATA)'; for p in $$list; do \
+	@list='$(e_examples_DATA)'; test -n "$(e_examplesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(e_examplesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(e_examplesdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(e_examplesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(e_examplesdir)/$$f'"; \
-	  $(e_examplesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(e_examplesdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(e_examplesdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(e_examplesdir)" || exit $$?; \
 	done
 
 uninstall-e_examplesDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(e_examples_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(e_examplesdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(e_examplesdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
+	@list='$(e_examples_DATA)'; test -n "$(e_examplesdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(e_examplesdir)'; $(am__uninstall_files_from_dir)
+extra-local: 
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -270,13 +489,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -284,7 +507,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(e_initdir)" "$(DESTDIR)$(e_examplesdir)"; do \
+	for dir in "$(DESTDIR)$(e_examplesdir)" "$(DESTDIR)$(e_initdir)" "$(DESTDIR)$(e_examplesdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -297,10 +520,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -308,6 +536,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -324,29 +553,45 @@ dvi: dvi-am
 
 dvi-am:
 
+extra: extra-am
+
+extra-am: extra-local
+
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-e_examplesDATA \
+install-data-am: install-e_examplesDATA install-e_examplesSCRIPTS \
 	install-e_initSCRIPTS
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -365,43 +610,45 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-e_examplesDATA uninstall-e_initSCRIPTS \
-	uninstall-local
+uninstall-am: uninstall-e_examplesDATA uninstall-e_examplesSCRIPTS \
+	uninstall-e_initSCRIPTS
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am \
-	install-e_examplesDATA install-e_initSCRIPTS install-exec \
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am \
+	extra-am extra-local html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-e_examplesDATA \
+	install-e_examplesSCRIPTS install-e_initSCRIPTS install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-e_examplesDATA uninstall-e_initSCRIPTS \
-	uninstall-local
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-e_examplesDATA uninstall-e_examplesSCRIPTS \
+	uninstall-e_initSCRIPTS
+
+.PRECIOUS: Makefile
 
 
-.sh_.sh:
-	cat $(srcdir)/../bin/$*.sh_ | sed "s%__SPOOL_DIR__%${e_spooldir}%g;s%__SBIN_DIR__%${sbindir}%g;"'s/\[:digit:\]/0-9/g;s/\[:space:\]/ \\t/g' > $*.tmp && mv $*.tmp $*.sh 
-	chmod ugo+x $*.sh
+emailrelay-notify.sh: emailrelay-notify.sh.in
+	$(do_sed) < $(srcdir)/emailrelay-notify.sh.in > emailrelay-notify.sh
+	chmod +x emailrelay-notify.sh
 
-emailrelay: emailrelay.sh
-	cp emailrelay.sh emailrelay
-	chmod ugo+x emailrelay
+emailrelay-resubmit.sh: emailrelay-resubmit.sh.in
+	$(do_sed) < $(srcdir)/emailrelay-resubmit.sh.in > emailrelay-resubmit.sh
+	chmod +x emailrelay-resubmit.sh
 
-install-data-local: install-e_examplesDATA install-e_initSCRIPTS
-	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-notify.sh
-	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-resubmit.sh
-	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-deliver.sh
-	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-submit.sh
-	chmod ugo+x $(DESTDIR)$(e_examplesdir)/emailrelay-process.sh
+emailrelay-submit.sh: emailrelay-submit.sh.in
+	$(do_sed) < $(srcdir)/emailrelay-submit.sh.in > emailrelay-submit.sh
+	chmod +x emailrelay-submit.sh
+
+emailrelay: emailrelay.sh.in
+	$(do_sed) < $(srcdir)/emailrelay.sh.in > emailrelay
+	chmod +x emailrelay
 
-uninstall-local:
-	-rmdir $(DESTDIR)$(e_examplesdir) 2>/dev/null
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

bin/emailrelay-bcc-check.pl

@@ -0,0 +1,131 @@
+#!/usr/bin/env perl
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-bcc-check.pl
+#
+# An example E-MailRelay "--filter" script that rejects e-mail messages that
+# have a non-empty "Bcc:" recipient list unless the "Bcc:" recipient list
+# contains a single addressee that matches the envelope recipient. This has
+# the effect of checking that a submitting user agent is behaving correctly
+# as per RFC-5322 3.6.3.
+#
+# Bcc handling is generally only a concern for e-mail user agent programs
+# and not relays and proxies. User agents should normally submit a message
+# separately for each Bcc recipient with either no "Bcc:" field or with the
+# "Bcc:" field containing that one recipient.
+#
+# Note that correct parsing of content files is beyond the scope of a simple
+# example script like this, and incorrect Bcc handling can have a serious
+# privacy implications.
+#
+
+use strict ;
+use FileHandle ;
+$SIG{__DIE__} = sub { (my $e = join(" ",@_)) =~ s/\n/ /g ; print "<<error: $e>>\n" ; exit 99 } ;
+
+my $content = $ARGV[0] or die "usage error\n" ;
+my $verbose = 1 ;
+
+# read the bcc list from the content file
+my %c = headers( $content ) ;
+my @bcc = split( /,/ , $c{Bcc} ) ; # todo -- allow for commas in quoted strings
+map { print "BCC=[$_]\n" } @bcc if $verbose ;
+
+# allow if there is no bcc list or it's empty
+exit 0 if scalar(@bcc) == 0 ;
+my $bcc = $bcc[0] =~ s/^\s*"?//r =~ s/"?\s*$//r ;
+exit 0 if( $bcc =~ m/^\s*$/ ) ;
+
+# read the recipient list from the envelope file
+my @rcp = read_fields( find_envelope($content) , qr/^X-MailRelay-To-Remote:\s*(.*)/ ) ;
+map { print "RECIPIENT=[$_]\n" } @rcp if $verbose ;
+
+# allow if there are no (remote) recipients at all
+exit 0 if scalar(@rcp) == 0 ;
+my $rcp = $rcp[0] ;
+
+# allow if one recipient matching one bcc
+exit 0 if( scalar(@rcp) == 1 && scalar(@bcc) == 1 && $bcc =~ m/\Q$rcp\E/ ) ;
+
+# deny otherwise
+print "<<bcc error>>\n" ;
+exit 1 ;
+
+sub headers
+{
+	my ( $file ) = @_ ;
+	my $fh = open_file( $file ) ;
+	my %h = read_headers( $fh ) ;
+	$fh->close() or die ;
+	return %h ;
+}
+
+sub read_headers
+{
+	my ( $fh ) = @_ ;
+	my %h = () ;
+	my $k ;
+	while(<$fh>)
+	{
+		chomp( my $line = $_ ) ;
+		$line =~ s/\r$// ;
+		last if ( $line eq "" ) ;
+		my ( $a , $b , $c , $d ) = ( $line =~ m/^(\S*):\s*(.*)|^(\s)(.*)/ ) ;
+		if( $a ) { $h{$a} = $b ; $k = $a }
+		if( $k && $d ) { $h{$k} .= "$c$d" } # folding
+	}
+	return %h ;
+}
+
+sub open_file
+{
+	my ( $file ) = @_ ;
+	my $fh = new FileHandle( $file , "r" ) or die "cannot open [$file]: $!\n" ;
+	return $fh ;
+}
+
+sub envelope
+{
+	my ( $content , $ext ) = @_ ;
+	$ext = "" if !defined($ext) ;
+	$content =~ m/\.content$/ or die "invalid content filename [$content]\n" ;
+	( my $envelope = $content ) =~ s/\.content$/.envelope/ ;
+	$envelope .= $ext ;
+	return $envelope ;
+}
+
+sub find_envelope
+{
+	my ( $content ) = @_ ;
+	map { return $_ if -f $_ } map { envelope($content,$_) } ( "" , ".new" , ".busy" ) ;
+	die "no envelope for [$content]\n" ;
+}
+
+sub read_fields
+{
+	my ( $file , $re ) = @_ ;
+	return map { s/$re/$1/ ; $_ } grep { m/$re/ } read_all( $file ) ;
+}
+
+sub read_all
+{
+	my ( $file ) = @_ ;
+	my $fh = open_file( $file ) ;
+	my @lines = () ;
+	while(<$fh>)
+	{
+		chomp( my $line = $_ ) ;
+		$line =~ s/\r$// ;
+		push @lines , $line ;
+	}
+	$fh->close() or die ;
+	return @lines ;
+}
+

bin/emailrelay-check-ipaddress.js

@@ -0,0 +1,49 @@
+//
+// Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+// 
+// Copying and distribution of this file, with or without modification,
+// are permitted in any medium without royalty provided the copyright
+// notice and this notice are preserved.  This file is offered as-is,
+// without any warranty.
+// ===
+//
+// emailrelay-check-ipaddress.js
+//
+// An example "--filter" script for Windows that verifies the submitting
+// client's IP address. The IP address is read from the envelope file.
+// Invalid IP addresses are rejected by deleting the two message files and
+// exiting with the special exit code of 100. Note that this checks the
+// IP address very late in the submission process; a firewall or DNSBL check
+// might work better.
+//
+try
+{
+	var content = WScript.Arguments(0) ;
+	var envelope = WScript.Arguments(1) ;
+	var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
+	var ts = fs.OpenTextFile( envelope , 1 , false ) ;
+	var txt = ts.ReadAll() ;
+	ts.Close() ;
+	var re = new RegExp( "X-MailRelay-Client: (\\S*)" , "m" ) ;
+	var ip = txt.match(re)[1] ;
+	var ok = ip === "1.1.1.1" ; /// edit here
+	if( ok )
+	{
+		WScript.Quit( 0 ) ;
+	}
+	else
+	{
+		WScript.StdOut.WriteLine( "<<not allowed>>" ) ;
+		fs.DeleteFile( envelope ) ;
+		fs.DeleteFile( content ) ;
+		WScript.Quit( 100 ) ;
+	}
+}
+catch( e )
+{
+	// report errors using the special <<...>> markers
+	WScript.StdOut.WriteLine( "<<error>>" ) ;
+	WScript.StdOut.WriteLine( "<<" + e + ">>" ) ;
+	WScript.Quit( 1 ) ;
+}
+

bin/emailrelay-check-ipaddress.pl

@@ -0,0 +1,52 @@
+#!/usr/bin/env perl
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-check-ipaddress.pl
+#
+# An example "--filter" script that verifies the submitting client's IP
+# address. The IP address is read from the envelope file. Invalid IP
+# addresses are rejected by deleting the two message files and exiting
+# with the special exit code of 100. Note that this checks the IP
+# address very late in the submission process; a firewall or DNSBL
+# check might work better.
+#
+
+use strict ;
+use warnings ;
+use FileHandle ;
+$SIG{__DIE__} = sub { (my $e = join(" ",@_)) =~ s/\n/ /g ; print "<<error>>\n<<error: $e>>\n" ; exit 99 } ;
+
+my %allow = (
+	"127.0.0.1" => 1 ,
+	"1.1.1.1" => 1 ,
+	# etc
+) ;
+
+my $content = $ARGV[0] or die "usage error\n" ;
+my $envelope = $ARGV[1] or die "usage error\n" ;
+my $fh = new FileHandle( $envelope ) or die "cannot open envelope file: $!\n" ;
+my $txt ;
+{
+	local $/ = undef ;
+	$txt = <$fh> ;
+}
+my ( $ip ) = ( $txt =~ m/X-MailRelay-Client: (\S*)/m ) ;
+if( $allow{$ip} )
+{
+	exit( 0 ) ;
+}
+else
+{
+	print "<<not allowed>>\n<<not allowed: $ip>>\n" ;
+	unlink( $content ) ;
+	unlink( $envelope ) ;
+	exit( 100 ) ;
+}
+

bin/emailrelay-deliver.sh_

@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-#
-# emailrelay-deliver.sh
-#
-# Looks for local mail in the E-MailRelay spool directory, and delivers 
-# it using 'procmail'.
-#
-# usage: emailrelay-deliver.sh [<spool-dir>]
-#
-
-store="__SPOOL_DIR__"
-postmaster="root"
-procmail="procmail"
-
-# parse the command line
-#
-if test $# -ge 1
-then
-	store="${1}"
-fi
-
-# check the spool directory is valid
-#
-if test \! -d "${store}"
-then
-	echo `basename $0`: invalid spool directory >&2
-	exit 1
-fi
-
-# for each e-mail to a local recipient...
-#
-for file in ${store}/emailrelay.*.envelope.local ""
-do
-	if test -f "${file}"
-	then
-		content="`echo ${file} | sed 's/envelope/content/'`"
-
-		deliver_to="`fgrep X-MailRelay-To-Local ${file} | sed 's/X-MailRelay-To-Local: //' | tr -d '\015' | sed \"s/postmaster/${postmaster}/g\"`"
-		if test "${deliver_to}" = "" 
-		then 
-			deliver_to="${postmaster}"
-		fi
-
-		# deliver using procmail
-		#
-		if test -f "${content}"
-		then
-			echo `basename $0`: delivering `basename ${content}` to ${deliver_to}
-			${procmail} -d ${deliver_to} < ${content}
-			rc=$?
-			if test "${rc}" -eq 0
-			then
-				rm -f "${file}" 2>/dev/null
-			fi
-		fi
-	fi
-done
-

bin/emailrelay-dkim-signer.pl

@@ -0,0 +1,65 @@
+#!/usr/bin/env perl
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-dkim-signer.pl
+#
+# An example E-MailRelay filter script for DKIM signing.
+#
+# To generate a key pair:
+#   $ openssl genrsa -out example.com.pk 2048
+#   $ openssl rsa -in example.com.pk -pubout -out example.com.pub
+#
+# Serve up the public key via DNS, eg:
+#   $ grep -v PUBLIC example.com.pub | tr -d '\n'
+#   upload default._domainkey TXT "p=Q8AMIIB...."
+#   $ nslookup -query=TXT default._domainkey.example.com
+#   text = "p=Q8AMIIB...."
+#
+# Test with spamassassin:
+#   $ c=`emailrelay-submit -v -s \`pwd\` -C DQo= -C aGVsbG8sIHdvcmxkIQ== -d -F -t -f me@example.com you@example.com`
+#   $ emailrelay-dkim-signer.pl $c
+#   $ spamassassin --debug=dkim --test-mode < $c
+#
+# Requires debian package 'libmail-dkim-perl'.
+#
+
+use strict ;
+use FileHandle ;
+use File::Copy ;
+use Mail::DKIM::Signer ;
+use Mail::DKIM::TextWrap ;
+
+$SIG{__DIE__} = sub { (my $e = join(" ",@_)) =~ s/\n/ /g ; print "<<error: $e>>\n" ; exit 99 } ;
+
+my $content = $ARGV[0] or die "usage error\n" ;
+my $fh = new FileHandle( $content ) or die "cannot open content file\n" ;
+
+my $dkim = new Mail::DKIM::Signer(
+	Algorithm => 'rsa-sha1' ,
+	Method => 'relaxed' ,
+	Domain => 'example.com' ,
+	Selector => 'default' , # => default._domainkey.example.com
+	KeyFile => '/etc/dkim/private/example.com.pk' ,
+	Headers => '' , # 'x-header:x-header2'
+);
+
+$dkim->load( $fh ) ; # includes CLOSE()
+$fh->close() or die ;
+
+my $signature = $dkim->signature->as_string() ;
+
+$fh = new FileHandle( $content.".tmp" , "w" ) or die ;
+print $fh $signature , "\r\n" ;
+$fh->flush() ;
+File::Copy::copy( $content , $fh ) or die ;
+$fh->close() or die ;
+File::Copy::move( $content.".tmp" , $content ) or die ;
+
+exit 0 ;

bin/emailrelay-edit-content.js

@@ -0,0 +1,62 @@
+//
+// Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+// 
+// Copying and distribution of this file, with or without modification,
+// are permitted in any medium without royalty provided the copyright
+// notice and this notice are preserved.  This file is offered as-is,
+// without any warranty.
+// ===
+//
+// emailrelay-edit-content.js
+//
+// An example "--filter" script for Windows that edits the message's content
+// file.
+//
+// In this example every "teh" is changed to "the".
+//
+try
+{
+	// parse the command-line to get the content filename
+	var content = WScript.Arguments(0) ;
+
+	// open the content file
+	var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
+	var in_ = fs.OpenTextFile( content , 1 , false ) ;
+
+	// create the new content file
+	var out_ = fs.OpenTextFile( content + ".tmp" , 8 , true ) ;
+
+	// read the headers
+	while( !in_.AtEndOfStream )
+	{
+		var line = in_.ReadLine() ;
+		out_.WriteLine( line ) ;
+		if( line === "" )
+			break ;
+	}
+
+	// read and edit the body
+	var re = new RegExp( "\\bteh\\b" , "gi" ) ;
+	while( !in_.AtEndOfStream )
+	{
+		var line = in_.ReadLine() ;
+		line = line.replace( re , "the" ) ;
+		out_.WriteLine( line ) ;
+	}
+
+	// replace the content file
+	in_.Close() ;
+	out_.Close() ;
+	fs.DeleteFile( content ) ;
+	fs.MoveFile( content + ".tmp" , content ) ;
+
+	// successful exit
+	WScript.Quit( 0 ) ;
+}
+catch( e )
+{
+	// report errors using the special <<...>> markers
+	WScript.StdOut.WriteLine( "<<edit failed>>" ) ;
+	WScript.StdOut.WriteLine( "<<" + e + ">>" ) ;
+	WScript.Quit( 1 ) ;
+}

bin/emailrelay-edit-envelope.js

@@ -0,0 +1,71 @@
+//
+// Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+// 
+// Copying and distribution of this file, with or without modification,
+// are permitted in any medium without royalty provided the copyright
+// notice and this notice are preserved.  This file is offered as-is,
+// without any warranty.
+// ===
+//
+// emailrelay-edit-envelope.js
+//
+// An example "--filter" script for Windows that edits the message's envelope
+// file.
+//
+// In this example the "MailFromAuthOut" field in the envelope file is
+// modified; this is used as the MAIL FROM AUTH parameter when the emailrelay
+// server forwards the message to the downstream server. In principle
+// (RFC-2554) when relaying the outgoing MAIL FROM AUTH value should be the
+// same as the incoming value iff the submitting client was authenticated
+// and trusted; or it can be the the submitting client's authentication id
+// if there was no incoming value; or it can be "<>".
+//
+try
+{
+	// parse the command-line to get the envelope filename
+	var content = WScript.Arguments(0) ;
+	var envelope = WScript.Arguments(1) ;
+
+	// open the envelope file
+	var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
+	var ts = fs.OpenTextFile( envelope , 1 , false ) ;
+
+	// read the contents of the envelope file
+	var txt = ts.ReadAll() ;
+	ts.Close() ;
+
+	// read the incoming values
+	var re_auth_in = new RegExp( "^X-MailRelay-MailFromAuthIn: *(\\S*)" , "m" ) ;
+	txt.match( re_auth_in ) ;
+	var auth_in = RegExp.lastParen ;
+	var re_authentication = new RegExp( "^X-MailRelay-Authentication: *(\\S*)" , "m" ) ;
+	txt.match( re_authentication ) ;
+	var authentication = RegExp.lastParen ;
+
+	// choose the auth-out value
+	var auth_out = "<>" ;
+	if( authentication )
+	{
+		function xtext( x ) { return x } // todo
+		auth_out = auth_in ? auth_in : xtext(authentication) ;
+	}
+
+	// set the auth-out
+	var re = new RegExp( "X-MailRelay-MailFromAuthOut: *\\S*" ) ;
+	txt = txt.replace( re , "X-MailRelay-MailFromAuthOut: " + auth_out ) ;
+
+	// write the envelope file back out
+	ts = fs.OpenTextFile( envelope , 2 , false ) ;
+	ts.Write( txt ) ;
+	ts.Close() ;
+
+	// successful exit
+	WScript.Quit( 0 ) ;
+}
+catch( e )
+{
+	// report errors using the special <<...>> markers
+	WScript.StdOut.WriteLine( "<<edit failed>>" ) ;
+	WScript.StdOut.WriteLine( "<<" + e + ">>" ) ;
+	WScript.Quit( 1 ) ;
+}

bin/emailrelay-ldap-verify.py

@@ -0,0 +1,89 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020-2023 <richardwvm@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-ldap-verify.py
+#
+# Example address verifier script using LDAP.
+#
+# See also: https://www.python-ldap.org/en/python-ldap-3.3.0
+#
+
+import sys
+import ldap
+
+try:
+	Arg1 = sys.argv[1]
+except:
+	print("error")
+	print("Usage: emailrelay-ldap-verify.py [--emailrelay-version | <email-address>]")
+	sys.exit(3)
+
+if Arg1 == "--emailrelay-version":
+	print("2.0")
+	sys.exit(0)
+
+AtChar = Arg1.find("@")
+
+if AtChar == -1:
+	print("invalid mailbox")
+	print("malformed e-mail address (no at sign)")
+	sys.exit(2)
+
+LocalDomain = "@domain.co.uk"
+
+if Arg1[AtChar:] != LocalDomain:
+	print("invalid mailbox")
+	print("invalid mailbox: %s" % Arg1)
+	sys.exit(2)
+
+LDAPSServer = "ldaps-server.domain.com"
+LDAPSPort = "636"
+LDAPSUsername = "DOMAIN\\username"
+LDAPSPassword = "password"
+UserSearchPath = "CN=Users,DC=domain,DC=com"
+PublicFolderSearchPath = "CN=Microsoft Exchange System Objects,DC=domain,DC=com"
+ErrorLevel = 1
+
+try:
+	connect = ldap.initialize("ldaps://" + LDAPSServer + ":" + LDAPSPort)
+	connect.set_option(ldap.OPT_NETWORK_TIMEOUT, 3)
+	connect.set_option(ldap.OPT_REFERRALS, 0)
+	connect.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
+	connect.set_option(ldap.OPT_X_TLS_NEWCTX, 0)
+	connect.simple_bind_s(LDAPSUsername, LDAPSPassword)
+	result = connect.search_s(UserSearchPath,
+														ldap.SCOPE_SUBTREE,
+														"(&(objectCategory=person)(objectclass=user)(!(userAccountControl:1.2.840.113556.1.4.803:=2))(proxyAddresses=SMTP:%s))" % (sys.argv[1]),
+														["mail"])
+	if len(result) != 1:
+		result = connect.search_s(PublicFolderSearchPath,
+															ldap.SCOPE_SUBTREE,
+															"(&(objectclass=publicFolder)(proxyAddresses=SMTP:%s))" % (sys.argv[1]),
+															["mail"])
+		if len(result) != 1:
+			print("invalid mailbox")
+			print("invalid mailbox: %s" % (sys.argv[1]))
+			ErrorLevel = 2
+		else:
+			print()
+			print(sys.argv[1])
+	else:
+		print()
+		print(sys.argv[1])
+except ldap.LDAPError as e:
+	print("temporary error")
+	print("ldap error: %s" % str(e))
+	ErrorLevel = 3
+except:
+	print("temporary error")
+	print("exception")
+	ErrorLevel = 3
+
+sys.exit(ErrorLevel)

bin/emailrelay-multicast.sh

@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-multicast.sh
+#
+# An example E-MailRelay "--filter" script that copies/links each new message
+# into all available sub-directories of the main spool directory. The original
+# message files are deleted if they were successfully copied/linked into all
+# sub-directories.
+#
+# This can be used for SMTP multicast by having an emailrelay forwarding
+# process polling each sub-directory. (For POP multicasting use the
+# "emailrelay-filter-copy" program with the "pop-by-name" feature so that
+# there is no need to copy or link content files.)
+#
+# Hard links are used for the content files in order to conserve disk space.
+# Log entries are written into the base envelope file to help with error
+# recovery.
+#
+# By default errors in running this script are fed back to the remote SMTP
+# client. Alternatively, edit the code below to ignore these errors and leave
+# the submitted e-mail message in the main spool directory.
+#
+
+# parse the command-line
+#
+content="$1"
+envelope="$2"
+base_dir="`dirname \"${content}\"`"
+if test "$1" = "" -o "${base_dir}" = "."
+then
+	echo usage: `basename $0` '<content-file> <envelope-file>' >&2
+	exit 2
+fi
+
+# copy/link message files
+#
+list="`find \"${base_dir}\" -mount -maxdepth 1 -mindepth 1 -type d`"
+error_list=""
+subdir_exists="0"
+for dir in ${list} ""
+do
+	if test -d "${dir}" -a "${dir}" != ".." -a "${dir}" != "." -a "${dir}" != "${base_dir}"
+	then
+		subdir_exists="1"
+		envelope_tmp="${envelope}.`basename \"${dir}\"`.tmp"
+		envelope_dst="${dir}/`basename \"${envelope}\" .new`"
+		if ln "${content}" "${dir}" && cp "${envelope}" "${envelope_tmp}" && mv "${envelope_tmp}" "${envelope_dst}"
+		then
+			echo "X-MailRelay-Multicast: ${dir}>" | tr '>' '\r' >> "${envelope}"
+		else
+			error_list="${error_list} ${dir}"
+			echo "X-MailRelay-Multicast-Error: ${dir}>" | tr '>' '\r' >> "${envelope}"
+		fi
+	fi
+done
+
+# error handling
+#
+if test "${subdir_exists}" = "0"
+then
+	# no sub-directories created -- this script has no effect
+	exit 0
+elif test "${error_list}" = ""
+then
+	# successfully copied -- delete the original
+	rm -f "${content}" "${envelope}"
+	exit 100
+else
+	# something failed -- tell the submitting smtp client, or
+	# replace these three lines with "exit 0" if the client should not know...
+	echo "<<multicast failed>>"
+	echo "<<`basename $0`: `basename "${content}"`: failed to copy message into${error_list}>>"
+	exit 1
+fi
+

bin/emailrelay-notify.sh.in

@@ -0,0 +1,119 @@
+#!/bin/sh
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-notify.sh
+#
+# Looks for failed mail in the E-MailRelay spool directory and sends failure
+# notification messages using 'procmail'.
+#
+# usage: emailrelay-notify.sh [<spool-dir>]
+#
+# Notification of failed e-mail by means of e-mail messages is a requirement
+# imposed by the SMTP specification. However, a simpler approach might be more
+# appropriate -- for example, a line like this in a ".profile" script:
+#
+#   if test -f /var/spool/emailrelay/*.envelope.bad ; then echo Failed mail >&2 ; fi
+#
+# or perhaps a cron entry like this, since output from a cron job gets sent
+# as mail:
+#
+#   0 0 * * * /bin/cat /var/spool/emailrelay/*.envelope.bad 2>/dev/null
+#
+
+tmp="/tmp/`basename $0`.$$.tmp"
+trap "rm -f \"${tmp}\" 2>/dev/null ; exit 0" 0 1 2 3 13 15
+procmail="procmail"
+
+# parse the command line
+#
+store="__SPOOL_DIR__"
+if test $# -ge 1
+then
+	store="${1}"
+fi
+
+# check the spool directory
+#
+if test \! -d "${store}"
+then
+	echo `basename $0`: invalid spool directory >&2
+	exit 1
+fi
+
+# for each failed e-mail...
+#
+for file in "${store}"/emailrelay.*.envelope.bad ""
+do
+	if test -f "${file}"
+	then
+		# parse out the failure reason and the original sender
+		#
+		content="`echo \"${file}\" | sed 's/envelope/content/' | sed 's/.bad//'`"
+		reason="`fgrep MailRelay-Reason \"${file}\" | sed 's/X-[^ ]*Reason: //' | tr -d '\015'`"
+		from="`fgrep MailRelay-From \"${file}\" | sed 's/X-MailRelay-From: //' | tr -d '\015'`"
+		deliver_to="${from}"
+		if test "${deliver_to}" = ""
+		then
+			deliver_to="root"
+		fi
+
+		# create a notification message header
+		#
+		boundary="--------------`basename \"${file}\"`.$$"
+		echo "To: ${deliver_to}" > "${tmp}"
+		echo "From: postmaster" >> "${tmp}"
+		echo "Subject: Your e-mail could not be delivered" >> "${tmp}"
+		echo "MIME-Version: 0.1" >> "${tmp}"
+		echo "Content-Type: multipart/mixed; boundary=\"${boundary}\"" >> "${tmp}"
+		echo "" >> "${tmp}"
+
+		# add the message text
+		#
+		echo "" >> "${tmp}"
+		echo "--${boundary}" >> "${tmp}"
+		echo "Content-Type: text/plain; charset=us-ascii" >> "${tmp}"
+		echo "" >> "${tmp}"
+		if test -f "${content}"
+		then
+			egrep -i '^To:|^Subject:' ${content} >> "${tmp}"
+		fi
+		if test "${reason}" != ""
+		then
+			echo "Reason: ${reason}" >> "${tmp}"
+		fi
+
+		# add the message attachment
+		#
+		if test -f "${content}"
+		then
+			echo "--${boundary}" >> "${tmp}"
+			echo "Content-Type: message/rfc822" >> "${tmp}"
+			echo "Content-Transfer-Encoding: 8bit" >> "${tmp}"
+			echo "Content-Description: `basename \"${content}\"`" >> "${tmp}"
+			echo "" >> "${tmp}"
+			cat "${content}" >> "${tmp}"
+		fi
+		echo "--${boundary}--" >> "${tmp}"
+
+		# deliver the notification using procmail
+		#
+		echo `basename $0`: delivering `basename "${content}"` to ${deliver_to}
+		"${procmail}" -d "${deliver_to}" < "${tmp}"
+		rc=$?
+
+		# clean up
+		#
+		if test "${rc}" -eq 0
+		then
+			rm -f "${file}" "${content}" 2>/dev/null
+		fi
+	fi
+done
+

bin/emailrelay-notify.sh_

@@ -1,127 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-# 
-# emailrelay-notify.sh
-#
-# Looks for failed mail in the E-MailRelay spool directory, and sends failure 
-# notification messages using 'procmail'.
-#
-# usage: emailrelay-notify.sh [<spool-dir>]
-#
-# Notification of failed e-mail by means of e-mail messages is a
-# requirement imposed by the SMTP specification. However, a simpler 
-# approach might be more appropriate -- for example, a line like this in
-# a ".profile" script:
-#
-#   if test -f /var/spool/emailrelay/*.envelope.bad ; then echo Failed mail >&2 ; fi
-#
-# or perhaps a cron entry like this (since output from a cron job gets sent as mail):
-#
-#   0 0 * * * /bin/cat /var/spool/emailrelay/*.envelope.bad 2>/dev/null
-#
-
-tmp="/tmp/`basename $0`.$$.tmp"
-trap "rm -f ${tmp} 2>/dev/null ; exit 0" 0 1 2 3 13 15
-procmail="procmail"
-
-# parse the command line
-#
-store="__SPOOL_DIR__"
-if test $# -ge 1
-then
-	store="${1}"
-fi
-
-# check the spool directory
-#
-if test \! -d "${store}"
-then
-	echo `basename $0`: invalid spool directory >&2
-	exit 1
-fi
-
-# for each failed e-mail...
-#
-for file in ${store}/emailrelay.*.envelope.bad ""
-do
-	if test -f "${file}"
-	then
-		# parse out the failure reason and the original sender
-		#
-		content="`echo ${file} | sed 's/envelope/content/' | sed 's/.bad//'`"
-		reason="`fgrep MailRelay-Reason ${file} | sed 's/X-[^ ]*Reason: //' | tr -d '\015'`"
-		from="`fgrep MailRelay-From ${file} | sed 's/X-MailRelay-From: //' | tr -d '\015'`"
-		deliver_to="${from}"
-		if test "${deliver_to}" = "" 
-		then 
-			deliver_to="root"
-		fi
-
-		# create a notification message header
-		#
-		boundary="--------------`basename ${file}`.$$"
-		echo "To: ${deliver_to}" > ${tmp}
-		echo "From: postmaster" >> ${tmp}
-		echo "Subject: Your e-mail could not be delivered" >> ${tmp}
-		echo "MIME-Version: 0.1" >> ${tmp}
-		echo "Content-Type: multipart/mixed; boundary=\"${boundary}\"" >> ${tmp}
-		echo "" >> ${tmp}
-
-		# add the message text
-		#
-		echo "" >> ${tmp}
-		echo "--${boundary}" >> ${tmp}
-		echo "Content-Type: text/plain; charset=us-ascii" >> ${tmp}
-		echo "" >> ${tmp}
-		if test -f "${content}"
-		then
-			egrep -i '^To:|^Subject:' ${content} >> ${tmp}
-		fi
-		if test "${reason}" != ""
-		then
-			echo "Reason: ${reason}" >> ${tmp}
-		fi
-
-		# add the message attachment
-		#
-		if test -f "${content}"
-		then
-			echo "--${boundary}" >> ${tmp}
-			echo "Content-Type: message/rfc822" >> ${tmp}
-			echo "Content-Transfer-Encoding: 8bit" >> ${tmp}
-			echo "Content-Description: `basename ${content}`" >> ${tmp}
-			echo "" >> ${tmp}
-			cat ${content} >> ${tmp}
-		fi
-		echo "--${boundary}--" >> ${tmp}
-
-		# deliver the notification using procmail
-		#
-		echo `basename $0`: delivering `basename ${content}` to ${deliver_to}
-		${procmail} -d "${deliver_to}" < ${tmp}
-		rc=$?
-
-		# clean up
-		#
-		if test "${rc}" -eq 0
-		then
-			rm -f "${file}" "${content}" 2>/dev/null
-		fi
-	fi
-done
-

bin/emailrelay-process.sh_

@@ -1,150 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-#
-# emailrelay-process.sh
-#
-# An example pre-processing script for the E-MailRelay
-# SMTP server which does rot-13 masking. (The pre-processor
-# is specified using the "--filter" switch on the emailrelay 
-# command line.)
-#
-
-awk="awk"
-tmp="/tmp/`basename $0`.$$.tmp"
-log="/tmp/`basename $0`.out"
-trap "rm -f ${tmp} >/dev/null 2>&1 ; exit" 0 1 2 3 13 15
-
-###
-# ProcessContent()
-# Processes the content part of an RFC822 message. This
-# implementation does rot13 masking.
-#
-ProcessContent()
-{
-	${awk} '
-	BEGIN {
-		map_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-		map_lower = tolower(map_upper)
-		in_header = 1
-	}
-
-	function rot( n , c , map )
-	{
-		return index(map,c) ? substr(map,((index(map,c)+n-1)%length(map))+1,1) : c
-	}
-
-	function rot_c( n , c )
-	{
-		return rot(n,rot(n,c,map_upper),map_lower)
-	}
-
-	function rot_s( n , string )
-	{
-		rot_s_result = ""
-		for( i = 1 ; i <= length(string) ; i++ )
-			rot_s_result = rot_s_result rot_c(n,substr(string,i,1))
-		return rot_s_result
-	}
-
-	{
-		is_blank = match($0,"^[[:space:]]*$")
-		if( in_header && is_blank )
-			in_header = 0
-	
-		if( in_header )
-			print
-		else
-			print rot_s(13,$0)
-	}
-	'
-}
-
-###
-# Wrap()
-# Processes an RCF822 message so that the original content
-# appears as an attachment.
-#
-Wrap()
-{
-	${awk} -v boundary="-----`basename $0`.$$" -v message="$@" '
-	BEGIN {
-		in_header = 1
-		n = 1
-	}
-	{
-		is_blank = match($0,"^[[:space:]]*$")
-		if( in_header && is_blank )
-		{
-			printf( "Content-Type: multipart/mixed; boundary=\"%s\"\r\n" , boundary )
-			printf( "\r\n" )
-			printf( "\r\n" )
-			printf( "--%s\r\n" , boundary )
-			printf( "Content-Type: text/plain; charset=us-ascii\r\n" )
-			printf( "\r\n" )
-			printf( "%s\r\n" , message )
-			printf( "\r\n" )
-			printf( "--%s\r\n" , boundary )
-			printf( "Content-Type: message/rfc822\r\n" )
-			printf( "Content-Transfer-Encoding: 8bit\r\n" )
-			printf( "Content-Description: encrypted message\r\n" )
-			printf( "\r\n" )
-			for( i = 1 ; i < n ; i++ )
-				print header[i]
-		}
-
-		if( in_header && is_blank )
-			in_header = 0
-
-		if( in_header )
-		{
-			header[n++] = $0
-
-			is_mime_content = match($0,"^Content-")
-			is_continuation = match($0,"^[[:space:]][[:space:]]*[^[:space:]]")
-			suppress = is_mime_content || (was_mime_content && is_continuation)
-			was_mime_content = suppress
-
-			if( ! suppress )
-				print
-		}
-		else
-		{
-			print
-		}
-	}
-	END {
-		printf( "--%s--\r\n" , boundary )
-		printf( "\r\n" )
-	}
-	'
-}
-
-Main()
-{
-	cat "${1}" | ProcessContent | Wrap "The original message has been encrypted..." > ${tmp}
-	cp ${tmp} "${1}"
-}
-
-debug="0"
-if test "${debug}" -eq 1
-then
-	Main $@ > ${log} 2>&1
-else
-	Main $@
-fi
-

bin/emailrelay-resubmit.js

@@ -1,49 +1,47 @@
 //
-// Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
+// Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
 // 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or 
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// Copying and distribution of this file, with or without modification,
+// are permitted in any medium without royalty provided the copyright
+// notice and this notice are preserved.  This file is offered as-is,
+// without any warranty.
 // ===
-///
-/// \file emailrelay-resubmit.js
-///
+//
+// emailrelay-resubmit.js
+//
+// A utility script for Windows that looks for all failed e-mails in the
+// E-MailRelay spool directory and resubmits them. However, if an e-mail has
+// been retried five times already then it is not submitted again.
+//
+// usage: cscript //nologo emailrelay-resubmit.js [<spool-dir>]
+//
 
-/// configuration
-///
-var cfg_store = "__SPOOL_DIR__" ;
+// configuration
+//
+var cfg_store = "C:/ProgramData/E-MailRelay/spool" ;
 var cfg_retry_limit = 5 ;
-var cfg_debug = true ;
+var cfg_debug = false ;
 
-/// parse the command line
-///
+// parse the command line
+//
 var args = WScript.Arguments
 if( args.length >= 1 )
 {
 	cfg_store = args(0) ;
 }
 
-/// debugging
-///
+// debugging
+//
 function debug( line )
 {
 	if( cfg_debug )
 	{
-		WScript.Echo( "debug: " + line ) ;
+		WScript.StdOut.WriteLine( "debug: " + line ) ;
 	}
 }
 
-/// check the spool directory
-///
+// check the spool directory
+//
 var fso = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
 if( ! fso.FolderExists( cfg_store ) )
 {
@@ -51,20 +49,20 @@ if( ! fso.FolderExists( cfg_store ) )
 	WScript.Quit( 1 ) ;
 }
 
-/// for each file...
-///
+// for each file...
+//
 var folder = fso.GetFolder( cfg_store ) ;
 var re_reason = new RegExp( "MailRelay-Reason: " , "" ) ;
 var re_bad = new RegExp( ".*\.bad" , "i" ) ;
 var iter = new Enumerator( folder.Files ) ;
 for( ; ! iter.atEnd() ; iter.moveNext() )
 {
-	///< if a failed envelope file...
+	// if a failed envelope file...
 	var path = new String(iter.item()) ;
 	debug( "path: " + path ) ;
 	if( path.match(re_bad) )
 	{
-		///< count the failure lines
+		// count the failure lines
 		var stream = fso.OpenTextFile( path , 1 ) ;
 		var failures = 0 ;
 		while( !stream.AtEndOfStream )
@@ -80,7 +78,7 @@ for( ; ! iter.atEnd() ; iter.moveNext() )
 		debug( "failures: " + failures ) ;
 		if( failures < cfg_retry_limit )
 		{
-			///< remove the ".bad" suffix
+			// remove the ".bad" suffix
 			var new_path = path.substr( 0 , path.length-4 ) ;
 			debug( "rename: " + path + " -> " + new_path ) ;
 			fso.MoveFile( path , new_path ) ;

bin/emailrelay-resubmit.sh.in

@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-resubmit.sh
+#
+# Looks for all failed e-mails in the E-MailRelay spool directory and resubmits
+# them. However, if an e-mail has been retried five times already then it is not
+# resubmitted again.
+#
+# usage: emailrelay-resubmit.sh [<spool-dir>]
+#
+# See also emailrelay-resubmit.js for Windows.
+#
+
+store="__SPOOL_DIR__"
+retry_limit="5"
+
+# parse the command line
+#
+if test $# -ge 1
+then
+	store="$1"
+fi
+
+# check the spool directory is valid
+#
+if test \! -d "$store"
+then
+	echo `basename $0`: invalid spool directory >&2
+	exit 1
+fi
+
+# for each failed e-mail...
+#
+ls -1 "$store/emailrelay.*.envelope.bad" | while read file
+do
+	if test -f "$file"
+	then
+		failures="`fgrep MailRelay-Reason: < \"${file}\" | wc -l`"
+		if test "$failures" -lt "$retry_limit"
+		then
+			good_file="`echo \"${file}\" | sed 's/\.bad$//'`"
+			mv -f "$file" "$good_file"
+		fi
+	fi
+done
+

bin/emailrelay-resubmit.sh_

@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-#
-# emailrelay-resubmit.sh
-#
-# Looks for all failed e-mails in the E-MailRelay spool directory 
-# and resubmits them. However, if an e-mail has been retried five 
-# times already then it is not resubmitted again.
-#
-# usage: emailrelay-resubmit.sh [<spool-dir>]
-#
-
-store="__SPOOL_DIR__"
-retry_limit="5"
-
-# parse the command line
-#
-if test $# -ge 1
-then
-	store="${1}"
-fi
-
-# check the spool directory is valid
-#
-if test \! -d "${store}"
-then
-	echo `basename $0`: invalid spool directory >&2
-	exit 1
-fi
-
-# for each failed e-mail...
-#
-for file in ${store}/emailrelay.*.envelope.bad ""
-do
-	if test -f "${file}"
-	then
-		failures="`fgrep MailRelay-Reason: < ${file} | wc -l`"
-		if test "${failures}" -lt "${retry_limit}"
-		then
-			good_file="`echo \"${file}\" | sed 's/\.bad$//'`"
-			mv -f "${file}" "${good_file}"
-		fi
-	fi
-done
-

bin/emailrelay-rot13.pl

@@ -0,0 +1,85 @@
+#!/usr/bin/env perl
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-rot13.pl
+#
+# An example E-MailRelay "--filter" script that does rot-13 masking.
+#
+
+use strict ;
+use FileHandle ;
+$SIG{__DIE__} = sub { (my $e = join(" ",@_)) =~ s/\n/ /g ; print "<<error: $e>>\n" ; exit 99 } ;
+
+my $content = $ARGV[0] ;
+my $content_tmp = "$content.tmp" ;
+my $fh_in = new FileHandle( $content , "r" ) or die "cannot open content file [$content]: $!\n" ;
+my $fh_out = new FileHandle( "$content_tmp" , "w" ) or die "cannot open temporary file [$content_tmp]: $!\n" ;
+my $boundary = "-----emailrelay-rot13-$$" ;
+my $in_header = 1 ;
+my @headers = () ;
+while(<$fh_in>)
+{
+	chomp( my $line = $_ ) ;
+	$line =~ s/\r$// ;
+
+	if( $in_header && ( $line =~ m/^\s/ ) && scalar(@headers) ) # folding
+	{
+		$headers[-1] .= "\r\n$line" ;
+	}
+	elsif( $in_header && ( $line =~ m/^$/ ) )
+	{
+		$in_header = 0 ;
+		for my $h ( @headers )
+		{
+			if( $h =~ m/^(subject|to|from):/i )
+			{
+				print $fh_out $h , "\r\n" ;
+			}
+		}
+		print $fh_out "Content-Type: multipart/mixed; boundary=\"$boundary\"\r\n" ;
+		print $fh_out "\r\n" ;
+		print $fh_out "\r\n" ;
+		print $fh_out "--$boundary\r\n" ;
+		print $fh_out "Content-Type: text/plain; charset=us-ascii\r\n" ;
+		print $fh_out "\r\n" ;
+		print $fh_out "The original message has been masked...\r\n" ;
+		print $fh_out "\r\n" ;
+		print $fh_out "--$boundary\r\n" ;
+		print $fh_out "Content-Type: text/plain\r\n" ;
+		print $fh_out "Content-Transfer-Encoding: 8bit\r\n" ;
+		print $fh_out "Content-Description: masked message\r\n" ;
+		print $fh_out "\r\n" ;
+		print $fh_out join( "\r\n" , map { rot13($_) } (@headers,"") ) ;
+	}
+	elsif( $in_header )
+	{
+		push @headers , $line ;
+	}
+	else
+	{
+		print $fh_out rot13($line) , "\r\n" ;
+	}
+}
+print $fh_out "--$boundary--\r\n" ;
+print $fh_out "\r\n" ;
+
+$fh_in->close() or die ;
+$fh_out->close() or die "cannot write new file [$content_tmp]: $!\n" ;
+unlink( $content ) or die "cannot delete original file [$content]: $!\n" ;
+rename( $content_tmp , $content ) or die "cannot rename [$content_tmp]: $!\n" ;
+exit( 0 ) ;
+
+sub rot13
+{
+	my ( $s ) = @_ ;
+	$s =~ tr/[a-m][n-z][A-M][N-Z]/[n-z][a-m][N-Z][A-M]/ ;
+	return $s ;
+}
+

bin/emailrelay-runperl.js

@@ -1,67 +0,0 @@
-//
-// Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or 
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// ===
-///
-/// \file emailrelay-runperl.js
-///
-var cfg_perl="perl -S -T -w"
-var cfg_perl_script="spamassassin"
-
-/// parse our command line
-var args = WScript.Arguments
-var filename = args(0)
-
-/// prepare a command using CMD.EXE to do file redirection
-var cmd_in = "\"" + filename + "\""
-var cmd_out = "\"" + filename + ".tmp\""
-var cmd_err = "\"" + filename + ".err\""
-var cmd_perl = "cmd /c " + cfg_perl + " " + cfg_perl_script
-var cmd = cmd_perl + " < " + cmd_in + " > " + cmd_out + " 2> " + cmd_err
-
-/// run the command
-var sh = WScript.CreateObject("WScript.Shell")
-var rc = sh.Run( cmd , 0 , true )
-
-/// check the file redirection
-var fs = WScript.CreateObject("Scripting.FileSystemObject")
-if( !fs.FileExists(filename+".tmp") || !fs.FileExists(filename+".err") )
-{
-	WScript.Echo("<<file redirection error>>")
-	WScript.Quit( 2 )
-}
-
-/// success or failure
-if( rc == 0 )
-{
-	fs.DeleteFile( filename )
-	fs.MoveFile( filename + ".tmp" , filename )
-	fs.DeleteFile( filename + ".err" )
-	WScript.Quit( 0 )
-}
-else
-{
-	fs.DeleteFile( filename + ".tmp" )
-	var error = fs.OpenTextFile( filename + ".err" , 1 )
-	if( ! error.AtEndOfStream )
-	{
-		var reason = error.ReadLine()
-		WScript.Echo( "<<" + reason + ">>" )
-	}
-	error.Close()
-	fs.DeleteFile( filename + ".err" )
-	WScript.Quit( rc )
-}
-

bin/emailrelay-sendmail.pl

@@ -0,0 +1,78 @@
+#!/usr/bin/env perl
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-sendmail.pl
+#
+# A sendmail/emailrelay shim. Typically installed as /usr/sbin/sendmail or
+# /usr/lib/sendmail.
+#
+
+use strict ;
+use FileHandle ;
+use Getopt::Std ;
+
+my $exe = "/usr/sbin/emailrelay-submit" ;
+my $usage = "usage: emailrelay-sendmail [-intUv] [-ABbCDdFfGhiLNnOopqRrtUVvX <arg>] [-f <from>] <to> [<to> ...]" ;
+
+# parse and mostly ignore sendmail command-line options
+my %opt = () ;
+$Getopt::Std::STANDARD_HELP_VERSION = 1 ;
+sub HELP_MESSAGE() { print "$usage\n" }
+sub VERSION_MESSAGE() {}
+getopts( 'A:B:b:C:D:d:F:f:Gh:iL:N:nO:o:p:q:R:r:tUV:vX:' , \%opt ) or die "$usage\n" ;
+my $from = defined($opt{f}) ? $opt{f} : $ENV{USER} ;
+my @submit_args = ( "--content-date" , @ARGV ) ; # also consider adding "--copy" here
+
+# if "-t" read envelope 'to' addresses from content headers
+if( $opt{t} )
+{
+	# read content headers
+	my %h = () ;
+	my @h = () ;
+	my $k = "" ;
+	while(<STDIN>)
+	{
+		chomp( my $line = $_ ) ;
+		$line =~ s/\r$// ;
+		last if ( $line eq "" ) ;
+        my ( $a , $b , $c , $d ) = ( $line =~ m/^(\S*):\s*(.*)|^(\s)(.*)/ ) ;
+        if( $a ) { $k = lc($a) ; $h{$k} = $b }
+        if( $k && $d ) { $h{$k} .= "$c$d" } # folding
+		push @h , $line unless ( lc($k) eq 'bcc' ) ; # remove Bcc
+	}
+
+	# extract 'to' addresses
+	my @to = () ;
+	push @to , split(" ",$h{to}) if exists($h{to}) ;
+	push @to , split(" ",$h{cc}) if exists($h{cc}) ;
+	push @to , split(" ",$h{bcc}) if exists($h{bcc}) ;
+
+	# write headers and copy body into temp file
+	my $tmp = "/tmp/emailrelay-sendmail.$$.tmp" ;
+	my $fh = new FileHandle( $tmp , "w" ) or die ;
+	map { print $fh $_ , "\r\n" } @h ;
+	print $fh "\r\n" ;
+	while(<STDIN>) { print $fh $_ }
+	$fh->close() or die ;
+
+	# make stdin read from the temp file
+	open STDIN , '<' , $tmp or die ;
+	unlink $tmp or die ;
+
+	# run emailrelay-submit
+	my @args = ( $exe , "-f" , $from , @to ) ;
+	exec { $exe } @args ;
+}
+else
+{
+	# run emailrelay-submit
+	my @args = ( $exe , "-f" , $from , @submit_args ) ;
+	exec { $exe } @args ;
+}

bin/emailrelay-service-install.js

@@ -0,0 +1,132 @@
+//
+// Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// ===
+//
+// emailrelay-service-install.js
+//
+// Runs "emailrelay-service --install" and then opens the Windows service
+// control panel.
+//
+// Note that the installation process creates a config file
+// "emailrelay-service.cfg" in the same directory as the service wrapper
+// and this points to the directory containing the startup batch file.
+//
+
+try
+{
+	var title = "E-MailRelay Service Install" ;
+	var shell = WScript.CreateObject( "WScript.Shell" ) ;
+	var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
+	var this_dir = fs.GetParentFolderName( WScript.ScriptFullName ) ;
+
+	// find the installation program's configuration file in "." or ".."
+	var config_filename = "emailrelay-service.cfg" ;
+	var config_file_1 = this_dir + "\\" + config_filename ;
+	var config_file_2 = fs.GetParentFolderName(this_dir) + "\\" + config_filename ;
+	var config_file = fs.FileExists(config_file_1) ? config_file_1 : config_file_2 ;
+	var config_file_exists = fs.FileExists(config_file) ;
+
+	// require this script to be run after installation, otherwise the
+	// service will be pointing at an ephemeral executable and a bogus
+	// startup batch file
+	if( !config_file_exists )
+		throw "No service configuration file found [" + config_filename + "]. Please run after successful E-MailRelay installation." ;
+
+	// read and parse the config file
+	var dir_config = "" ;
+	if( config_file_exists )
+	{
+		var f = fs.OpenTextFile( config_file ) ;
+		var config_text = f.ReadAll() ;
+		f.Close() ;
+
+		var re_config = new RegExp( "^dir.config=([ \\S]*)" , "m" ) ;
+		var re_dequote = new RegExp( "\"?([^\"]*)" ) ;
+
+		config_text.match( re_config ) ;
+		dir_config = RegExp.lastParen ;
+		dir_config.match( re_dequote ) ;
+		dir_config = RegExp.lastParen ;
+
+		if( !dir_config )
+			throw "Cannot parse the config file [" + config_file + "]" ;
+	}
+
+	// the dir-config value should normally be an absolute path, but
+	// the service wrapper also allows for a special value of "@app"
+	// meaning the service-wrapper's directory, so expand it here
+	if( dir_config === "@app" )
+		dir_config = this_dir ;
+
+	// check for the startup batch file containing the server configuration
+	var startup_batch_file = dir_config + "\\emailrelay-start.bat" ;
+	if( !fs.FileExists(startup_batch_file) )
+		throw "No startup batch file [" + startup_batch_file + "]" ;
+
+	// check for the service wrapper
+	var dir_install = fs.GetParentFolderName( config_file ) ;
+	var service_wrapper = dir_install + "\\emailrelay-service.exe" ;
+	if( !fs.FileExists(startup_batch_file) )
+		throw "No service wrapper [" + service_wrapper + "]" ;
+
+	var ok = shell.Popup( "About to run [" + service_wrapper + " --install] ..." , 0 , title , 1 ) ;
+	if( ok === 1 )
+	{
+		// do the service wrapper installation
+		var exec = shell.exec( "cmd.exe /c \"" + service_wrapper + "\" --install" ) ;
+		//var exec = shell.exec( service_wrapper + " --install" ) ;
+		while( exec.Status === 0 )
+		{
+			WScript.Sleep( 100 ) ;
+		}
+
+		// report the results
+		var stdout_text = exec.StdOut.ReadAll() ;
+		var stderr_text = exec.StdErr.ReadAll() ;
+		var success = !stderr_text && ( exec.ExitCode === 0 ) ;
+		var text = "Service installed" ;
+		if( !success )
+		{
+			text = "Service installation failed: exit " + exec.ExitCode + "\n" +
+				stdout_text + "\n" + stderr_text ;
+		}
+		var topmost = 262144 ;
+		var foreground = 65536 ;
+		var icon_info = 0 ;
+		var icon_hand = 16 ;
+		var icon_question = 1 ;
+		shell.Popup( text , 0 , title , topmost+foreground+(success?icon_info:icon_hand) ) ;
+
+		// optionally open the services control panel
+		if( success )
+		{
+			if( 1 === shell.Popup( "Open the services control panel?" , 0 , title , topmost+foreground+icon_question ) )
+				shell.exec( "cmd.exe /c %windir%\\system32\\services.msc" ) ;
+		}
+	}
+	else
+	{
+		throw "Cancelled" ;
+	}
+
+	WScript.Quit( 0 ) ;
+}
+catch( e )
+{
+	shell.Popup( "Error: " + e , 0 , "E-MailRelay Service Install" , 16 ) ;
+	WScript.Quit( 1 ) ;
+}
+

bin/emailrelay-set-from.js

@@ -0,0 +1,94 @@
+//
+// Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+// 
+// Copying and distribution of this file, with or without modification,
+// are permitted in any medium without royalty provided the copyright
+// notice and this notice are preserved.  This file is offered as-is,
+// without any warranty.
+// ===
+//
+// emailrelay-set-from.js
+//
+// An example "--filter" script that edits the content originator fields
+// (ie. From, Sender and Reply-To) to a fixed value.
+//
+// Also consider setting the envelope-from field by editing the envelope
+// file, as in emailrelay-edit-envelope.js.
+//
+// See also: emailrelay-set-from.pl, RFC-2822
+//
+try
+{
+	var new_from = 'noreply@example.com' ;
+	var new_sender = '' ;
+	var new_reply_to = new_from ;
+
+	var content = WScript.Arguments( 0 ) ;
+	var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
+	var in_ = fs.OpenTextFile( content , 1 , false ) ;
+	var out_ = fs.OpenTextFile( content + ".tmp" , 8 , true ) ;
+
+	var re_from = /^From:/i ;
+	var re_sender = /^Sender:/i ;
+	var re_reply_to = /^Reply-To:/i ;
+	var re_fold = /^[ \t]/ ;
+
+	var in_edit = 0 ;
+	while( !in_.AtEndOfStream )
+	{
+		var line = in_.ReadLine() ;
+		if( line === "" )
+		{
+			out_.WriteLine( line ) ;
+			break ;
+		}
+
+		if( line.match(re_from) && new_from !== null )
+		{
+			in_edit = 1 ;
+			line = "From: " + new_from ;
+			out_.WriteLine( line ) ;
+		}
+		else if( line.match(re_sender) && new_sender !== null )
+		{
+			in_edit = 1 ;
+			line = "Sender: " + new_sender ;
+			if( new_sender !== "" )
+			{
+				out_.WriteLine( line ) ;
+			}
+		}
+		else if( line.match(re_reply_to) && new_reply_to !== null )
+		{
+			in_edit = 1 ;
+			line = "Reply-To: " + new_reply_to ;
+			out_.WriteLine( line ) ;
+		}
+		else if( in_edit && line.match(re_fold) )
+		{
+		}
+		else
+		{
+			in_edit = 0 ;
+			out_.WriteLine( line ) ;
+		}
+	}
+	while( !in_.AtEndOfStream )
+	{
+		var body_line = in_.ReadLine() ;
+		out_.WriteLine( body_line ) ;
+	}
+
+	in_.Close() ;
+	out_.Close() ;
+	fs.DeleteFile( content ) ;
+	fs.MoveFile( content + ".tmp" , content ) ;
+
+	WScript.Quit( 0 ) ;
+}
+catch( e )
+{
+	WScript.StdOut.WriteLine( "<<edit failed>>" ) ;
+	WScript.StdOut.WriteLine( "<<" + e + ">>" ) ;
+	WScript.Quit( 1 ) ;
+}

bin/emailrelay-set-from.pl

@@ -0,0 +1,84 @@
+#!/usr/bin/env perl
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-set-from.pl
+#
+# An example E-MailRelay "--filter" script that edits the content originator
+# fields (ie. From, Sender and Reply-To) to a fixed value.
+#
+# Also consider setting the envelope-from field by editing the envelope
+# file.
+#
+# See also: emailrelay-set-from.js, RFC-2822
+#
+
+use strict ;
+use FileHandle ;
+$SIG{__DIE__} = sub { (my $e = join(" ",@_)) =~ s/\n/ /g ; print "<<error: $e>>\n" ; exit 99 } ;
+
+# originator fields (RFC-2822 3.6.2)
+my $new_from = 'noreply@example.com' ;
+my $new_sender = '' ;
+my $new_reply_to = $new_from ;
+
+my $content = $ARGV[0] or die "usage error\n" ;
+
+my $in = new FileHandle( $content , "r" ) or die ;
+my $out = new FileHandle( "$content.tmp" , "w" ) or die ;
+my $in_body = undef ;
+my $in_edit = undef ;
+while(<$in>)
+{
+	if( $in_body )
+	{
+		print $out $_ ;
+	}
+	else
+	{
+		chomp( my $line = $_ ) ;
+		$line =~ s/\r$// ;
+
+		$in_body = 1 if ( $line eq "" ) ;
+		my $is_from = ( $line =~ m/^From:/i ) ;
+		my $is_sender = ( $line =~ m/^Sender:/i ) ;
+		my $is_reply_to = ( $line =~ m/^Reply-To:/i ) ;
+
+		if( $in_body )
+		{
+			print $out "\r\n" ;
+		}
+		elsif( $is_from && defined($new_from) )
+		{
+			$in_edit = 1 ;
+			print $out "From: $new_from\r\n" ;
+		}
+		elsif( $is_sender && defined($new_sender) )
+		{
+			$in_edit = 1 ;
+			print $out "Sender: $new_sender\r\n" unless $new_sender eq "" ;
+		}
+		elsif( $is_reply_to && defined($new_reply_to) )
+		{
+			$in_edit = 1 ;
+			print $out "Reply-To: $new_reply_to\r\n" ;
+		}
+		elsif( $in_edit && $line =~ m/^[ \t]/ ) # original header was folded
+		{
+		}
+		else
+		{
+			$in_edit = undef ;
+			print $out $line , "\r\n" ;
+		}
+	}
+}
+$out->close() or die ;
+rename( "$content.tmp" , $content ) or die ;
+exit 0 ;

bin/emailrelay-set-message-id.js

@@ -0,0 +1,77 @@
+//
+// Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+// 
+// Copying and distribution of this file, with or without modification,
+// are permitted in any medium without royalty provided the copyright
+// notice and this notice are preserved.  This file is offered as-is,
+// without any warranty.
+// ===
+//
+// emailrelay-set-message-id.js
+//
+// An example "--filter" script that sets a message-id header if there
+// is none.
+//
+try
+{
+	var domain = "example.com" ;
+
+	var content = WScript.Arguments( 0 ) ;
+	var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
+	var in_ = fs.OpenTextFile( content , 1 , false ) ;
+	var out_ = fs.OpenTextFile( content + ".tmp" , 8 , true ) ;
+
+	var re_message_id = /^Message-ID:/i ;
+	var re_fold = /^[ \t]/ ;
+
+	var in_message_id = 0 ;
+	var have_message_id = 0 ;
+	while( !in_.AtEndOfStream )
+	{
+		var line = in_.ReadLine() ;
+		if( line === "" )
+		{
+			if( !have_message_id )
+			{
+				var now = new Date() ;
+				var lhs = (now.getTime()/1000) + "." + (Math.random()*1000).toFixed(0) ) ;
+				var new_message_id = lhs + "@" + domain ;
+				out_.WriteLine( "Message-ID: " + new_message_id ) ;
+			}
+			out_.WriteLine( line ) ;
+			break ;
+		}
+
+		if( line.match(re_message_id) )
+		{
+			have_message_id = 1 ;
+			in_message_id = 1 ;
+		}
+		else if( in_message_id && line.match(re_fold) )
+		{
+		}
+		else
+		{
+			in_message_id = 0 ;
+			out_.WriteLine( line ) ;
+		}
+	}
+	while( !in_.AtEndOfStream )
+	{
+		var body_line = in_.ReadLine() ;
+		out_.WriteLine( body_line ) ;
+	}
+
+	in_.Close() ;
+	out_.Close() ;
+	fs.DeleteFile( content ) ;
+	fs.MoveFile( content + ".tmp" , content ) ;
+
+	WScript.Quit( 0 ) ;
+}
+catch( e )
+{
+	WScript.StdOut.WriteLine( "<<edit failed>>" ) ;
+	WScript.StdOut.WriteLine( "<<" + e + ">>" ) ;
+	WScript.Quit( 1 ) ;
+}

bin/emailrelay-submit.sh.in

@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+# ===
+#
+# emailrelay-submit.sh
+#
+# An example script that reads an e-mail message from stdin and deposits in into
+# a sub-directory of the E-MailRelay spool directory depending on the "To:"
+# address. This could be used with an E-MailRelay POP server using the
+# "--pop-by-name" option so that messages get routed appropriately.
+#
+# See also 'man emailrelay-filter-copy'.
+#
+
+store="__SPOOL_DIR__"
+log="/var/log/emailrelay-submit.out"
+
+tmp="/tmp/`basename $0.$$.tmp`"
+trap "rm -f \"${tmp}\" 2>/dev/null ; exit 0" 0
+trap "rm -f \"${tmp}\" 2>/dev/null ; exit 1" 1 2 3 13 15
+
+List()
+{
+	# Maps from the given "To:" address to a spool sub-directory -- edit as required
+	to_="${1}"
+	to_="`echo \"${to_}\" | tr '[A-Z]' '[a-z]'`"
+	case "${to_}" in
+		me@*) echo me_1 me_2 ;;
+		other@*) echo other_1 other_2 ;;
+		*) echo postmaster ;;
+	esac
+}
+
+Create()
+{
+	# Creates a spool sub-directory if it doesnt already exist
+	dir_="${1}"
+	if test ! -f "${dir_}"
+	then
+		echo `basename $0`: creating directory \"${dir_}\"
+		mkdir "${dir_}"
+		chown root:daemon "${dir_}"
+		chmod 775 "${dir_}"
+	fi
+}
+
+Main()
+{
+	# take a copy of the content
+	cat > ${tmp}
+
+	# parse out the "To:" address
+	to="`head -500 \"${tmp}\" | grep '^To:' | perl -ane 'print $F[1];exit'`"
+	echo `basename $0`: to \"${to}\"
+
+	# submit the message into the main spool directory
+	content="`cat \"${tmp}\" | \"${sbin}emailrelay-submit\" --verbose --spool-dir \"${store}\" \"${to}\"`"
+	envelope="`echo \"${content}\" | sed 's/content/envelope/'`"
+	if test \! -f "${content}"
+	then
+		echo `basename $0`: emailrelay-submit failed >&2
+		trap "" 0 # leave it in /tmp
+		return
+	fi
+
+	# link & copy into sub-directories
+	copied="0"
+	for name in `List "${to}"` ""
+	do
+		if test "${name}" != ""
+		then
+			Create "${store}/${name}"
+
+			c="${store}/${name}/`basename \"${content}\"`"
+			e="${store}/${name}/`basename \"${envelope}\"`"
+
+			ln "${content}" "${c}" && cp -p "${envelope}" "${e}"
+			if test "$?" -ne 0 ; then return ; fi
+			copied="1"
+		fi
+	done
+
+	# delete from the main directory
+	if test "${copied}" -eq 1
+	then
+		rm -f "${envelope}" && rm -f "${content}"
+	fi
+}
+
+Main "$@" >> "${log}" 2>&1
+

bin/emailrelay-submit.sh_

@@ -1,111 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-#
-# emailrelay-submit.sh
-#
-# An example wrapper script for the "emailrelay-submit" 
-# utility that adds the capability of copying messages 
-# into multiple subdirectories (eg. for "pop-by-name")
-# based on the message content.
-#
-# Edit as required.
-#
-# Reads the message content from the standard input.
-# All output goes to a log file.
-#
-# usage: emailrelay-submit.sh
-#
-
-store="__SPOOL_DIR__"
-log="/var/log/emailrelay-submit.out"
-awk="awk" # nawk
-
-tmp="/tmp/`basename $0.$$.tmp`"
-trap "rm -f ${tmp} 2>/dev/null ; exit 0" 0
-trap "rm -f ${tmp} 2>/dev/null ; exit 1" 1 2 3 13 15
-
-List()
-{
-	# Maps from the given "To:" address to a spool subdirectory -- edit as required
-	to_="${1}"
-	to_="`echo \"${to_}\" | tr '[A-Z]' '[a-z]'`"
-	case "${to_}" in
-		me@*) echo me_1 me_2 ;;
-		other@*) echo other_1 other_2 ;;
-		*) echo postmaster ;;
-	esac
-}
-
-Create()
-{
-	# Creates a spool subdirectory if it doesnt already exist
-	dir_="${1}"
-	if test ! -f "${dir_}"
-	then
-		echo `basename $0`: creating directory \"${dir_}\"
-		mkdir "${dir_}"
-		chown root:daemon "${dir_}"
-		chmod 775 "${dir_}"
-	fi
-}
-
-Main()
-{
-	# take a copy of the content
-	cat > ${tmp}
-
-	# parse out the "To:" address
-	to="`head -500 \"${tmp}\" | grep '^To:' | ${awk} '{print $2}'`"
-	echo `basename $0`: to \"${to}\"
-
-	# submit the message into the main spool directory
-	content="`cat \"${tmp}\" | ${sbin}emailrelay-submit --verbose --spool-dir \"${store}\" \"${to}\"`"
-	envelope="`echo ${content} | sed 's/content/envelope/'`"
-	if test \! -f "${content}"
-	then
-		echo `basename $0`: emailrelay-submit failed >&2
-		trap "" 0 # leave it in /tmp
-		return
-	fi
-
-	# link & copy into subdirectories
-	copied="0"
-	for name in `List "${to}"` ""
-	do
-		if test "${name}" != ""
-		then
-			Create "${store}/${name}"
-
-			c="${store}/${name}/`basename \"${content}\"`"
-			e="${store}/${name}/`basename \"${envelope}\"`"
-
-			ln "${content}" "${c}" && cp -p "${envelope}" "${e}"
-			if test "$?" -ne 0 ; then return ; fi
-			copied="1"
-		fi
-	done
-
-	# delete from the main directory
-	if test "${copied}" -eq 1
-	then
-		rm -f "${envelope}" && rm -f "${content}"
-	fi
-}
-
-Main "$@" >> "${log}" 2>&1
-

bin/emailrelay.sh.in

@@ -0,0 +1,267 @@
+#!/bin/sh
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# ===
+#
+# emailrelay
+#
+# A start/stop script for E-MailRelay in the SysV init system.
+#
+# usage: emailrelay { start | stop | restart | force-reload | status }
+#
+# See also: install_initd, remove_initd
+#
+### BEGIN INIT INFO
+# Provides:            emailrelay
+# Required-Start:      $local_fs $network $syslog
+# Required-Stop:       $local_fs $network $syslog
+# Default-Start:       2 3 4 5
+# Default-Stop:        0 1 6
+# Short-Description:   E-MailRelay mail server
+### END INIT INFO
+##
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+NAME=emailrelay
+DESC="E-MailRelay mail server"
+CONFIG=__SYSCONF_DIR__/$NAME.conf
+PIDFILE=__RUN_DIR__/$NAME.pid
+GROUP=daemon
+DAEMON=__SBIN_DIR__/$NAME
+SUBMIT=__SBIN_DIR__/$NAME-submit
+FACILITY=mail
+
+test -f __SYSCONF_DIR__/default/$NAME && . __SYSCONF_DIR__/default/$NAME
+test -f /etc/rc.conf.d/$NAME && . /etc/rc.conf.d/$NAME
+test -f /etc/default/rcS && . /etc/default/rcS
+
+# Default lsb functions in case there is no lsb/init-functions...
+#
+log_success_msg()
+{
+	echo "$@"
+}
+log_failure_msg()
+{
+	echo "$@"
+}
+log_warning_msg()
+{
+	echo "$@"
+}
+start_daemon()
+{
+	if test "`cat \"$2\" 2>/dev/null`" -gt 0 2>/dev/null && kill -0 "`cat \"$2\"`"
+	then
+		: # running already
+	else
+		shift ; shift ; shift
+		"$@"
+	fi
+}
+killproc()
+{
+	shift
+	kill `cat "$1" 2>/dev/null` 2>/dev/null
+}
+pidofproc()
+{
+	shift
+	kill -0 `cat "$1" 2>/dev/null` 2>/dev/null
+}
+log_daemon_msg()
+{
+	echo -n "$@"
+}
+log_progress_msg()
+{
+	:;
+}
+log_end_msg()
+{
+	if test "$1" -eq 0
+	then
+		log_success_msg " ... ok"
+		true
+	else
+		log_failure_msg " ... failed!"
+		false
+	fi
+}
+
+# Setup functions...
+#
+# Some packaging scripts do "emailrelay setup" for some of their
+# post-install steps, and "emailrelay setup" might also be useful
+# administratively after editing the /etc/default file. The "start"
+# sub-command below also uses setup_rundir() because the /run
+# directory will not necessarily persist across a reboot.
+#
+# (This code must come before the potential 'init-functions' redirect
+# to systemd.)
+#
+setup_config()
+{
+	if test ! -e "$CONFIG"
+	then
+		echo "# emailrelay.conf" > "$CONFIG"
+	fi
+}
+root_root()
+{
+	# True if the given file exists and is owned by 'root.root',
+	# as if newly copied by the install process and never
+	# subsequently chown'ed by the administrator
+	ls -nd "$1" 2>/dev/null | cut -d' ' -f 3,4 | grep -q '^0 0$'
+}
+spooldir()
+{
+	# Prints the spool directory path from the config file, but with a
+	# default because packaged installs might not edit the config file
+	# like 'make install' does
+	( echo spool-dir /var/spool/emailrelay ; cat "$CONFIG" ) | \
+		tr '\t' ' ' | sed 's/  */ /g' | grep '^spool-dir [^ ]' | \
+		tail -1 | cut -d' ' -f 2
+}
+setup_rundir_imp()
+{
+	test -d "$1" || mkdir -p "$1"
+	if echo "$1" | grep -q "/emailrelay$"
+	then
+		if root_root "$1"
+		then
+			chgrp "$GROUP" "$1"
+			chmod 775 "$1"
+		fi
+	fi
+}
+setup_rundir()
+{
+	# Recreates the pidfile directory, which might disappear after a reboot
+	setup_rundir_imp "`dirname \"$PIDFILE\"`"
+}
+setup_spooldir_imp()
+{
+	test -d "$1" || mkdir -p "$1"
+	if root_root "$1"
+	then
+		chgrp "$GROUP" "$1"
+		chmod 775 "$1"
+		chmod g+s "$1"
+	fi
+}
+setup_spooldir()
+{
+	setup_spooldir_imp "`spooldir`"
+}
+setup_sgid()
+{
+	if root_root "$1"
+	then
+		chgrp "$GROUP" "$1"
+		chmod 755 "$1"
+		chmod g+s "$1"
+	fi
+}
+setup_tools()
+{
+	setup_sgid "__SBIN_DIR__/emailrelay-submit"
+}
+setup_openrc()
+{
+	rc-update -q -q add "$NAME" >/dev/null 2>&1 || true
+}
+setup()
+{
+	setup_config
+	setup_rundir
+	setup_spooldir
+	setup_tools
+	setup_openrc
+}
+if test "$1" = "setup" ; then setup ; exit 0 ; fi
+
+# Read lsb init-functions. Annoyingly, systemd sometimes hijacks this to
+# generate a service file under /run/systemd, run systemctl etc, without
+# ever returning to this script.
+#
+test -f /lib/lsb/init-functions && . /lib/lsb/init-functions
+
+case "$1" in
+
+	restart|force-reload)
+		$0 stop
+		$0 start
+	;;
+
+	try-restart)
+		echo `basename $0`: $1 not implemented >&2
+		exit 3
+		;;
+
+	*start)
+		if test "${EMAILRELAY_ENABLED:-1}" -eq 1
+		then
+			log_daemon_msg "Starting $DESC"
+			log_progress_msg "$NAME"
+			setup_rundir
+			start_daemon -p "$PIDFILE" -- "$DAEMON" --as-server --syslog=$FACILITY --pid-file "$PIDFILE" "$CONFIG"
+			e="$?"
+			log_end_msg $e
+			if test -d /run/systemd/system ; then sleep 0.2 2>/dev/null ; fi # pid file race
+			test "$e" -eq 0
+		else
+			log_warning_msg "$NAME startup is disabled in __SYSCONF_DIR__/default/$NAME"
+			exit 0
+		fi
+		;;
+
+	stop)
+		log_daemon_msg "Stopping $DESC"
+		log_progress_msg "$NAME"
+		killproc -p "$PIDFILE" "$DAEMON"
+		e="$?"
+		log_end_msg $e
+		test "$e" -eq 0
+		;;
+
+	reload)
+		echo `basename $0`: $1 not implemented >&2
+		exit 3
+		;;
+
+	status)
+		if pidofproc -p "$PIDFILE" "$DAEMON" >/dev/null
+		then
+			log_success_msg "$NAME is running"
+			exit 0
+		else
+			log_failure_msg "$NAME is not running"
+			exit 32 # see guiboot_unix.cpp
+		fi
+		;;
+
+	setup)
+		# never gets here -- see above
+		setup
+		;;
+
+	*)
+		echo usage: `basename $0` "{start|stop|restart|status}" >&2
+		exit 2
+		;;
+
+esac

bin/emailrelay.sh_

@@ -1,243 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-# 
-# emailrelay
-# 
-# A shell-script wrapper for E-MailRelay designed for use in the SysV-init 
-# system (/etc/init.d).
-#
-# Additional command-line switches for the emailrelay daemon are sourced 
-# from the file "/etc/emailrelay.conf" if it exists. Uncommented lines in this 
-# file have "--" prepended to them and then they are pasted onto the command 
-# line.
-#
-# usage: emailrelay { start | stop | restart | force-reload | status }
-#
-# See also: LSB, start_daemon (lsb), startproc (suse), install_initd (lsb), 
-#           insserv (suse), /usr/share/doc/initscripts*/sysvinitfiles (redhat)
-#
-
-##
-# LSB comment block...
-#
-### BEGIN INIT INFO
-# Provides:       emailrelay
-# Required-Start: $network
-# Required-Stop:  $network
-# Default-Start:  3 4 5
-# Default-Stop:   3 4 5
-# Description:    E-MailRelay SMTP proxy and store-and-forward MTA.
-### END INIT INFO
-##
-
-# choose an infrastructure style
-#
-if test -f /lib/lsb/init-functions
-then 
-	style="lsb" 
-	. /lib/lsb/init-functions
-else
-	style="unix"
-fi
-
-# script configuration
-#
-var_run="/var/run"
-emailrelay="__SBIN_DIR__/emailrelay" # (absolute path required in some environments)
-if test \! -d "${var_run}" ; then var_run="/tmp" ; fi
-if test \! -x "${emailrelay}" ; then emailrelay="`pwd`/emailrelay" ; fi
-pid_file="${var_run}/emailrelay.pid"
-PATH="${PATH}:/sbin:/bin:/usr/bin"
-cfg_file="/etc/emailrelay.conf"
-
-# server configuration using the config file
-#
-start_switches="--as-server --pid-file ${pid_file} `cat \"${cfg_file}\" 2>/dev/null | egrep -v '^#|^ *$' | sed 's/^/--/'`"
-
-# functions...
-#
-# <style>_reset() -- initialise
-# <style>_cmd_stop() -- stop command
-# <style>_cmd_start() -- start command
-# <style>_cmd_restarted() -- called after stop/start
-# <style>_cmd_status() -- status command
-# <style>_exit() -- exit with saved errno
-
-unix_reset()
-{
-	unix_errno="0"
-}
-
-unix_cmd_start()
-{
-	echo -n "${1}"
-	shift
-	"$@"
-	unix_errno="$?"
-	if test "${unix_errno}" -eq 0
-	then
-		echo " ... done"
-	else
-		echo " ... failed"
-	fi
-}
-
-unix_cmd_stop()
-{
-	echo -n "${1}"
-	if test -f "${pid_file}" && test "`cat ${pid_file}`" != ""
-	then
-		kill "`cat ${pid_file}`"
-		rm -f "${pid_file}" 2>/dev/null
-	fi
-	echo " ... done"
-	unix_errno="0" # (could do better)
-}
-
-unix_cmd_restarted()
-{
-	unix_errno="$?"
-}
-
-unix_cmd_status()
-{
-	echo -n "${1}"
-	if test -f "${pid_file}" && test "`cat ${pid_file}`" != "" && kill -0 "`cat ${pid_file}`" 2>/dev/null
-	then
-		echo " ... running"
-		unix_errno="0"
-	elif test -f "${pid_file}" 
-	then
-		echo " ... failed"
-		unix_errno="1"
-	else
-		echo " ... not running"
-		unix_errno="3"
-	fi
-}
-
-unix_exit()
-{
-	exit "${unix_errno}"
-}
-
-##
-
-lsb_reset()
-{
-	lsb_errno="0"
-}
-
-lsb_cmd_start()
-{
-	lsb_text="${1}"
-	shift
-	start_daemon "$@"
-	lsb_errno=$?
-	if test "${lsb_errno}" -eq 0
-	then
-		log_success_msg "${lsb_text}"
-	else
-		log_failure_msg "${lsb_text}"
-	fi
-}
-
-lsb_cmd_stop()
-{
-	lsb_text="${1}"
-	killproc "`basename \"${2}\"`"
-	lsb_errno=$?
-	if test "${lsb_errno}" -eq 0
-	then
-		log_success_msg "${lsb_text}"
-	else
-		log_failure_msg "${lsb_text}"
-	fi
-}
-
-lsb_cmd_restarted()
-{
-	lsb_errno="$?"
-}
- 
-lsb_cmd_status()
-{
-	lsb_text="${1}"
-	base="`basename \"${2}\"`"
-	pids="`pidofproc \"${base}\" | sed 's/ *$//'`"
-	if test "${pids}" != ""
-	then
-		lsb_errno="0"
-		log_success_msg "${lsb_text}"
-	else
-		lsb_errno="1"
-		log_failure_msg "${lsb_text}"
-	fi
-}
-
-lsb_exit()
-{
-	exit ${lsb_errno}
-}
-
-# check the command line
-#
-usage="{ start | stop | restart | force-reload | status }"
-if test $# -eq 0
-then
-	echo usage: `basename $0` "${usage}" >&2
-	exit 2
-fi
-
-# process the command line
-#
-${style}_reset
-case "${1}" in
-
-	start)
-		shift
-		${style}_cmd_start "Starting E-MailRelay server" ${emailrelay} ${start_switches} "$@"
-		;;
-
-	stop)
-		${style}_cmd_stop "Shutting down E-MailRelay" "${emailrelay}"
-		;;
-
-	restart|force-reload)
-		shift
-		$0 stop
-		$0 start "$@"
-		${style}_cmd_restarted
-		;;
-
-	reload)
-		echo usage: `basename $0` reload: not implemented >&2
-		exit 3
-		;;
-
-	status)
-		${style}_cmd_status "Checking for E-MailRelay" "${emailrelay}"
-		;;
-
-	*)
-		echo usage: `basename $0` "${usage}" >&2
-		exit 2
-		;;
-esac
-${style}_exit
-

bin/expand.sh_

@@ -1,118 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-#
-# expand.sh
-#
-# Expands "#include#<file>#" directives.
-# 
-# Only does one sustitution per line. Directives which start the line are
-# multi-line. Those within a line are one-line, expanded in-place.
-#
-# The "-t" switch can be used to suppress expansion where the included
-# file has an extension of ".html".
-#
-# In edit mode (--edit) the specified file is modified in-place. With this
-# switch the exit value is 0 (shell true) if the file is modified in any
-# way. This allows for recursive expansion using a shell while loop.
-#
-# usage: expand.sh [-a <awk>] [-t] { --edit <file> | [<file> ...] }
-#
-
-Usage()
-{
-	echo usage: `basename $0` '[-a <awk>] [-t] { --edit <file> | [<file> ...] }' >&2
-}
-
-tmp="/tmp/`basename $0`.$$.tmp"
-
-awk="gawk"
-if test "${1}" = "-a"
-then
-	shift
-	awk="${1}"
-	shift
-fi
-
-expand_html="1"
-if test "${1}" = "-t"
-then
-	shift
-	expand_html="0"
-fi
-
-edit="0"
-if test "${1}" = "--edit"
-then
-	shift
-	edit="1"
-	if test $# -ne 1 ; then Usage ; exit 1 ; fi
-fi
-
-Expand()
-{
-	${awk} -v expand_html="${expand_html}" -v cat="${awk} '{print}'" '
-	BEGIN { modified = 0 }
-	{
-		line = $0
-		if( match(line,"#include#[^#]*#") )
-		{
-			rstart = RSTART
-			directive = substr(line,RSTART,RLENGTH)
-			path = substr(line,RSTART+9,RLENGTH-10)
-
-			if( !expand_html && match(path,".html$") )
-			{
-				print line
-			}
-			else
-			{
-				modified = 1
-				head = substr(line,1,rstart-1)
-				if( match(head,"^[[:space:]]*$") )
-				{
-					system( cat "  " path )
-				}
-				else
-				{
-					getline text <path
-					if( length(text) == 0 )
-						printf( "expand.sh: warning: line %d: empty text sustitution for %s\n" , NR , path ) >"/dev/fd/2"
-					sub( directive , text , line )
-					print line
-				}
-			}
-		}
-		else
-		{
-			print line
-		}
-	}
-	END { exit ! modified }
-	' $@
-}
-
-if test "${edit}" -eq 1
-then
-	# (use cp rather than mv here to protect read-only files)
-	Expand $@ > "${tmp}" && cp "${tmp}" "${1}"
-	rc=$? ; rm -f "${tmp}" 2>/dev/null ; exit "${rc}"
-else
-	Expand $@
-	true
-fi
-

bin/mu2docbook.sh_

@@ -1,312 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-#
-# mu2docbook.sh
-#
-# Mark-up to docbook converter. Converts the output of "txt2mu.sh" 
-# into docbook markup.
-#
-# Does some in-line formatting independently of the line-based 
-# mark-up in the input. For example, it converts quoted words into 
-# "<em></em>" tags, and it converts "*foo* [bar]" text into
-# hypertext links.
-#
-# The "-x" flag suppresses the output of the xml header. This is 
-# useful when the output is to be spliced into another document.
-#
-# usage: mu2docbook.sh [-a <awk>] [{-x|--head|--tail}] [<title>]
-#
-# (If the title is not supplied then the input is copied
-# to a temporary file in order to extract the H1 header
-# text for the title.)
-#
-
-awk="gawk"
-if test "${1}" = "-a"
-then
-	shift
-	if test "${1}" != "" ; then awk="${1}" ; fi
-	shift
-fi
-
-full="1"
-if test "${1}" = "-x"
-then
-	full="0"
-	shift
-fi
-
-op=""
-if test "${1}" = "--head"
-then
-	shift
-	op="head"
-elif test "${1}" = "--tail"
-then
-	shift
-	op="tail"
-fi
-
-title="${1}"
-
-Head()
-{
-	echo '' | ${awk} -v prefix="`basename $0`" -v title="${1}" -v full="${2}" '
-	BEGIN {
-		if( full )
-		{
-			dtd_name="-//OASIS//DTD DocBook XML V4.1.2//EN"
-			dtd_ref="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-			qq="\""
-			printf( "%s\n" , "<?xml version=\"1.0\"?>" )
-			printf( "<!DOCTYPE article PUBLIC \"%s\" \"%s\">\n" , dtd_name , dtd_ref )
-
-			printf( "<article>\n" )
-			printf( " <articleinfo>\n" ) ;
-			printf( "  <title>%s</title>\n" , title )
-			printf( " </articleinfo>\n" )
-		}
-	} '
-}
-
-Tail()
-{
-	echo '' | ${awk} -v prefix="`basename $0`" -v title="${1}" -v full="${2}" '
-	BEGIN {
-		if( full )
-		{
-			printf( "</article>\n" )
-		}
-	} ' 
-}
-
-Body()
-{
-	${awk} -v prefix="`basename $0`" -v title="${1}" -v full="${2}" '
-	function arg1( type )
-	{
-		sub( "[^,]*," , "" , type )
-		sub( ",.*" , "" , type )
-		return type
-	}
-	function arg2( type )
-	{
-		sub( "[^,]*," , "" , type )
-		sub( "[^,]*," , "" , type )
-		sub( ",.*" , "" , type )
-		return type
-	}
-	function escape( line )
-	{
-		gsub( "&" , "\\&amp;" , line )
-		gsub( "<" , "\\&lt;" , line )
-		gsub( ">" , "\\&gt;" , line )
-		return line
-	}
-	function dequote( line )
-	{
-		quote = "\""
-		not_quote = "[^" quote "]"
-		start_tag="<emphasis>"
-		end_tag="</emphasis>"
-		gsub( quote not_quote "*" quote , start_tag "&" end_tag , line )
-		gsub( start_tag quote , start_tag , line )
-		gsub( quote end_tag , end_tag , line )
-		return line
-	}
-	function fn( line )
-	{
-		gsub( "[^[:space:]][^[:space:]]*\\(\\)" , "<literal>&</literal>" , line )
-		return line
-	}
-	{
-		pos = index( $0 , ":" )
-		type = substr( $0 , 1 , pos )
-		tail = substr( $0 , pos+1 )
-		etail_raw = escape(tail)
-		etail = fn(dequote(escape(tail)))
-	
-		# h1
-		if( match(type,"^h1[:,]") )
-		{
-			if( done_h2 )
-			printf( "   </section>\n" )
-			if( done_h1 )
-			printf( "  </section>\n" )
-			printf( "  <section><title>%s</title>\n" , etail )
-			done_h1 = 1
-			done_h2 = 0
-		}
-	
-		# h2
-		else if( match(type,"^h2[:,]") )
-		{
-			if( done_h2 )
-			printf( "   </section>\n" , etail )
-			printf( "   <section><title>%s</title>\n" , etail )
-			done_h2 = 1
-		}
-	
-		# item
-		else if( match(type,"^item,1[:,]") )
-			printf( "    <itemizedlist>\n     <listitem><para>%s</para></listitem>\n" , etail )
-		else if( match(type,"^item[:,]") )
-			printf( "     <listitem><para>%s</para></listitem>\n" , etail )
-		else if( match(type,"^item-end[:,]") )
-			printf( "    </itemizedlist>\n" , etail )
-	
-		# item-numbered
-		else if( match(type,"^item-numbered,1[:,]") )
-			printf( "    <orderedlist>\n     <listitem><para>%s</para></listitem>\n" , etail )
-		else if( match(type,"^item-numbered[:,]") )
-			printf( "     <listitem><para>%s</para></listitem>\n" , etail )
-		else if( match(type,"^item-numbered-end[:,]") )
-			printf( "    </orderedlist>\n" , etail )
-	
-		# item-outer
-		else if( match(type,"^item-outer,1[:,]") )
-			printf( "    <itemizedlist>\n     <listitem><para>%s\n" , etail )
-		else if( match(type,"^item-outer[:,]") )
-			printf( "     </para></listitem>\n     <listitem><para>%s\n" , etail )
-		else if( match(type,"^item-outer-end[:,]") )
-			printf( "     </para></listitem>\n    </itemizedlist>\n" , etail )
-	
-		# item-inner
-		else if( match(type,"^item-inner,1[:,]") )
-			printf( "      <itemizedlist>\n       <listitem><para>%s</para></listitem>\n" , etail )
-		else if( match(type,"^item-inner[:,]") )
-			printf( "       <listitem><para>%s</para></listitem>\n" , etail )
-		else if( match(type,"^item-inner-end[:,]") )
-			printf( "      </itemizedlist>\n" , etail )
-	
-		# item-name
-		else if( match(type,"^item-name,1[:,]") )
-			printf( "    <variablelist>\n     <varlistentry><term>%s</term>\n" , etail )
-		else if( match(type,"^item-name[:,]") )
-			printf( "     </varlistentry>\n     <varlistentry><term>%s</term>\n" , etail )
-		else if( match(type,"^item-name-end[:,]") )
-			printf( "    </varlistentry>\n     </variablelist>\n" , etail )
-	
-		# item-detail
-		else if( match(type,"^item-detail,1[:,]") )
-			printf( "      <listitem><para>\n       %s\n" , etail )
-		else if( match(type,"^item-detail[:,]") )
-			printf( "       %s\n" , etail )
-		else if( match(type,"^item-detail-end[:,]") )
-			printf( "      </para></listitem>\n" )
-		else if( match(type,"^item-detail-blank[:,]") )
-			printf( "       </para><para>\n" )
-
-		# code
-		else if( match(type,"^code,1[:,]") )
-			printf( "      <programlisting>%s" , etail_raw )
-		else if( match(type,"^code[:,]") )
-			printf( "\n%s" , etail_raw )
-		else if( match(type,"^code-end[:,]") )
-			printf( "</programlisting>\n" )
-
-		# text
-		else if( match(type,"^text,1[:,]") )
-			printf( "    <para>\n     %s\n" , etail )
-		else if( match(type,"^text[:,]") )
-			printf( "     %s\n" , etail )
-		else if( match(type,"^text-end[:,]") )
-			printf( "    </para>\n" )
-
-		# footer-text
-		else if( match(type,"^footer,1[:,]") )
-			printf( "    <para>\n      %s\n" , etail )
-		else if( match(type,"^footer[:,]") )
-			printf( "      %s\n" , etail )
-		else if( match(type,"^footer-end[:,]") )
-			printf( "    </para>\n" )
-
-		# citation-text
-		else if( match(type,"^citation,1[:,]") )
-			printf( "    <p class=\"citation\">\n     %s\n" , etail )
-		else if( match(type,"^citation[:,]") )
-			printf( "     %s\n" , etail )
-		else if( match(type,"^citation-end[:,]") )
-			printf( "    </p>\n" )
-
-		# author-text
-		else if( match(type,"^author,1[:,]") )
-			printf( "    <para>\n     %s\n" , etail )
-		else if( match(type,"^author[:,]") )
-			printf( "     %s\n" , etail )
-		else if( match(type,"^author-end[:,]") )
-			printf( "    </para>\n" )
-
-		# html
-		else if( match(type,"^html[:,]") )
-			printf( "%s\n" , tail )
-
-		# image
-		else if( match(type,"^image[:,]") )
-			printf( "<graphic fileref=\"%s\"/>\n" , tail )
-
-		# blank
-		else if( match(type,"^blank[:,]") )
-			printf( "\n" )
-	
-		# ignore
-		else if( match(type,"^ignore") )
-			printf( "" )
-
-		else if( match(type,"[^[:space:]]") )
-			printf( "%s: unrecognised mark-up tag on line %d: \"%s\"\n" , prefix , NR , type )>"/dev/fd/2"
-	}
-	END {
-		if( done_h2 )
-		printf( "   </section>\n" )
-		if( done_h1 )
-		printf( "  </section>\n" )
-	} '
-
-	Tail
-}
-
-Main()
-{
-	Head "${title}" "${full}"
-	Body "${title}" "${full}"
-	Tail "${title}" "${full}"
-}
-
-Anchorise()
-{
-	sed 's/\*\([^\*]*\)\* \[\([^]]*\)\]/<ulink url="\2">\1<\/ulink>/g'
-}
-
-if test "${op}" = "head"
-then
-	Head "${title}" "${full}"
-elif test "${op}" = "tail"
-then
-	Tail "${title}" "${full}"
-elif test "${title}" = ""
-then
-	tmp="`basename $0`.tmp"
-	${awk} '{print}' > ${tmp}
-	title="`${awk} '/^h1/ { sub(\"[^:]*:\",\"\") ; print ; exit }' ${tmp}`"
-	${awk} '{print}' ${tmp} | Main "${title}" "${full}" | Anchorise
-	rm -f ${tmp}
-else
-	Main "${title}" "${full}" | Anchorise
-fi
-

bin/mu2html.sh_

@@ -1,276 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-#
-# mu2html.sh
-#
-# Mark-up to html converter. Converts the output of "txt2mu.sh" 
-# into html. (Also see "index.sh".)
-#
-# Does some in-line formatting independently of the line-based 
-# mark-up in the input. For example, it converts quoted words into 
-# "<em></em>" tags, and it converts "*foo* [bar]" text into
-# hypertext links.
-#
-# The "-x" flag suppresses the output of html header and
-# footer sections. This is useful when the output is to be
-# spliced into another html document.
-#
-# usage: mu2html.sh [-a <awk>] [-x] [<title> [<stylesheet>]]
-#
-# (If the title is not supplied then the input is copied
-# to a temporary file in order to extract the H1 header
-# text for the title.)
-#
-
-awk="gawk"
-if test "${1}" = "-a"
-then
-	shift
-	if test "${1}" != "" ; then awk="${1}" ; fi
-	shift
-fi
-
-full="1"
-if test "${1}" = "-x"
-then
-	full="0"
-	shift
-fi
-
-title="${1}"
-stylesheet="${2}"
-
-
-if test "${stylesheet}" != "" -a \! -f "${stylesheet}"
-then
-	echo `basename $0`: warning: missing stylesheet: ${stylesheet} >&2
-fi
-
-Main()
-{
-	${awk} -v prefix="`basename $0`" -v title="${1}" -v stylesheet="${2}" -v full="${3}" '
-	BEGIN {
-		if( full )
-		{
-			dtd_name = "-//W3C//DTD HTML 4.01//EN"
-			dtd_ref = "http://www.w3.org/TR/html4/strict.dtd"
-			printf( "<!DOCTYPE HTML PUBLIC \"%s\" \"%s\">\n" , dtd_name , dtd_ref )
-			printf( "<html>\n" )
-			printf( " <head>\n" )
-			printf( "  <title>%s</title>\n" , title )
-			printf( "  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">\n" )
-			if( length(stylesheet) )
-				printf( "  <link rel=\"stylesheet\" href=\"%s\" type=\"text/css\">\n" , stylesheet )
-			printf( " </head>\n" )
-			printf( " <body>\n" )
-			printf( "  <!-- index:0::::%s -->\n" , title )
-			printf( " <div class=\"div-main\">\n" )
-		}
-	}
-	function arg1( type )
-	{
-		sub( "[^,]*," , "" , type )
-		sub( ",.*" , "" , type )
-		return type
-	}
-	function arg2( type )
-	{
-		sub( "[^,]*," , "" , type )
-		sub( "[^,]*," , "" , type )
-		sub( ",.*" , "" , type )
-		return type
-	}
-	function escape( line )
-	{
-		gsub( "&" , "\\&amp;" , line )
-		gsub( "<" , "\\&lt;" , line )
-		gsub( ">" , "\\&gt;" , line )
-		return line
-	}
-	function dequote( line )
-	{
-		quote = "\""
-		not_quote = "[^" quote "]"
-		start_tag="<em class=\"quote\">"
-		end_tag="</em>"
-		gsub( quote not_quote "*" quote , start_tag "&" end_tag , line )
-		gsub( start_tag quote , start_tag , line )
-		gsub( quote end_tag , end_tag , line )
-		return line
-	}
-	function fn( line )
-	{
-		gsub( "[^[:space:]][^[:space:]]*\\(\\)" , "<em class=\"fn\">&</em>" , line )
-		return line
-	}
-	{
-		pos = index( $0 , ":" )
-		type = substr( $0 , 1 , pos )
-		tail = substr( $0 , pos+1 )
-		etail_raw = escape(tail)
-		etail = fn(dequote(escape(tail)))
-	
-		# h1
-		if( match(type,"^h1[:,]") )
-		{
-			printf( "  <h1><a class=\"a-header\" name=\"H_%d\">%s</a></h1> " , arg1(type) , etail )
-			printf( "<!-- index:1:H:%d::%s -->\n" , arg1(type) , etail )
-		}
-	
-		# h2
-		else if( match(type,"^h2[:,]") )
-		{
-			printf( "   <h2><a class=\"a-header\" name=\"SH_%d_%d\">%s</a></h2> " , arg1(type) , arg2(type) , etail )
-			printf( "<!-- index:2:SH:%d:%d:%s -->\n" , arg1(type) , arg2(type) , etail )
-		}
-	
-		# item
-		else if( match(type,"^item,1[:,]") )
-			printf( "    <ul>\n     <li>%s</li>\n" , etail )
-		else if( match(type,"^item[:,]") )
-			printf( "     <li>%s</li>\n" , etail )
-		else if( match(type,"^item-end[:,]") )
-			printf( "    </ul>\n" , etail )
-	
-		# item-numbered
-		else if( match(type,"^item-numbered,1[:,]") )
-			printf( "    <ol>\n     <li>%s</li>\n" , etail )
-		else if( match(type,"^item-numbered[:,]") )
-			printf( "     <li>%s</li>\n" , etail )
-		else if( match(type,"^item-numbered-end[:,]") )
-			printf( "    </ol>\n" , etail )
-	
-		# item-outer
-		else if( match(type,"^item-outer,1[:,]") )
-			printf( "    <ul>\n     <li>%s\n" , etail )
-		else if( match(type,"^item-outer[:,]") )
-			printf( "     </li>\n     <li>%s\n" , etail )
-		else if( match(type,"^item-outer-end[:,]") )
-			printf( "     </li>\n    </ul>\n" , etail )
-	
-		# item-inner
-		else if( match(type,"^item-inner,1[:,]") )
-			printf( "      <ul>\n       <li>%s</li>\n" , etail )
-		else if( match(type,"^item-inner[:,]") )
-			printf( "       <li>%s</li>\n" , etail )
-		else if( match(type,"^item-inner-end[:,]") )
-			printf( "      </ul>\n" , etail )
-	
-		# item-name
-		else if( match(type,"^item-name,1[:,]") )
-			printf( "    <dl>\n     <dt>%s</dt>\n" , etail )
-		else if( match(type,"^item-name[:,]") )
-			printf( "     <dt>%s</dt>\n" , etail )
-		else if( match(type,"^item-name-end[:,]") )
-			printf( "    </dl>\n" , etail )
-	
-		# item-detail
-		else if( match(type,"^item-detail,1[:,]") )
-			printf( "      <dd>\n       %s\n" , etail )
-		else if( match(type,"^item-detail[:,]") )
-			printf( "       %s\n" , etail )
-		else if( match(type,"^item-detail-end[:,]") )
-			printf( "      </dd>\n" )
-		else if( match(type,"^item-detail-blank[:,]") )
-			printf( "       <p class=\"p-break\"></p>\n" )
-
-		# code
-		else if( match(type,"^code,1[:,]") )
-			printf( "      <div class=\"div-pre\">\n       <pre>%s" , etail_raw )
-		else if( match(type,"^code[:,]") )
-			printf( "\n%s" , etail_raw )
-		else if( match(type,"^code-end[:,]") )
-			printf( "</pre>\n      </div><!-- div-pre -->\n" )
-
-		# text
-		else if( match(type,"^text,1[:,]") )
-			printf( "    <p>\n     %s\n" , etail )
-		else if( match(type,"^text[:,]") )
-			printf( "     %s\n" , etail )
-		else if( match(type,"^text-end[:,]") )
-			printf( "    </p>\n" , etail )
-
-		# footer-text
-		else if( match(type,"^footer,1[:,]") )
-			printf( "    <div class=\"div-footer\">\n     <p>\n      %s\n" , etail )
-		else if( match(type,"^footer[:,]") )
-			printf( "      %s\n" , etail )
-		else if( match(type,"^footer-end[:,]") )
-			printf( "     </p>\n    </div><!-- div-footer -->\n" , etail )
-
-		# citation-text
-		else if( match(type,"^citation,1[:,]") )
-			printf( "    <p class=\"citation\">\n     %s\n" , etail )
-		else if( match(type,"^citation[:,]") )
-			printf( "     %s\n" , etail )
-		else if( match(type,"^citation-end[:,]") )
-			printf( "    </p>\n" , etail )
-
-		# author-text
-		else if( match(type,"^author,1[:,]") )
-			printf( "    <p class=\"author\">\n     %s\n" , etail )
-		else if( match(type,"^author[:,]") )
-			printf( "     %s\n" , etail )
-		else if( match(type,"^author-end[:,]") )
-			printf( "    </p>\n" , etail )
-
-		# html
-		else if( match(type,"^html[:,]") )
-			printf( "%s\n" , tail )
-
-		# image
-		else if( match(type,"^image[:,]") )
-			printf( "<img src=\"%s\" alt=\"%s\">\n" , tail , "image" )
-
-		# blank
-		else if( match(type,"^blank[:,]") )
-			printf( "\n" )
-	
-		# ignore
-		else if( match(type,"^ignore") )
-			printf( "" )
-
-		else if( match(type,"[^[:space:]]") )
-			printf( "%s: unrecognised mark-up tag on line %d: \"%s\"\n" , prefix , NR , type )>"/dev/fd/2"
-	}
-	END {
-		if( full )
-		{
-			printf( " </div> <!-- div-main -->\n" )
-			printf( " </body>\n" )
-			printf( "</html>\n" )
-		}
-	} ' 
-}
-
-Anchorise()
-{
-	sed 's/\*\([^\*]*\)\* \[\([^]]*\)\]/<a class=\"a-href\" href="\2">\1<\/a>/g'
-}
-
-if test "${title}" = ""
-then
-	tmp="`basename $0`.tmp"
-	${awk} '{print}' > ${tmp}
-	title="`${awk} '/^h1/ { sub(\"[^:]*:\",\"\") ; print ; exit }' ${tmp}`"
-	${awk} '{print}' ${tmp} | Main "${title}" "${stylesheet}" "${full}" | Anchorise
-	rm -f ${tmp}
-else
-	Main "${title}" "${stylesheet}" "${full}" | Anchorise
-fi
-

bin/txt2html.sh_

@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-#
-# txt2html.sh
-#
-# Converts specially-formatted plain-text to html. 
-# Uses "expand.sh", "txt2mu.sh" and "mu2html.sh".
-# See also "index.sh".
-#
-# The "-t" (text-mode) switch can be used for
-# non-technical input text.
-#
-# The "-x" (exclude) switch excludes html header
-# and footer from the output.
-#
-# usage: txt2html.sh [-a <awk-binary>] [-v] [-x] [-t] [<input-file> [<stylesheet> [<graphics-dir> [<title>]]]]
-#
-
-awk="gawk"
-if test "${1}" = "-a"
-then
-	shift
-	if test "${1}" != "" ; then awk="${1}" ; fi
-	shift
-fi
-
-v=""
-if test "${1}" = "-v"
-then
-	shift
-	v="-v"
-fi
-
-x=""
-if test "${1}" = "-x"
-then
-	x="-x"
-	shift
-fi
-
-t=""
-if test "${1}" = "-t"
-then
-	t="-t"
-	shift
-fi
-
-file="${1}"
-stylesheet="${2}"
-graphics_dir="${3}"
-title="${4}"
-
-if test "${v}" != "" -a "${file}" != ""
-then
-	echo `basename $0`: processing ${file} >&2
-fi
-
-if test "${file}" != "" -a \! -f "${file}"
-then
-	echo `basename $0`: no such file: ${file} >&2
-	exit 1
-fi
-
-if test "${stylesheet}" != "" -a \! -f "${stylesheet}"
-then
-	echo `basename $0`: warning: missing stylesheet: "${stylesheet}" >&2
-fi
-
-if test "${graphics_dir}" = ""
-then
-	graphics_dir="graphics"
-fi
-
-txt2mu="`dirname $0`/txt2mu.sh"
-mu2html="`dirname $0`/mu2html.sh"
-expand="`dirname $0`/expand.sh"
-cat ${file} | ${expand} -a "${awk}" ${t} | ${txt2mu} -a "${awk}" ${t} | ${mu2html} -a "${awk}" ${x} "${title}" "${stylesheet}" | ${expand} -a "${awk}"
-

bin/txt2mu.sh_

@@ -1,342 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# ===
-#
-# txt2mu.sh
-#
-# Converts specially-formatted plain-text to marked-up text.
-# The mark-up process works on complete lines; inline
-# markup is handled by later processing (eg. "mu2html.sh").
-#
-# The "-t" (text-mode) switch modifies the set
-# of available styles to suit non-technical texts.
-#
-# usage: txt2mu.sh [-a <awk-binary>] [-t] [<input-file>]
-#
-
-awk="gawk"
-if test "${1}" = "-a"
-then
-	shift
-	if test "${1}" != "" ; then awk="${1}" ; fi
-	shift
-fi
-
-text_mode="0"
-if test "${1}" = "-t"
-then
-	shift
-	text_mode="1"
-fi
-
-file="${1}"
-
-# ===
-# Main()
-#
-# Does most of the processing.
-#
-Main()
-{
-	${awk} -v text_mode="${1}" '
-
-	BEGIN { in_footer = 0 }
-
-	function output( line )
-	{
-		printf( "%s\n" , line )
-	}
-
-	function tagOutput( line , tag )
-	{
-		printf( "%s:%s\n" , tag , line )
-	}
-
-	function tagOutputRaw( line , tag )
-	{
-		printf( "%s:%s\n" , tag , line )
-	}
-
-	function process( line , next_ )
-	{
-		tab = "	"
-		is_blank = match( line , "^[[:space:]]*$" )
-		is_heading = match( next_ , "^==*[[:space:]]*$" )
-		is_footer = match( line , "^____*[[:space:]]*$" )
-		is_sub_heading = match( next_ , "^--*[[:space:]]*$" )
-		is_item = match( line , "^\\* " ) 
-		is_item_name = match( line , "^\\# " ) 
-		is_item_detail = match( line , "^  [^- ]" )
-		is_item_numbered = match( line , "^\\([[:digit:]][[:digit:]]*\\)" )
-		is_heading_line = match( line , "^==*[[:space:]]*$" )
-		is_sub_heading_line = match( line , "^--*[[:space:]]*$" )
-		is_image = match( line , "^[[:space:]]*<<.*>>[[:space:]]*$" )
-
-		if( text_mode )
-		{
-			is_citation = match( line , "^" tab "[^" tab "]" )
-			is_author = match( line , "^" tab tab )
-			is_html = match( line , "^<.*>[[:space:]]*$" )
-			is_code = 0
-			is_item_outer = 0
-			is_item_inner = 0
-		}
-		else
-		{
-			is_citation = 0
-			is_author = 0
-			is_html = 0
-			is_code = match( line , "^" tab )
-			is_item_outer = match( line , "^\\+ " ) 
-			is_item_inner = match( line , "^  - " ) 
-		}
-
-		if( is_footer )
-		{
-			in_footer = 1
-		}
-		else if( is_code )
-		{
-			sub( "^" tab , "" , line )
-			tagOutputRaw( line , "code" )
-		}
-		else if( is_image )
-		{
-			sub( "^[[:space:]]*<<" , "" , line )
-			sub( ">>[[:space:]]*$" , "" , line )
-			tagOutputRaw( line , "image" )
-		}
-		else if( is_html )
-		{
-			tagOutputRaw( line , "html" )
-		}
-		else if( is_blank )
-		{
-			tagOutput( "" , "blank" )
-		}
-		else if( is_item_name )
-		{
-			sub( "^# " , "" , line )
-			tagOutput( line , "item-name" )
-		}
-		else if( is_item_detail )
-		{
-			sub( "^  " , "" , line )
-			tagOutput( line , "item-detail" )
-		}
-		else if( is_item )
-		{
-			sub( "^\\* " , "" , line )
-			tagOutput( line , "item" )
-		}
-		else if( is_item_outer )
-		{
-			sub( "^\\+ " , "" , line )
-			tagOutput( line , "item-outer" )
-		}
-		else if( is_item_inner )
-		{
-			sub( "^  - " , "" , line )
-			tagOutput( line , "item-inner" )
-		}
-		else if( is_item_numbered )
-		{
-			gsub( "^\\([[:digit:]][[:digit:]]*\\) " , "" , line )
-			tagOutput( line , "item-numbered" )
-		}
-		else if( is_citation )
-		{
-			sub( "^" tab , "" , line )
-			tagOutput( line , "citation" )
-		}
-		else if( is_author )
-		{
-			sub( "^" tab tab , "" , line )
-			tagOutput( line , "author" )
-		}
-		else if( is_heading )
-		{
-			major += 1
-			minor = 0
-			h1_tag = "h1" "," major "," minor
-			tagOutput( line , h1_tag )
-		}
-		else if( is_sub_heading )
-		{
-			minor += 1
-			h2_tag = "h2" "," major "," minor
-			tagOutput( line , h2_tag )
-		}
-		else if( !is_heading_line && !is_sub_heading_line )
-		{
-			tagOutput( line , in_footer ? "footer" : "text" )
-		}
-	}
-
-	{
-		if( NR != 1 )
-			process( previous , $0 )
-		previous = $0
-	}
-	
-	END {
-		process( previous , "" )
-	} '
-}
-
-# ===
-# Number()
-#
-# Numbers a set of commonly-tagged lines, and inserts an end
-# marker line at the end of the sequence.
-#
-# The 'ignore' parameters can be used to make sure that
-# item lines separated with 'ignore' patterns are
-# treated as being contiguous.
-#
-# Eg: Number foo bar
-#   foo,1: first line
-#   ignore,bar:
-#   foo,2: second line
-#   foo-end:
-#
-Number()
-{
-	${awk} -v item_tag="${1}" -v ignore_1="${2}" -v ignore_2="${3}" -v ignore_3="${4}" -v ignore_4="${5}" '
-	function ignore_line( line )
-	{
-		i_0 = match( line , "^ignore" )
-		i_1 = length(ignore_1) && match( line , "^" ignore_1 "[:,]" )
-		i_2 = length(ignore_2) && match( line , "^" ignore_2 "[:,]" )
-		i_3 = length(ignore_3) && match( line , "^" ignore_3 "[:,]" )
-		i_4 = length(ignore_3) && match( line , "^" ignore_4 "[:,]" )
-		return i_0 || i_1 || i_2 || i_3 || i_4
-	}
-	BEGIN {
-		n = 1
-	}
-	{
-		if( match( $0 , "^" item_tag "[:,]" ) )
-		{
-			sub( "^" item_tag , "" )
-			printf( "%s,%d%s\n" , item_tag , n++ , $0 )
-		}
-		else
-		{
-			if( !ignore_line($0) )
-			{
-				if( n > 1 )
-					printf( "%s-end:\n" , item_tag )
-				n = 1
-			}
-			print
-		}
-	} '
-}
-
-# ===
-# Compress()
-#
-# Removes blank lines near to headings (etc) by changing
-# the "blank" tag to "ignore,blank".
-#
-# As a special case, converts single blank lines within an
-# "item-detail" block to have a tag of "item-detail-blank"
-# rather than "blank".
-#
-Compress()
-{
-	${awk} '
-	function process( previous , line , next_ )
-	{
-		re_blank = "^blank:"
-		re_heading = "^h[[:digit:]][:,]"
-		re_detail = "^item-detail:"
-		re_pre_start = "^code,1[:,]"
-
-		this_is_blank = match(line,re_blank)
-		next_is_heading = match(next_,re_heading)
-		previous_is_heading = match(previous,re_heading)
-		next_is_detail = match(next_,re_detail)
-		previous_is_detail = match(previous,re_detail)
-		next_is_pre_start = match(next_,re_pre_start)
-	
-		if( this_is_blank && ( next_is_heading || previous_is_heading ) )
-		{
-			print "ignore," line
-		}
-		else if( this_is_blank && !previous_is_detail && next_is_detail )
-		{
-			print "ignore," line
-		}
-		else if( this_is_blank && previous_is_detail && !next_is_detail )
-		{
-			print "ignore," line
-		}
-		else if( this_is_blank && next_is_detail && previous_is_detail )
-		{
-			print "item-detail-" line
-		}
-		else if( this_is_blank && next_is_pre_start )
-		{
-			print "ignore," line
-		}
-		else
-		{
-			print line
-		}
-	}
-	{
-		if( NR >= 2 )
-			process( l2 , l1 , $0 )
-		l2 = l1
-		l1 = $0
-	}
-	END {
-		process( l2 , l1 , "" )
-		process( l1 , "" , "" )
-	} '
-}
-
-# ===
-# Cat()
-#
-# An awk version of "cat".
-#
-Cat()
-{
-	${awk} '{print}' $@ | tr -d '\015'
-}
-
-# ==
-
-Cat ${file} | \
-	Main "${text_mode}" | \
-	Compress | \
-	Number "item" | \
-	Number "item-outer" "item-inner" "blank" | \
-	Number "item-inner" "blank" | \
-	Number "item-numbered" | \
-	Number "item-name" "item-detail" "blank" "item-detail-blank" "code" | \
-	Number "item-detail" "item-detail-blank" "code" | \
-	Number "code" "blank" "image" | \
-	Number "footer" "blank" "image" | \
-	Number "citation" "blank" | \
-	Number "author" | \
-	Number "text" "image"
-
-

bootstrap

@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# bootstrap
+#
+# Autogenerates stuff.
+#
+aclocal -I .
+autoconf
+autoheader
+automake -ac -Woverride -Wportability

bsd/Makefile.am

@@ -1,9 +1,9 @@
 #
-## Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
 ## 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or 
+## the Free Software Foundation, either version 3 of the License, or
 ## (at your option) any later version.
 ## 
 ## This program is distributed in the hope that it will be useful,
@@ -14,31 +14,20 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-#
-# mingw.mak
-#
 
-mk_sources=\
-	gappbase.cpp \
-	gappinst.cpp \
-	gcontrol.cpp \
-	gcracker.cpp \
-	gdc.cpp \
-	gdialog.cpp \
-	gpump.cpp \
-	gpump_dialog.cpp \
-	gscmap.cpp \
-	gtray.cpp \
-	gwinbase.cpp \
-	gwindow.cpp \
-	gwinhid.cpp
+if GCONFIG_BSD
+EXTRA_DIST = emailrelay-bsd.sh.in
+e_bsdinit_SCRIPTS = emailrelay
+CLEANFILES = emailrelay
+else
+EXTRA_DIST = emailrelay-bsd.sh.in
+e_bsdinit_SCRIPTS =
+CLEANFILES =
+endif
 
-mk_target=gwin32.a
+do_sed = sed -e "s%__SBIN_DIR__%${sbindir}%g" -e "s%__INIT_DIR__%${e_initdir}%g"
 
-all: $(mk_target)
-
-include ../mingw-common.mak
-
-$(mk_target): $(mk_objects)
-	$(mk_ar) $(mk_target) $(mk_objects)
+emailrelay: emailrelay-bsd.sh.in
+	$(do_sed) < $(srcdir)/emailrelay-bsd.sh.in > emailrelay
+	chmod +x emailrelay
 

bsd/Makefile.in

@@ -0,0 +1,530 @@
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+#
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = bsd
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(e_bsdinitdir)"
+SCRIPTS = $(e_bsdinit_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__extra_recursive_targets = extra-recursive
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARFLAGS = @ARFLAGS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
+GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
+GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
+GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
+GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
+GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
+GCONFIG_WINDMC = @GCONFIG_WINDMC@
+GCONFIG_WINDRES = @GCONFIG_WINDRES@
+GREP = @GREP@
+GZIP = @GZIP@
+HAVE_CXX11 = @HAVE_CXX11@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+QT_CFLAGS = @QT_CFLAGS@
+QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_MOC = @QT_MOC@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+e_bsdinitdir = @e_bsdinitdir@
+e_docdir = @e_docdir@
+e_examplesdir = @e_examplesdir@
+e_icondir = @e_icondir@
+e_initdir = @e_initdir@
+e_libdir = @e_libdir@
+e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
+e_spooldir = @e_spooldir@
+e_sysconfdir = @e_sysconfdir@
+e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@GCONFIG_BSD_FALSE@EXTRA_DIST = emailrelay-bsd.sh.in
+@GCONFIG_BSD_TRUE@EXTRA_DIST = emailrelay-bsd.sh.in
+@GCONFIG_BSD_FALSE@e_bsdinit_SCRIPTS = 
+@GCONFIG_BSD_TRUE@e_bsdinit_SCRIPTS = emailrelay
+@GCONFIG_BSD_FALSE@CLEANFILES = 
+@GCONFIG_BSD_TRUE@CLEANFILES = emailrelay
+do_sed = sed -e "s%__SBIN_DIR__%${sbindir}%g" -e "s%__INIT_DIR__%${e_initdir}%g"
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bsd/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu bsd/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-e_bsdinitSCRIPTS: $(e_bsdinit_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	@list='$(e_bsdinit_SCRIPTS)'; test -n "$(e_bsdinitdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(e_bsdinitdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(e_bsdinitdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(e_bsdinitdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(e_bsdinitdir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-e_bsdinitSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(e_bsdinit_SCRIPTS)'; test -n "$(e_bsdinitdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	dir='$(DESTDIR)$(e_bsdinitdir)'; $(am__uninstall_files_from_dir)
+extra-local: 
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+	for dir in "$(DESTDIR)$(e_bsdinitdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+extra: extra-am
+
+extra-am: extra-local
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-e_bsdinitSCRIPTS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-e_bsdinitSCRIPTS
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am \
+	extra-am extra-local html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-e_bsdinitSCRIPTS install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-e_bsdinitSCRIPTS
+
+.PRECIOUS: Makefile
+
+
+emailrelay: emailrelay-bsd.sh.in
+	$(do_sed) < $(srcdir)/emailrelay-bsd.sh.in > emailrelay
+	chmod +x emailrelay
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

bsd/emailrelay-bsd.sh.in

@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# ===
+#
+# emailrelay-bsd.sh
+#
+# Start/stop wrapper for E-MailRelay on FreeBSD, installed as
+# "/etc/rc.d/emailrelay" or "/usr/local/etc/rc.d/emailrelay".
+#
+# Requires the following line to be added to "/etc/rc.conf":
+#
+#    emailrelay_enable="YES"
+#
+# Delegates to the linux start/stop script, which reads default directories
+# from "/etc/rc.conf.d/emailrelay" (if present) and server command-line
+# options from "/usr/local/etc/emailrelay.conf".
+#
+# See also man rc(8), man service(8)
+#
+# PROVIDE: emailrelay
+# REQUIRE: DAEMON
+#
+
+. /etc/rc.subr
+emailrelay_enable=${emailrelay_enable:-"NO"}
+name=emailrelay
+procname=__SBIN_DIR__/emailrelay
+rcvar=emailrelay_enable
+command=__INIT_DIR__/emailrelay
+command_args="$1"
+load_rc_config $name
+run_rc_command "$1"
+

compile

@@ -0,0 +1,348 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN* | MSYS*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/* | msys/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:

config.h.in

@@ -1,112 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if <ctime> requires <time.h> */
-#undef HAVE_BUGGY_CTIME
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if getipnodebyname() is available */
-#undef HAVE_GETIPNODEBYNAME
-
-/* Define to 1 if you have the `glob' function. */
-#undef HAVE_GLOB
-
-/* Define to 1 if gmtime_r in time.h */
-#undef HAVE_GMTIME_R
-
-/* Define to 1 to enable gui code */
-#undef HAVE_GUI
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if ipv6 is available */
-#undef HAVE_IPV6
-
-/* Define to 1 if localtime_r in time.h */
-#undef HAVE_LOCALTIME_R
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Define to 1 to enable tls/ssh code using openssl */
-#undef HAVE_OPENSSL
-
-/* Define to 1 if setgroups is available */
-#undef HAVE_SETGROUPS
-
-/* Define to 1 if sockaddr_in6 has a sin6_len member */
-#undef HAVE_SIN6_LEN
-
-/* Define to 1 if socklen_t type definition in sys/socket.h */
-#undef HAVE_SOCKLEN_T
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the <zlib.h> header file. */
-#undef HAVE_ZLIB_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to enable extra debug messages at compile-time */
-#undef _DEBUG

configure.ac

@@ -1,8 +1,8 @@
-dnl Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
+dnl Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
 dnl 
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation, either version 3 of the License, or 
+dnl the Free Software Foundation, either version 3 of the License, or
 dnl (at your option) any later version.
 dnl 
 dnl This program is distributed in the hope that it will be useful,
@@ -14,138 +14,123 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl ===
 dnl
+dnl configure.ac
+dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_INIT(src/gsmtp/gsmtp.h)
-AM_INIT_AUTOMAKE(emailrelay,1.7)
-AM_CONFIG_HEADER(config.h)
+AC_INIT([E-MailRelay],[2.5],[],[emailrelay])
+AC_CONFIG_SRCDIR([src/glib/gdef.h])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([no-define])
+AM_SILENT_RULES([no])
+AM_EXTRA_RECURSIVE_TARGETS([extra])
+AC_CONFIG_HEADERS([src/gconfig_defs.h])
 AM_MAINTAINER_MODE
+AC_DISABLE_OPTION_CHECKING
 
-dnl ===
-dnl check for programs...
+dnl check for programs
 dnl
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_RANLIB
+AC_PROG_CC([cc gcc clang])
+AC_PROG_CXX([c++ g++ clang++])
+AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])
 AC_PROG_INSTALL
-AC_PROG_AWK
+AC_PROG_RANLIB
+AC_PROG_SED
 AC_PROG_GREP
-AC_CHECK_PROGS(MAKE,make gmake)
-AC_CHECK_PROGS(AR,ar gar)
-AC_CHECK_PROGS(GZIP,gzip)
-AC_CHECK_PROG(HAVE_DOXYGEN,doxygen,yes)
-AC_CHECK_PROG(HAVE_MAN2HTML,man2html,yes)
-ACLOCAL_COMPILER_VERSION
+AC_CHECK_PROGS([MAKE],[make gmake])
+AC_CHECK_PROGS([AR],[ar gar])
+AC_CHECK_PROGS([GZIP],[gzip])
+AC_CHECK_PROG([GCONFIG_HAVE_DOXYGEN],[doxygen],[yes])
+AC_CHECK_PROG([GCONFIG_HAVE_MAN2HTML],[man2html],[yes])
+GCONFIG_FN_PROG_WINDRES
+GCONFIG_FN_PROG_WINDMC
+GCONFIG_FN_ARFLAGS
 
-dnl ===
-dnl check for libraries...
+dnl check for system libraries
 dnl
-AC_LANG_C
-AC_SEARCH_LIBS(gethostbyname,nsl)
-AC_SEARCH_LIBS(connect,socket)
-AC_SEARCH_LIBS(compress2,z)
+AC_LANG([C])
+GCONFIG_FN_SEARCHLIBS_NAMESERVICE
+GCONFIG_FN_SEARCHLIBS_SOCKET
 
-dnl ===
-dnl check for header files, functions and typedefs...
+dnl check for header files, functions, types etc.
 dnl
-AC_HEADER_STDC
-AC_HEADER_DIRENT
-AC_HEADER_TIME
-AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(sys/time.h)
-AC_CHECK_HEADERS(zlib.h)
-AC_CHECK_FUNCS(glob)
-AC_LANG_CPLUSPLUS
-ACLOCAL_TYPE_SOCKLEN_T
-ACLOCAL_CHECK_IPV6
-ACLOCAL_CHECK_GETIPNODEBYNAME
-ACLOCAL_CHECK_SIN6_LEN
-ACLOCAL_CHECK_BUGGY_CTIME
-ACLOCAL_CHECK_GMTIME_R
-ACLOCAL_CHECK_LOCALTIME_R
-ACLOCAL_CHECK_SETGROUPS
+AC_LANG([C++])
+GCONFIG_FN_CHECK_HEADERS
+GCONFIG_FN_CHECK_TYPES
+GCONFIG_FN_CHECK_CXX
+GCONFIG_FN_CHECK_NET
+GCONFIG_FN_CHECK_FUNCTIONS
 
-dnl ===
-dnl initialise aclocal/pkg.m4...
+dnl initialise aclocal/pkg.m4
 dnl
-PKG_PROG_PKG_CONFIG(0.9.0)
+# if the configure script fails in this area then you are probably missing pkg.m4
+PKG_PROG_PKG_CONFIG([0.9.0])
 
-dnl ===
-dnl "--enable-debug"
+dnl check for packages
 dnl
-AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[enable extra debug messages at compile-time (default disabled)]))
-ENABLE_DEBUG
+GCONFIG_FN_QT
+GCONFIG_FN_QT_BUILD
+GCONFIG_FN_TLS_OPENSSL
+GCONFIG_FN_TLS_MBEDTLS
 
-dnl ===
-dnl "--enable-ipv6"
+dnl "--enable-whatever" for internal features
 dnl
-AC_ARG_ENABLE(ipv6,AC_HELP_STRING([--enable-ipv6],[enable ipv6 (default disabled)]))
-ENABLE_IPV6
+AC_ARG_ENABLE([bsd],AS_HELP_STRING([--enable-bsd],[enable building for bsd (default auto)]))
+GCONFIG_FN_ENABLE_BSD
+AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[enable extra debug messages at compile-time (default no)]))
+GCONFIG_FN_ENABLE_DEBUG
+AC_ARG_ENABLE([epoll],AS_HELP_STRING([--enable-epoll],[enable epoll (default auto)]))
+GCONFIG_FN_ENABLE_EPOLL
+AC_ARG_ENABLE([gui],AS_HELP_STRING([--enable-gui],[enable configuration gui (requires Qt) (default auto)]))
+GCONFIG_FN_ENABLE_GUI
+AC_ARG_ENABLE([install-hook],AS_HELP_STRING([--enable-install-hook],[enable fixing up the start/stop configuration file at install time (default yes)]))
+GCONFIG_FN_ENABLE_INSTALL_HOOK
+AC_ARG_ENABLE([interface-names],AS_HELP_STRING([--enable-interface-names],[allow network interface names for defining listening addresses (default yes)]))
+GCONFIG_FN_ENABLE_INTERFACE_NAMES
+AC_ARG_ENABLE([pop],AS_HELP_STRING([--enable-pop],[enable pop (default yes)]))
+GCONFIG_FN_ENABLE_POP
+AC_ARG_ENABLE([mac],AS_HELP_STRING([--enable-mac],[enable building for mac os x (default auto)]))
+GCONFIG_FN_ENABLE_MAC
+AC_ARG_ENABLE([std-thread],AS_HELP_STRING([--enable-std-thread],[use std::thread or not (default auto)]))
+GCONFIG_FN_ENABLE_STD_THREAD
+AC_ARG_ENABLE([testing],AS_HELP_STRING([--enable-testing],[enable make check tests (default yes)]))
+GCONFIG_FN_ENABLE_TESTING
+AC_ARG_ENABLE([verbose],AS_HELP_STRING([--enable-verbose],[enable verbose logging (default yes)]))
+GCONFIG_FN_ENABLE_VERBOSE
+AC_ARG_ENABLE([windows],AS_HELP_STRING([--enable-windows],[enable building for windows (default auto)]))
+GCONFIG_FN_ENABLE_WINDOWS
+AC_ARG_ENABLE([uds],AS_HELP_STRING([--enable-uds],[enable unix domain sockets (default auto)]))
+GCONFIG_FN_ENABLE_UDS
+AC_ARG_ENABLE([dnsbl],AS_HELP_STRING([--enable-dnsbl],[enable DNSBL (default yes)]))
+GCONFIG_FN_ENABLE_DNSBL
+AC_ARG_ENABLE([submission],AS_HELP_STRING([--enable-submission],[main binary is a submission tool when named emailrelay-submit (default no)]))
+GCONFIG_FN_ENABLE_SUBMISSION
 
-dnl ===
-dnl "--enable-gui"
+dnl "--with-whatever" for external dependencies
 dnl
-AC_ARG_ENABLE(gui,AC_HELP_STRING([--enable-gui],[enable configuration gui (requires Qt4) (default auto)]))
-ENABLE_GUI
+AC_ARG_WITH([doxygen],AS_HELP_STRING([--with-doxygen],[generate source code documentation with doxygen (default auto)]))
+GCONFIG_FN_WITH_DOXYGEN
+AC_ARG_WITH([gettext],AS_HELP_STRING([--with-gettext],[use gettext (default auto)]))
+GCONFIG_FN_WITH_GETTEXT
+AC_ARG_WITH([man2html],AS_HELP_STRING([--with-man2html],[convert man pages to html using man2html (default auto)]))
+GCONFIG_FN_WITH_MAN2HTML
+AC_ARG_WITH([openssl],AS_HELP_STRING([--with-openssl],[use openssl for tls layer (default auto)]))
+AC_ARG_WITH([mbedtls],AS_HELP_STRING([--with-mbedtls],[use mbedtls for tls layer (default auto)]))
+GCONFIG_FN_TLS
+AC_ARG_WITH([pam],AS_HELP_STRING([--with-pam],[use linux pam for authentication (default auto)]))
+GCONFIG_FN_WITH_PAM
 
-dnl ===
-dnl "--with-workshop"
-dnl
-AC_ARG_WITH(workshop,AC_HELP_STRING([--with-workshop],[use Sun WorkShop 'CC -xar' as the 'ar' tool (default disabled)]))
-WITH_WORKSHOP
-
-dnl ===
-dnl "--with-doxygen"
-dnl
-AC_ARG_WITH(doxygen,AC_HELP_STRING([--with-doxygen],[generate source code documentation with doxygen (default auto)]))
-WITH_DOXYGEN
-
-dnl ===
-dnl "--with-man2html"
-dnl
-AC_ARG_WITH(man2html,AC_HELP_STRING([--with-man2html],[convert man pages to html using man2html (default auto)]))
-WITH_MAN2HTML
-
-dnl ===
-dnl "--with-openssl"
-dnl
-AC_ARG_WITH(openssl,AC_HELP_STRING([--with-openssl],[use openssl for smtp client tls extension (default auto)]))
-WITH_OPENSSL
-
-dnl ===
-dnl "--enable-static-linking"
-dnl
-AC_ARG_ENABLE(static-linking,AC_HELP_STRING([--enable-static-linking],[prefer static linking for some libraries (default no)]))
-ENABLE_STATIC_LINKING
-
-dnl ===
-dnl directory tweaking and "--enable-fhs" ...
-dnl
-dnl define e_ prefixed variables with a gnu feel and then
-dnl use the enable_fhs macro tweak them for fhs
+dnl directory tweaking -- define e_ prefixed directory variables
 dnl
 dnl not AC_PREFIX_DEFAULT([/usr])
-AC_ARG_ENABLE(fhs,AC_HELP_STRING([--enable-fhs],[force FHS-compliant directories, ignoring --prefix etc (default disabled)]))
-AC_SUBST(e_docdir)
-if test "$e_docdir" = "" ; then e_docdir="$docdir" ; fi
-if test "$e_docdir" = "" ; then e_docdir="$datadir/$PACKAGE/doc" ; fi
-AC_SUBST(e_initdir)
-if test "$e_initdir" = "" ; then e_initdir="$libexecdir/$PACKAGE/init" ; fi
-AC_SUBST(e_spooldir)
-if test "$e_spooldir" = "" ; then e_spooldir="$localstatedir/spool/$PACKAGE" ; fi
-AC_SUBST(e_examplesdir)
-if test "$e_examplesdir" = "" ; then e_examplesdir="$libexecdir/$PACKAGE/examples" ; fi
-AC_SUBST(e_libexecdir)
-if test "$e_libexecdir" = "" ; then e_libexecdir="$libexecdir/$PACKAGE" ; fi
-AC_SUBST(e_sysconfdir)
-if test "$e_sysconfdir" = "" ; then e_sysconfdir="$sysconfdir" ; fi
-AC_SUBST(e_qtmoc)
-if test "$e_qtmoc" = "" ; then e_qtmoc="moc" ; fi
-ENABLE_FHS
+GCONFIG_FN_SET_DIRECTORIES_E
 
-dnl ===
-dnl generate files...
+dnl generate files
 dnl
-AC_OUTPUT(Makefile src/Makefile src/glib/Makefile src/gssl/Makefile src/gnet/Makefile src/gsmtp/Makefile src/gpop/Makefile src/main/Makefile src/win32/Makefile src/gui/Makefile lib/Makefile lib/gcc2.95/Makefile lib/msvc6.0/Makefile lib/sunpro5/Makefile bin/Makefile doc/Makefile etc/Makefile test/Makefile)
+AC_CONFIG_FILES([Makefile libexec/Makefile src/Makefile src/glib/Makefile src/gssl/Makefile src/gnet/Makefile src/gauth/Makefile src/gstore/Makefile src/gsmtp/Makefile src/gpop/Makefile src/gfilters/Makefile src/gverifiers/Makefile src/main/Makefile src/main/icon/Makefile src/win32/Makefile src/gui/Makefile bin/Makefile doc/Makefile etc/Makefile test/Makefile test/certificates/Makefile m4/Makefile bsd/Makefile debian/Makefile po/Makefile unity/Makefile])
+AC_OUTPUT
 
+dnl final warnings
+dnl
+GCONFIG_FN_WARNINGS

configure.sh

@@ -0,0 +1,273 @@
+#!/bin/sh
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# ===
+#
+# configure.sh
+#
+# A wrapper for the autoconf configure script that specifies more sensible
+# directories depending on the host environment and simplifies
+# cross-compilation.
+#
+# usage: configure.sh [-g] [{-d|-s <>}] [{-o|-w|-p}] -- [<configure-options>]
+#         -d   add debug compiler flags
+#         -s   add sanitiser compiler flags (eg. -s address)
+#         -o   cross-compile for openwrt (edit as required)
+#         -w   cross-compile for windows 32-bit with mingw-w64
+#         -w32 cross-compile for windows 32-bit with mingw-w64
+#         -w64 cross-compile for windows 64-bit with mingw-w64
+#         -p   cross-compile for rpi
+#         -g   git-clone mbedtls and exit
+#         -S   force e_systemddir
+#         -X   suppress e_systemddir
+#
+# When cross-compiling with mbedtls the mbedtls source should be unpacked
+# into this base directory (see MBEDTLS_DIR below), or use '-g' to
+# git-clone it.
+#
+
+thisdir="`cd \`dirname $0\` && pwd`"
+
+usage="[-g] [{-d|-s <>}] [{-o|-w|-p}] -- <configure-args>"
+opt_systemd=0 ; if test "`systemctl is-system-running 2>/dev/null | sed 's/offline//'`" != "" ; then opt_systemd=1 ; fi
+while expr "x$1" : "x-" >/dev/null
+do
+	valued=0
+	case "`echo \"$1\" | sed 's/^--*//'`" in
+		g) opt_git=1 ;;
+		d) opt_debug=1 ;;
+		s) opt_sanitise="$2" ; valued=1 ;;
+		o) opt_openwrt=1 ;;
+		w) opt_mingw=1 ; opt_win=32 ;;
+		w32) opt_mingw=1 ; opt_win=32 ;;
+		w64) opt_mingw=1 ; opt_win=64 ;;
+		p) opt_rpi=1 ;;
+		S) opt_systemd=1 ;;
+		X) opt_systemd=0 ;;
+		h) echo usage: `basename $0` $usage "..." ; $thisdir/configure --help=short ; exit 0 ;;
+		#\?) echo usage: `basename $0` $usage >&2 ; exit 2 ;;
+		*) opt_passthrough="$opt_passthrough $1" ;;
+	esac
+	if test $valued -eq 1 ; then shift ; fi
+	shift
+done
+if expr 0$opt_openwrt + 0$opt_mingw + 0$opt_rpi \> 1 > /dev/null
+then
+	echo usage: too many target options >&2 ; exit 2
+fi
+
+if test ! -e "$thisdir/configure"
+then
+	echo error: no autoconf configure script: try running \'bootstrap\' >&2
+	exit 1
+fi
+
+if test "0$opt_git" -eq 1
+then
+    branch="mbedtls-2.28"
+    #branch="master"
+    git clone https://github.com/Mbed-TLS/mbedtls.git
+    ( cd mbedtls && git checkout -q remotes/origin/$branch )
+	e="$?"
+	patch -d mbedtls/library -l -p1 < src/gssl/mbedtls-vsnprintf-fix-new.p1 || patch -d mbedtls/library -l -p1 < src/gssl/mbedtls-vsnprintf-fix.p1
+	if test "$e" -eq 0 -a "0$opt_mingw" -eq 0
+	then
+		echo build with...
+		echo "  make -C mbedtls/library WINDOWS=0"
+	fi
+	exit "$e"
+fi
+
+enable_debug=""
+if test "0$opt_debug" -eq 1
+then
+	export CFLAGS="-O0 -g"
+	export CXXFLAGS="-O0 -g"
+	if expr "x$*" : '.*enable.debug' >/dev/null ; then : ; else enable_debug="--enable-debug" ; fi
+:
+elif expr "x$*" : '.*enable.debug' >/dev/null
+then
+	if test "$CFLAGS$CXXFLAGS" = ""
+	then
+		export CFLAGS="-O0 -g"
+		export CXXFLAGS="-O0 -g"
+	fi
+fi
+
+if test "$opt_sanitise" != ""
+then
+	export CXX="clang++"
+	export CXXFLAGS="-O3 -fstrict-aliasing -Wstrict-aliasing -fsanitize=$opt_sanitise"
+	export LDFLAGS="-fsanitize=$opt_sanitise"
+fi
+
+MBEDTLS_DIR="`find . -maxdepth 1 -type d -name mbedtls\* 2>/dev/null | head -1`"
+make_mbedtls=0
+with_mbedtls=""
+if test "0$opt_mingw" -eq 1 -o "0$opt_rpi" -eq 1 -o "0$opt_openwrt" -eq 1
+then
+	with_mbedtls="--with-mbedtls=no"
+fi
+if test -d "$MBEDTLS_DIR"
+then
+	echo "configure.sh: mbedtls directory exists: adding --with-mbedtls and CXXFLAGS=-I$MBEDTLS_DIR/include etc"
+	with_mbedtls="--with-mbedtls"
+	make_mbedtls=1
+	export CXXFLAGS="$CXXFLAGS -I`pwd`/$MBEDTLS_DIR/include"
+	export LDFLAGS="$LDFLAGS -L`pwd`/$MBEDTLS_DIR/library"
+fi
+
+if test "0$opt_mingw" -eq 1
+then
+	if test "$opt_win" -eq 32
+	then
+		TARGET="i686-w64-mingw32" # 32-bit binaries
+	else
+		TARGET="x86_64-w64-mingw32" # 64-bit binaries
+	fi
+	export CXX="$TARGET-g++-posix"
+	export CC="$TARGET-gcc-posix"
+	export AR="$TARGET-ar"
+	export STRIP="$TARGET-strip"
+	export GCONFIG_WINDMC="$TARGET-windmc"
+	export GCONFIG_WINDRES="$TARGET-windres"
+	export CXXFLAGS="$CXXFLAGS -std=c++11 -pthread"
+	#export CXXFLAGS="$CXXFLAGS -D_WIN32_WINNT=0x0501" eg. for Windows XP, otherwise whatever mingw defaults to
+	export LDFLAGS="$LDFLAGS -pthread"
+	if test -x "`which $CXX`" ; then : ; else echo "error: no mingw c++ compiler: [$CXX]\n" ; exit 1 ; fi
+	( echo msbuild . ; echo qt-x86 . ; echo qt-x64 . ; echo cmake . ; echo msvc . ) > winbuild.cfg
+	if test "$make_mbedtls" -eq 1
+	then
+		echo mbedtls $MBEDTLS_DIR >> winbuild.cfg
+	else
+		echo mbedtls . >> winbuild.cfg
+	fi
+	$thisdir/configure $enable_debug --host $TARGET \
+		--enable-windows --disable-interface-names \
+		$with_mbedtls \
+		--disable-gui --without-pam --without-doxygen \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var $opt_passthrough e_initdir=/etc/init.d "$@"
+	echo :
+	echo "build with..."
+	test "$make_mbedtls" -eq 1 && echo "  make -C $MBEDTLS_DIR/library WINDOWS=1 CC=$CC AR=$AR"
+	echo "  make"
+	echo "  make -C src/main strip"
+	echo "  perl winbuild.pl mingw"
+:
+elif test "0$opt_rpi" -eq 1
+then
+	TARGET="arm-linux-gnueabihf"
+	export CXX="$TARGET-g++"
+	export CC="$TARGET-gcc"
+	export AR="$TARGET-ar"
+	export STRIP="$TARGET-strip"
+	export CXXFLAGS="$CXXFLAGS -std=c++11 -pthread"
+	export LDFLAGS="$LDFLAGS -pthread"
+	$thisdir/configure $enable_debug --host $TARGET \
+		--disable-gui $with_mbedtls --without-openssl \
+		--without-pam --without-doxygen \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var $opt_passthrough e_initdir=/etc/init.d "$@"
+	echo :
+	echo "build with..."
+	test "$make_mbedtls" -eq 1 && echo "  make -C $MBEDTLS_DIR/library CC=$CC AR=$AR"
+	echo "  make"
+	echo "  make -C src/main strip"
+:
+elif test "0$opt_openwrt" -eq 1
+then
+	TARGET="mips-openwrt-linux-musl"
+	SDK_DIR="`find $HOME -maxdepth 3 -type d -iname openwrt-sdk\* 2>/dev/null | sort | head -1`"
+	SDK_TOOLCHAIN_DIR="`find \"$SDK_DIR/staging_dir\" -type d -iname toolchain-\* 2>/dev/null | sort | head -1`"
+	SDK_TARGET_DIR="`find \"$SDK_DIR/staging_dir\" -type d -iname target-\* 2>/dev/null | sort | head -1`"
+	export CC="$SDK_TOOLCHAIN_DIR/bin/$TARGET-gcc"
+	export CXX="$SDK_TOOLCHAIN_DIR/bin/$TARGET-c++"
+	export AR="$SDK_TOOLCHAIN_DIR/bin/$TARGET-ar"
+	export STRIP="$SDK_TOOLCHAIN_DIR/bin/$TARGET-strip"
+	export CXXFLAGS="-fno-rtti -fno-threadsafe-statics -Os $CXXFLAGS"
+	export CXXFLAGS="$CXXFLAGS -DG_LIB_SMALL -DG_SMALL"
+	export LDFLAGS="$LDFLAGS -static"
+	export LIBS="-lgcc_eh"
+	if test -x "$CXX" ; then : ; else echo "error: no c++ compiler for target [$TARGET]: CXX=[$CXX]\n" ; exit 1 ; fi
+	$thisdir/configure $enable_debug --host $TARGET \
+		--disable-gui --without-pam --without-doxygen \
+		$with_mbedtls --disable-std-thread \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var $opt_passthrough e_initdir=/etc/init.d "$@"
+	echo :
+	echo "build with..."
+	#echo "  export PATH=\"$SDK_TOOLCHAIN_DIR/bin:\$PATH\""
+	#echo "  export STAGING_DIR=\"$SDK_DIR/staging_dir\""
+	test "$make_mbedtls" -eq 1 && echo "  make -C $MBEDTLS_DIR/library CC=$CC AR=$AR"
+	echo "  make"
+	echo "  make -C src/main strip"
+:
+elif test "`uname`" = "NetBSD"
+then
+	export CXXFLAGS="$CXXFLAGS -I/usr/X11R7/include"
+	export LDFLAGS="$LDFLAGS -L/usr/X11R7/lib"
+	$thisdir/configure $enable_debug $with_mbedtls \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var $opt_passthrough e_bsdinitdir=/etc/rc.d "$@"
+:
+elif test "`uname`" = "FreeBSD"
+then
+	export CXXFLAGS="$CXXFLAGS -I/usr/local/include -I/usr/local/include/libav"
+	export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/local/lib/libav"
+	$thisdir/configure $enable_debug $with_mbedtls \
+		--prefix=/usr/local --mandir=/usr/local/man \
+		$opt_passthrough e_bsdinitdir=/usr/local/etc/rc.d "$@"
+:
+elif test "`uname`" = "OpenBSD"
+then
+	export CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
+	export LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
+	$thisdir/configure $enable_debug $with_mbedtls \
+		--prefix=/usr/local --mandir=/usr/local/man \
+		$opt_passthrough e_bsdinitdir=/usr/local/etc/rc.d "$@"
+:
+elif test "`uname`" = "Darwin"
+then
+	export CXXFLAGS="$CXXFLAGS -I/opt/local/include -I/opt/X11/include"
+	export LDFLAGS="$LDFLAGS -L/opt/local/lib -L/opt/X11/lib"
+	$thisdir/configure $enable_debug $with_mbedtls \
+		--prefix=/opt/local --mandir=/opt/local/man $opt_passthrough "$@"
+:
+elif test "`uname`" = "Linux" -a "$opt_systemd" -eq 1
+then
+	export CXXFLAGS
+	export LDFLAGS
+	$thisdir/configure $enable_debug $with_mbedtls \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var e_systemddir=/usr/lib/systemd/system \
+		$opt_passthrough e_rundir=/run/emailrelay "$@"
+:
+elif test "`uname`" = "Linux"
+then
+	export CXXFLAGS
+	export LDFLAGS
+	$thisdir/configure $enable_debug $with_mbedtls \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var e_initdir=/etc/init.d \
+		$opt_passthrough e_rundir=/run/emailrelay "$@"
+:
+else
+	export CXXFLAGS="$CXXFLAGS -I/usr/X11R7/include -I/usr/X11R6/include -I/usr/local/include -I/opt/local/include -I/opt/X11/include"
+	export LDFLAGS="$LDFLAGS -L/usr/X11R7/lib -L/usr/X11R6/lib -L/usr/local/lib -L/opt/local/lib -L/opt/X11/lib"
+	$thisdir/configure $enable_debug $with_mbedtls $opt_passthrough "$@"
+fi
+

debian/Makefile.am

@@ -1,9 +1,9 @@
 #
-## Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
 ## 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or 
+## the Free Software Foundation, either version 3 of the License, or
 ## (at your option) any later version.
 ## 
 ## This program is distributed in the hope that it will be useful,
@@ -14,4 +14,19 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-EXTRA_DIST = xar
+
+EXTRA_DIST = \
+	emailrelay.init \
+	emailrelay.default \
+	emailrelay.service \
+	emailrelay.pam \
+	changelog \
+	conffiles \
+	control \
+	copyright \
+	preinst \
+	postinst \
+	prerm \
+	postrm \
+	rules
+

debian/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,9 +17,65 @@
 #
 #
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -32,22 +88,46 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = lib/gcc2.95
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+subdir = debian
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__extra_recursive_targets = extra-recursive
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+ARFLAGS = @ARFLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -55,10 +135,9 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILER_VERSION = @COMPILER_VERSION@
-CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -69,16 +148,22 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
+GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
+GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
+GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
+GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
+GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
+GCONFIG_WINDMC = @GCONFIG_WINDMC@
+GCONFIG_WINDRES = @GCONFIG_WINDRES@
 GREP = @GREP@
 GZIP = @GZIP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_MAN2HTML = @HAVE_MAN2HTML@
+HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-IP = @IP@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -87,25 +172,26 @@ MAINT = @MAINT@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MOC = @MOC@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SSL = @SSL@
-SSL_LIBS = @SSL_LIBS@
-STATIC_END = @STATIC_END@
-STATIC_START = @STATIC_START@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -126,13 +212,18 @@ datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+e_bsdinitdir = @e_bsdinitdir@
 e_docdir = @e_docdir@
 e_examplesdir = @e_examplesdir@
+e_icondir = @e_icondir@
 e_initdir = @e_initdir@
-e_libexecdir = @e_libexecdir@
-e_qtmoc = @e_qtmoc@
+e_libdir = @e_libdir@
+e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
+e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -150,14 +241,30 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = iostream limits sstream xlocale
+EXTRA_DIST = \
+	emailrelay.init \
+	emailrelay.default \
+	emailrelay.service \
+	emailrelay.pam \
+	changelog \
+	conffiles \
+	control \
+	copyright \
+	preinst \
+	postinst \
+	prerm \
+	postrm \
+	rules
+
 all: all-am
 
 .SUFFIXES:
@@ -165,22 +272,21 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/gcc2.95/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lib/gcc2.95/Makefile
-.PRECIOUS: Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu debian/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -190,14 +296,19 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-tags: TAGS
-TAGS:
+$(am__aclocal_m4_deps):
+extra-local: 
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -213,13 +324,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -237,16 +352,22 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -263,8 +384,14 @@ dvi: dvi-am
 
 dvi-am:
 
+extra: extra-am
+
+extra-am: extra-local
+
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -273,18 +400,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -307,15 +444,20 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am \
+	extra-am extra-local html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

debian/changelog

@@ -0,0 +1,429 @@
+emailrelay (2.5) unstable; urgency=low
+  * Multiple configurations in one process.
+  * SMTP PIPELINING (RFC-2920).
+  * SMTP CHUNKING/8BITMIME 'BDAT' extension (RFC-3030), disabled by default.
+  * SMTP SMTPUTF8 extension (RFC-6531), disabled by default.
+  * No 7-bit/8-bit check on received message content (see NEWS file).
+  * New built-in filters: "deliver:", "split:", "copy:", "mx:", "msgid:".
+  * New built-in address verifier: "account:"
+  * No ".local" files (see NEWS file).
+  * PAM authentication is now enabled with "--server-auth=pam:" not "/pam".
+  * Client authentication details can be given directly from the command-line.
+  * Multiple "client" authentication secrets, selected by a new envelope field.
+  * Main binary can act as a simple submission tool ("configure --enable-submission").
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Thu, 10 Aug 2023 00:00:00 +0000
+
+emailrelay (2.4) unstable; urgency=low
+  * Multiple "--filter" and "--client-filter" options allowed.
+  * TLS key and certificate files can be specified separately.
+  * Finer control when using "--anonymous" (eg. "--anonymous=server").
+  * The "auth-config" options can distinguish between TLS and non-TLS authentication.
+  * Hourly log file rotation using "%h" (eg. "--log-file=log.%d.%h").
+  * Listening file descriptors can be inherited from the parent process (see "--interface").
+  * Listening ports on Windows use exclusive binding.
+  * The Linux event loop uses "epoll" by default rather than "select".
+  * Some support for message routing (see NEWS).
+  * Fix of error handling in network client filters ("--client-filter=net:...") [bug-id #50].
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Thu, 10 Aug 2023 00:00:00 +0000
+
+emailrelay (2.3) unstable; urgency=low
+  * Unix domain sockets supported (eg. "--interface=/tmp/smtp.s").
+  * Windows event log not used for verbose logging (prefer "--log-file").
+  * New admin "forward" command to trigger forwarding without waiting.
+  * Optional base64 encoding of passwords in secrets files ("plain:b").
+  * Support for MbedTLS version 3.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sun, 10 Apr 2022 00:00:00 +0000
+
+emailrelay (2.2) unstable; urgency=low
+  * Connections from IPv4 'private use' addresses are allowed by default (see "--remote-clients").
+  * Interface names can be used with "--interface" (eg. "--interface=eth0").
+  * New "--server-tls-connection" option for server-side implicit TLS.
+  * New "--forward-to-some" option to permit some message recipients to be rejected.
+  * New "--log-address" option to aid adaptive firewalling.
+  * Dynamic log file rolling when using "--log-file=%d".
+  * Choice of syslog 'facility' on Linux with "--syslog=local0" etc.
+  * Pipelined SMTP QUIT commands sent by broken clients are tolerated.
+  * Better handling of overly-verbose or unkillable "--filter" scripts.
+  * Optional epoll event loop on Linux ("configure --enable-epoll").
+  * Some internationalisation support (see NEWS file).
+  * Support for Windows XP restored when built with mingw-w64.
+  * C++ 2011 compiler is required.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Tue, 16 Feb 2021 00:00:00 +0000
+
+emailrelay (2.1) unstable; urgency=low
+  * Backwards compatibility features for 1.9-to-2.0 transition removed.
+  * Better handling of too-many-connections on Windows.
+  * New "--idle-timeout" option for server-side connections.
+  * Support for RFC-5782 DNSBL blocking ("--dnsbl").
+  * Filter scripts are given the path of the envelope file in argv2.
+  * Message files can be edited by "--client-filter" scripts.
+  * Better support for CRAM-SHAx authentication.
+  * New "--client-auth-config" and "--server-auth-config" options.
+  * New "--show" option on windows to better control the user interface style.
+  * The "--pop" option always requires "--pop-auth".
+  * No message is spooled if all its envelope recipients are local-mailboxes.
+  * TLS cipher name added to "Received" line as per RFC-8314 4.3.
+  * Certificate contents are not logged.
+  * Timestamp parts of spool filenames no longer limited to six digits.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Mon, 16 Sep 2019 00:00:00 +0000
+
+emailrelay (2.0.1) unstable; urgency=low
+  * Make PLAIN client authentication work against servers with broken 334 responses.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Wed, 14 Aug 2019 00:00:00 +0000
+
+emailrelay (2.0) unstable; urgency=low
+  * Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see "--interface").
+  * Server process is not blocked during "--filter" or "--address-verifier" execution, if multi-threaded.
+  * Support for the "mbedTLS" TLS library as an alternative to OpenSSL ("configure --with-mbedtls").
+  * TLS server certificates specified with new "--server-tls-certificate" option, not "--server-tls".
+  * TLS servers enable client certificate verification with "--server-tls-verify", not "--tls-config".
+  * TLS clients can verify server certificates with "--client-tls-verify" and "--client-tls-verify-name".
+  * The "--tls-config" option works differently (see NEWS file).
+  * New "--client-tls-server-name" option for server name identification (SNI).
+  * New "--client-tls-required" option to force client connections to use TLS.
+  * New "--server-tls-required" option to force remote SMTP clients to use STARTTLS.
+  * New "--forward-on-disconnect" option replaces "--poll=0".
+  * The "--anonymous" option now suppresses the "Received" line, whatever the "--domain".
+  * The second field in the secrets file indicates the password encoding, not AUTH mechanism.
+  * The "--verifier" option is now "--address-verifier", with simplified command-line parameters.
+  * Command-line file paths can use "@app" as a prefix to be relative to the executable directory.
+  * Command-line file paths can be relative to the startup cwd even when daemonised.
+  * Filter exit codes between 104 and 107 are interpreted differently (see NEWS file).
+  * Message rejection reasons passed back to the submitting SMTP client are much less verbose.
+  * Forwarding events are queued up if the forwarding client is still busy from last time.
+  * The bind address for outgoing connections is no longer taken from first unqualified "--interface" address [bug-id #27].
+  * The SMTP client protocol tries more than one authentication mechanism.
+  * Some support for XOAUTH2 client-side authentication.
+  * Client protocol sends QUIT with a socket shutdown().
+  * The Windows commdlg list-view widget is used for the server status pages.
+  * The Windows connection-lookup feature is withdrawn ("--peer-lookup").
+  * Several build-time configure options like "--disable-pop" are withdrawn.
+  * C++ 2011 is preferred, and required for multi-threading.
+  * Support for very old versions of Windows is dropped.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Fri, 15 Jun 2018 00:00:00 +0000
+
+emailrelay (1.9.2) unstable; urgency=low
+  * Fixed a leak in the event-loop garbage collection.
+  * A local hostname that fails to resolve is not an error.
+  * A warning is emitted if there is more than one client authentication secret.
+  * Multiple "--interface" options are allowed separately on the command-line.
+  * Added a new "--client-interface" option.
+  * The "Received" line is formatted as per RFC-3848 ("with ESMTPSA").
+  * The LOGIN and PLAIN mechanisms in the secrets file are now equivalent.
+  * The Windows service wrapper can use a configuration file to locate the startup batch file.
+  * Simplified the implementation of the GUI installation program.
+  * Reworded the "read error: disconnected" log message.
+  * Less verbose logging of "no more messages to send".
+  * Qt4 or Qt5 selected by the "configure" script.
+  * Improved the RPM spec file.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Thu, 01 Jan 2015 00:00:00 +0000
+
+emailrelay (1.9.1) unstable; urgency=low
+  * Updated OpenSSL from 1.0.1e to 1.0.1g in the Windows build.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sat, 12 Apr 2014 00:00:00 +0000
+
+emailrelay (1.9) unstable; urgency=low
+  * Added negotiated TLS/SSL for POP (ie. "STLS").
+  * The first two fields in the secrets files are reordered (with backwards compatibility).
+  * Added Linux PAM authentication ("configure --with-pam" and then "--server-auth=/pam").
+  * Optional protocol-specific "--interface" qualifiers, eg. "--interface smtp=127.0.0.1,pop=192.168.1.1".
+  * Outgoing client connection bound with the first "--interface" or "--interface client=..." address.
+  * Support for SMTP-over-TLS on outgoing client connection ("--client-tls-connection") (cf. "STARTTLS")
+  * Support for SOCKS 4a on outgoing client connection, eg. "--forward-to example.com:25@127.0.0.1:9050".
+  * TLS configuration options ("--tls-config=...") for SSLv2/3 fallback etc.
+  * No "Received" line added if "--anonymous" and an empty "--domain" name.
+  * Error text for "all recipients rejected" is now more accurately "one or more recipients rejected".
+  * New behaviour for "--client-filter" exit values of 100 and over.
+  * New commands on the admin interface, "failures" and "unfail-all".
+  * Shorter descriptions in the usage help unless "--verbose".
+  * New default spool directory location on windows, now under "system32".
+  * Windows project files for MSVC 2012 included.
+  * Removed support for Windows NT and Windows 9x.
+  * Better support for Windows Vista and Windows 7.
+  * Removed Windows "--icon" option.
+  * Removed "--enable-fhs" option for "configure" (see INSTALL document for equivalent usage).
+  * Added "--log-file" option to redirect stderr.
+  * Added Windows "--peer-lookup" option.
+  * Fix for MD5 code in 64-bit builds.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sun, 01 Dec 2013 00:00:00 +0000
+
+emailrelay (1.8.2) unstable; urgency=low
+  * Fix namespaces for gcc 3.4.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sat, 22 Aug 2009 00:00:00 +0000
+
+emailrelay (1.8.1) unstable; urgency=low
+  * Changed the definition of "--as-proxy" to use "--poll 0" rather than "--immediate" [bug-id 1961652].
+  * Fixed stalling bug when using server-side TLS/SSL ("--server-tls") [bug-id 1961655].
+  * Improved Debian packaging for Linux ("make deb").
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Wed, 21 May 2008 00:00:00 +0000
+
+emailrelay (1.8) unstable; urgency=low
+  * Speed optimisations (as identified by KCachegrind/valgrind in KDevelop).
+  * Build-time size optimisations (eg. "./configure --disable-exec --enable-small-exceptions ...").
+  * Build-time options to reduce runtime library dependencies (eg. "./configure --disable-dns --disable-identity").
+  * New switch to limit the size of submitted messages ("--size").
+  * New semantics for "--poll 0", providing a good alternative to "--immediate" when proxying.
+  * SMTP client protocol emits a RSET after a rejected recipient as a workround for broken server protocols.
+  * SMTP client protocol continues if the server advertises AUTH but the client has no authentication secrets.
+  * When a message cannot be forwarded the offending SMTP protocol response number, if any, is put in the envelope file.
+  * A warning is printed if logging is requested but both stderr and syslog are disabled.
+  * A cross-compiling toolchain builder script added for running on mips-based routers ("extra/mips").
+  * New example scripts for SMTP multicasting and editing envelope files.
+  * Improved native support for Mac OS X (10.5) with graphical installation from disk image.
+  * Compatibility with gcc 2.95 restored.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Thu, 17 Apr 2008 00:00:00 +0000
+
+emailrelay (1.7) unstable; urgency=low
+  * TLS/SSL support for SMTP using OpenSSL ("./configure --with-openssl" with "--client-tls" and "--server-tls").
+  * Authentication mechanism "PLAIN" added.
+  * Some tightening up of the SMTP server protocol.
+  * Windows service wrapper has an "--uninstall" option.
+  * Windows installation GUI uninstalls the service before reinstalling it.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Tue, 02 Oct 2007 00:00:00 +0000
+
+emailrelay (1.6) unstable; urgency=low
+  * GPLv3 licence (see "http://gplv3.fsf.org").
+  * New "--prompt-timeout" switch for the timeout when waiting for the initial 220 prompt from the SMTP server.
+  * Fix for flow-control assertion error when the POP server sends a very long list of spooled messages.
+  * Wildcard matching for trusted IP addresses in the authentication secrets file can now use CIDR notation.
+  * More fine-grained switching of effective user-id to read files and directories when running as root.
+  * Fewer new client connections when proxying.
+  * The server drops the connection if a remote SMTP client causes too many protocol errors.
+  * More complete implementation of "--hidden" on Windows.
+  * Scanner switch ("--scanner") replaced by a more general "--filter" and "--client-filter" switch syntax.
+  * Support for address verification ("--verifier") over the network.
+  * Better support for running as a Windows service ("emailrelay-service --install").
+  * Utility filter program "emailrelay-filter-copy" exits with 100 if it deletes the envelope file.
+  * Windows "cscript.exe" wrapper is added automatically to non-bat/exe "--filter" command-lines.
+  * Installation GUI makes backups of the files it edits and preserves authentication secrets.
+  * Installation GUI can install "init.d" links.
+  * Experimental SpamAssassin spamc/spamd protocol support.
+  * Acceptance tests added to the distribution.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Mon, 27 Aug 2007 00:00:00 +0000
+
+emailrelay (1.5) unstable; urgency=low
+  * New installation and configuration GUI using TrollTech Qt 4.x ("./configure --enable-gui")
+  * Default address verifier accepts all addresses as valid and never treats them as local mailboxes.
+  * Fix for server exit bug when failing to send data down a newly accepted connection.
+  * Spooled content files can be left in the parent directory to save diskspace when using "--pop-by-name".
+  * Client protocol improved for the case where there are no valid recipients.
+  * New "--syslog" switch to override "--no-syslog".
+  * New "--filter-timeout" switch added.
+  * Support for "--foo=bar" switch syntax (ie. with "=").
+  * Multiple listening interfaces allowed with a comma-separated "--interface" list.
+  * New "--filter" utility called "emailrelay-filter-copy" to support "--pop-by-name".
+  * Documentation also created in docbook format (requires xmlto).
+  * Windows installation document revised.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Tue, 10 Apr 2007 00:00:00 +0000
+
+emailrelay (1.4) unstable; urgency=low
+  * POP3 server (enable with "--pop", disable at build-time with "./configure --disable-pop").
+  * Fix for logging reentrancy bug (affects "./configure --enable-debug" with "--debug").
+  * Fix to ensure sockets are always non-blocking (affects "--scanner").
+  * Allow "--verifier" scripts to reject addresses with a temporary "4xx" error code.
+  * Automatic re-reading of secrets files.
+  * Write to the Windows event log even if no write access to the registry.
+  * Modification of set-group-id policy if not started as root.
+  * Better checking of spool directory access on startup.
+  * New "emailrelay-submit.sh" example script for submitting messages for "--pop-by-name".
+  * The "--dont-listen" switch is now "--no-smtp".
+  * Better IPv6 support (Linux only).
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Mon, 09 Jan 2006 00:00:00 +0000
+
+emailrelay (1.3.3) unstable; urgency=low
+  * No bind() for outgoing connections [bug-id 1051689].
+  * Updated rpm spec file [bug-id 1224850].
+  * Fix for gcc3.4 compilation error in "md5.cpp".
+  * Fix for glob()/size_t compilation warning.
+  * Documentation of "auth" switches corrected.
+  * State-machine template type declaration modernised, possibly breaking older compilers.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sun, 24 Jul 2005 00:00:00 +0000
+
+emailrelay (1.3.2) unstable; urgency=low
+  * Fix for core dump when "--client-filter" pre-processing fails.
+  * Revised code structure to prepare for asynchronous pre-processing.
+  * Better diagnostics when pre-processor exec() fails.
+  * Better cleanup of empty and orphaned files.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Mon, 07 Jun 2004 00:00:00 +0000
+
+emailrelay (1.3.1) unstable; urgency=low
+  * Windows resource leak from CreateProcess() fixed.
+  * Windows dialog box double-close fix.
+  * Some documentation for the "--scanner" switch.
+  * New usage patterns section in the user guide.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Fri, 14 May 2004 00:00:00 +0000
+
+emailrelay (1.3) unstable; urgency=low
+  * Client protocol waits for a greeting from the server on startup [bug-id 842156].
+  * Fix for incorrect backslash normalisation on "--verifier" command-lines containing spaces [bug-id 890646].
+  * Verifier programs can now summarily abort a connection using an exit value of 100.
+  * New "--anonymous" switch that reduces information leakage to the SMTP client and disables "VRFY".
+  * Better validation of "MAIL-FROM" and "RCPT-TO" formatting.
+  * Rewrite of low-level MD5 code.
+  * Performance tuning.
+  * Template "emailrelay.conf" gets installed in "/etc".
+  * New switches for the "configure" script.
+  * More JavaScript example scripts.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Thu, 26 Feb 2004 00:00:00 +0000
+
+emailrelay (1.2) unstable; urgency=low
+  * The "--filter" and "--verifier" arguments interpreted as command-lines; spaces in executable paths now need escaping.
+  * The "--interface" switch applies to outgoing connections too.
+  * New "--client-filter" switch to do synchronous message processing before sending.
+  * Keeps authentication after a "rset" command.
+  * Fix for dangling reference bug, seen after "quit" command on Windows.
+  * JavaScript examples in the documentation.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Mon, 03 Nov 2003 00:00:00 +0000
+
+emailrelay (1.1.2) unstable; urgency=low
+  * Earlier check for un-bindable ports on startup, and later fork()ing [bug-id 776972].
+  * Resolved the file-descriptor kludge for "--verifier" on Windows.
+  * Less strict about failing eight bit messages sent to servers with no "8BITMIME" extension.
+  * Supplementary group memberships revoked at startup if root or suid.
+  * Pre-processor ("--filter") program's standard output searched for a failure reason string.
+  * Undocumented "--scanner" switch added for asynchronous processing by a separate network server.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sun, 07 Sep 2003 00:00:00 +0000
+
+emailrelay (1.1.1) unstable; urgency=low
+  * Restored the fix for building with gcc2.96.
+  * Support for MinGW builds on Windows.
+  * More reasonable size of the "--help --verbose" message box on Windows.
+  * Windows "--icon" switch changed from "-i" to "-c" to avoid conflicting with "--interface".
+  * Shows "next server address" correctly in the configuration report when using "--forward-to".
+  * Fix for "make install" when "man2html" is not available.
+  * Updated init script.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sat, 05 Jul 2003 00:00:00 +0000
+
+emailrelay (1.1.0) unstable; urgency=low
+  * In proxy mode unexpected client-side disconnects and timeouts do not leave ".bad" files [see also bug-id 659039].
+  * By default proxy mode does not interpret addresses for local delivery ("--postmaster").
+  * Polling option added ("--poll") to rescan the spool directory periodically.
+  * New special exit code (103) for the pre-processor to trigger immediate polling; 100 to 107 now reserved.
+  * Orphaned zero-length content files are deleted properly if the server-side dialogue is cut short.
+  * The "--interface" switch applies to the "--admin" interface too.
+  * Improved internal event architecture using slot/signal design pattern, and fewer singleton classes.
+  * Event notification available through the administration interface.
+  * New "--hidden" switch for Windows.
+  * Syslog output includes process-id.
+  * Support for Sun WorkShop 5.0 added.
+  * Documentation overhaul.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sun, 18 May 2003 00:00:00 +0000
+
+emailrelay (1.0.2) unstable; urgency=low
+  * Support for trusted IP addresses, allowing certain clients to avoid authentication.
+  * Address verifier interface extended to include authentication information.
+  * New public mail relay section added to the user guide.
+  * Example verifier scripts etc. added to the reference guide.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sun, 16 Feb 2003 00:00:00 +0000
+
+emailrelay (1.0.1) unstable; urgency=low
+  * In proxy mode unexpected client-side disconnects and timeouts result in ".bad" files [bug-id 659039].
+  * Require successful "AUTH" before "MAIL FROM" when using "--server-auth".
+  * Better word-wrap on "--help" output.
+  * Use of RedHat's "functions" code, and support for "chkconfig", added to the "init.d" script.
+  * Builds with gcc3.2 (1.0.0-pl5).
+  * Fix for files left as "busy" after a connection failure in proxy mode [bug-id 631032] (1.0.0-pl3/4/5).
+  * Trivial documentation fixes (1.0.0-pl3).
+  * Fix for the double-dot escape bug in the client protocol [bug-id 611624] (1.0.0-pl2).
+  * Fix build when using gcc2.96 rather than gcc2.95 (1.0.0-pl1).
+  * Fix default spool directory in example scripts (1.0.0-pl1).
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sun, 12 Jan 2003 00:00:00 +0000
+
+emailrelay (1.0.0) unstable; urgency=low
+  * Briefer "--help" output; works with "--verbose".
+  * Option to listen on a specific network interface ("--interface").
+  * Option for an external address verifier program ("--verifier").
+  * Some Linux Standard Base stuff added to the "init.d" script.
+  * Pid files world-readable and deleted on abnormal termination.
+  * Compiles with gcc 3.0 and intel 6.0.
+  * Autoconf tweak for MacOS X.
+  * Corrected the "Received:" typo [bug-id 572236].
+  * EHLO response parsing is now case-insensitive [bug-id 561522].
+  * Fewer missing-secrets warnings [bug-id 564987].
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Fri, 16 Aug 2002 00:00:00 +0000
+
+emailrelay (0.9.9) unstable; urgency=low
+  * More flexible logging options ("--verbose" and "--debug" work better).
+  * File Hierarchy Standard (FHS) option for "configure" ("--enable-fhs").
+  * FHS-compatible RPMs.
+  * Spool files writeable by pre-processor when server started as root.
+  * Default directories in executables and scripts come from "configure".
+  * The "init.d" script is renamed "emailrelay" (was "emailrelay.sh").
+  * Man pages are gzipped when installed.
+  * Fix for access violation under Windows NT when client disconnects.
+  * Use of event log when compiled on Windows NT.
+  * Fix for info-after-flush bug when using the administration interface. [rc2]
+  * New "resubmit" script. [rc2]
+  * Submit utility works under Windows. [rc2]
+  * Improved Windows project files. [rc2]
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Mon, 22 Apr 2002 00:00:00 +0000
+
+emailrelay (0.9.8) unstable; urgency=low
+  * Fix for running pre-processor ("--filter") as root.
+  * Ignore bogus "AUTH=LOGIN" lines in EHLO response.
+  * Submit utility improved to work with mutt.
+  * Installation of submit man page.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Tue, 26 Mar 2002 00:00:00 +0000
+
+emailrelay (0.9.7) unstable; urgency=low
+  * CRAM-MD5 authentication mechanism added.
+  * Revoke root permissions at start up, and reclaim them when needed.
+  * Allow mail pre-processing ("--filter") when started as root.
+  * Domain-override switch ("--domain") added.
+  * Non-privileged user switch ("--user") added.
+  * Better handling of NarrowPipe exception (ie. 8-bit message to 7-bit server).
+  * Allow null return path in MAIL-FROM.
+  * Reject recipients which look like "<user>@localhost" (as used by fetchmail for local delivery).
+  * Treat recipients which look like "postmaster@localhost" or "postmaster@<fqdn>" as local postmaster.
+  * Optional timestamps on log output ("--log-time").
+  * Fix EHLO to HELO fallback for 501/502 responses in client protocol.
+  * Submission utility "emailrelay-submit" added.
+  * HTML4.0 compliant HTML documentation, using CSS.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sun, 17 Mar 2002 00:00:00 +0000
+
+emailrelay (0.9.6) unstable; urgency=low
+  * SMTP AUTHentication extension -- LOGIN mechanism only.
+  * Client-side protocol timeout.
+  * Client-side connection timeout.
+  * Preprocessor can cancel further message processing.
+  * Client's IP address recorded in envelope files.
+  * Multiple hard-coded listening addresses supported at compile-time.
+  * Fix for automatic reopening of stderr stream.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Tue, 18 Dec 2001 00:00:00 +0000
+
+emailrelay (0.9.5) unstable; urgency=low
+  * system-tray + dialog-box user interface
+  * fix for dropped connections
+  * fix for content file deletion
+  * fix for directory iterator
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sat, 27 Oct 2001 00:00:00 +0000
+
+emailrelay (0.9.4) unstable; urgency=low
+  * Fixed memory leak when no "--log" switch.
+  * Windows build is more "gui" and less "command-line".
+  * "Info" command added to the administration interface.
+  * Doxygen files removed from binary RPM.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Tue, 23 Oct 2001 00:00:00 +0000
+
+emailrelay (0.9.3) unstable; urgency=low
+  * Proxy mode ("--immediate" and "--as-proxy").
+  * Message pre-processing ("--filter").
+  * Message store classes better separated using abstract interfaces.
+  * Improved notification script, with MIME encoding.
+  * Builds with old 2.91 version of gcc.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Fri, 19 Oct 2001 00:00:00 +0000
+
+emailrelay (0.9.2) unstable; urgency=low
+  * Better autoconf detection.
+  * Workround for FreeBSD uname() feature.
+  * Added missing ".sh_" files to the distribution.
+  * Fixed a benign directory iterator bug.
+  * Use of gcc's "exception" header.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Thu, 13 Sep 2001 00:00:00 +0000
+
+emailrelay (0.9.1) unstable; urgency=low
+  * Improved documentation from doxygen.
+  * More complete use of namespaces.
+  * Experimental compile-time support for IPv6.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Sat, 08 Sep 2001 00:00:00 +0000
+

debian/control

@@ -0,0 +1,17 @@
+Source: emailrelay
+Section: mail
+Priority: optional
+Maintainer: Graeme Walker <graeme_walker@users.sourceforge.net>
+Build-Depends: debhelper-compat (= 13), autotools-dev, libssl-dev, libpam0g-dev
+Standards-Version: 3.9.8
+Homepage: http://emailrelay.sourceforge.net
+
+Package: emailrelay
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: E-mail store-and-forward transfer agent and pop server.
+ E-MailRelay is a lightweight SMTP store-and-forward mail server with POP access
+ to spooled messages. It can be used as a personal internet mail server with
+ SpamAssassin spam filtering and DNSBL connection blocking. Forwarding can be
+ to a fixed smarthost or using DNS MX routing. External scripts can be used for
+ address validation and e-mail message processing.

debian/copyright

@@ -0,0 +1,21 @@
+Copyright
+=========
+Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+
+Refer to the file COPYING (included), /usr/share/common-licenses/GPL-3, or
+<http://www.gnu.org/licenses/> for the terms of the GNU General Public License.
+
+Binary distributions
+--------------------
+Binary distributions of E-MailRelay might include copyrighted code from:
+* OpenSSL Toolkit (http://www.openssl.org)
+* mbedTLS (http://tls.mbed.org)
+* Qt (http://qt.io)
+* Microsoft (http://microsoft.com)
+* Free Software Foundation (fsf.org)
+
+These parts are distributed under license; please refer to their
+websites for further details.
+
+This product includes software developed by the OpenSSL Project
+for use in the OpenSSL Toolkit (http://www.openssl.org/).

debian/emailrelay.default

@@ -0,0 +1,2 @@
+# set EMAILRELAY_ENABLED=0 to disable sysv-init emailrelay start
+#EMAILRELAY_ENABLED=0

debian/emailrelay.init

@@ -0,0 +1,267 @@
+#!/bin/sh
+#
+# Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# ===
+#
+# emailrelay
+#
+# A start/stop script for E-MailRelay in the SysV init system.
+#
+# usage: emailrelay { start | stop | restart | force-reload | status }
+#
+# See also: install_initd, remove_initd
+#
+### BEGIN INIT INFO
+# Provides:            emailrelay
+# Required-Start:      $local_fs $network $syslog
+# Required-Stop:       $local_fs $network $syslog
+# Default-Start:       2 3 4 5
+# Default-Stop:        0 1 6
+# Short-Description:   E-MailRelay mail server
+### END INIT INFO
+##
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+NAME=emailrelay
+DESC="E-MailRelay mail server"
+CONFIG=/etc/$NAME.conf
+PIDFILE=/run/emailrelay/$NAME.pid
+GROUP=daemon
+DAEMON=/usr/sbin/$NAME
+SUBMIT=/usr/sbin/$NAME-submit
+FACILITY=mail
+
+test -f /etc/default/$NAME && . /etc/default/$NAME
+test -f /etc/rc.conf.d/$NAME && . /etc/rc.conf.d/$NAME
+test -f /etc/default/rcS && . /etc/default/rcS
+
+# Default lsb functions in case there is no lsb/init-functions...
+#
+log_success_msg()
+{
+	echo "$@"
+}
+log_failure_msg()
+{
+	echo "$@"
+}
+log_warning_msg()
+{
+	echo "$@"
+}
+start_daemon()
+{
+	if test "`cat \"$2\" 2>/dev/null`" -gt 0 2>/dev/null && kill -0 "`cat \"$2\"`"
+	then
+		: # running already
+	else
+		shift ; shift ; shift
+		"$@"
+	fi
+}
+killproc()
+{
+	shift
+	kill `cat "$1" 2>/dev/null` 2>/dev/null
+}
+pidofproc()
+{
+	shift
+	kill -0 `cat "$1" 2>/dev/null` 2>/dev/null
+}
+log_daemon_msg()
+{
+	echo -n "$@"
+}
+log_progress_msg()
+{
+	:;
+}
+log_end_msg()
+{
+	if test "$1" -eq 0
+	then
+		log_success_msg " ... ok"
+		true
+	else
+		log_failure_msg " ... failed!"
+		false
+	fi
+}
+
+# Setup functions...
+#
+# Some packaging scripts do "emailrelay setup" for some of their
+# post-install steps, and "emailrelay setup" might also be useful
+# administratively after editing the /etc/default file. The "start"
+# sub-command below also uses setup_rundir() because the /run
+# directory will not necessarily persist across a reboot.
+#
+# (This code must come before the potential 'init-functions' redirect
+# to systemd.)
+#
+setup_config()
+{
+	if test ! -e "$CONFIG"
+	then
+		echo "# emailrelay.conf" > "$CONFIG"
+	fi
+}
+root_root()
+{
+	# True if the given file exists and is owned by 'root.root',
+	# as if newly copied by the install process and never
+	# subsequently chown'ed by the administrator
+	ls -nd "$1" 2>/dev/null | cut -d' ' -f 3,4 | grep -q '^0 0$'
+}
+spooldir()
+{
+	# Prints the spool directory path from the config file, but with a
+	# default because packaged installs might not edit the config file
+	# like 'make install' does
+	( echo spool-dir /var/spool/emailrelay ; cat "$CONFIG" ) | \
+		tr '\t' ' ' | sed 's/  */ /g' | grep '^spool-dir [^ ]' | \
+		tail -1 | cut -d' ' -f 2
+}
+setup_rundir_imp()
+{
+	test -d "$1" || mkdir -p "$1"
+	if echo "$1" | grep -q "/emailrelay$"
+	then
+		if root_root "$1"
+		then
+			chgrp "$GROUP" "$1"
+			chmod 775 "$1"
+		fi
+	fi
+}
+setup_rundir()
+{
+	# Recreates the pidfile directory, which might disappear after a reboot
+	setup_rundir_imp "`dirname \"$PIDFILE\"`"
+}
+setup_spooldir_imp()
+{
+	test -d "$1" || mkdir -p "$1"
+	if root_root "$1"
+	then
+		chgrp "$GROUP" "$1"
+		chmod 775 "$1"
+		chmod g+s "$1"
+	fi
+}
+setup_spooldir()
+{
+	setup_spooldir_imp "`spooldir`"
+}
+setup_sgid()
+{
+	if root_root "$1"
+	then
+		chgrp "$GROUP" "$1"
+		chmod 755 "$1"
+		chmod g+s "$1"
+	fi
+}
+setup_tools()
+{
+	setup_sgid "/usr/sbin/emailrelay-submit"
+}
+setup_openrc()
+{
+	rc-update -q -q add "$NAME" >/dev/null 2>&1 || true
+}
+setup()
+{
+	setup_config
+	setup_rundir
+	setup_spooldir
+	setup_tools
+	setup_openrc
+}
+if test "$1" = "setup" ; then setup ; exit 0 ; fi
+
+# Read lsb init-functions. Annoyingly, systemd sometimes hijacks this to
+# generate a service file under /run/systemd, run systemctl etc, without
+# ever returning to this script.
+#
+test -f /lib/lsb/init-functions && . /lib/lsb/init-functions
+
+case "$1" in
+
+	restart|force-reload)
+		$0 stop
+		$0 start
+	;;
+
+	try-restart)
+		echo `basename $0`: $1 not implemented >&2
+		exit 3
+		;;
+
+	*start)
+		if test "${EMAILRELAY_ENABLED:-1}" -eq 1
+		then
+			log_daemon_msg "Starting $DESC"
+			log_progress_msg "$NAME"
+			setup_rundir
+			start_daemon -p "$PIDFILE" -- "$DAEMON" --as-server --syslog=$FACILITY --pid-file "$PIDFILE" "$CONFIG"
+			e="$?"
+			log_end_msg $e
+			if test -d /run/systemd/system ; then sleep 0.2 2>/dev/null ; fi # pid file race
+			test "$e" -eq 0
+		else
+			log_warning_msg "$NAME startup is disabled in /etc/default/$NAME"
+			exit 0
+		fi
+		;;
+
+	stop)
+		log_daemon_msg "Stopping $DESC"
+		log_progress_msg "$NAME"
+		killproc -p "$PIDFILE" "$DAEMON"
+		e="$?"
+		log_end_msg $e
+		test "$e" -eq 0
+		;;
+
+	reload)
+		echo `basename $0`: $1 not implemented >&2
+		exit 3
+		;;
+
+	status)
+		if pidofproc -p "$PIDFILE" "$DAEMON" >/dev/null
+		then
+			log_success_msg "$NAME is running"
+			exit 0
+		else
+			log_failure_msg "$NAME is not running"
+			exit 32 # see guiboot_unix.cpp
+		fi
+		;;
+
+	setup)
+		# never gets here -- see above
+		setup
+		;;
+
+	*)
+		echo usage: `basename $0` "{start|stop|restart|status}" >&2
+		exit 2
+		;;
+
+esac

debian/emailrelay.pam

@@ -0,0 +1,2 @@
+# emailrelay pam configuration
+auth requisite pam_unix.so nullok_secure

debian/emailrelay.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=E-MailRelay mail server
+Documentation=man:emailrelay(1)
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=forking
+Restart=on-success
+KillMode=control-group
+ExecStart=/usr/sbin/emailrelay --as-server --syslog --pid-file /run/emailrelay/emailrelay.pid /etc/emailrelay.conf
+ExecStop=/bin/kill -15 $MAINPID
+PIDFile=/run/emailrelay/emailrelay.pid
+
+[Install]
+WantedBy=multi-user.target
+

debian/postinst

@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# postinst
+#
+
+spool="/var/spool/emailrelay"
+submit="/usr/sbin/emailrelay-submit"
+filtercopy="/usr/lib/emailrelay/emailrelay-filter-copy"
+init="/etc/init.d/emailrelay"
+rundir="/run/emailrelay"
+
+emailrelay_setup()
+{
+	# use the init script for some post-install setup
+	if test -e "$init" -a ! -x "$init"
+	then
+		chmod +x "$init"
+	fi
+	"$init" setup
+}
+
+emailrelay_fix_html()
+{
+	# index.html refers to changelog.html, not changelog.html.gz
+	cd /usr/share/doc/emailrelay && gzip -d -c changelog.html.gz > changelog.html
+}
+
+emailrelay_create_config()
+{
+	if test ! -e /etc/emailrelay.conf -a -f /etc/emailrelay.conf.template
+	then
+		cp /etc/emailrelay.conf.template /etc/emailrelay.conf
+	fi
+}
+
+emailrelay_setup
+emailrelay_fix_html
+emailrelay_create_config
+
+#DEBHELPER#
+
+exit 0
+

debian/postrm

@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# postrm
+#
+
+spool="/var/spool/emailrelay"
+rundir="/run/emailrelay"
+
+emailrelay_unfix_html()
+{
+	# see postinst
+	rm -f /usr/share/doc/emailrelay/changelog.html
+}
+
+emailrelay_purge()
+{
+	# (purge deliberately fails if spooled messages exist)
+	#rm -rf "$spool" 2>/dev/null
+	rmdir "$spool" 2>/dev/null
+	rmdir "$rundir" 2>/dev/null
+	rm /etc/emailrelay.conf 2>/dev/null
+	rm -rf "/usr/share/doc/emailrelay/doxygen" 2>/dev/null
+}
+
+#DEBHELPER#
+
+emailrelay_unfix_html
+if test "$1" = "purge"
+then
+	emailrelay_purge
+fi
+exit 0
+

debian/preinst

@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# preinst
+#
+
+#DEBHELPER#
+

debian/prerm

@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# prerm
+#
+
+#DEBHELPER#
+

debian/rules

@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+#
+# rules
+#
+# See dh(1) and debhelper(7)
+#
+
+%:
+	dh $@ --parallel --no-start
+
+override_dh_auto_configure:
+	# (the init script and pam file go to one side under /usr/lib since we have .init and .pam files in debian/)
+	dh_auto_configure -- e_libdir=/usr/lib/emailrelay e_initdir=/usr/lib/emailrelay/init e_rundir=/run/emailrelay e_pamdir=/usr/lib/emailrelay/pam --without-doxygen --without-man2html --with-openssl --without-mbedtls --with-pam --disable-gui --disable-testing
+

depcomp

@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2006-10-15.18
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,9 +16,7 @@ scriptversion=2006-10-15.18
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -30,9 +27,9 @@ scriptversion=2006-10-15.18
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -42,11 +39,11 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -59,6 +56,66 @@ EOF
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -71,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -82,9 +142,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -107,8 +190,7 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -116,13 +198,17 @@ gcc3)
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -130,31 +216,31 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -172,8 +258,7 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -181,99 +266,156 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
 
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -285,8 +427,8 @@ icc)
   sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process this invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -297,9 +439,8 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -310,8 +451,7 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -321,72 +461,107 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
 
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
 
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
 
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
 
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
@@ -399,13 +574,13 @@ dashmstdout)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -425,18 +600,18 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -450,41 +625,51 @@ makedepend)
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
-  for arg in "$@"; do
+  cleared=no eat=no
+  for arg
+  do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -495,13 +680,13 @@ cpp)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -520,10 +705,10 @@ cpp)
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -533,35 +718,56 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
+  # always write the preprocessed file to stdout.
   "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
   IFS=" "
   for arg
   do
     case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 none)
   exec "$@"
   ;;
@@ -577,8 +783,9 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
 # End:

doc/Makefile.am

@@ -1,9 +1,9 @@
 #
-## Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
 ## 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or 
+## the Free Software Foundation, either version 3 of the License, or
 ## (at your option) any later version.
 ## 
 ## This program is distributed in the hope that it will be useful,
@@ -15,89 +15,122 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-stylesheet=emailrelay.css
-txt_files=developer.txt reference.txt userguide.txt windows.txt 
-man_files_in=emailrelay.1 emailrelay-passwd.1 emailrelay-poke.1 emailrelay-submit.1 emailrelay-filter-copy.1
-man_files_out=emailrelay.1.gz emailrelay-passwd.1.gz emailrelay-poke.1.gz emailrelay-submit.1.gz emailrelay-filter-copy.1.gz
-html_files_in=doxygen_header.html
-html_files_thru=index.html emailrelay-man.html $(stylesheet)
-html_files_out=readme.html developer.html reference.html userguide.html windows.html changelog.html
-docbook_files_out=emailrelay.docbook
-png_files=gsmtp-classes.png gnet-classes.png sequence-3.png gnet-client.png gsmtp-serverprotocol.png auth.png
+txt_files_install=\
+	readme.txt readme.md readme.rst \
+	developer.txt developer.md developer.rst \
+	reference.txt reference.md reference.rst \
+	userguide.txt userguide.md userguide.rst \
+	windows.txt windows.md windows.rst \
+	changelog.txt changelog.md changelog.rst \
+	doxygen.cfg.in
 
-EXTRA_DIST = $(man_files_in) $(txt_files) $(html_files_in) $(html_files_thru) $(png_files) doxygen_missing.html
-noinst_SCRIPTS = .dox .docbook
-man1_MANS = $(man_files_in)
-e_doc_DATA = $(txt_files) $(html_files_out) $(html_files_thru) $(png_files) $(docbook_files_out)
-CLEANFILES = $(noinst_SCRIPTS) $(man_files_out) $(html_files_out) $(docbook_files_out) doxygen/* *.db *.mu docbook/*
+txt_files_noinstall=\
+	index.rst \
+	conf.py
 
-SUFFIXES = .txt .html .db .mu
+man_files_install=\
+	emailrelay.1 \
+	emailrelay-passwd.1 \
+	emailrelay-submit.1
 
-converter_html=$(top_builddir)/bin/txt2html.sh
-converter_txt2mu=$(top_builddir)/bin/txt2mu.sh
-converter_mu2html=$(top_builddir)/bin/mu2html.sh
-converter_expand=$(top_builddir)/bin/expand.sh
-converter_mu2docbook=$(top_builddir)/bin/mu2docbook.sh
-run_doxygen=$(top_builddir)/bin/doxygen.sh
+man_files_clean=\
+	emailrelay.1.gz \
+	emailrelay-passwd.1.gz \
+	emailrelay-submit.1.gz
 
-.txt.html:
-	$(converter_html) -a "$(AWK)" $(top_srcdir)/doc/$*.txt $(stylesheet) > $*.html
+html_files_install=\
+	index.html \
+	emailrelay-man.html \
+	readme.html \
+	developer.html \
+	reference.html \
+	userguide.html \
+	windows.html \
+	changelog.html
 
-.txt.mu:
-	$(converter_txt2mu) -a "$(AWK)" $(top_srcdir)/doc/$*.txt > $*.mu
+html_files_noinstall=\
+	man2html-missing.html \
+	doxygen-missing.html
 
-.mu.db:
-	$(converter_mu2docbook) -a "$(AWK)" -x < $(top_builddir)/doc/$*.mu > $*.db
+css_files_install=\
+	emailrelay.css \
+	emailrelay-doxygen.css
 
-head.db: $(converter_mu2docbook)
-	$(converter_mu2docbook) -a "$(AWK)" --head "E-MailRelay" > head.db.tmp && mv -f head.db.tmp head.db
+svg_files_noinstall=\
+	authentication.svg \
+	forwardto.svg \
+	serverclient.svg \
+	whatisit.svg \
+	mailserver.svg \
+	popbyname.svg
 
-tail.db: $(converter_mu2docbook)
-	$(converter_mu2docbook) -a "$(AWK)" --tail > tail.db.tmp && mv -f tail.db.tmp tail.db
+png_files_install=\
+	authentication.png \
+	forwardto.png \
+	serverclient.png \
+	whatisit.png \
+	download-button.png \
+	mailserver.png \
+	popbyname.png
 
-emailrelay.docbook: head.db tail.db userguide.db reference.db developer.db
-	cat head.db userguide.db reference.db developer.db tail.db > emailrelay.docbook
+EXTRA_DIST = \
+	$(man_files_install) \
+	$(txt_files_install) \
+	$(txt_files_noinstall) \
+	$(css_files_install) \
+	$(png_files_install) \
+	$(svg_files_noinstall) \
+	$(html_files_install) \
+	$(html_files_noinstall)
 
-.docbook: emailrelay.docbook
-	-xmlto -o docbook html emailrelay.docbook && touch .docbook && cp *.png docbook/
+noinst_SCRIPTS = .dox
+man1_MANS = $(man_files_install)
+e_doc_DATA = $(txt_files_install) $(html_files_install) $(css_files_install) $(png_files_install)
+CLEANFILES = $(noinst_SCRIPTS) $(man_files_clean) emailrelay-man.html doxygen.out doxygen.cfg doxygen/search/* doxygen/*
+
+SUFFIXES = .txt .html
+
+run_doxygen=$(top_srcdir)/libexec/doxygen.sh
 
 .dox:
-	$(run_doxygen) "$(HAVE_DOXYGEN)" "$(top_srcdir)" "$(top_builddir)" && touch .dox
+	-@chmod +x $(run_doxygen)
+	$(run_doxygen) "$(GCONFIG_HAVE_DOXYGEN)" "$(top_srcdir)" "$(top_builddir)" doxygen doxygen.cfg.in && touch .dox
 
 emailrelay-man.html: emailrelay.1
-	if test "$(HAVE_MAN2HTML)" = "yes" ; then man2html -r -L. emailrelay.1 < /dev/null > emailrelay-man.html.tmp && mv emailrelay-man.html.tmp emailrelay-man.html ; grep -v '^Content-type:' < emailrelay-man.html > emailrelay-man.html.tmp && mv emailrelay-man.html.tmp emailrelay-man.html ; fi
-
-developer.html reference.html userguide.html: $(converter_html)
-
-developer.mu reference.mu userguide.mu: $(converter_txt2mu)
-
-readme.html: $(top_srcdir)/README $(converter_html)
-	$(converter_html) -a "$(AWK)" $(top_srcdir)/README $(stylesheet) > readme.html
-
-changelog.html: $(top_srcdir)/ChangeLog $(converter_html)
-	$(converter_html) -a "$(AWK)" $(top_srcdir)/ChangeLog $(stylesheet) > changelog.html
+	if test "$(GCONFIG_HAVE_MAN2HTML)" = "yes" ; then man2html -r -L. emailrelay.1 < /dev/null > emailrelay-man.html.tmp && mv emailrelay-man.html.tmp emailrelay-man.html ; grep -v '^Content-type:' < emailrelay-man.html | grep -v '^Time:' > emailrelay-man.html.tmp ; mv emailrelay-man.html.tmp emailrelay-man.html ; else cp man2html-missing.html emailrelay-man.html ; fi
 
 emailrelay.1.gz : emailrelay.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay.1 > emailrelay.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c "$(top_srcdir)/doc/emailrelay.1" > emailrelay.1.gz ; fi
 
 emailrelay-passwd.1.gz : emailrelay-passwd.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-passwd.1 > emailrelay-passwd.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c "$(top_srcdir)/doc/emailrelay-passwd.1" > emailrelay-passwd.1.gz ; fi
 
 emailrelay-submit.1.gz : emailrelay-submit.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-submit.1 > emailrelay-submit.1.gz ; fi
-
-emailrelay-filter-copy.1.gz : emailrelay-filter-copy.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-filter-copy.1 > emailrelay-filter-copy.1.gz ; fi
-
-emailrelay-poke.1.gz: emailrelay-poke.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-poke.1 > emailrelay-poke.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c "$(top_srcdir)/doc/emailrelay-submit.1" > emailrelay-submit.1.gz ; fi
 
 install-data-local: install-e_docDATA
-	$(mkinstalldirs) $(DESTDIR)$(e_docdir)/doxygen
-	if test "$(HAVE_DOXYGEN)" = "yes" ; then for file in doxygen/* ; do $(INSTALL) $$file $(DESTDIR)$(e_docdir)/$$file ; done ; fi
+	$(mkinstalldirs) "$(DESTDIR)$(e_docdir)/doxygen"
+	if test -d doxygen ; then for file in doxygen/* ; do $(INSTALL) -m 644 "$$file" "$(DESTDIR)$(e_docdir)/$$file" || true ; done ; else true ; fi
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(e_docdir)/doxygen/* 2>/dev/null
-	-rmdir $(DESTDIR)$(e_docdir)/doxygen 2>/dev/null
-	-rmdir $(DESTDIR)$(e_docdir) 2>/dev/null
+	-find "$(DESTDIR)$(e_docdir)/doxygen" -type f | xargs rm -f
+	-rmdir "$(DESTDIR)$(e_docdir)/doxygen" 2>/dev/null
+	-rmdir "$(DESTDIR)$(e_docdir)" 2>/dev/null
+
+.PHONY: rst
+rst:
+	ls -1 *.rst | grep -v index.rst | sed 's/.rst$$//' | xargs -i__ rst2html.py __.rst __.html
+
+.PHONY: md
+md:
+	for f in *.md ; do markdown $$f > "`basename $$f .md`".html ; done
+
+.PHONY: sphinx
+sphinx:
+	sphinx-build -b html . ./_build
+
+.PHONY: website
+website:
+	@chmod +x $(top_srcdir)/libexec/make-website || true
+	$(top_srcdir)/libexec/make-website `cat $(top_srcdir)/VERSION`
 

doc/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,9 +19,65 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -35,34 +91,78 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/src/gconfig_defs.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SCRIPTS = $(noinst_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(e_docdir)"
-NROFF = nroff
-MANS = $(man1_MANS)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-e_docDATA_INSTALL = $(INSTALL_DATA)
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(e_docdir)"
+NROFF = nroff
+MANS = $(man1_MANS)
 DATA = $(e_doc_DATA)
+am__extra_recursive_targets = extra-recursive
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+ARFLAGS = @ARFLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -70,10 +170,9 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILER_VERSION = @COMPILER_VERSION@
-CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -84,16 +183,22 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
+GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
+GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
+GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
+GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
+GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
+GCONFIG_WINDMC = @GCONFIG_WINDMC@
+GCONFIG_WINDRES = @GCONFIG_WINDRES@
 GREP = @GREP@
 GZIP = @GZIP@
-HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_MAN2HTML = @HAVE_MAN2HTML@
+HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-IP = @IP@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -102,25 +207,26 @@ MAINT = @MAINT@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MOC = @MOC@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
+QT_LRELEASE = @QT_LRELEASE@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
-SSL = @SSL@
-SSL_LIBS = @SSL_LIBS@
-STATIC_END = @STATIC_END@
-STATIC_START = @STATIC_START@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
@@ -141,13 +247,18 @@ datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+e_bsdinitdir = @e_bsdinitdir@
 e_docdir = @e_docdir@
 e_examplesdir = @e_examplesdir@
+e_icondir = @e_icondir@
 e_initdir = @e_initdir@
-e_libexecdir = @e_libexecdir@
-e_qtmoc = @e_qtmoc@
+e_libdir = @e_libdir@
+e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
+e_systemddir = @e_systemddir@
+e_trdir = @e_trdir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 htmldir = @htmldir@
@@ -165,58 +276,112 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-stylesheet = emailrelay.css
-txt_files = developer.txt reference.txt userguide.txt windows.txt 
-man_files_in = emailrelay.1 emailrelay-passwd.1 emailrelay-poke.1 emailrelay-submit.1 emailrelay-filter-copy.1
-man_files_out = emailrelay.1.gz emailrelay-passwd.1.gz emailrelay-poke.1.gz emailrelay-submit.1.gz emailrelay-filter-copy.1.gz
-html_files_in = doxygen_header.html
-html_files_thru = index.html emailrelay-man.html $(stylesheet)
-html_files_out = readme.html developer.html reference.html userguide.html windows.html changelog.html
-docbook_files_out = emailrelay.docbook
-png_files = gsmtp-classes.png gnet-classes.png sequence-3.png gnet-client.png gsmtp-serverprotocol.png auth.png
-EXTRA_DIST = $(man_files_in) $(txt_files) $(html_files_in) $(html_files_thru) $(png_files) doxygen_missing.html
-noinst_SCRIPTS = .dox .docbook
-man1_MANS = $(man_files_in)
-e_doc_DATA = $(txt_files) $(html_files_out) $(html_files_thru) $(png_files) $(docbook_files_out)
-CLEANFILES = $(noinst_SCRIPTS) $(man_files_out) $(html_files_out) $(docbook_files_out) doxygen/* *.db *.mu docbook/*
-SUFFIXES = .txt .html .db .mu
-converter_html = $(top_builddir)/bin/txt2html.sh
-converter_txt2mu = $(top_builddir)/bin/txt2mu.sh
-converter_mu2html = $(top_builddir)/bin/mu2html.sh
-converter_expand = $(top_builddir)/bin/expand.sh
-converter_mu2docbook = $(top_builddir)/bin/mu2docbook.sh
-run_doxygen = $(top_builddir)/bin/doxygen.sh
+txt_files_install = \
+	readme.txt readme.md readme.rst \
+	developer.txt developer.md developer.rst \
+	reference.txt reference.md reference.rst \
+	userguide.txt userguide.md userguide.rst \
+	windows.txt windows.md windows.rst \
+	changelog.txt changelog.md changelog.rst \
+	doxygen.cfg.in
+
+txt_files_noinstall = \
+	index.rst \
+	conf.py
+
+man_files_install = \
+	emailrelay.1 \
+	emailrelay-passwd.1 \
+	emailrelay-submit.1
+
+man_files_clean = \
+	emailrelay.1.gz \
+	emailrelay-passwd.1.gz \
+	emailrelay-submit.1.gz
+
+html_files_install = \
+	index.html \
+	emailrelay-man.html \
+	readme.html \
+	developer.html \
+	reference.html \
+	userguide.html \
+	windows.html \
+	changelog.html
+
+html_files_noinstall = \
+	man2html-missing.html \
+	doxygen-missing.html
+
+css_files_install = \
+	emailrelay.css \
+	emailrelay-doxygen.css
+
+svg_files_noinstall = \
+	authentication.svg \
+	forwardto.svg \
+	serverclient.svg \
+	whatisit.svg \
+	mailserver.svg \
+	popbyname.svg
+
+png_files_install = \
+	authentication.png \
+	forwardto.png \
+	serverclient.png \
+	whatisit.png \
+	download-button.png \
+	mailserver.png \
+	popbyname.png
+
+EXTRA_DIST = \
+	$(man_files_install) \
+	$(txt_files_install) \
+	$(txt_files_noinstall) \
+	$(css_files_install) \
+	$(png_files_install) \
+	$(svg_files_noinstall) \
+	$(html_files_install) \
+	$(html_files_noinstall)
+
+noinst_SCRIPTS = .dox
+man1_MANS = $(man_files_install)
+e_doc_DATA = $(txt_files_install) $(html_files_install) $(css_files_install) $(png_files_install)
+CLEANFILES = $(noinst_SCRIPTS) $(man_files_clean) emailrelay-man.html doxygen.out doxygen.cfg doxygen/search/* doxygen/*
+SUFFIXES = .txt .html
+run_doxygen = $(top_srcdir)/libexec/doxygen.sh
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .txt .html .db .mu
+.SUFFIXES: .txt .html
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
-.PRECIOUS: Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu doc/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -226,76 +391,81 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-man1: $(man1_MANS) $(man_MANS)
+$(am__aclocal_m4_deps):
+install-man1: $(man1_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
+	@list1='$(man1_MANS)'; \
+	list2=''; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
 	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-e_docDATA: $(e_doc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(e_docdir)" || $(MKDIR_P) "$(DESTDIR)$(e_docdir)"
-	@list='$(e_doc_DATA)'; for p in $$list; do \
+	@list='$(e_doc_DATA)'; test -n "$(e_docdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(e_docdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(e_docdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(e_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(e_docdir)/$$f'"; \
-	  $(e_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(e_docdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(e_docdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(e_docdir)" || exit $$?; \
 	done
 
 uninstall-e_docDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(e_doc_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(e_docdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(e_docdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
+	@list='$(e_doc_DATA)'; test -n "$(e_docdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(e_docdir)'; $(am__uninstall_files_from_dir)
+extra-local: 
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -311,13 +481,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -338,10 +512,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -349,6 +528,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -365,8 +545,14 @@ dvi: dvi-am
 
 dvi-am:
 
+extra: extra-am
+
+extra-am: extra-local
+
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -375,18 +561,28 @@ install-data-am: install-data-local install-e_docDATA install-man
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man: install-man1
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -411,80 +607,65 @@ uninstall-man: uninstall-man1
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am \
-	install-e_docDATA install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-e_docDATA uninstall-local uninstall-man \
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am \
+	extra-am extra-local html html-am info info-am install \
+	install-am install-data install-data-am install-data-local \
+	install-dvi install-dvi-am install-e_docDATA install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man1 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-e_docDATA uninstall-local uninstall-man \
 	uninstall-man1
 
+.PRECIOUS: Makefile
 
-.txt.html:
-	$(converter_html) -a "$(AWK)" $(top_srcdir)/doc/$*.txt $(stylesheet) > $*.html
-
-.txt.mu:
-	$(converter_txt2mu) -a "$(AWK)" $(top_srcdir)/doc/$*.txt > $*.mu
-
-.mu.db:
-	$(converter_mu2docbook) -a "$(AWK)" -x < $(top_builddir)/doc/$*.mu > $*.db
-
-head.db: $(converter_mu2docbook)
-	$(converter_mu2docbook) -a "$(AWK)" --head "E-MailRelay" > head.db.tmp && mv -f head.db.tmp head.db
-
-tail.db: $(converter_mu2docbook)
-	$(converter_mu2docbook) -a "$(AWK)" --tail > tail.db.tmp && mv -f tail.db.tmp tail.db
-
-emailrelay.docbook: head.db tail.db userguide.db reference.db developer.db
-	cat head.db userguide.db reference.db developer.db tail.db > emailrelay.docbook
-
-.docbook: emailrelay.docbook
-	-xmlto -o docbook html emailrelay.docbook && touch .docbook && cp *.png docbook/
 
 .dox:
-	$(run_doxygen) "$(HAVE_DOXYGEN)" "$(top_srcdir)" "$(top_builddir)" && touch .dox
+	-@chmod +x $(run_doxygen)
+	$(run_doxygen) "$(GCONFIG_HAVE_DOXYGEN)" "$(top_srcdir)" "$(top_builddir)" doxygen doxygen.cfg.in && touch .dox
 
 emailrelay-man.html: emailrelay.1
-	if test "$(HAVE_MAN2HTML)" = "yes" ; then man2html -r -L. emailrelay.1 < /dev/null > emailrelay-man.html.tmp && mv emailrelay-man.html.tmp emailrelay-man.html ; grep -v '^Content-type:' < emailrelay-man.html > emailrelay-man.html.tmp && mv emailrelay-man.html.tmp emailrelay-man.html ; fi
-
-developer.html reference.html userguide.html: $(converter_html)
-
-developer.mu reference.mu userguide.mu: $(converter_txt2mu)
-
-readme.html: $(top_srcdir)/README $(converter_html)
-	$(converter_html) -a "$(AWK)" $(top_srcdir)/README $(stylesheet) > readme.html
-
-changelog.html: $(top_srcdir)/ChangeLog $(converter_html)
-	$(converter_html) -a "$(AWK)" $(top_srcdir)/ChangeLog $(stylesheet) > changelog.html
+	if test "$(GCONFIG_HAVE_MAN2HTML)" = "yes" ; then man2html -r -L. emailrelay.1 < /dev/null > emailrelay-man.html.tmp && mv emailrelay-man.html.tmp emailrelay-man.html ; grep -v '^Content-type:' < emailrelay-man.html | grep -v '^Time:' > emailrelay-man.html.tmp ; mv emailrelay-man.html.tmp emailrelay-man.html ; else cp man2html-missing.html emailrelay-man.html ; fi
 
 emailrelay.1.gz : emailrelay.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay.1 > emailrelay.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c "$(top_srcdir)/doc/emailrelay.1" > emailrelay.1.gz ; fi
 
 emailrelay-passwd.1.gz : emailrelay-passwd.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-passwd.1 > emailrelay-passwd.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c "$(top_srcdir)/doc/emailrelay-passwd.1" > emailrelay-passwd.1.gz ; fi
 
 emailrelay-submit.1.gz : emailrelay-submit.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-submit.1 > emailrelay-submit.1.gz ; fi
-
-emailrelay-filter-copy.1.gz : emailrelay-filter-copy.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-filter-copy.1 > emailrelay-filter-copy.1.gz ; fi
-
-emailrelay-poke.1.gz: emailrelay-poke.1
-	if test -n "$(GZIP)" ; then $(GZIP) -c $(top_srcdir)/doc/emailrelay-poke.1 > emailrelay-poke.1.gz ; fi
+	if test -n "$(GZIP)" ; then $(GZIP) -c "$(top_srcdir)/doc/emailrelay-submit.1" > emailrelay-submit.1.gz ; fi
 
 install-data-local: install-e_docDATA
-	$(mkinstalldirs) $(DESTDIR)$(e_docdir)/doxygen
-	if test "$(HAVE_DOXYGEN)" = "yes" ; then for file in doxygen/* ; do $(INSTALL) $$file $(DESTDIR)$(e_docdir)/$$file ; done ; fi
+	$(mkinstalldirs) "$(DESTDIR)$(e_docdir)/doxygen"
+	if test -d doxygen ; then for file in doxygen/* ; do $(INSTALL) -m 644 "$$file" "$(DESTDIR)$(e_docdir)/$$file" || true ; done ; else true ; fi
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(e_docdir)/doxygen/* 2>/dev/null
-	-rmdir $(DESTDIR)$(e_docdir)/doxygen 2>/dev/null
-	-rmdir $(DESTDIR)$(e_docdir) 2>/dev/null
+	-find "$(DESTDIR)$(e_docdir)/doxygen" -type f | xargs rm -f
+	-rmdir "$(DESTDIR)$(e_docdir)/doxygen" 2>/dev/null
+	-rmdir "$(DESTDIR)$(e_docdir)" 2>/dev/null
+
+.PHONY: rst
+rst:
+	ls -1 *.rst | grep -v index.rst | sed 's/.rst$$//' | xargs -i__ rst2html.py __.rst __.html
+
+.PHONY: md
+md:
+	for f in *.md ; do markdown $$f > "`basename $$f .md`".html ; done
+
+.PHONY: sphinx
+sphinx:
+	sphinx-build -b html . ./_build
+
+.PHONY: website
+website:
+	@chmod +x $(top_srcdir)/libexec/make-website || true
+	$(top_srcdir)/libexec/make-website `cat $(top_srcdir)/VERSION`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

doc/authentication.svg

@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!-- Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3036"
+   version="1.1"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   width="1650"
+   height="1023"
+   sodipodi:docname="authentication.svg"
+   inkscape:export-filename="/home/graeme/src/gnetapps/emailrelay/doc/graphics/authentication.png"
+   inkscape:export-xdpi="18"
+   inkscape:export-ydpi="18">
+  <metadata
+     id="metadata3042">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3040" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2108"
+     inkscape:window-height="1169"
+     id="namedview3038"
+     showgrid="false"
+     inkscape:zoom="0.7584233"
+     inkscape:cx="701.35349"
+     inkscape:cy="362.80329"
+     inkscape:window-x="0"
+     inkscape:window-y="150"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer4" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="colour"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="shapes"
+     style="display:inline">
+    <g
+       id="g3401"
+       transform="translate(-91.993978,-3.4071843)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path7860"
+         d="m 809.83225,449.90435 c -75.21714,-9.37864 -141.10301,-48.21472 -165.49853,-97.5523 -12.16037,-24.59314 -14.91307,-37.10424 -13.36523,-60.7455 2.83502,-43.30151 25.87459,-86.11586 70.69643,-131.37492 35.78606,-36.13513 64.67414,-55.66718 107.95002,-72.988042 20.00723,-8.007756 27.06735,-12.945778 19.01164,-13.29721 -8.19547,-0.357528 23.83022,-10.32233 51.07725,-15.8927 27.73809,-5.670761 34.51142,-6.171832 68.38466,-5.058892 30.95125,1.016936 41.65196,2.386243 60.53611,7.746461 91.2608,25.904136 149.1482,94.538613 154.4554,183.130973 6.1079,101.95624 -77.0761,174.58867 -230.75806,201.48742 -33.24747,5.81926 -94.14629,8.07877 -122.48969,4.54471 l 0,0 z"
+         style="fill:#ddffdd;fill-opacity:1;stroke:none;display:inline" />
+      <path
+         sodipodi:nodetypes="csscscsssccsscsssscccssssssscsccsccssssssssssccsscssscsssssssccsccsscsssscsscscssccssssccccscssc"
+         style="fill:#161616"
+         d="m 737.19034,432.52548 c 15.97401,6.391 17.99931,6.9368 41.00961,13.2088 1.925,0.5247 6.2,1.3483 9.5,1.8302 3.3,0.4819 9.825,1.5796 14.5,2.4392 17.83747,3.28 56.54521,4.4905 83.63111,2.6152 19.5949,-1.3566 48.1731,-5.2192 59.3689,-8.0242 1.925,-0.4822 5.627,-1.1465 8.2267,-1.476 2.5997,-0.3295 4.9887,-1.0232 5.309,-1.5414 0.3203,-0.5182 1.9863,-0.9422 3.7023,-0.9422 1.716,0 4.502,-0.4155 6.191,-0.9233 1.6891,-0.5078 5.546,-1.4777 8.571,-2.1554 3.025,-0.6776 8.875,-2.3516 13,-3.7199 4.125,-1.3683 9.075,-2.8431 11.00004,-3.2773 5.3321,-1.2027 16.6146,-5.3717 25.3054,-9.3506 4.293,-1.9654 8.4985,-3.5735 9.3457,-3.5735 0.8472,0 2.7347,-0.6123 4.1946,-1.3607 1.4599,-0.7484 7.6043,-3.729 13.6543,-6.6236 15.903,-7.6089 31.0245,-16.4939 43.8243,-25.7501 13.6987,-9.9064 35.6511,-32.5881 41.7134,-43.0994 0.8458,-1.4664 2.681,-4.4662 4.0783,-6.6662 4.0531,-6.3817 10.4319,-19.4825 12.6593,-26 7.4046,-21.6652 9.2579,-33.5212 8.8056,-56.3298 -0.5545,-27.9635 -3.0912,-41.6208 -12.8472,-69.1702 -12.4462,-35.146 -38.334,-68.37969 -70.2337,-90.162894 -19.7598,-13.4933 -45.5209,-25.7893 -64,-30.548 -3.3,-0.8498 -9.825,-2.6122 -14.5,-3.9165 -19.73684,-5.5063 -37.65074,-7.579 -66.50004,-7.6941 -20.805,-0.083 -24.5747,0.1742 -39.5,2.6948 -16.6511,2.8122 -37.5958,7.4185 -46.1342,10.1462 -2.5488,0.8143 -5.1808,1.4805 -5.8489,1.4805 -0.6681,0 -2.6327,0.6379 -4.3658,1.4176 -1.7331,0.7796 -6.0761,2.4123 -9.65111,3.6281 -3.575,1.2157 -7.4,2.6922 -8.5,3.281 -1.76298,0.9437 -1.47997,1.1621 2.3881,1.8433 4.89608,0.8623 5.58547,1.2547 4.70551,2.6785 -0.59258,0.9589 -4.78106,2.6321 -23.09246,9.2254 -4.94937,1.7821 -13.94937,5.6049 -20,8.4951 -10.02655,4.7893 -13.66541,6.800004 -28.91174,15.975704 -7.36301,4.4312 -26.94189,19.1179 -34.08941,25.5713 -1.1,0.9932 -4.23798,3.73589 -6.97328,6.09489 -10.58231,9.1265 -32.29146,31.7526 -39.02672,40.6752 -2.2,2.9145 -5.59107,7.1699 -7.53572,9.4565 -8.12985,9.5593 -15.86194,22.0848 -25.00502,40.5063 -17.24179,34.7388 -21.21508,68.6397 -11.54015,98.463 3.88903,11.988 11.95767,28.5452 18.36622,37.6881 18.11851,25.8493 47.76836,47.9125 83.71467,62.2942 m -0.81538,8.4516 c -35.55321,-14.6977 -61.63316,-33.5314 -81.60544,-57.9645 -13.88533,-16.9867 -18.78696,-25.1602 -25.05631,-41.7813 -1.76337,-4.675 -3.8399,-9.9778 -4.6145,-11.7839 -0.7746,-1.8062 -1.40837,-4.5894 -1.40837,-6.1849 0,-1.5956 -0.49266,-4.1678 -1.09481,-5.7161 -1.51337,-3.8914 -2.19029,-27.2119 -1.05412,-36.3151 1.34654,-10.7888 4.16023,-25.3075 5.13336,-26.4884 0.45852,-0.5564 1.79409,-3.9366 2.96793,-7.5116 1.17383,-3.575 3.51454,-9.425 5.20156,-13 7.93762,-16.8208 8.52886,-17.8653 18.54657,-32.7651 2.86027,-4.2542 6.46027,-9.6918 8,-12.0835 4.2959,-6.673 23.35565,-28.3363 36.23671,-41.1866 32.32046,-32.24309 57.53908,-49.361494 97.0628,-65.885894 4.44028,-1.8564 8.92787,-4.5997 11,-6.7243 3.84614,-3.9435 7.17902,-5.6069 9.4718,-4.727 0.83531,0.3205 3.58332,-0.9597 6.25868,-2.9158 6.17055,-4.5115 15.18643,-8.5345 28.26953,-12.6144 5.775,-1.8009 11.85,-3.8838 13.5,-4.6286 3.292,-1.4861 26.9165,-6.5352 32.5,-6.9461 1.925,-0.1416 6.65,-0.8343 10.5,-1.5393 10.3175,-1.8894 54.2348,-1.6505 66.5,0.3617 5.225,0.8572 12.425,2.0415 16,2.6318 12.4944,2.0632 30.66524,7.385 47.00004,13.7651 50.4688,19.7124 88.0026,51.695504 113.1983,96.457794 5.8626,10.4154 13.6377,28.0067 16.707,37.8002 4.3293,13.8135 5.0947,16.5219 5.0947,18.0278 0,0.9336 0.8805,5.2468 1.9567,9.5848 2.5122,10.1268 4.27,34.7721 3.4868,48.8874 -1.0134,18.2659 -6.2292,40.5191 -12.7737,54.4988 -1.509,3.2234 -11.991,21.2673 -15.4804,26.6485 -9.1235,14.0694 -27.2624,32.4805 -41.3219,41.9418 -2.8287,1.9036 -6.7686,4.7071 -8.7553,6.2299 -1.9867,1.5229 -4.7372,3.3099 -6.1122,3.9712 -1.375,0.6613 -5.2,2.9871 -8.5,5.1685 -3.3,2.1814 -7.125,4.4328 -8.5,5.0031 -1.375,0.5704 -3.175,1.4686 -4,1.9962 -1.9517,1.248 -13.8635,7.042 -14.4776,7.042 -0.2598,0 -3.5211,1.4069 -7.2474,3.1265 -3.7262,1.7196 -9.7,4.1751 -13.275,5.4568 -3.575,1.2817 -8.975,3.2999 -12,4.4849 -3.025,1.185 -7.525,2.7454 -10,3.4677 -2.475,0.7222 -7.2,2.1976 -10.5,3.2785 -3.30004,1.081 -8.47504,2.5244 -11.50004,3.2076 -3.025,0.6833 -6.3958,1.7066 -7.4907,2.2741 -2.0349,1.0548 -15.878,4.1736 -25.2028,5.6781 -2.8565,0.4609 -5.5827,1.0784 -6.0582,1.3724 -3.6903,2.2807 -78.4885,10.1442 -89.7483,9.4352 -1.65,-0.1039 -6.825,-0.3049 -11.5,-0.4467 -42.75848,-1.2969 -82.19252,-8.9163 -113.825,-21.9931"
+         id="path3257"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path3237"
+       d="m 468.89325,209.04327 c -1.31585,-1.144 -1.20126,-2.6234 0.53745,-6.9392 2.39819,-5.9527 5.49124,-8.1216 16.67164,-11.6903 3.46347,-1.1055 6.29639,-2.3264 6.29539,-2.7132 -0.003,-0.8314 -22.35133,-7.3615 -33.25814,-9.7176 -4.19214,-0.9055 -8.93573,-2.0212 -10.5413,-2.4792 -4.0213,-1.1471 -34.4214,-7.6813 -49.66451,-10.6749 -13.46267,-2.6439 -21.27117,-3.9512 -43.03864,-7.2057 -7.62208,-1.1396 -18.32299,-2.7566 -23.77979,-3.5933 -23.17844,-3.5541 -90.10952,-5.8316 -100.25214,-3.4113 -2.66773,0.6365 -7.65672,1.2938 -11.08666,1.4605 -15.18289,0.7382 -29.41703,2.9999 -37.87621,6.0183 -7.69838,2.747 -11.1649,1.4899 -12.31617,-4.4663 -0.59719,-3.0896 -0.24145,-3.4881 4.32985,-4.8495 2.73928,-0.8159 5.91594,-2.0668 7.05925,-2.7798 2.68193,-1.6725 15.74058,-3.5731 22.86622,-3.3279 7.80147,0.2684 25.11022,-1.0802 29.53994,-2.3017 5.09959,-1.4062 26.99746,-1.7936 36.28706,-0.6419 4.19214,0.5197 14.21094,1.0611 22.264,1.203 8.05306,0.142 15.75281,0.7068 17.11055,1.255 1.35774,0.5483 5.55449,0.783 9.32611,0.5215 4.48322,-0.3109 8.63516,0.071 11.99191,1.1027 2.82393,0.8679 10.31825,2.0463 16.65401,2.6185 6.33577,0.5722 12.84945,1.7125 14.47485,2.5341 1.95868,0.9899 4.64103,1.2991 7.95414,0.9168 3.12927,-0.3611 6.97884,0.02 10.2929,1.0194 2.91172,0.8778 6.46982,1.5961 7.9069,1.5961 3.17903,0 43.82844,8.1204 51.09609,10.2073 1.90551,0.5472 7.51813,1.7946 12.47248,2.772 10.43387,2.0585 25.93172,5.4915 29.44892,6.5232 1.46684,0.4303 2.42521,0.2616 2.42521,-0.4269 0,-0.6261 -1.09134,-1.4314 -2.42521,-1.7895 -3.00839,-0.8076 -10.38786,-4.4395 -11.75666,-5.7861 -1.43923,-1.4159 0.27562,-7.7171 2.57859,-9.4751 1.70008,-1.2977 2.38863,-1.2641 5.72845,0.2802 2.08783,0.9654 9.4087,3.8166 16.26856,6.336 17.91725,6.5803 35.30031,14.1659 40.68932,17.756 4.53569,3.0216 8.50154,8.3024 10.38633,13.8299 0.81177,2.3807 0.2443,3.0544 -4.46848,5.3049 -4.93809,2.358 -7.21408,2.6529 -26.69566,3.4581 -24.21907,1.001 -29.25256,1.8302 -36.56564,6.0238 -5.95022,3.4122 -6.63374,3.5294 -8.93091,1.5321 z"
+       style="fill:#161616" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3235"
+       d="m 1080.9768,180.45936 c -1.9182,-2.6689 -2.0996,-8.1501 -0.3147,-9.5093 3.1189,-2.3749 20.8492,-10.3099 36.6848,-16.4176 4.2328,-1.6327 8.498,-3.3919 9.4779,-3.9095 0.98,-0.5176 2.4859,-0.9411 3.3462,-0.9411 0.8604,0 3.5218,-0.8585 5.9143,-1.9077 2.3924,-1.0493 5.5043,-2.1378 6.9153,-2.4191 2.4111,-0.4806 10.3027,-3.0192 14.8791,-4.7864 3.3718,-1.3021 16.1177,-4.6431 20.5229,-5.3795 2.2576,-0.3775 4.6769,-1.1471 5.3763,-1.7103 0.6995,-0.5633 4.1627,-1.1275 7.6961,-1.2538 4.1752,-0.1493 7.9385,-0.9856 10.7491,-2.3887 2.3786,-1.1874 5.8417,-2.115 7.6961,-2.0614 1.8543,0.054 6.142,-0.6133 9.5283,-1.4822 3.3863,-0.8688 7.688,-1.5867 9.5593,-1.5953 1.8714,-0.01 4.323,-0.4957 5.4482,-1.0826 6.9618,-3.6309 89.9032,-6.6163 129.1662,-4.6492 11.0054,0.5514 22.2838,1.0506 25.0631,1.1094 l 5.0532,0.1068 -0.246,-6.6506 c -0.1483,-4.0056 0.2021,-6.9206 0.8808,-7.3294 0.6198,-0.3733 2.6125,0.1603 4.4281,1.1858 1.8157,1.0254 5.3792,2.4644 7.9189,3.1978 13.2776,3.8339 29.4804,10.5812 34.8318,14.505 1.9439,1.4253 4.1863,2.5914 4.9831,2.5914 0.7969,0 3.2467,1.3878 5.4445,3.084 3.9373,3.0391 3.9956,3.1826 3.9956,9.845 0,9.1369 -0.7701,9.6913 -18.8779,13.5875 -3.8925,0.8376 -9.8219,2.9485 -13.1765,4.6909 -7.4877,3.8892 -9.3585,3.2337 -9.8121,-3.4381 -0.2978,-4.3798 -0.1487,-4.6373 4.6177,-7.9813 4.2265,-2.9653 10.2752,-5.7018 18.1907,-8.2298 1.7027,-0.5438 1.7741,-0.8189 0.5132,-1.9769 -1.7771,-1.632 -33.9292,-4.8032 -51.3,-5.0597 -6.5273,-0.096 -12.4101,-0.502 -13.0731,-0.9013 -1.2981,-0.7818 -74.0035,-0.9391 -85.8831,-0.1859 -3.9506,0.2506 -12.2624,0.7397 -18.4706,1.087 -6.2082,0.3473 -14.5201,1.1056 -18.4707,1.6851 -3.9506,0.5795 -9.03,1.1879 -11.2876,1.3519 -4.8154,0.3499 -20.9957,2.977 -23.935,3.8861 -1.1182,0.3459 -4.5021,1.0529 -7.5197,1.5711 -13.2174,2.27 -41.3884,9.5065 -48.5848,12.4803 -1.6931,0.6997 -5.1563,1.8159 -7.696,2.4805 -10.8361,2.8353 -50.574,18.8745 -60.6013,24.4599 -5.616,3.1284 -7.5785,3.1979 -9.6317,0.3412 z"
+       style="fill:#161616" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+       x="1066.4489"
+       y="380.74576"
+       id="text3324"><tspan
+         sodipodi:role="line"
+         id="tspan3326"
+         x="1066.4489"
+         y="380.74576"
+         style="font-size:48px;line-height:1.25">--client-auth</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       x="176.8667"
+       y="385.01154"
+       id="text3324-9"><tspan
+         sodipodi:role="line"
+         id="tspan3326-1"
+         x="176.8667"
+         y="385.01154"
+         style="font-size:48px;line-height:1.25">--server-auth</tspan></text>
+    <g
+       id="g3384"
+       transform="translate(-155.02689,-30.664659)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path8377"
+         d="m 1661.9361,118.9409 c -1.771,-3.3091 -1.6446,-6.39842 0.4329,-10.58363 2.4886,-5.01311 4.9505,-6.02558 16.216,-6.66877 18.5597,-1.05965 29.5411,1.28198 28.5934,6.09719 -1.4666,7.45155 -13.4826,13.712 -28.3874,14.79011 -12.3126,0.89062 -14.7096,0.37369 -16.8549,-3.6349 z"
+         style="fill:#fbdeb2;fill-opacity:1;stroke:none;display:inline" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3239"
+         d="m 1654.2227,237.16914 c -2.154,-2.2928 -2.2798,-3.0697 -1.7838,-11.0193 0.558,-8.9437 3.3281,-16.3433 8.0954,-21.6244 1.1864,-1.3143 3.3402,-3.9646 4.7861,-5.8896 1.446,-1.925 4.0263,-5.075 5.7341,-7 3.2914,-3.7102 3.3422,-3.8329 3.5216,-8.5 0.097,-2.5285 0.5082,-2.9859 2.6153,-2.9103 1.375,0.049 3.175,0.2743 4,0.5 1.0035,0.2745 1.4438,-0.2517 1.3303,-1.5897 -0.2702,-3.1859 -2.5316,-10.8828 -3.5992,-12.25 -1.2121,-1.55241 -8.9685,-1.61551 -17.4309,-0.14181 -4.7845,0.83321 -7.068,0.81641 -9.2022,-0.068 -3.1033,-1.2854 -5.3823,-5.1362 -4.4609,-7.5374 0.7469,-1.9462 2.2502,-2.223 17.3629,-3.1973 l 12.5,-0.8059 0.5,-9 c 0.4551,-8.1922 0.6885,-9.0269 2.6001,-9.2999 1.3402,-0.1914 3.3961,0.9961 5.6819,3.2819 3.1076,3.1076 3.5075,4.04 3.0205,7.0415 -0.8789,5.416 0.7005,6.4765 9.6456,6.4765 6.7592,0 7.9697,0.2837 9.8776,2.3144 4.5646,4.8589 1.8972,7.624 -7.51,7.7853 -9.2541,0.1586 -10.7644,0.8649 -11.1269,5.20381 -0.1712,2.0485 0.6631,7.6558 1.854,12.4605 l 2.1652,8.736 8.979,9.1999 c 9.4407,9.673 10.6653,12.5254 5.6285,13.1094 -3.4107,0.3954 -8.9308,-3.1513 -15.0799,-9.6889 -6.5015,-6.9122 -7.908,-7.5592 -11.0539,-5.0847 -3.9039,3.0708 -15.0491,16.9481 -17.5586,21.863 -1.2353,2.4192 -2.7028,6.9192 -3.2612,10 -0.9998,5.5157 -3.1382,10.1013 -4.7106,10.1013 -0.4415,0 -1.8455,-1.11 -3.12,-2.4667 z"
+         style="fill:#161616" />
+      <path
+         sodipodi:nodetypes="ccccsscscsscccccscssssc"
+         inkscape:connector-curvature="0"
+         id="path3066"
+         d="m 1680.1083,124.22703 c 7.0818,-0.2751 10.2071,-1.0243 14.2901,-2.5674 l 0,-2e-4 c 7.0507,-2.6646 11.1812,-6.0188 13.8472,-11.2445 1.9056,-3.7354 1.9254,-4.0795 0.3352,-5.8366 -3.0633,-3.3849 -8.2846,-4.43 -20.9479,-4.1932 -6.8882,0.1288 -13.6023,-0.2658 -15.7613,-0.926202 -3.4318,-1.0499 -3.9877,-0.9393 -6.3473,1.263102 -3.0038,2.8037 -5.8546,8.0568 -6.8328,12.5908 -0.9266,4.2944 1.6041,9.1015 5.2095,9.896 1.5025,0.3311 3.1819,0.783 3.7319,1.0042 0.55,0.2212 5.5,0.2275 11,0.014 m -0.3448,10.1672 c -0.39,-0.075 -0.7802,-0.1993 -2.1552,-0.4052 -12.019,-1.8001 -14.4349,-2.7238 -18.7581,-7.1721 -2.3812,-2.45 -4.9847,-6.023 -5.7857,-7.94 -4.7123,-11.2783 1.6556,-23.835002 15.8795,-31.312402 9.2319,-4.8531 12.0541,-4.7682 20.1517,0.6068 3.5494,2.3559 6.6277,3.5194 10.2516,3.8745 6.4828,0.6353 11.9926,3.4083 17.7688,8.942902 3.6122,3.4611 4.4922,4.9758 4.4922,7.7323 0,13.5694 -10.6345,21.7402 -32.2909,24.8103 -4.285,0.6075 -8.11,1.0432 -8.5,0.9683"
+         style="fill:#161616" />
+      <text
+         id="text3379"
+         y="288.75177"
+         x="1633.7449"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="288.75177"
+           x="1633.7449"
+           id="tspan3381"
+           sodipodi:role="line"
+           style="font-size:48px;line-height:1.25">bob</tspan></text>
+    </g>
+    <path
+       style="fill:#161616;display:inline"
+       d="m 311.95448,476.78664 c 24.58022,-0.4873 42.77494,-0.9269 45.45641,-0.9767 2.68148,-0.05 8.89763,-0.2859 13.81367,-0.5246 4.91606,-0.2386 20.63927,-0.7058 34.94048,-1.038 14.30122,-0.3323 29.33033,-0.8366 33.39806,-1.1206 12.42628,-0.8679 81.80619,-2.0079 114.13509,-1.8754 27.9904,0.1147 78.5421,2.7498 81.8676,4.2675 7.0635,3.2237 8.904,6.0438 9.9447,15.2381 0.5833,5.1531 1.0373,10.9443 1.0091,12.8693 -0.062,4.1586 -4.7443,29.1768 -7.5808,40.5 -1.4465,5.7738 -1.9156,24.1011 -1.6859,65.8615 0.3544,64.4154 -0.1495,61.6385 11.2037,61.6385 7.8853,0 5.2544,-1.20564 9.4039,2.38016 2.7897,2.4107 0.853,6.28274 -0.4039,7.50144 -1.3723,1.3308 5.93,1.5563 -5.2986,1.2691 l -13.6549,-0.3493 -2.7894,3.5993 c -2.8607,3.6914 -6.2908,4.5598 -9.2791,2.3493 -0.9292,-0.6875 -3.0364,-2.3361 -4.6821,-3.6636 -2.6687,-2.1525 -4.4708,-2.4515 -16.6571,-2.7639 -7.5156,-0.1926 -30.1191,0.1098 -50.2302,0.6719 -20.1111,0.5622 -44.6101,1.2489 -54.4421,1.5261 -9.83212,0.2773 -21.53311,0.7153 -26.00224,0.9734 -26.6222,1.5379 -133.39053,3.4824 -161.70125,2.945 -53.94127,-1.0239 -84.94478,-2.9391 -91.17945,-6.9251 -4.90207,-3.134 -7.82651,-8.5054 -5.88772,-10.8143 0.97671,-1.1632 0.5922,-6.119 -1.08639,-14 -1.42899,-6.7097 -1.65543,-20.2995 -2.94774,-30.1995 -2.80971,-21.5241 -4.64015,-44.5512 -6.89959,-53.5 -4.48895,-17.7787 -4.55992,-47.49 -5.04762,-66.0309 -0.29692,-11.292 -1.02238,-21.3045 -1.61198,-22.25 -3.01869,-4.8405 1.34317,-5.5332 39.09156,-6.2079 14.30121,-0.2556 46.11329,-0.8634 70.69351,-1.3508 m -7.36074,10.8144 c -15.64196,0.53 -35.29914,1.2175 -48.70653,1.5277 -13.40739,0.3102 -27.4684,0.8235 -31.24669,1.1407 l -6.86962,0.5768 0.8883,18.1399 c 1.06772,21.804 -2.91279,21.9841 0.54617,42.1399 1.51007,8.8 1.44804,17.382 2.30628,19.071 0.8584,1.689 1.56078,5.0927 1.56078,7.5636 0,2.4709 1.59875,9.55628 2.59129,15.929 1.1216,7.20139 1.65562,13.45001 1.99707,17.02501 0.34143,3.575 0.20667,8.76139 0.6596,10.41139 0.45293,1.65 1.96219,10.875 3.35396,20.5 3.59805,24.8838 4.80294,30.0601 7.20993,30.9754 11.03566,4.1968 80.28241,5.4772 169.76592,3.3817 l 0,2e-4 c 18.77035,-0.4395 35.22487,-0.7068 36.56561,-0.594 1.34074,0.1129 15.60133,-0.4571 31.6902,-1.2666 33.12808,-1.6668 99.51048,-3.4798 127.78058,-3.4898 14.302,-0.01 19.3606,-0.3508 20.8055,-1.4221 1.402,-1.0396 1.6563,-7.4785 0.9577,-24.25 -2.872,-68.9384 -2.2018,-91.939 3.3315,-114.3346 1.291,-5.225 2.8188,-16.9688 3.3952,-26.0973 0.8625,-13.6582 0.6447,-16.757 -1.2297,-17.4994 -2.3828,-0.9438 -20.7022,-3.1881 -27.1349,-3.3243 -56.518,-3.26162 -107.62546,-1.67151 -157.15837,-0.2613 -14.30122,0.6344 -45.01633,1.6125 -68.25581,2.1734 -23.23947,0.561 -55.05154,1.4536 -70.69351,1.9837"
+       id="path3255-3-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccsssssssccscssscsccsscssssssccsccssssssssccccscsssscccsc" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 1011.6284,387.35747 c -5.0743,5.05658 2.2532,9.37808 8.4237,11.75071 31.7564,17.83841 58.0478,43.73861 92.3449,56.99351 14.9653,6.74659 28.0431,11.81756 43.0194,18.53707 4.8155,-3.79198 4.9285,-7.14478 -1.7635,-9.69948 -20.1954,-8.63561 -35.188,-11.25388 -58.3955,-24.06174 -23.2075,-12.80786 -53.6574,-37.82502 -79.6525,-54.46677 -2.9805,-2.19336 -2.1639,-2.3389 -3.9765,0.9467 z"
+       id="path3439"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccczcc" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 431.96386,477.5158 c -5.0743,-5.05658 2.2532,-9.37808 8.4237,-11.75071 31.7564,-17.83841 58.0478,-43.73861 92.3449,-56.99351 14.9653,-6.74659 28.0431,-11.81756 43.0194,-18.53707 4.8155,3.79198 4.9285,7.14478 -1.7635,9.69948 -20.1954,8.63561 -35.188,11.25388 -58.3955,24.06174 -23.2075,12.80786 -53.6574,37.82502 -79.6525,54.46677 -2.9805,2.19336 -2.1639,2.3389 -3.9765,-0.9467 z"
+       id="path3439-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccczcc" />
+    <path
+       style="fill:#161616;display:inline"
+       d="m 1021.3328,474.27836 c 24.5803,-0.4873 42.775,-0.9269 45.4564,-0.9767 2.6815,-0.05 8.8977,-0.2859 13.8137,-0.5246 4.9161,-0.2386 20.6393,-0.7058 34.9405,-1.038 14.3012,-0.3323 29.3303,-0.8366 33.398,-1.1206 12.4263,-0.8679 81.8062,-2.0079 114.1351,-1.8754 27.9904,0.1147 78.5421,2.7498 81.8676,4.2675 7.0635,3.2237 8.904,6.0438 9.9447,15.2381 0.5833,5.1531 1.0373,10.9443 1.0091,12.8693 -0.062,4.1586 -4.7443,29.1768 -7.5808,40.5 -1.4465,5.7738 -1.9156,24.1011 -1.6859,65.8615 0.3544,64.4154 -0.1495,61.6385 11.2037,61.6385 7.8853,0 5.2544,-1.20564 9.4039,2.38016 2.7897,2.4107 0.853,6.28274 -0.4039,7.50144 -1.3723,1.3308 5.93,1.5563 -5.2986,1.2691 l -13.6549,-0.3493 -2.7894,3.5993 c -2.8607,3.6914 -6.2908,4.5598 -9.2791,2.3493 -0.9292,-0.6875 -3.0364,-2.3361 -4.6821,-3.6636 -2.6687,-2.1525 -4.4708,-2.4515 -16.6571,-2.7639 -7.5156,-0.1926 -30.1191,0.1098 -50.2302,0.6719 -20.1111,0.5622 -44.6101,1.2489 -54.4421,1.5261 -9.8321,0.2773 -21.5331,0.7153 -26.0022,0.9734 -26.6222,1.5379 -133.3905,3.4824 -161.7012,2.945 -53.94131,-1.0239 -84.94482,-2.9391 -91.17949,-6.9251 -4.90207,-3.134 -7.82651,-8.5054 -5.88772,-10.8143 0.97671,-1.1632 0.5922,-6.119 -1.08639,-14 -1.42899,-6.7097 -1.65543,-20.2995 -2.94774,-30.1995 -2.80971,-21.5241 -4.64015,-44.5512 -6.89959,-53.5 -4.48895,-17.7787 -4.55992,-47.49 -5.04762,-66.0309 -0.29692,-11.292 -1.02238,-21.3045 -1.61198,-22.25 -3.01869,-4.8405 1.34317,-5.5332 39.09156,-6.2079 14.30121,-0.2556 46.11329,-0.8634 70.69347,-1.3508 m -7.3607,10.8144 c -15.64196,0.53 -35.29914,1.2175 -48.70653,1.5277 -13.40739,0.3102 -27.4684,0.8235 -31.24669,1.1407 l -6.86962,0.5768 0.8883,18.1399 c 1.06772,21.804 -2.91279,21.9841 0.54617,42.1399 1.51007,8.8 1.44804,17.382 2.30628,19.071 0.8584,1.689 1.56078,5.0927 1.56078,7.5636 0,2.4709 1.59875,9.55628 2.59129,15.929 1.1216,7.20139 1.65562,13.45001 1.99707,17.02501 0.34143,3.575 0.20667,8.76139 0.6596,10.41139 0.45293,1.65 1.96219,10.875 3.35396,20.5 3.59805,24.8838 4.80294,30.0601 7.20993,30.9754 11.03566,4.1968 80.28246,5.4772 169.76586,3.3817 l 0,2e-4 c 18.7704,-0.4395 35.2249,-0.7068 36.5657,-0.594 1.3407,0.1129 15.6013,-0.4571 31.6902,-1.2666 33.128,-1.6668 99.5104,-3.4798 127.7805,-3.4898 14.302,-0.01 19.3606,-0.3508 20.8055,-1.4221 1.402,-1.0396 1.6563,-7.4785 0.9577,-24.25 -2.872,-68.9384 -2.2018,-91.939 3.3315,-114.3346 1.291,-5.225 2.8188,-16.9688 3.3952,-26.0973 0.8625,-13.6582 0.6447,-16.757 -1.2297,-17.4994 -2.3828,-0.9438 -20.7022,-3.1881 -27.1349,-3.3243 -56.518,-3.26162 -107.6254,-1.67151 -157.1583,-0.2613 -14.3013,0.6344 -45.0164,1.6125 -68.2558,2.1734 -23.2395,0.561 -55.0516,1.4536 -70.6935,1.9837"
+       id="path3255-3-2-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccsssssssccscssscsccsscssssssccsccssssssssccccscsssscccsc" />
+    <path
+       style="fill:#fff6d5;stroke:none"
+       d="m 241.02081,672.36506 c -7.17795,-1.7118 -7.35326,-2.13464 -11.297,-27.24711 -9.6652,-61.54492 -14.28972,-102.65603 -14.257,-126.74218 l 0.0352,-25.89255 24.91124,-1.43226 c 13.70118,-0.78775 67.01731,-2.52796 118.48028,-3.86713 51.46297,-1.33917 114.34866,-3.07693 139.74597,-3.86169 48.76938,-1.50693 124.42585,2.12252 128.46621,6.16289 1.57306,1.57306 0.79182,13.05247 -2.27649,33.44986 -3.59488,23.89791 -4.67148,44.21739 -4.67148,88.16846 l 0,57.11357 -35.24029,1.5381 c -55.3579,2.41615 -335.78506,4.54449 -343.89661,2.61004 z"
+       id="path3088"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#fff6d5;stroke:none"
+       d="m 950.71481,669.92649 c -6.7719,-1.62947 -7.46902,-2.88127 -10.29836,-18.4923 -1.66912,-9.20948 -4.66724,-29.43367 -6.66248,-44.94264 -1.99524,-15.50897 -4.72122,-35.30695 -6.05773,-43.9955 -1.33652,-8.68855 -2.45201,-28.54586 -2.47889,-44.12734 l -0.0489,-28.32998 22.48088,-1.4083 c 12.36448,-0.77457 64.58694,-2.51393 116.04994,-3.86523 51.4629,-1.35131 115.9891,-3.11198 143.3915,-3.91261 51.0226,-1.49074 125.5025,2.02317 129.5935,6.11414 1.3848,1.38479 0.1708,17.08301 -3.1485,40.71432 -4.5092,32.10264 -5.2625,46.69669 -4.5569,88.28302 l 0.8453,49.82248 -36.4555,1.52842 c -57.9773,2.43073 -334.64218,4.53932 -342.65389,2.61152 z"
+       id="path3090"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+       x="218.47667"
+       y="514.90009"
+       id="text3405"><tspan
+         sodipodi:role="line"
+         id="tspan3407"
+         x="218.47667"
+         y="514.90009"
+         style="font-size:28px;line-height:1.25">server plain alice ...</tspan><tspan
+         sodipodi:role="line"
+         x="218.47667"
+         y="549.90009"
+         id="tspan3409"
+         style="font-size:28px;line-height:1.25">server plain carol ...</tspan><tspan
+         sodipodi:role="line"
+         x="218.47667"
+         y="584.90009"
+         id="tspan3411"
+         style="font-size:28px;line-height:1.25">server plain dave ...</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+       x="928.94977"
+       y="521.77808"
+       id="text3413"><tspan
+         sodipodi:role="line"
+         id="tspan3415"
+         x="928.94977"
+         y="521.77808"
+         style="font-size:28px;line-height:1.25">client plain bob ...</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="text"
+     style="display:inline">
+    <g
+       id="g3393"
+       transform="translate(-52.811358,-27.257475)">
+      <text
+         id="text3375"
+         y="283.64099"
+         x="95.401161"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="283.64099"
+           x="95.401161"
+           id="tspan3377"
+           sodipodi:role="line"
+           style="font-size:48px;line-height:1.25">alice</tspan></text>
+      <path
+         inkscape:connector-curvature="0"
+         id="path8377-5"
+         d="m 129.84106,124.82785 c -1.771,-3.3091 -1.6446,-6.39842 0.4329,-10.58363 2.4886,-5.01311 4.9505,-6.02558 16.216,-6.66877 18.5597,-1.05965 29.5411,1.28198 28.5934,6.09719 -1.4666,7.45155 -13.4826,13.712 -28.3874,14.79011 -12.3126,0.89062 -14.7096,0.37369 -16.8549,-3.6349 z"
+         style="fill:#fbdeb2;fill-opacity:1;stroke:none;display:inline" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3239-6"
+         d="m 122.12766,243.05609 c -2.154,-2.2928 -2.2798,-3.0697 -1.7838,-11.0193 0.558,-8.9437 3.3281,-16.3433 8.0954,-21.6244 1.1864,-1.3143 3.3402,-3.9646 4.7861,-5.8896 1.446,-1.925 4.0263,-5.075 5.7341,-7 3.2914,-3.7102 3.3422,-3.8329 3.5216,-8.5 0.097,-2.5285 0.5082,-2.9859 2.6153,-2.9103 1.375,0.049 3.175,0.2743 4,0.5 1.0035,0.2745 1.4438,-0.2517 1.3303,-1.5897 -0.2702,-3.1859 -2.5316,-10.8828 -3.5992,-12.25 -1.2121,-1.55241 -8.9685,-1.61551 -17.4309,-0.14181 -4.7845,0.83321 -7.068,0.81641 -9.2022,-0.068 -3.1033,-1.2854 -5.3823,-5.1362 -4.4609,-7.5374 0.7469,-1.9462 2.2502,-2.223 17.3629,-3.1973 l 12.5,-0.8059 0.5,-9 c 0.4551,-8.1922 0.6885,-9.0269 2.6001,-9.2999 1.3402,-0.1914 3.3961,0.9961 5.6819,3.2819 3.1076,3.1076 3.5075,4.04 3.0205,7.0415 -0.8789,5.416 0.7005,6.4765 9.6456,6.4765 6.7592,0 7.9697,0.2837 9.8776,2.3144 4.5646,4.8589 1.8972,7.624 -7.51,7.7853 -9.2541,0.1586 -10.7644,0.8649 -11.1269,5.20381 -0.1712,2.0485 0.6631,7.6558 1.854,12.4605 l 2.1652,8.736 8.979,9.1999 c 9.4407,9.673 10.6653,12.5254 5.6285,13.1094 -3.4107,0.3954 -8.9308,-3.1513 -15.0799,-9.6889 -6.5015,-6.9122 -7.908,-7.5592 -11.0539,-5.0847 -3.9039,3.0708 -15.0491,16.9481 -17.5586,21.863 -1.2353,2.4192 -2.7028,6.9192 -3.2612,10 -0.9998,5.5157 -3.1382,10.1013 -4.7106,10.1013 -0.4415,0 -1.8455,-1.11 -3.12,-2.4667 z"
+         style="fill:#161616;display:inline" />
+      <path
+         sodipodi:nodetypes="ccccsscscsscccccscssssc"
+         inkscape:connector-curvature="0"
+         id="path3066-2"
+         d="m 148.01326,130.11398 c 7.0818,-0.2751 10.2071,-1.0243 14.2901,-2.5674 l 0,-2e-4 c 7.0507,-2.6646 11.1812,-6.0188 13.8472,-11.2445 1.9056,-3.7354 1.9254,-4.0795 0.3352,-5.8366 -3.0633,-3.3849 -8.2846,-4.43 -20.9479,-4.1932 -6.8882,0.1288 -13.6023,-0.2658 -15.7613,-0.9262 -3.4318,-1.0499 -3.9877,-0.9393 -6.3473,1.2631 -3.0038,2.8037 -5.8546,8.0568 -6.8328,12.5908 -0.9266,4.2944 1.6041,9.1015 5.2095,9.896 1.5025,0.3311 3.1819,0.783 3.7319,1.0042 0.55,0.2212 5.5,0.2275 11,0.014 m -0.3448,10.1672 c -0.39,-0.075 -0.7802,-0.1993 -2.1552,-0.4052 -12.019,-1.8001 -14.4349,-2.7238 -18.7581,-7.1721 -2.3812,-2.45 -4.9847,-6.023 -5.7857,-7.94 -4.7123,-11.2783 1.6556,-23.835 15.8795,-31.312398 9.2319,-4.8531 12.0541,-4.7682 20.1517,0.6068 3.5494,2.3559 6.6277,3.5194 10.2516,3.8745 6.4828,0.6353 11.9926,3.408298 17.7688,8.942898 3.6122,3.4611 4.4922,4.9758 4.4922,7.7323 0,13.5694 -10.6345,21.7402 -32.2909,24.8103 -4.285,0.6075 -8.11,1.0432 -8.5,0.9683"
+         style="fill:#161616;display:inline" />
+    </g>
+  </g>
+</svg>
+

doc/changelog.html

@@ -0,0 +1,448 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>E-MailRelay Change Log</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <link rel="stylesheet" href="emailrelay.css" type="text/css">
+ </head>
+ <body>
+  <!-- index:0::::E-MailRelay Change Log -->
+ <div class="div-main">
+  <h1><a class="a-header" name="H_1">E-MailRelay Change Log</a></h1> <!-- index:1:H:E-MailRelay Change Log -->
+   <h2><a class="a-header" name="SH_1_1">2.4 -> 2.5</a></h2> <!-- index:2:SH:1:1:2.4 -> 2.5 -->
+    <ul>
+     <li>Multiple configurations in one process.</li>
+     <li>SMTP PIPELINING (RFC-2920).</li>
+     <li>SMTP CHUNKING/8BITMIME 'BDAT' extension (RFC-3030), disabled by default.</li>
+     <li>SMTP SMTPUTF8 extension (RFC-6531), disabled by default.</li>
+     <li>No 7-bit/8-bit check on received message content (see NEWS file).</li>
+     <li>New built-in filters: <em>deliver:</em>, <em>split:</em>, <em>copy:</em>, <em>mx:</em>, <em>msgid:</em>.</li>
+     <li>New built-in address verifier: <em>account:</em></li>
+     <li>No <em>.local</em> files (see NEWS file).</li>
+     <li>PAM authentication is now enabled with <em>--server-auth=pam:</em> not <em>/pam</em>.</li>
+     <li>Client authentication details can be given directly from the command-line.</li>
+     <li>Multiple <em>client</em> authentication secrets, selected by a new envelope field.</li>
+     <li>Main binary can act as a simple submission tool (<em>configure --enable-submission</em>).</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_2">2.3 -> 2.4</a></h2> <!-- index:2:SH:1:2:2.3 -> 2.4 -->
+    <ul>
+     <li>Multiple <em>--filter</em> and <em>--client-filter</em> options allowed.</li>
+     <li>TLS key and certificate files can be specified separately.</li>
+     <li>Finer control when using <em>--anonymous</em> (eg. <em>--anonymous=server</em>).</li>
+     <li>The <em>auth-config</em> options can distinguish between TLS and non-TLS authentication.</li>
+     <li>Hourly log file rotation using <em>%h</em> (eg. <em>--log-file=log.%d.%h</em>).</li>
+     <li>Listening file descriptors can be inherited from the parent process (see <em>--interface</em>).</li>
+     <li>Listening ports on Windows use exclusive binding.</li>
+     <li>The Linux event loop uses <em>epoll</em> by default rather than <em>select</em>.</li>
+     <li>Some support for message routing (see NEWS).</li>
+     <li>Fix of error handling in network client filters (<em>--client-filter=net:...</em>) [bug-id #50].</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_3">2.2 -> 2.3</a></h2> <!-- index:2:SH:1:3:2.2 -> 2.3 -->
+    <ul>
+     <li>Unix domain sockets supported (eg. <em>--interface=/tmp/smtp.s</em>).</li>
+     <li>Windows event log not used for verbose logging (prefer <em>--log-file</em>).</li>
+     <li>New admin <em>forward</em> command to trigger forwarding without waiting.</li>
+     <li>Optional base64 encoding of passwords in secrets files (<em>plain:b</em>).</li>
+     <li>Support for MbedTLS version 3.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_4">2.1 -> 2.2</a></h2> <!-- index:2:SH:1:4:2.1 -> 2.2 -->
+    <ul>
+     <li>Connections from IPv4 'private use' addresses are allowed by default (see <em>--remote-clients</em>).</li>
+     <li>Interface names can be used with <em>--interface</em> (eg. <em>--interface=eth0</em>).</li>
+     <li>New <em>--server-tls-connection</em> option for server-side implicit TLS.</li>
+     <li>New <em>--forward-to-some</em> option to permit some message recipients to be rejected.</li>
+     <li>New <em>--log-address</em> option to aid adaptive firewalling.</li>
+     <li>Dynamic log file rolling when using <em>--log-file=%d</em>.</li>
+     <li>Choice of syslog 'facility' on Linux with <em>--syslog=local0</em> etc.</li>
+     <li>Pipelined SMTP QUIT commands sent by broken clients are tolerated.</li>
+     <li>Better handling of overly-verbose or unkillable <em>--filter</em> scripts.</li>
+     <li>Optional epoll event loop on Linux (<em>configure --enable-epoll</em>).</li>
+     <li>Some internationalisation support (see NEWS file).</li>
+     <li>Support for Windows XP restored when built with mingw-w64.</li>
+     <li>C++ 2011 compiler is required.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_5">2.0.1 -> 2.1</a></h2> <!-- index:2:SH:1:5:2.0.1 -> 2.1 -->
+    <ul>
+     <li>Backwards compatibility features for 1.9-to-2.0 transition removed.</li>
+     <li>Better handling of too-many-connections on Windows.</li>
+     <li>New <em>--idle-timeout</em> option for server-side connections.</li>
+     <li>Support for RFC-5782 DNSBL blocking (<em>--dnsbl</em>).</li>
+     <li>Filter scripts are given the path of the envelope file in argv2.</li>
+     <li>Message files can be edited by <em>--client-filter</em> scripts.</li>
+     <li>Better support for CRAM-SHAx authentication.</li>
+     <li>New <em>--client-auth-config</em> and <em>--server-auth-config</em> options.</li>
+     <li>New <em>--show</em> option on windows to better control the user interface style.</li>
+     <li>The <em>--pop</em> option always requires <em>--pop-auth</em>.</li>
+     <li>No message is spooled if all its envelope recipients are local-mailboxes.</li>
+     <li>TLS cipher name added to <em>Received</em> line as per RFC-8314 4.3.</li>
+     <li>Certificate contents are not logged.</li>
+     <li>Timestamp parts of spool filenames no longer limited to six digits.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_6">2.0 -> 2.0.1</a></h2> <!-- index:2:SH:1:6:2.0 -> 2.0.1 -->
+    <ul>
+     <li>Make PLAIN client authentication work against servers with broken 334 responses.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_7">1.9.2 -> 2.0</a></h2> <!-- index:2:SH:1:7:1.9.2 -> 2.0 -->
+    <ul>
+     <li>Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see <em>--interface</em>).</li>
+     <li>Server process is not blocked during <em>--filter</em> or <em>--address-verifier</em> execution, if multi-threaded.</li>
+     <li>Support for the <em>mbedTLS</em> TLS library as an alternative to OpenSSL (<em>configure --with-mbedtls</em>).</li>
+     <li>TLS server certificates specified with new <em>--server-tls-certificate</em> option, not <em>--server-tls</em>.</li>
+     <li>TLS servers enable client certificate verification with <em>--server-tls-verify</em>, not <em>--tls-config</em>.</li>
+     <li>TLS clients can verify server certificates with <em>--client-tls-verify</em> and <em>--client-tls-verify-name</em>.</li>
+     <li>The <em>--tls-config</em> option works differently (see NEWS file).</li>
+     <li>New <em>--client-tls-server-name</em> option for server name identification (SNI).</li>
+     <li>New <em>--client-tls-required</em> option to force client connections to use TLS.</li>
+     <li>New <em>--server-tls-required</em> option to force remote SMTP clients to use STARTTLS.</li>
+     <li>New <em>--forward-on-disconnect</em> option replaces <em>--poll=0</em>.</li>
+     <li>The <em>--anonymous</em> option now suppresses the <em>Received</em> line, whatever the <em>--domain</em>.</li>
+     <li>The second field in the secrets file indicates the password encoding, not AUTH mechanism.</li>
+     <li>The <em>--verifier</em> option is now <em>--address-verifier</em>, with simplified command-line parameters.</li>
+     <li>Command-line file paths can use <em>@app</em> as a prefix to be relative to the executable directory.</li>
+     <li>Command-line file paths can be relative to the startup cwd even when daemonised.</li>
+     <li>Filter exit codes between 104 and 107 are interpreted differently (see NEWS file).</li>
+     <li>Message rejection reasons passed back to the submitting SMTP client are much less verbose.</li>
+     <li>Forwarding events are queued up if the forwarding client is still busy from last time.</li>
+     <li>The bind address for outgoing connections is no longer taken from first unqualified <em>--interface</em> address [bug-id #27].</li>
+     <li>The SMTP client protocol tries more than one authentication mechanism.</li>
+     <li>Some support for XOAUTH2 client-side authentication.</li>
+     <li>Client protocol sends QUIT with a socket shutdown().</li>
+     <li>The Windows commdlg list-view widget is used for the server status pages.</li>
+     <li>The Windows connection-lookup feature is withdrawn (<em>--peer-lookup</em>).</li>
+     <li>Several build-time configure options like <em>--disable-pop</em> are withdrawn.</li>
+     <li>C++ 2011 is preferred, and required for multi-threading.</li>
+     <li>Support for very old versions of Windows is dropped.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_8">1.9.1 -> 1.9.2</a></h2> <!-- index:2:SH:1:8:1.9.1 -> 1.9.2 -->
+    <ul>
+     <li>Fixed a leak in the event-loop garbage collection.</li>
+     <li>A local hostname that fails to resolve is not an error.</li>
+     <li>A warning is emitted if there is more than one client authentication secret.</li>
+     <li>Multiple <em>--interface</em> options are allowed separately on the command-line.</li>
+     <li>Added a new <em>--client-interface</em> option.</li>
+     <li>The <em>Received</em> line is formatted as per RFC-3848 (<em>with ESMTPSA</em>).</li>
+     <li>The LOGIN and PLAIN mechanisms in the secrets file are now equivalent.</li>
+     <li>The Windows service wrapper can use a configuration file to locate the startup batch file.</li>
+     <li>Simplified the implementation of the GUI installation program.</li>
+     <li>Reworded the <em>read error: disconnected</em> log message.</li>
+     <li>Less verbose logging of <em>no more messages to send</em>.</li>
+     <li>Qt4 or Qt5 selected by the <em>configure</em> script.</li>
+     <li>Improved the RPM spec file.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_9">1.9 -> 1.9.1</a></h2> <!-- index:2:SH:1:9:1.9 -> 1.9.1 -->
+    <ul>
+     <li>Updated OpenSSL from 1.0.1e to 1.0.1g in the Windows build.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_10">1.8.2 -> 1.9</a></h2> <!-- index:2:SH:1:10:1.8.2 -> 1.9 -->
+    <ul>
+     <li>Added negotiated TLS/SSL for POP (ie. <em>STLS</em>).</li>
+     <li>The first two fields in the secrets files are reordered (with backwards compatibility).</li>
+     <li>Added Linux PAM authentication (<em>configure --with-pam</em> and then <em>--server-auth=/pam</em>).</li>
+     <li>Optional protocol-specific <em>--interface</em> qualifiers, eg. <em>--interface smtp=127.0.0.1,pop=192.168.1.1</em>.</li>
+     <li>Outgoing client connection bound with the first <em>--interface</em> or <em>--interface client=...</em> address.</li>
+     <li>Support for SMTP-over-TLS on outgoing client connection (<em>--client-tls-connection</em>) (cf. <em>STARTTLS</em>)</li>
+     <li>Support for SOCKS 4a on outgoing client connection, eg. <em>--forward-to example.com:25@127.0.0.1:9050</em>.</li>
+     <li>TLS configuration options (<em>--tls-config=...</em>) for SSLv2/3 fallback etc.</li>
+     <li>No <em>Received</em> line added if <em>--anonymous</em> and an empty <em>--domain</em> name.</li>
+     <li>Error text for <em>all recipients rejected</em> is now more accurately <em>one or more recipients rejected</em>.</li>
+     <li>New behaviour for <em>--client-filter</em> exit values of 100 and over.</li>
+     <li>New commands on the admin interface, <em>failures</em> and <em>unfail-all</em>.</li>
+     <li>Shorter descriptions in the usage help unless <em>--verbose</em>.</li>
+     <li>New default spool directory location on windows, now under <em>system32</em>.</li>
+     <li>Windows project files for MSVC 2012 included.</li>
+     <li>Removed support for Windows NT and Windows 9x.</li>
+     <li>Better support for Windows Vista and Windows 7.</li>
+     <li>Removed Windows <em>--icon</em> option.</li>
+     <li>Removed <em>--enable-fhs</em> option for <em>configure</em> (see INSTALL document for equivalent usage).</li>
+     <li>Added <em>--log-file</em> option to redirect stderr.</li>
+     <li>Added Windows <em>--peer-lookup</em> option.</li>
+     <li>Fix for MD5 code in 64-bit builds.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_11">1.8.1 -> 1.8.2</a></h2> <!-- index:2:SH:1:11:1.8.1 -> 1.8.2 -->
+    <ul>
+     <li>Fix namespaces for gcc 3.4.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_12">1.8 -> 1.8.1</a></h2> <!-- index:2:SH:1:12:1.8 -> 1.8.1 -->
+    <ul>
+     <li>Changed the definition of <em>--as-proxy</em> to use <em>--poll 0</em> rather than <em>--immediate</em> [bug-id 1961652].</li>
+     <li>Fixed stalling bug when using server-side TLS/SSL (<em>--server-tls</em>) [bug-id 1961655].</li>
+     <li>Improved Debian packaging for Linux (<em>make deb</em>).</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_13">1.7 -> 1.8</a></h2> <!-- index:2:SH:1:13:1.7 -> 1.8 -->
+    <ul>
+     <li>Speed optimisations (as identified by KCachegrind/valgrind in KDevelop).</li>
+     <li>Build-time size optimisations (eg. <em>./configure --disable-exec --enable-small-exceptions ...</em>).</li>
+     <li>Build-time options to reduce runtime library dependencies (eg. <em>./configure --disable-dns --disable-identity</em>).</li>
+     <li>New switch to limit the size of submitted messages (<em>--size</em>).</li>
+     <li>New semantics for <em>--poll 0</em>, providing a good alternative to <em>--immediate</em> when proxying.</li>
+     <li>SMTP client protocol emits a RSET after a rejected recipient as a workround for broken server protocols.</li>
+     <li>SMTP client protocol continues if the server advertises AUTH but the client has no authentication secrets.</li>
+     <li>When a message cannot be forwarded the offending SMTP protocol response number, if any, is put in the envelope file.</li>
+     <li>A warning is printed if logging is requested but both stderr and syslog are disabled.</li>
+     <li>A cross-compiling toolchain builder script added for running on mips-based routers (<em>extra/mips</em>).</li>
+     <li>New example scripts for SMTP multicasting and editing envelope files.</li>
+     <li>Improved native support for Mac OS X (10.5) with graphical installation from disk image.</li>
+     <li>Compatibility with gcc 2.95 restored.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_14">1.6 -> 1.7</a></h2> <!-- index:2:SH:1:14:1.6 -> 1.7 -->
+    <ul>
+     <li>TLS/SSL support for SMTP using OpenSSL (<em>./configure --with-openssl</em> with <em>--client-tls</em> and <em>--server-tls</em>).</li>
+     <li>Authentication mechanism <em>PLAIN</em> added.</li>
+     <li>Some tightening up of the SMTP server protocol.</li>
+     <li>Windows service wrapper has an <em>--uninstall</em> option.</li>
+     <li>Windows installation GUI uninstalls the service before reinstalling it.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_15">1.5 -> 1.6</a></h2> <!-- index:2:SH:1:15:1.5 -> 1.6 -->
+    <ul>
+     <li>GPLv3 licence (see <em>http://gplv3.fsf.org</em>).</li>
+     <li>New <em>--prompt-timeout</em> switch for the timeout when waiting for the initial 220 prompt from the SMTP server.</li>
+     <li>Fix for flow-control assertion error when the POP server sends a very long list of spooled messages.</li>
+     <li>Wildcard matching for trusted IP addresses in the authentication secrets file can now use CIDR notation.</li>
+     <li>More fine-grained switching of effective user-id to read files and directories when running as root.</li>
+     <li>Fewer new client connections when proxying.</li>
+     <li>The server drops the connection if a remote SMTP client causes too many protocol errors.</li>
+     <li>More complete implementation of <em>--hidden</em> on Windows.</li>
+     <li>Scanner switch (<em>--scanner</em>) replaced by a more general <em>--filter</em> and <em>--client-filter</em> switch syntax.</li>
+     <li>Support for address verification (<em>--verifier</em>) over the network.</li>
+     <li>Better support for running as a Windows service (<em>emailrelay-service --install</em>).</li>
+     <li>Utility filter program <em>emailrelay-filter-copy</em> exits with 100 if it deletes the envelope file.</li>
+     <li>Windows <em>cscript.exe</em> wrapper is added automatically to non-bat/exe <em>--filter</em> command-lines.</li>
+     <li>Installation GUI makes backups of the files it edits and preserves authentication secrets.</li>
+     <li>Installation GUI can install <em>init.d</em> links.</li>
+     <li>Experimental SpamAssassin spamc/spamd protocol support.</li>
+     <li>Acceptance tests added to the distribution.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_16">1.4 -> 1.5</a></h2> <!-- index:2:SH:1:16:1.4 -> 1.5 -->
+    <ul>
+     <li>New installation and configuration GUI using TrollTech Qt 4.x (<em>./configure --enable-gui</em>)</li>
+     <li>Default address verifier accepts all addresses as valid and never treats them as local mailboxes.</li>
+     <li>Fix for server exit bug when failing to send data down a newly accepted connection.</li>
+     <li>Spooled content files can be left in the parent directory to save diskspace when using <em>--pop-by-name</em>.</li>
+     <li>Client protocol improved for the case where there are no valid recipients.</li>
+     <li>New <em>--syslog</em> switch to override <em>--no-syslog</em>.</li>
+     <li>New <em>--filter-timeout</em> switch added.</li>
+     <li>Support for <em>--foo=bar</em> switch syntax (ie. with <em>=</em>).</li>
+     <li>Multiple listening interfaces allowed with a comma-separated <em>--interface</em> list.</li>
+     <li>New <em>--filter</em> utility called <em>emailrelay-filter-copy</em> to support <em>--pop-by-name</em>.</li>
+     <li>Documentation also created in docbook format (requires xmlto).</li>
+     <li>Windows installation document revised.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_17">1.3.3 -> 1.4</a></h2> <!-- index:2:SH:1:17:1.3.3 -> 1.4 -->
+    <ul>
+     <li>POP3 server (enable with <em>--pop</em>, disable at build-time with <em>./configure --disable-pop</em>).</li>
+     <li>Fix for logging reentrancy bug (affects <em>./configure --enable-debug</em> with <em>--debug</em>).</li>
+     <li>Fix to ensure sockets are always non-blocking (affects <em>--scanner</em>).</li>
+     <li>Allow <em>--verifier</em> scripts to reject addresses with a temporary <em>4xx</em> error code.</li>
+     <li>Automatic re-reading of secrets files.</li>
+     <li>Write to the Windows event log even if no write access to the registry.</li>
+     <li>Modification of set-group-id policy if not started as root.</li>
+     <li>Better checking of spool directory access on startup.</li>
+     <li>New <em>emailrelay-submit.sh</em> example script for submitting messages for <em>--pop-by-name</em>.</li>
+     <li>The <em>--dont-listen</em> switch is now <em>--no-smtp</em>.</li>
+     <li>Better IPv6 support (Linux only).</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_18">1.3.2 -> 1.3.3</a></h2> <!-- index:2:SH:1:18:1.3.2 -> 1.3.3 -->
+    <ul>
+     <li>No bind() for outgoing connections [bug-id 1051689].</li>
+     <li>Updated rpm spec file [bug-id 1224850].</li>
+     <li>Fix for gcc3.4 compilation error in <em>md5.cpp</em>.</li>
+     <li>Fix for glob()/size_t compilation warning.</li>
+     <li>Documentation of <em>auth</em> switches corrected.</li>
+     <li>State-machine template type declaration modernised, possibly breaking older compilers.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_19">1.3.1 -> 1.3.2</a></h2> <!-- index:2:SH:1:19:1.3.1 -> 1.3.2 -->
+    <ul>
+     <li>Fix for core dump when <em>--client-filter</em> pre-processing fails.</li>
+     <li>Revised code structure to prepare for asynchronous pre-processing.</li>
+     <li>Better diagnostics when pre-processor exec() fails.</li>
+     <li>Better cleanup of empty and orphaned files.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_20">1.3 -> 1.3.1</a></h2> <!-- index:2:SH:1:20:1.3 -> 1.3.1 -->
+    <ul>
+     <li>Windows resource leak from CreateProcess() fixed.</li>
+     <li>Windows dialog box double-close fix.</li>
+     <li>Some documentation for the <em>--scanner</em> switch.</li>
+     <li>New usage patterns section in the user guide.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_21">1.2 -> 1.3</a></h2> <!-- index:2:SH:1:21:1.2 -> 1.3 -->
+    <ul>
+     <li>Client protocol waits for a greeting from the server on startup [bug-id 842156].</li>
+     <li>Fix for incorrect backslash normalisation on <em>--verifier</em> command-lines containing spaces [bug-id 890646].</li>
+     <li>Verifier programs can now summarily abort a connection using an exit value of 100.</li>
+     <li>New <em>--anonymous</em> switch that reduces information leakage to the SMTP client and disables <em>VRFY</em>.</li>
+     <li>Better validation of <em>MAIL-FROM</em> and <em>RCPT-TO</em> formatting.</li>
+     <li>Rewrite of low-level MD5 code.</li>
+     <li>Performance tuning.</li>
+     <li>Template <em>emailrelay.conf</em> gets installed in <em>/etc</em>.</li>
+     <li>New switches for the <em>configure</em> script.</li>
+     <li>More JavaScript example scripts.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_22">1.1.2 -> 1.2</a></h2> <!-- index:2:SH:1:22:1.1.2 -> 1.2 -->
+    <ul>
+     <li>The <em>--filter</em> and <em>--verifier</em> arguments interpreted as command-lines; spaces in executable paths now need escaping.</li>
+     <li>The <em>--interface</em> switch applies to outgoing connections too.</li>
+     <li>New <em>--client-filter</em> switch to do synchronous message processing before sending.</li>
+     <li>Keeps authentication after a <em>rset</em> command.</li>
+     <li>Fix for dangling reference bug, seen after <em>quit</em> command on Windows.</li>
+     <li>JavaScript examples in the documentation.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_23">1.1.1 -> 1.1.2</a></h2> <!-- index:2:SH:1:23:1.1.1 -> 1.1.2 -->
+    <ul>
+     <li>Earlier check for un-bindable ports on startup, and later fork()ing [bug-id 776972].</li>
+     <li>Resolved the file-descriptor kludge for <em>--verifier</em> on Windows.</li>
+     <li>Less strict about failing eight bit messages sent to servers with no <em>8BITMIME</em> extension.</li>
+     <li>Supplementary group memberships revoked at startup if root or suid.</li>
+     <li>Pre-processor (<em>--filter</em>) program's standard output searched for a failure reason string.</li>
+     <li>Undocumented <em>--scanner</em> switch added for asynchronous processing by a separate network server.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_24">1.1.0 -> 1.1.1</a></h2> <!-- index:2:SH:1:24:1.1.0 -> 1.1.1 -->
+    <ul>
+     <li>Restored the fix for building with gcc2.96.</li>
+     <li>Support for MinGW builds on Windows.</li>
+     <li>More reasonable size of the <em>--help --verbose</em> message box on Windows.</li>
+     <li>Windows <em>--icon</em> switch changed from <em>-i</em> to <em>-c</em> to avoid conflicting with <em>--interface</em>.</li>
+     <li>Shows <em>next server address</em> correctly in the configuration report when using <em>--forward-to</em>.</li>
+     <li>Fix for <em>make install</em> when <em>man2html</em> is not available.</li>
+     <li>Updated init script.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_25">1.0.2 -> 1.1.0</a></h2> <!-- index:2:SH:1:25:1.0.2 -> 1.1.0 -->
+    <ul>
+     <li>In proxy mode unexpected client-side disconnects and timeouts do not leave <em>.bad</em> files [see also bug-id 659039].</li>
+     <li>By default proxy mode does not interpret addresses for local delivery (<em>--postmaster</em>).</li>
+     <li>Polling option added (<em>--poll</em>) to rescan the spool directory periodically.</li>
+     <li>New special exit code (103) for the pre-processor to trigger immediate polling; 100 to 107 now reserved.</li>
+     <li>Orphaned zero-length content files are deleted properly if the server-side dialogue is cut short.</li>
+     <li>The <em>--interface</em> switch applies to the <em>--admin</em> interface too.</li>
+     <li>Improved internal event architecture using slot/signal design pattern, and fewer singleton classes.</li>
+     <li>Event notification available through the administration interface.</li>
+     <li>New <em>--hidden</em> switch for Windows.</li>
+     <li>Syslog output includes process-id.</li>
+     <li>Support for Sun WorkShop 5.0 added.</li>
+     <li>Documentation overhaul.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_26">1.0.0 -> 1.0.2</a></h2> <!-- index:2:SH:1:26:1.0.0 -> 1.0.2 -->
+    <ul>
+     <li>Support for trusted IP addresses, allowing certain clients to avoid authentication.</li>
+     <li>Address verifier interface extended to include authentication information.</li>
+     <li>New public mail relay section added to the user guide.</li>
+     <li>Example verifier scripts etc. added to the reference guide.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_27">1.0.0 -> 1.0.1</a></h2> <!-- index:2:SH:1:27:1.0.0 -> 1.0.1 -->
+    <ul>
+     <li>In proxy mode unexpected client-side disconnects and timeouts result in <em>.bad</em> files [bug-id 659039].</li>
+     <li>Require successful <em>AUTH</em> before <em>MAIL FROM</em> when using <em>--server-auth</em>.</li>
+     <li>Better word-wrap on <em>--help</em> output.</li>
+     <li>Use of RedHat's <em>functions</em> code, and support for <em>chkconfig</em>, added to the <em>init.d</em> script.</li>
+     <li>Builds with gcc3.2 (1.0.0-pl5).</li>
+     <li>Fix for files left as <em>busy</em> after a connection failure in proxy mode [bug-id 631032] (1.0.0-pl3/4/5).</li>
+     <li>Trivial documentation fixes (1.0.0-pl3).</li>
+     <li>Fix for the double-dot escape bug in the client protocol [bug-id 611624] (1.0.0-pl2).</li>
+     <li>Fix build when using gcc2.96 rather than gcc2.95 (1.0.0-pl1).</li>
+     <li>Fix default spool directory in example scripts (1.0.0-pl1).</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_28">0.9.9 -> 1.0.0</a></h2> <!-- index:2:SH:1:28:0.9.9 -> 1.0.0 -->
+    <ul>
+     <li>Briefer <em>--help</em> output; works with <em>--verbose</em>.</li>
+     <li>Option to listen on a specific network interface (<em>--interface</em>).</li>
+     <li>Option for an external address verifier program (<em>--verifier</em>).</li>
+     <li>Some Linux Standard Base stuff added to the <em>init.d</em> script.</li>
+     <li>Pid files world-readable and deleted on abnormal termination.</li>
+     <li>Compiles with gcc 3.0 and intel 6.0.</li>
+     <li>Autoconf tweak for MacOS X.</li>
+     <li>Corrected the <em>Received:</em> typo [bug-id 572236].</li>
+     <li>EHLO response parsing is now case-insensitive [bug-id 561522].</li>
+     <li>Fewer missing-secrets warnings [bug-id 564987].</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_29">0.9.8 -> 0.9.9</a></h2> <!-- index:2:SH:1:29:0.9.8 -> 0.9.9 -->
+    <ul>
+     <li>More flexible logging options (<em>--verbose</em> and <em>--debug</em> work better).</li>
+     <li>File Hierarchy Standard (FHS) option for <em>configure</em> (<em>--enable-fhs</em>).</li>
+     <li>FHS-compatible RPMs.</li>
+     <li>Spool files writeable by pre-processor when server started as root.</li>
+     <li>Default directories in executables and scripts come from <em>configure</em>.</li>
+     <li>The <em>init.d</em> script is renamed <em>emailrelay</em> (was <em>emailrelay.sh</em>).</li>
+     <li>Man pages are gzipped when installed.</li>
+     <li>Fix for access violation under Windows NT when client disconnects.</li>
+     <li>Use of event log when compiled on Windows NT.</li>
+     <li>Fix for info-after-flush bug when using the administration interface. [rc2]</li>
+     <li>New <em>resubmit</em> script. [rc2]</li>
+     <li>Submit utility works under Windows. [rc2]</li>
+     <li>Improved Windows project files. [rc2]</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_30">0.9.7 -> 0.9.8</a></h2> <!-- index:2:SH:1:30:0.9.7 -> 0.9.8 -->
+    <ul>
+     <li>Fix for running pre-processor (<em>--filter</em>) as root.</li>
+     <li>Ignore bogus <em>AUTH=LOGIN</em> lines in EHLO response.</li>
+     <li>Submit utility improved to work with mutt.</li>
+     <li>Installation of submit man page.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_31">0.9.6 -> 0.9.7</a></h2> <!-- index:2:SH:1:31:0.9.6 -> 0.9.7 -->
+    <ul>
+     <li>CRAM-MD5 authentication mechanism added.</li>
+     <li>Revoke root permissions at start up, and reclaim them when needed.</li>
+     <li>Allow mail pre-processing (<em>--filter</em>) when started as root.</li>
+     <li>Domain-override switch (<em>--domain</em>) added.</li>
+     <li>Non-privileged user switch (<em>--user</em>) added.</li>
+     <li>Better handling of NarrowPipe exception (ie. 8-bit message to 7-bit server).</li>
+     <li>Allow null return path in MAIL-FROM.</li>
+     <li>Reject recipients which look like <em><user>@localhost</em> (as used by fetchmail for local delivery).</li>
+     <li>Treat recipients which look like <em>postmaster@localhost</em> or <em>postmaster@<fqdn></em> as local postmaster.</li>
+     <li>Optional timestamps on log output (<em>--log-time</em>).</li>
+     <li>Fix EHLO to HELO fallback for 501/502 responses in client protocol.</li>
+     <li>Submission utility <em>emailrelay-submit</em> added.</li>
+     <li>HTML4.0 compliant HTML documentation, using CSS.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_32">0.9.5 -> 0.9.6</a></h2> <!-- index:2:SH:1:32:0.9.5 -> 0.9.6 -->
+    <ul>
+     <li>SMTP AUTHentication extension -- LOGIN mechanism only.</li>
+     <li>Client-side protocol timeout.</li>
+     <li>Client-side connection timeout.</li>
+     <li>Preprocessor can cancel further message processing.</li>
+     <li>Client's IP address recorded in envelope files.</li>
+     <li>Multiple hard-coded listening addresses supported at compile-time.</li>
+     <li>Fix for automatic reopening of stderr stream.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_33">0.9.4 -> 0.9.5</a></h2> <!-- index:2:SH:1:33:0.9.4 -> 0.9.5 -->
+    <p>
+     Windows fixes and improvements...
+    </p>
+    <ul>
+     <li>system-tray + dialog-box user interface</li>
+     <li>fix for dropped connections</li>
+     <li>fix for content file deletion</li>
+     <li>fix for directory iterator</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_34">0.9.3 -> 0.9.4</a></h2> <!-- index:2:SH:1:34:0.9.3 -> 0.9.4 -->
+    <ul>
+     <li>Fixed memory leak when no <em>--log</em> switch.</li>
+     <li>Windows build is more <em>gui</em> and less <em>command-line</em>.</li>
+     <li><em>Info</em> command added to the administration interface.</li>
+     <li>Doxygen files removed from binary RPM.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_35">0.9.2 -> 0.9.3</a></h2> <!-- index:2:SH:1:35:0.9.2 -> 0.9.3 -->
+    <ul>
+     <li>Proxy mode (<em>--immediate</em> and <em>--as-proxy</em>).</li>
+     <li>Message pre-processing (<em>--filter</em>).</li>
+     <li>Message store classes better separated using abstract interfaces.</li>
+     <li>Improved notification script, with MIME encoding.</li>
+     <li>Builds with old 2.91 version of gcc.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_36">0.9.1 -> 0.9.2</a></h2> <!-- index:2:SH:1:36:0.9.1 -> 0.9.2 -->
+    <ul>
+     <li>Better autoconf detection.</li>
+     <li>Workround for FreeBSD uname() feature.</li>
+     <li>Added missing <em>.sh_</em> files to the distribution.</li>
+     <li>Fixed a benign directory iterator bug.</li>
+     <li>Use of gcc's <em>exception</em> header.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_37">0.9 -> 0.9.1</a></h2> <!-- index:2:SH:1:37:0.9 -> 0.9.1 -->
+    <ul>
+     <li>Improved documentation from doxygen.</li>
+     <li>More complete use of namespaces.</li>
+     <li>Experimental compile-time support for IPv6.</li>
+    </ul>
+
+ </div> <!-- div-main -->
+ </body>
+</html>
+<!-- Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->

doc/changelog.md

@@ -0,0 +1,485 @@
+E-MailRelay Change Log
+======================
+
+2.4 -> 2.5
+----------
+
+* Multiple configurations in one process.
+* [SMTP][] PIPELINING ([RFC-2920][]).
+* SMTP CHUNKING/8BITMIME 'BDAT' extension ([RFC-3030][]), disabled by default.
+* SMTP SMTPUTF8 extension ([RFC-6531][]), disabled by default.
+* No 7-bit/8-bit check on received message content (see NEWS file).
+* New built-in filters: `deliver:`, `split:`, `copy:`, `mx:`, `msgid:`.
+* New built-in address verifier: `account:`
+* No `.local` files (see NEWS file).
+* [PAM][] authentication is now enabled with `--server-auth=pam:` not `/pam`.
+* Client authentication details can be given directly from the command-line.
+* Multiple `client` authentication secrets, selected by a new envelope field.
+* Main binary can act as a simple submission tool (`configure --enable-submission`).
+
+2.3 -> 2.4
+----------
+
+* Multiple `--filter` and `--client-filter` options allowed.
+* [TLS][] key and certificate files can be specified separately.
+* Finer control when using `--anonymous` (eg. `--anonymous=server`).
+* The `auth-config` options can distinguish between TLS and non-TLS authentication.
+* Hourly log file rotation using `%h` (eg. `--log-file=log.%d.%h`).
+* Listening file descriptors can be inherited from the parent process (see `--interface`).
+* Listening ports on Windows use exclusive binding.
+* The Linux event loop uses `epoll` by default rather than `select`.
+* Some support for message routing (see NEWS).
+* Fix of error handling in network client filters (`--client-filter=net:...`) [bug-id #50].
+
+2.2 -> 2.3
+----------
+
+* Unix domain sockets supported (eg. `--interface=/tmp/smtp.s`).
+* Windows event log not used for verbose logging (prefer `--log-file`).
+* New admin `forward` command to trigger forwarding without waiting.
+* Optional base64 encoding of passwords in secrets files (`plain:b`).
+* Support for MbedTLS version 3.
+
+2.1 -> 2.2
+----------
+
+* Connections from IPv4 'private use' addresses are allowed by default (see `--remote-clients`).
+* Interface names can be used with `--interface` (eg. `--interface=eth0`).
+* New `--server-tls-connection` option for server-side implicit TLS.
+* New `--forward-to-some` option to permit some message recipients to be rejected.
+* New `--log-address` option to aid adaptive firewalling.
+* Dynamic log file rolling when using `--log-file=%d`.
+* Choice of syslog 'facility' on Linux with `--syslog=local0` etc.
+* Pipelined SMTP QUIT commands sent by broken clients are tolerated.
+* Better handling of overly-verbose or unkillable `--filter` scripts.
+* Optional epoll event loop on Linux (`configure --enable-epoll`).
+* Some internationalisation support (see NEWS file).
+* Support for Windows XP restored when built with mingw-w64.
+* C++ 2011 compiler is required.
+
+2.0.1 -> 2.1
+------------
+
+* Backwards compatibility features for 1.9-to-2.0 transition removed.
+* Better handling of too-many-connections on Windows.
+* New `--idle-timeout` option for server-side connections.
+* Support for [RFC-5782][] [DNSBL][] blocking (`--dnsbl`).
+* Filter scripts are given the path of the envelope file in argv2.
+* Message files can be edited by `--client-filter` scripts.
+* Better support for CRAM-SHAx authentication.
+* New `--client-auth-config` and `--server-auth-config` options.
+* New `--show` option on windows to better control the user interface style.
+* The `--pop` option always requires `--pop-auth`.
+* No message is spooled if all its envelope recipients are local-mailboxes.
+* TLS cipher name added to `Received` line as per [RFC-8314][] 4.3.
+* Certificate contents are not logged.
+* Timestamp parts of spool filenames no longer limited to six digits.
+
+2.0 -> 2.0.1
+------------
+
+* Make PLAIN client authentication work against servers with broken 334 responses.
+
+1.9.2 -> 2.0
+------------
+
+* Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see `--interface`).
+* Server process is not blocked during `--filter` or `--address-verifier` execution, if multi-threaded.
+* Support for the `mbedTLS` TLS library as an alternative to OpenSSL (`configure --with-mbedtls`).
+* TLS server certificates specified with new `--server-tls-certificate` option, not `--server-tls`.
+* TLS servers enable client certificate verification with `--server-tls-verify`, not `--tls-config`.
+* TLS clients can verify server certificates with `--client-tls-verify` and `--client-tls-verify-name`.
+* The `--tls-config` option works differently (see NEWS file).
+* New `--client-tls-server-name` option for server name identification (SNI).
+* New `--client-tls-required` option to force client connections to use TLS.
+* New `--server-tls-required` option to force remote SMTP clients to use STARTTLS.
+* New `--forward-on-disconnect` option replaces `--poll=0`.
+* The `--anonymous` option now suppresses the `Received` line, whatever the `--domain`.
+* The second field in the secrets file indicates the password encoding, not AUTH mechanism.
+* The `--verifier` option is now `--address-verifier`, with simplified command-line parameters.
+* Command-line file paths can use `@app` as a prefix to be relative to the executable directory.
+* Command-line file paths can be relative to the startup cwd even when daemonised.
+* Filter exit codes between 104 and 107 are interpreted differently (see NEWS file).
+* Message rejection reasons passed back to the submitting SMTP client are much less verbose.
+* Forwarding events are queued up if the forwarding client is still busy from last time.
+* The bind address for outgoing connections is no longer taken from first unqualified `--interface` address [bug-id #27].
+* The SMTP client protocol tries more than one authentication mechanism.
+* Some support for XOAUTH2 client-side authentication.
+* Client protocol sends QUIT with a socket shutdown().
+* The Windows commdlg list-view widget is used for the server status pages.
+* The Windows connection-lookup feature is withdrawn (`--peer-lookup`).
+* Several build-time configure options like `--disable-pop` are withdrawn.
+* C++ 2011 is preferred, and required for multi-threading.
+* Support for very old versions of Windows is dropped.
+
+1.9.1 -> 1.9.2
+--------------
+
+* Fixed a leak in the event-loop garbage collection.
+* A local hostname that fails to resolve is not an error.
+* A warning is emitted if there is more than one client authentication secret.
+* Multiple `--interface` options are allowed separately on the command-line.
+* Added a new `--client-interface` option.
+* The `Received` line is formatted as per [RFC-3848][] (`with ESMTPSA`).
+* The LOGIN and PLAIN mechanisms in the secrets file are now equivalent.
+* The Windows service wrapper can use a configuration file to locate the startup batch file.
+* Simplified the implementation of the GUI installation program.
+* Reworded the `read error: disconnected` log message.
+* Less verbose logging of `no more messages to send`.
+* Qt4 or Qt5 selected by the `configure` script.
+* Improved the RPM spec file.
+
+1.9 -> 1.9.1
+------------
+
+* Updated OpenSSL from 1.0.1e to 1.0.1g in the Windows build.
+
+1.8.2 -> 1.9
+------------
+
+* Added negotiated TLS/SSL for [POP][] (ie. `STLS`).
+* The first two fields in the secrets files are reordered (with backwards compatibility).
+* Added Linux PAM authentication (`configure --with-pam` and then `--server-auth=/pam`).
+* Optional protocol-specific `--interface` qualifiers, eg. `--interface smtp=127.0.0.1,pop=192.168.1.1`.
+* Outgoing client connection bound with the first `--interface` or `--interface client=...` address.
+* Support for SMTP-over-TLS on outgoing client connection (`--client-tls-connection`) (cf. `STARTTLS`)
+* Support for [SOCKS][] 4a on outgoing client connection, eg. `--forward-to example.com:25@127.0.0.1:9050`.
+* TLS configuration options (`--tls-config=...`) for SSLv2/3 fallback etc.
+* No `Received` line added if `--anonymous` and an empty `--domain` name.
+* Error text for `all recipients rejected` is now more accurately `one or more recipients rejected`.
+* New behaviour for `--client-filter` exit values of 100 and over.
+* New commands on the admin interface, `failures` and `unfail-all`.
+* Shorter descriptions in the usage help unless `--verbose`.
+* New default spool directory location on windows, now under `system32`.
+* Windows project files for MSVC 2012 included.
+* Removed support for Windows NT and Windows 9x.
+* Better support for Windows Vista and Windows 7.
+* Removed Windows `--icon` option.
+* Removed `--enable-fhs` option for `configure` (see INSTALL document for equivalent usage).
+* Added `--log-file` option to redirect stderr.
+* Added Windows `--peer-lookup` option.
+* Fix for MD5 code in 64-bit builds.
+
+1.8.1 -> 1.8.2
+--------------
+
+* Fix namespaces for gcc 3.4.
+
+1.8 -> 1.8.1
+------------
+
+* Changed the definition of `--as-proxy` to use `--poll 0` rather than `--immediate` [bug-id 1961652].
+* Fixed stalling bug when using server-side TLS/SSL (`--server-tls`) [bug-id 1961655].
+* Improved Debian packaging for Linux (`make deb`).
+
+1.7 -> 1.8
+----------
+
+* Speed optimisations (as identified by KCachegrind/valgrind in KDevelop).
+* Build-time size optimisations (eg. `./configure --disable-exec --enable-small-exceptions ...`).
+* Build-time options to reduce runtime library dependencies (eg. `./configure --disable-dns --disable-identity`).
+* New switch to limit the size of submitted messages (`--size`).
+* New semantics for `--poll 0`, providing a good alternative to `--immediate` when proxying.
+* SMTP client protocol emits a RSET after a rejected recipient as a workround for broken server protocols.
+* SMTP client protocol continues if the server advertises AUTH but the client has no authentication secrets.
+* When a message cannot be forwarded the offending SMTP protocol response number, if any, is put in the envelope file.
+* A warning is printed if logging is requested but both stderr and syslog are disabled.
+* A cross-compiling toolchain builder script added for running on mips-based routers (`extra/mips`).
+* New example scripts for SMTP multicasting and editing envelope files.
+* Improved native support for Mac OS X (10.5) with graphical installation from disk image.
+* Compatibility with gcc 2.95 restored.
+
+1.6 -> 1.7
+----------
+
+* TLS/SSL support for SMTP using OpenSSL (`./configure --with-openssl` with `--client-tls` and `--server-tls`).
+* Authentication mechanism `PLAIN` added.
+* Some tightening up of the SMTP server protocol.
+* Windows service wrapper has an `--uninstall` option.
+* Windows installation GUI uninstalls the service before reinstalling it.
+
+1.5 -> 1.6
+----------
+
+* GPLv3 licence (see `http://gplv3.fsf.org`).
+* New `--prompt-timeout` switch for the timeout when waiting for the initial 220 prompt from the SMTP server.
+* Fix for flow-control assertion error when the POP server sends a very long list of spooled messages.
+* Wildcard matching for trusted IP addresses in the authentication secrets file can now use CIDR notation.
+* More fine-grained switching of effective user-id to read files and directories when running as root.
+* Fewer new client connections when proxying.
+* The server drops the connection if a remote SMTP client causes too many protocol errors.
+* More complete implementation of `--hidden` on Windows.
+* Scanner switch (`--scanner`) replaced by a more general `--filter` and `--client-filter` switch syntax.
+* Support for address verification (`--verifier`) over the network.
+* Better support for running as a Windows service (`emailrelay-service --install`).
+* Utility filter program `emailrelay-filter-copy` exits with 100 if it deletes the envelope file.
+* Windows `cscript.exe` wrapper is added automatically to non-bat/exe `--filter` command-lines.
+* Installation GUI makes backups of the files it edits and preserves authentication secrets.
+* Installation GUI can install `init.d` links.
+* Experimental SpamAssassin spamc/spamd protocol support.
+* Acceptance tests added to the distribution.
+
+1.4 -> 1.5
+----------
+
+* New installation and configuration GUI using TrollTech Qt 4.x (`./configure --enable-gui`)
+* Default address verifier accepts all addresses as valid and never treats them as local mailboxes.
+* Fix for server exit bug when failing to send data down a newly accepted connection.
+* Spooled content files can be left in the parent directory to save diskspace when using `--pop-by-name`.
+* Client protocol improved for the case where there are no valid recipients.
+* New `--syslog` switch to override `--no-syslog`.
+* New `--filter-timeout` switch added.
+* Support for `--foo=bar` switch syntax (ie. with `=`).
+* Multiple listening interfaces allowed with a comma-separated `--interface` list.
+* New `--filter` utility called `emailrelay-filter-copy` to support `--pop-by-name`.
+* Documentation also created in docbook format (requires xmlto).
+* Windows installation document revised.
+
+1.3.3 -> 1.4
+------------
+
+* POP3 server (enable with `--pop`, disable at build-time with `./configure --disable-pop`).
+* Fix for logging reentrancy bug (affects `./configure --enable-debug` with `--debug`).
+* Fix to ensure sockets are always non-blocking (affects `--scanner`).
+* Allow `--verifier` scripts to reject addresses with a temporary `4xx` error code.
+* Automatic re-reading of secrets files.
+* Write to the Windows event log even if no write access to the registry.
+* Modification of set-group-id policy if not started as root.
+* Better checking of spool directory access on startup.
+* New `emailrelay-submit.sh` example script for submitting messages for `--pop-by-name`.
+* The `--dont-listen` switch is now `--no-smtp`.
+* Better IPv6 support (Linux only).
+
+1.3.2 -> 1.3.3
+--------------
+
+* No bind() for outgoing connections [bug-id 1051689].
+* Updated rpm spec file [bug-id 1224850].
+* Fix for gcc3.4 compilation error in `md5.cpp`.
+* Fix for glob()/size_t compilation warning.
+* Documentation of `auth` switches corrected.
+* State-machine template type declaration modernised, possibly breaking older compilers.
+
+1.3.1 -> 1.3.2
+--------------
+
+* Fix for core dump when `--client-filter` pre-processing fails.
+* Revised code structure to prepare for asynchronous pre-processing.
+* Better diagnostics when pre-processor exec() fails.
+* Better cleanup of empty and orphaned files.
+
+1.3 -> 1.3.1
+------------
+
+* Windows resource leak from CreateProcess() fixed.
+* Windows dialog box double-close fix.
+* Some documentation for the `--scanner` switch.
+* New usage patterns section in the user guide.
+
+1.2 -> 1.3
+----------
+
+* Client protocol waits for a greeting from the server on startup [bug-id 842156].
+* Fix for incorrect backslash normalisation on `--verifier` command-lines containing spaces [bug-id 890646].
+* Verifier programs can now summarily abort a connection using an exit value of 100.
+* New `--anonymous` switch that reduces information leakage to the SMTP client and disables `VRFY`.
+* Better validation of `MAIL-FROM` and `RCPT-TO` formatting.
+* Rewrite of low-level MD5 code.
+* Performance tuning.
+* Template `emailrelay.conf` gets installed in `/etc`.
+* New switches for the `configure` script.
+* More JavaScript example scripts.
+
+1.1.2 -> 1.2
+------------
+
+* The `--filter` and `--verifier` arguments interpreted as command-lines; spaces in executable paths now need escaping.
+* The `--interface` switch applies to outgoing connections too.
+* New `--client-filter` switch to do synchronous message processing before sending.
+* Keeps authentication after a `rset` command.
+* Fix for dangling reference bug, seen after `quit` command on Windows.
+* JavaScript examples in the documentation.
+
+1.1.1 -> 1.1.2
+--------------
+
+* Earlier check for un-bindable ports on startup, and later fork()ing [bug-id 776972].
+* Resolved the file-descriptor kludge for `--verifier` on Windows.
+* Less strict about failing eight bit messages sent to servers with no `8BITMIME` extension.
+* Supplementary group memberships revoked at startup if root or suid.
+* Pre-processor (`--filter`) program's standard output searched for a failure reason string.
+* Undocumented `--scanner` switch added for asynchronous processing by a separate network server.
+
+1.1.0 -> 1.1.1
+--------------
+
+* Restored the fix for building with gcc2.96.
+* Support for MinGW builds on Windows.
+* More reasonable size of the `--help --verbose` message box on Windows.
+* Windows `--icon` switch changed from `-i` to `-c` to avoid conflicting with `--interface`.
+* Shows `next server address` correctly in the configuration report when using `--forward-to`.
+* Fix for `make install` when `man2html` is not available.
+* Updated init script.
+
+1.0.2 -> 1.1.0
+--------------
+
+* In proxy mode unexpected client-side disconnects and timeouts do not leave `.bad` files [see also bug-id 659039].
+* By default proxy mode does not interpret addresses for local delivery (`--postmaster`).
+* Polling option added (`--poll`) to rescan the spool directory periodically.
+* New special exit code (103) for the pre-processor to trigger immediate polling; 100 to 107 now reserved.
+* Orphaned zero-length content files are deleted properly if the server-side dialogue is cut short.
+* The `--interface` switch applies to the `--admin` interface too.
+* Improved internal event architecture using slot/signal design pattern, and fewer singleton classes.
+* Event notification available through the administration interface.
+* New `--hidden` switch for Windows.
+* Syslog output includes process-id.
+* Support for Sun WorkShop 5.0 added.
+* Documentation overhaul.
+
+1.0.0 -> 1.0.2
+--------------
+
+* Support for trusted IP addresses, allowing certain clients to avoid authentication.
+* Address verifier interface extended to include authentication information.
+* New public mail relay section added to the user guide.
+* Example verifier scripts etc. added to the reference guide.
+
+1.0.0 -> 1.0.1
+--------------
+
+* In proxy mode unexpected client-side disconnects and timeouts result in `.bad` files [bug-id 659039].
+* Require successful `AUTH` before `MAIL FROM` when using `--server-auth`.
+* Better word-wrap on `--help` output.
+* Use of RedHat's `functions` code, and support for `chkconfig`, added to the `init.d` script.
+* Builds with gcc3.2 (1.0.0-pl5).
+* Fix for files left as `busy` after a connection failure in proxy mode [bug-id 631032] (1.0.0-pl3/4/5).
+* Trivial documentation fixes (1.0.0-pl3).
+* Fix for the double-dot escape bug in the client protocol [bug-id 611624] (1.0.0-pl2).
+* Fix build when using gcc2.96 rather than gcc2.95 (1.0.0-pl1).
+* Fix default spool directory in example scripts (1.0.0-pl1).
+
+0.9.9 -> 1.0.0
+--------------
+
+* Briefer `--help` output; works with `--verbose`.
+* Option to listen on a specific network interface (`--interface`).
+* Option for an external address verifier program (`--verifier`).
+* Some Linux Standard Base stuff added to the `init.d` script.
+* Pid files world-readable and deleted on abnormal termination.
+* Compiles with gcc 3.0 and intel 6.0.
+* Autoconf tweak for MacOS X.
+* Corrected the `Received:` typo [bug-id 572236].
+* EHLO response parsing is now case-insensitive [bug-id 561522].
+* Fewer missing-secrets warnings [bug-id 564987].
+
+0.9.8 -> 0.9.9
+--------------
+
+* More flexible logging options (`--verbose` and `--debug` work better).
+* File Hierarchy Standard ([FHS][]) option for `configure` (`--enable-fhs`).
+* FHS-compatible RPMs.
+* Spool files writeable by pre-processor when server started as root.
+* Default directories in executables and scripts come from `configure`.
+* The `init.d` script is renamed `emailrelay` (was `emailrelay.sh`).
+* Man pages are gzipped when installed.
+* Fix for access violation under Windows NT when client disconnects.
+* Use of event log when compiled on Windows NT.
+* Fix for info-after-flush bug when using the administration interface. [rc2]
+* New `resubmit` script. [rc2]
+* Submit utility works under Windows. [rc2]
+* Improved Windows project files. [rc2]
+
+0.9.7 -> 0.9.8
+--------------
+
+* Fix for running pre-processor (`--filter`) as root.
+* Ignore bogus `AUTH=LOGIN` lines in EHLO response.
+* Submit utility improved to work with mutt.
+* Installation of submit man page.
+
+0.9.6 -> 0.9.7
+--------------
+
+* CRAM-MD5 authentication mechanism added.
+* Revoke root permissions at start up, and reclaim them when needed.
+* Allow mail pre-processing (`--filter`) when started as root.
+* Domain-override switch (`--domain`) added.
+* Non-privileged user switch (`--user`) added.
+* Better handling of NarrowPipe exception (ie. 8-bit message to 7-bit server).
+* Allow null return path in MAIL-FROM.
+* Reject recipients which look like `<user>@localhost` (as used by fetchmail for local delivery).
+* Treat recipients which look like `postmaster@localhost` or `postmaster@<fqdn>` as local postmaster.
+* Optional timestamps on log output (`--log-time`).
+* Fix EHLO to HELO fallback for 501/502 responses in client protocol.
+* Submission utility `emailrelay-submit` added.
+* HTML4.0 compliant HTML documentation, using CSS.
+
+0.9.5 -> 0.9.6
+--------------
+
+* SMTP AUTHentication extension \-\- LOGIN mechanism only.
+* Client-side protocol timeout.
+* Client-side connection timeout.
+* Preprocessor can cancel further message processing.
+* Client's IP address recorded in envelope files.
+* Multiple hard-coded listening addresses supported at compile-time.
+* Fix for automatic reopening of stderr stream.
+
+0.9.4 -> 0.9.5
+--------------
+Windows fixes and improvements...
+
+* system-tray + dialog-box user interface
+* fix for dropped connections
+* fix for content file deletion
+* fix for directory iterator
+
+0.9.3 -> 0.9.4
+--------------
+
+* Fixed memory leak when no `--log` switch.
+* Windows build is more `gui` and less `command-line`.
+* `Info` command added to the administration interface.
+* Doxygen files removed from binary RPM.
+
+0.9.2 -> 0.9.3
+--------------
+
+* Proxy mode (`--immediate` and `--as-proxy`).
+* Message pre-processing (`--filter`).
+* Message store classes better separated using abstract interfaces.
+* Improved notification script, with MIME encoding.
+* Builds with old 2.91 version of gcc.
+
+0.9.1 -> 0.9.2
+--------------
+
+* Better autoconf detection.
+* Workround for FreeBSD uname() feature.
+* Added missing `.sh_` files to the distribution.
+* Fixed a benign directory iterator bug.
+* Use of gcc's `exception` header.
+
+0.9 -> 0.9.1
+------------
+
+* Improved documentation from doxygen.
+* More complete use of namespaces.
+* Experimental compile-time support for IPv6.
+
+
+[DNSBL]: https://en.wikipedia.org/wiki/DNSBL
+[FHS]: https://wiki.linuxfoundation.org/lsb/fhs
+[PAM]: https://en.wikipedia.org/wiki/Linux_PAM
+[POP]: https://en.wikipedia.org/wiki/Post_Office_Protocol
+[RFC-2920]: https://tools.ietf.org/html/rfc2920
+[RFC-3030]: https://tools.ietf.org/html/rfc3030
+[RFC-3848]: https://tools.ietf.org/html/rfc3848
+[RFC-5782]: https://tools.ietf.org/html/rfc5782
+[RFC-6531]: https://tools.ietf.org/html/rfc6531
+[RFC-8314]: https://tools.ietf.org/html/rfc8314
+[SMTP]: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
+[SOCKS]: https://en.wikipedia.org/wiki/SOCKS
+[TLS]: https://en.wikipedia.org/wiki/Transport_Layer_Security
+

doc/changelog.rst

@@ -0,0 +1,486 @@
+**********
+Change Log
+**********
+
+2.4 -> 2.5
+==========
+
+* Multiple configurations in one process.
+* SMTP_ PIPELINING (RFC-2920_).
+* SMTP CHUNKING/8BITMIME 'BDAT' extension (RFC-3030_), disabled by default.
+* SMTP SMTPUTF8 extension (RFC-6531_), disabled by default.
+* No 7-bit/8-bit check on received message content (see NEWS file).
+* New built-in filters: *deliver:*, *split:*, *copy:*, *mx:*, *msgid:*.
+* New built-in address verifier: *account:*
+* No *.local* files (see NEWS file).
+* PAM_ authentication is now enabled with *--server-auth=pam:* not */pam*.
+* Client authentication details can be given directly from the command-line.
+* Multiple *client* authentication secrets, selected by a new envelope field.
+* Main binary can act as a simple submission tool (\ *configure --enable-submission*\ ).
+
+2.3 -> 2.4
+==========
+
+* Multiple *--filter* and *--client-filter* options allowed.
+* TLS_ key and certificate files can be specified separately.
+* Finer control when using *--anonymous* (eg. *--anonymous=server*).
+* The *auth-config* options can distinguish between TLS and non-TLS authentication.
+* Hourly log file rotation using *%h* (eg. *--log-file=log.%d.%h*).
+* Listening file descriptors can be inherited from the parent process (see *--interface*).
+* Listening ports on Windows use exclusive binding.
+* The Linux event loop uses *epoll* by default rather than *select*.
+* Some support for message routing (see NEWS).
+* Fix of error handling in network client filters (\ *--client-filter=net:...*\ ) [bug-id #50].
+
+2.2 -> 2.3
+==========
+
+* Unix domain sockets supported (eg. *--interface=/tmp/smtp.s*).
+* Windows event log not used for verbose logging (prefer *--log-file*).
+* New admin *forward* command to trigger forwarding without waiting.
+* Optional base64 encoding of passwords in secrets files (\ *plain:b*\ ).
+* Support for MbedTLS version 3.
+
+2.1 -> 2.2
+==========
+
+* Connections from IPv4 'private use' addresses are allowed by default (see *--remote-clients*).
+* Interface names can be used with *--interface* (eg. *--interface=eth0*).
+* New *--server-tls-connection* option for server-side implicit TLS.
+* New *--forward-to-some* option to permit some message recipients to be rejected.
+* New *--log-address* option to aid adaptive firewalling.
+* Dynamic log file rolling when using *--log-file=%d*.
+* Choice of syslog 'facility' on Linux with *--syslog=local0* etc.
+* Pipelined SMTP QUIT commands sent by broken clients are tolerated.
+* Better handling of overly-verbose or unkillable *--filter* scripts.
+* Optional epoll event loop on Linux (\ *configure --enable-epoll*\ ).
+* Some internationalisation support (see NEWS file).
+* Support for Windows XP restored when built with mingw-w64.
+* C++ 2011 compiler is required.
+
+2.0.1 -> 2.1
+============
+
+* Backwards compatibility features for 1.9-to-2.0 transition removed.
+* Better handling of too-many-connections on Windows.
+* New *--idle-timeout* option for server-side connections.
+* Support for RFC-5782_ DNSBL_ blocking (\ *--dnsbl*\ ).
+* Filter scripts are given the path of the envelope file in argv2.
+* Message files can be edited by *--client-filter* scripts.
+* Better support for CRAM-SHAx authentication.
+* New *--client-auth-config* and *--server-auth-config* options.
+* New *--show* option on windows to better control the user interface style.
+* The *--pop* option always requires *--pop-auth*.
+* No message is spooled if all its envelope recipients are local-mailboxes.
+* TLS cipher name added to *Received* line as per RFC-8314_ 4.3.
+* Certificate contents are not logged.
+* Timestamp parts of spool filenames no longer limited to six digits.
+
+2.0 -> 2.0.1
+============
+
+* Make PLAIN client authentication work against servers with broken 334 responses.
+
+1.9.2 -> 2.0
+============
+
+* Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see *--interface*).
+* Server process is not blocked during *--filter* or *--address-verifier* execution, if multi-threaded.
+* Support for the *mbedTLS* TLS library as an alternative to OpenSSL (\ *configure --with-mbedtls*\ ).
+* TLS server certificates specified with new *--server-tls-certificate* option, not *--server-tls*.
+* TLS servers enable client certificate verification with *--server-tls-verify*, not *--tls-config*.
+* TLS clients can verify server certificates with *--client-tls-verify* and *--client-tls-verify-name*.
+* The *--tls-config* option works differently (see NEWS file).
+* New *--client-tls-server-name* option for server name identification (SNI).
+* New *--client-tls-required* option to force client connections to use TLS.
+* New *--server-tls-required* option to force remote SMTP clients to use STARTTLS.
+* New *--forward-on-disconnect* option replaces *--poll=0*.
+* The *--anonymous* option now suppresses the *Received* line, whatever the *--domain*.
+* The second field in the secrets file indicates the password encoding, not AUTH mechanism.
+* The *--verifier* option is now *--address-verifier*, with simplified command-line parameters.
+* Command-line file paths can use *@app* as a prefix to be relative to the executable directory.
+* Command-line file paths can be relative to the startup cwd even when daemonised.
+* Filter exit codes between 104 and 107 are interpreted differently (see NEWS file).
+* Message rejection reasons passed back to the submitting SMTP client are much less verbose.
+* Forwarding events are queued up if the forwarding client is still busy from last time.
+* The bind address for outgoing connections is no longer taken from first unqualified *--interface* address [bug-id #27].
+* The SMTP client protocol tries more than one authentication mechanism.
+* Some support for XOAUTH2 client-side authentication.
+* Client protocol sends QUIT with a socket shutdown().
+* The Windows commdlg list-view widget is used for the server status pages.
+* The Windows connection-lookup feature is withdrawn (\ *--peer-lookup*\ ).
+* Several build-time configure options like *--disable-pop* are withdrawn.
+* C++ 2011 is preferred, and required for multi-threading.
+* Support for very old versions of Windows is dropped.
+
+1.9.1 -> 1.9.2
+==============
+
+* Fixed a leak in the event-loop garbage collection.
+* A local hostname that fails to resolve is not an error.
+* A warning is emitted if there is more than one client authentication secret.
+* Multiple *--interface* options are allowed separately on the command-line.
+* Added a new *--client-interface* option.
+* The *Received* line is formatted as per RFC-3848_ (\ *with ESMTPSA*\ ).
+* The LOGIN and PLAIN mechanisms in the secrets file are now equivalent.
+* The Windows service wrapper can use a configuration file to locate the startup batch file.
+* Simplified the implementation of the GUI installation program.
+* Reworded the *read error: disconnected* log message.
+* Less verbose logging of *no more messages to send*.
+* Qt4 or Qt5 selected by the *configure* script.
+* Improved the RPM spec file.
+
+1.9 -> 1.9.1
+============
+
+* Updated OpenSSL from 1.0.1e to 1.0.1g in the Windows build.
+
+1.8.2 -> 1.9
+============
+
+* Added negotiated TLS/SSL for POP_ (ie. *STLS*).
+* The first two fields in the secrets files are reordered (with backwards compatibility).
+* Added Linux PAM authentication (*configure --with-pam* and then *--server-auth=/pam*).
+* Optional protocol-specific *--interface* qualifiers, eg. *--interface smtp=127.0.0.1,pop=192.168.1.1*.
+* Outgoing client connection bound with the first *--interface* or *--interface client=...* address.
+* Support for SMTP-over-TLS on outgoing client connection (\ *--client-tls-connection*\ ) (cf. *STARTTLS*)
+* Support for SOCKS_ 4a on outgoing client connection, eg. *--forward-to example.com:25@127.0.0.1:9050*.
+* TLS configuration options (\ *--tls-config=...*\ ) for SSLv2/3 fallback etc.
+* No *Received* line added if *--anonymous* and an empty *--domain* name.
+* Error text for *all recipients rejected* is now more accurately *one or more recipients rejected*.
+* New behaviour for *--client-filter* exit values of 100 and over.
+* New commands on the admin interface, *failures* and *unfail-all*.
+* Shorter descriptions in the usage help unless *--verbose*.
+* New default spool directory location on windows, now under *system32*.
+* Windows project files for MSVC 2012 included.
+* Removed support for Windows NT and Windows 9x.
+* Better support for Windows Vista and Windows 7.
+* Removed Windows *--icon* option.
+* Removed *--enable-fhs* option for *configure* (see INSTALL document for equivalent usage).
+* Added *--log-file* option to redirect stderr.
+* Added Windows *--peer-lookup* option.
+* Fix for MD5 code in 64-bit builds.
+
+1.8.1 -> 1.8.2
+==============
+
+* Fix namespaces for gcc 3.4.
+
+1.8 -> 1.8.1
+============
+
+* Changed the definition of *--as-proxy* to use *--poll 0* rather than *--immediate* [bug-id 1961652].
+* Fixed stalling bug when using server-side TLS/SSL (\ *--server-tls*\ ) [bug-id 1961655].
+* Improved Debian packaging for Linux (\ *make deb*\ ).
+
+1.7 -> 1.8
+==========
+
+* Speed optimisations (as identified by KCachegrind/valgrind in KDevelop).
+* Build-time size optimisations (eg. *./configure --disable-exec --enable-small-exceptions ...*).
+* Build-time options to reduce runtime library dependencies (eg. *./configure --disable-dns --disable-identity*).
+* New switch to limit the size of submitted messages (\ *--size*\ ).
+* New semantics for *--poll 0*, providing a good alternative to *--immediate* when proxying.
+* SMTP client protocol emits a RSET after a rejected recipient as a workround for broken server protocols.
+* SMTP client protocol continues if the server advertises AUTH but the client has no authentication secrets.
+* When a message cannot be forwarded the offending SMTP protocol response number, if any, is put in the envelope file.
+* A warning is printed if logging is requested but both stderr and syslog are disabled.
+* A cross-compiling toolchain builder script added for running on mips-based routers (\ *extra/mips*\ ).
+* New example scripts for SMTP multicasting and editing envelope files.
+* Improved native support for Mac OS X (10.5) with graphical installation from disk image.
+* Compatibility with gcc 2.95 restored.
+
+1.6 -> 1.7
+==========
+
+* TLS/SSL support for SMTP using OpenSSL (*./configure --with-openssl* with *--client-tls* and *--server-tls*).
+* Authentication mechanism *PLAIN* added.
+* Some tightening up of the SMTP server protocol.
+* Windows service wrapper has an *--uninstall* option.
+* Windows installation GUI uninstalls the service before reinstalling it.
+
+1.5 -> 1.6
+==========
+
+* GPLv3 licence (see *http://gplv3.fsf.org*).
+* New *--prompt-timeout* switch for the timeout when waiting for the initial 220 prompt from the SMTP server.
+* Fix for flow-control assertion error when the POP server sends a very long list of spooled messages.
+* Wildcard matching for trusted IP addresses in the authentication secrets file can now use CIDR notation.
+* More fine-grained switching of effective user-id to read files and directories when running as root.
+* Fewer new client connections when proxying.
+* The server drops the connection if a remote SMTP client causes too many protocol errors.
+* More complete implementation of *--hidden* on Windows.
+* Scanner switch (\ *--scanner*\ ) replaced by a more general *--filter* and *--client-filter* switch syntax.
+* Support for address verification (\ *--verifier*\ ) over the network.
+* Better support for running as a Windows service (\ *emailrelay-service --install*\ ).
+* Utility filter program *emailrelay-filter-copy* exits with 100 if it deletes the envelope file.
+* Windows *cscript.exe* wrapper is added automatically to non-bat/exe *--filter* command-lines.
+* Installation GUI makes backups of the files it edits and preserves authentication secrets.
+* Installation GUI can install *init.d* links.
+* Experimental SpamAssassin spamc/spamd protocol support.
+* Acceptance tests added to the distribution.
+
+1.4 -> 1.5
+==========
+
+* New installation and configuration GUI using TrollTech Qt 4.x (\ *./configure --enable-gui*\ )
+* Default address verifier accepts all addresses as valid and never treats them as local mailboxes.
+* Fix for server exit bug when failing to send data down a newly accepted connection.
+* Spooled content files can be left in the parent directory to save diskspace when using *--pop-by-name*.
+* Client protocol improved for the case where there are no valid recipients.
+* New *--syslog* switch to override *--no-syslog*.
+* New *--filter-timeout* switch added.
+* Support for *--foo=bar* switch syntax (ie. with *=*).
+* Multiple listening interfaces allowed with a comma-separated *--interface* list.
+* New *--filter* utility called *emailrelay-filter-copy* to support *--pop-by-name*.
+* Documentation also created in docbook format (requires xmlto).
+* Windows installation document revised.
+
+1.3.3 -> 1.4
+============
+
+* POP3 server (enable with *--pop*, disable at build-time with *./configure --disable-pop*).
+* Fix for logging reentrancy bug (affects *./configure --enable-debug* with *--debug*).
+* Fix to ensure sockets are always non-blocking (affects *--scanner*).
+* Allow *--verifier* scripts to reject addresses with a temporary *4xx* error code.
+* Automatic re-reading of secrets files.
+* Write to the Windows event log even if no write access to the registry.
+* Modification of set-group-id policy if not started as root.
+* Better checking of spool directory access on startup.
+* New *emailrelay-submit.sh* example script for submitting messages for *--pop-by-name*.
+* The *--dont-listen* switch is now *--no-smtp*.
+* Better IPv6 support (Linux only).
+
+1.3.2 -> 1.3.3
+==============
+
+* No bind() for outgoing connections [bug-id 1051689].
+* Updated rpm spec file [bug-id 1224850].
+* Fix for gcc3.4 compilation error in *md5.cpp*.
+* Fix for glob()/size_t compilation warning.
+* Documentation of *auth* switches corrected.
+* State-machine template type declaration modernised, possibly breaking older compilers.
+
+1.3.1 -> 1.3.2
+==============
+
+* Fix for core dump when *--client-filter* pre-processing fails.
+* Revised code structure to prepare for asynchronous pre-processing.
+* Better diagnostics when pre-processor exec() fails.
+* Better cleanup of empty and orphaned files.
+
+1.3 -> 1.3.1
+============
+
+* Windows resource leak from CreateProcess() fixed.
+* Windows dialog box double-close fix.
+* Some documentation for the *--scanner* switch.
+* New usage patterns section in the user guide.
+
+1.2 -> 1.3
+==========
+
+* Client protocol waits for a greeting from the server on startup [bug-id 842156].
+* Fix for incorrect backslash normalisation on *--verifier* command-lines containing spaces [bug-id 890646].
+* Verifier programs can now summarily abort a connection using an exit value of 100.
+* New *--anonymous* switch that reduces information leakage to the SMTP client and disables *VRFY*.
+* Better validation of *MAIL-FROM* and *RCPT-TO* formatting.
+* Rewrite of low-level MD5 code.
+* Performance tuning.
+* Template *emailrelay.conf* gets installed in */etc*.
+* New switches for the *configure* script.
+* More JavaScript example scripts.
+
+1.1.2 -> 1.2
+============
+
+* The *--filter* and *--verifier* arguments interpreted as command-lines; spaces in executable paths now need escaping.
+* The *--interface* switch applies to outgoing connections too.
+* New *--client-filter* switch to do synchronous message processing before sending.
+* Keeps authentication after a *rset* command.
+* Fix for dangling reference bug, seen after *quit* command on Windows.
+* JavaScript examples in the documentation.
+
+1.1.1 -> 1.1.2
+==============
+
+* Earlier check for un-bindable ports on startup, and later fork()ing [bug-id 776972].
+* Resolved the file-descriptor kludge for *--verifier* on Windows.
+* Less strict about failing eight bit messages sent to servers with no *8BITMIME* extension.
+* Supplementary group memberships revoked at startup if root or suid.
+* Pre-processor (\ *--filter*\ ) program's standard output searched for a failure reason string.
+* Undocumented *--scanner* switch added for asynchronous processing by a separate network server.
+
+1.1.0 -> 1.1.1
+==============
+
+* Restored the fix for building with gcc2.96.
+* Support for MinGW builds on Windows.
+* More reasonable size of the *--help --verbose* message box on Windows.
+* Windows *--icon* switch changed from *-i* to *-c* to avoid conflicting with *--interface*.
+* Shows *next server address* correctly in the configuration report when using *--forward-to*.
+* Fix for *make install* when *man2html* is not available.
+* Updated init script.
+
+1.0.2 -> 1.1.0
+==============
+
+* In proxy mode unexpected client-side disconnects and timeouts do not leave *.bad* files [see also bug-id 659039].
+* By default proxy mode does not interpret addresses for local delivery (\ *--postmaster*\ ).
+* Polling option added (\ *--poll*\ ) to rescan the spool directory periodically.
+* New special exit code (103) for the pre-processor to trigger immediate polling; 100 to 107 now reserved.
+* Orphaned zero-length content files are deleted properly if the server-side dialogue is cut short.
+* The *--interface* switch applies to the *--admin* interface too.
+* Improved internal event architecture using slot/signal design pattern, and fewer singleton classes.
+* Event notification available through the administration interface.
+* New *--hidden* switch for Windows.
+* Syslog output includes process-id.
+* Support for Sun WorkShop 5.0 added.
+* Documentation overhaul.
+
+1.0.0 -> 1.0.2
+==============
+
+* Support for trusted IP addresses, allowing certain clients to avoid authentication.
+* Address verifier interface extended to include authentication information.
+* New public mail relay section added to the user guide.
+* Example verifier scripts etc. added to the reference guide.
+
+1.0.0 -> 1.0.1
+==============
+
+* In proxy mode unexpected client-side disconnects and timeouts result in *.bad* files [bug-id 659039].
+* Require successful *AUTH* before *MAIL FROM* when using *--server-auth*.
+* Better word-wrap on *--help* output.
+* Use of RedHat's *functions* code, and support for *chkconfig*, added to the *init.d* script.
+* Builds with gcc3.2 (1.0.0-pl5).
+* Fix for files left as *busy* after a connection failure in proxy mode [bug-id 631032] (1.0.0-pl3/4/5).
+* Trivial documentation fixes (1.0.0-pl3).
+* Fix for the double-dot escape bug in the client protocol [bug-id 611624] (1.0.0-pl2).
+* Fix build when using gcc2.96 rather than gcc2.95 (1.0.0-pl1).
+* Fix default spool directory in example scripts (1.0.0-pl1).
+
+0.9.9 -> 1.0.0
+==============
+
+* Briefer *--help* output; works with *--verbose*.
+* Option to listen on a specific network interface (\ *--interface*\ ).
+* Option for an external address verifier program (\ *--verifier*\ ).
+* Some Linux Standard Base stuff added to the *init.d* script.
+* Pid files world-readable and deleted on abnormal termination.
+* Compiles with gcc 3.0 and intel 6.0.
+* Autoconf tweak for MacOS X.
+* Corrected the *Received:* typo [bug-id 572236].
+* EHLO response parsing is now case-insensitive [bug-id 561522].
+* Fewer missing-secrets warnings [bug-id 564987].
+
+0.9.8 -> 0.9.9
+==============
+
+* More flexible logging options (*--verbose* and *--debug* work better).
+* File Hierarchy Standard (FHS_) option for *configure* (\ *--enable-fhs*\ ).
+* FHS-compatible RPMs.
+* Spool files writeable by pre-processor when server started as root.
+* Default directories in executables and scripts come from *configure*.
+* The *init.d* script is renamed *emailrelay* (was *emailrelay.sh*).
+* Man pages are gzipped when installed.
+* Fix for access violation under Windows NT when client disconnects.
+* Use of event log when compiled on Windows NT.
+* Fix for info-after-flush bug when using the administration interface. [rc2]
+* New *resubmit* script. [rc2]
+* Submit utility works under Windows. [rc2]
+* Improved Windows project files. [rc2]
+
+0.9.7 -> 0.9.8
+==============
+
+* Fix for running pre-processor (\ *--filter*\ ) as root.
+* Ignore bogus *AUTH=LOGIN* lines in EHLO response.
+* Submit utility improved to work with mutt.
+* Installation of submit man page.
+
+0.9.6 -> 0.9.7
+==============
+
+* CRAM-MD5 authentication mechanism added.
+* Revoke root permissions at start up, and reclaim them when needed.
+* Allow mail pre-processing (\ *--filter*\ ) when started as root.
+* Domain-override switch (\ *--domain*\ ) added.
+* Non-privileged user switch (\ *--user*\ ) added.
+* Better handling of NarrowPipe exception (ie. 8-bit message to 7-bit server).
+* Allow null return path in MAIL-FROM.
+* Reject recipients which look like *<user>@localhost* (as used by fetchmail for local delivery).
+* Treat recipients which look like *postmaster@localhost* or *postmaster@<fqdn>* as local postmaster.
+* Optional timestamps on log output (\ *--log-time*\ ).
+* Fix EHLO to HELO fallback for 501/502 responses in client protocol.
+* Submission utility *emailrelay-submit* added.
+* HTML4.0 compliant HTML documentation, using CSS.
+
+0.9.5 -> 0.9.6
+==============
+
+* SMTP AUTHentication extension -- LOGIN mechanism only.
+* Client-side protocol timeout.
+* Client-side connection timeout.
+* Preprocessor can cancel further message processing.
+* Client's IP address recorded in envelope files.
+* Multiple hard-coded listening addresses supported at compile-time.
+* Fix for automatic reopening of stderr stream.
+
+0.9.4 -> 0.9.5
+==============
+Windows fixes and improvements...
+
+* system-tray + dialog-box user interface
+* fix for dropped connections
+* fix for content file deletion
+* fix for directory iterator
+
+0.9.3 -> 0.9.4
+==============
+
+* Fixed memory leak when no *--log* switch.
+* Windows build is more *gui* and less *command-line*.
+* *Info* command added to the administration interface.
+* Doxygen files removed from binary RPM.
+
+0.9.2 -> 0.9.3
+==============
+
+* Proxy mode (*--immediate* and *--as-proxy*).
+* Message pre-processing (\ *--filter*\ ).
+* Message store classes better separated using abstract interfaces.
+* Improved notification script, with MIME encoding.
+* Builds with old 2.91 version of gcc.
+
+0.9.1 -> 0.9.2
+==============
+
+* Better autoconf detection.
+* Workround for FreeBSD uname() feature.
+* Added missing *.sh_* files to the distribution.
+* Fixed a benign directory iterator bug.
+* Use of gcc's *exception* header.
+
+0.9 -> 0.9.1
+============
+
+* Improved documentation from doxygen.
+* More complete use of namespaces.
+* Experimental compile-time support for IPv6.
+
+
+.. _DNSBL: https://en.wikipedia.org/wiki/DNSBL
+.. _FHS: https://wiki.linuxfoundation.org/lsb/fhs
+.. _PAM: https://en.wikipedia.org/wiki/Linux_PAM
+.. _POP: https://en.wikipedia.org/wiki/Post_Office_Protocol
+.. _RFC-2920: https://tools.ietf.org/html/rfc2920
+.. _RFC-3030: https://tools.ietf.org/html/rfc3030
+.. _RFC-3848: https://tools.ietf.org/html/rfc3848
+.. _RFC-5782: https://tools.ietf.org/html/rfc5782
+.. _RFC-6531: https://tools.ietf.org/html/rfc6531
+.. _RFC-8314: https://tools.ietf.org/html/rfc8314
+.. _SMTP: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
+.. _SOCKS: https://en.wikipedia.org/wiki/SOCKS
+.. _TLS: https://en.wikipedia.org/wiki/Transport_Layer_Security
+

doc/changelog.txt

@@ -0,0 +1,433 @@
+E-MailRelay Change Log
+======================
+
+2.4 -> 2.5
+----------
+* Multiple configurations in one process.
+* SMTP PIPELINING (RFC-2920).
+* SMTP CHUNKING/8BITMIME 'BDAT' extension (RFC-3030), disabled by default.
+* SMTP SMTPUTF8 extension (RFC-6531), disabled by default.
+* No 7-bit/8-bit check on received message content (see NEWS file).
+* New built-in filters: "deliver:", "split:", "copy:", "mx:", "msgid:".
+* New built-in address verifier: "account:"
+* No ".local" files (see NEWS file).
+* PAM authentication is now enabled with "--server-auth=pam:" not "/pam".
+* Client authentication details can be given directly from the command-line.
+* Multiple "client" authentication secrets, selected by a new envelope field.
+* Main binary can act as a simple submission tool ("configure --enable-submission").
+
+2.3 -> 2.4
+----------
+* Multiple "--filter" and "--client-filter" options allowed.
+* TLS key and certificate files can be specified separately.
+* Finer control when using "--anonymous" (eg. "--anonymous=server").
+* The "auth-config" options can distinguish between TLS and non-TLS authentication.
+* Hourly log file rotation using "%h" (eg. "--log-file=log.%d.%h").
+* Listening file descriptors can be inherited from the parent process (see "--interface").
+* Listening ports on Windows use exclusive binding.
+* The Linux event loop uses "epoll" by default rather than "select".
+* Some support for message routing (see NEWS).
+* Fix of error handling in network client filters ("--client-filter=net:...") [bug-id #50].
+
+2.2 -> 2.3
+----------
+* Unix domain sockets supported (eg. "--interface=/tmp/smtp.s").
+* Windows event log not used for verbose logging (prefer "--log-file").
+* New admin "forward" command to trigger forwarding without waiting.
+* Optional base64 encoding of passwords in secrets files ("plain:b").
+* Support for MbedTLS version 3.
+
+2.1 -> 2.2
+----------
+* Connections from IPv4 'private use' addresses are allowed by default (see "--remote-clients").
+* Interface names can be used with "--interface" (eg. "--interface=eth0").
+* New "--server-tls-connection" option for server-side implicit TLS.
+* New "--forward-to-some" option to permit some message recipients to be rejected.
+* New "--log-address" option to aid adaptive firewalling.
+* Dynamic log file rolling when using "--log-file=%d".
+* Choice of syslog 'facility' on Linux with "--syslog=local0" etc.
+* Pipelined SMTP QUIT commands sent by broken clients are tolerated.
+* Better handling of overly-verbose or unkillable "--filter" scripts.
+* Optional epoll event loop on Linux ("configure --enable-epoll").
+* Some internationalisation support (see NEWS file).
+* Support for Windows XP restored when built with mingw-w64.
+* C++ 2011 compiler is required.
+
+2.0.1 -> 2.1
+------------
+* Backwards compatibility features for 1.9-to-2.0 transition removed.
+* Better handling of too-many-connections on Windows.
+* New "--idle-timeout" option for server-side connections.
+* Support for RFC-5782 DNSBL blocking ("--dnsbl").
+* Filter scripts are given the path of the envelope file in argv2.
+* Message files can be edited by "--client-filter" scripts.
+* Better support for CRAM-SHAx authentication.
+* New "--client-auth-config" and "--server-auth-config" options.
+* New "--show" option on windows to better control the user interface style.
+* The "--pop" option always requires "--pop-auth".
+* No message is spooled if all its envelope recipients are local-mailboxes.
+* TLS cipher name added to "Received" line as per RFC-8314 4.3.
+* Certificate contents are not logged.
+* Timestamp parts of spool filenames no longer limited to six digits.
+
+2.0 -> 2.0.1
+------------
+* Make PLAIN client authentication work against servers with broken 334 responses.
+
+1.9.2 -> 2.0
+------------
+* Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see "--interface").
+* Server process is not blocked during "--filter" or "--address-verifier" execution, if multi-threaded.
+* Support for the "mbedTLS" TLS library as an alternative to OpenSSL ("configure --with-mbedtls").
+* TLS server certificates specified with new "--server-tls-certificate" option, not "--server-tls".
+* TLS servers enable client certificate verification with "--server-tls-verify", not "--tls-config".
+* TLS clients can verify server certificates with "--client-tls-verify" and "--client-tls-verify-name".
+* The "--tls-config" option works differently (see NEWS file).
+* New "--client-tls-server-name" option for server name identification (SNI).
+* New "--client-tls-required" option to force client connections to use TLS.
+* New "--server-tls-required" option to force remote SMTP clients to use STARTTLS.
+* New "--forward-on-disconnect" option replaces "--poll=0".
+* The "--anonymous" option now suppresses the "Received" line, whatever the "--domain".
+* The second field in the secrets file indicates the password encoding, not AUTH mechanism.
+* The "--verifier" option is now "--address-verifier", with simplified command-line parameters.
+* Command-line file paths can use "@app" as a prefix to be relative to the executable directory.
+* Command-line file paths can be relative to the startup cwd even when daemonised.
+* Filter exit codes between 104 and 107 are interpreted differently (see NEWS file).
+* Message rejection reasons passed back to the submitting SMTP client are much less verbose.
+* Forwarding events are queued up if the forwarding client is still busy from last time.
+* The bind address for outgoing connections is no longer taken from first unqualified "--interface" address [bug-id #27].
+* The SMTP client protocol tries more than one authentication mechanism.
+* Some support for XOAUTH2 client-side authentication.
+* Client protocol sends QUIT with a socket shutdown().
+* The Windows commdlg list-view widget is used for the server status pages.
+* The Windows connection-lookup feature is withdrawn ("--peer-lookup").
+* Several build-time configure options like "--disable-pop" are withdrawn.
+* C++ 2011 is preferred, and required for multi-threading.
+* Support for very old versions of Windows is dropped.
+
+1.9.1 -> 1.9.2
+--------------
+* Fixed a leak in the event-loop garbage collection.
+* A local hostname that fails to resolve is not an error.
+* A warning is emitted if there is more than one client authentication secret.
+* Multiple "--interface" options are allowed separately on the command-line.
+* Added a new "--client-interface" option.
+* The "Received" line is formatted as per RFC-3848 ("with ESMTPSA").
+* The LOGIN and PLAIN mechanisms in the secrets file are now equivalent.
+* The Windows service wrapper can use a configuration file to locate the startup batch file.
+* Simplified the implementation of the GUI installation program.
+* Reworded the "read error: disconnected" log message.
+* Less verbose logging of "no more messages to send".
+* Qt4 or Qt5 selected by the "configure" script.
+* Improved the RPM spec file.
+
+1.9 -> 1.9.1
+------------
+* Updated OpenSSL from 1.0.1e to 1.0.1g in the Windows build.
+
+1.8.2 -> 1.9
+------------
+* Added negotiated TLS/SSL for POP (ie. "STLS").
+* The first two fields in the secrets files are reordered (with backwards compatibility).
+* Added Linux PAM authentication ("configure --with-pam" and then "--server-auth=/pam").
+* Optional protocol-specific "--interface" qualifiers, eg. "--interface smtp=127.0.0.1,pop=192.168.1.1".
+* Outgoing client connection bound with the first "--interface" or "--interface client=..." address.
+* Support for SMTP-over-TLS on outgoing client connection ("--client-tls-connection") (cf. "STARTTLS")
+* Support for SOCKS 4a on outgoing client connection, eg. "--forward-to example.com:25@127.0.0.1:9050".
+* TLS configuration options ("--tls-config=...") for SSLv2/3 fallback etc.
+* No "Received" line added if "--anonymous" and an empty "--domain" name.
+* Error text for "all recipients rejected" is now more accurately "one or more recipients rejected".
+* New behaviour for "--client-filter" exit values of 100 and over.
+* New commands on the admin interface, "failures" and "unfail-all".
+* Shorter descriptions in the usage help unless "--verbose".
+* New default spool directory location on windows, now under "system32".
+* Windows project files for MSVC 2012 included.
+* Removed support for Windows NT and Windows 9x.
+* Better support for Windows Vista and Windows 7.
+* Removed Windows "--icon" option.
+* Removed "--enable-fhs" option for "configure" (see INSTALL document for equivalent usage).
+* Added "--log-file" option to redirect stderr.
+* Added Windows "--peer-lookup" option.
+* Fix for MD5 code in 64-bit builds.
+
+1.8.1 -> 1.8.2
+--------------
+* Fix namespaces for gcc 3.4.
+
+1.8 -> 1.8.1
+------------
+* Changed the definition of "--as-proxy" to use "--poll 0" rather than "--immediate" [bug-id 1961652].
+* Fixed stalling bug when using server-side TLS/SSL ("--server-tls") [bug-id 1961655].
+* Improved Debian packaging for Linux ("make deb").
+
+1.7 -> 1.8
+----------
+* Speed optimisations (as identified by KCachegrind/valgrind in KDevelop).
+* Build-time size optimisations (eg. "./configure --disable-exec --enable-small-exceptions ...").
+* Build-time options to reduce runtime library dependencies (eg. "./configure --disable-dns --disable-identity").
+* New switch to limit the size of submitted messages ("--size").
+* New semantics for "--poll 0", providing a good alternative to "--immediate" when proxying.
+* SMTP client protocol emits a RSET after a rejected recipient as a workround for broken server protocols.
+* SMTP client protocol continues if the server advertises AUTH but the client has no authentication secrets.
+* When a message cannot be forwarded the offending SMTP protocol response number, if any, is put in the envelope file.
+* A warning is printed if logging is requested but both stderr and syslog are disabled.
+* A cross-compiling toolchain builder script added for running on mips-based routers ("extra/mips").
+* New example scripts for SMTP multicasting and editing envelope files.
+* Improved native support for Mac OS X (10.5) with graphical installation from disk image.
+* Compatibility with gcc 2.95 restored.
+
+1.6 -> 1.7
+----------
+* TLS/SSL support for SMTP using OpenSSL ("./configure --with-openssl" with "--client-tls" and "--server-tls").
+* Authentication mechanism "PLAIN" added.
+* Some tightening up of the SMTP server protocol.
+* Windows service wrapper has an "--uninstall" option.
+* Windows installation GUI uninstalls the service before reinstalling it.
+
+1.5 -> 1.6
+----------
+* GPLv3 licence (see "http://gplv3.fsf.org").
+* New "--prompt-timeout" switch for the timeout when waiting for the initial 220 prompt from the SMTP server.
+* Fix for flow-control assertion error when the POP server sends a very long list of spooled messages.
+* Wildcard matching for trusted IP addresses in the authentication secrets file can now use CIDR notation.
+* More fine-grained switching of effective user-id to read files and directories when running as root.
+* Fewer new client connections when proxying.
+* The server drops the connection if a remote SMTP client causes too many protocol errors.
+* More complete implementation of "--hidden" on Windows.
+* Scanner switch ("--scanner") replaced by a more general "--filter" and "--client-filter" switch syntax.
+* Support for address verification ("--verifier") over the network.
+* Better support for running as a Windows service ("emailrelay-service --install").
+* Utility filter program "emailrelay-filter-copy" exits with 100 if it deletes the envelope file.
+* Windows "cscript.exe" wrapper is added automatically to non-bat/exe "--filter" command-lines.
+* Installation GUI makes backups of the files it edits and preserves authentication secrets.
+* Installation GUI can install "init.d" links.
+* Experimental SpamAssassin spamc/spamd protocol support.
+* Acceptance tests added to the distribution.
+
+1.4 -> 1.5
+----------
+* New installation and configuration GUI using TrollTech Qt 4.x ("./configure --enable-gui")
+* Default address verifier accepts all addresses as valid and never treats them as local mailboxes.
+* Fix for server exit bug when failing to send data down a newly accepted connection.
+* Spooled content files can be left in the parent directory to save diskspace when using "--pop-by-name".
+* Client protocol improved for the case where there are no valid recipients.
+* New "--syslog" switch to override "--no-syslog".
+* New "--filter-timeout" switch added.
+* Support for "--foo=bar" switch syntax (ie. with "=").
+* Multiple listening interfaces allowed with a comma-separated "--interface" list.
+* New "--filter" utility called "emailrelay-filter-copy" to support "--pop-by-name".
+* Documentation also created in docbook format (requires xmlto).
+* Windows installation document revised.
+
+1.3.3 -> 1.4
+------------
+* POP3 server (enable with "--pop", disable at build-time with "./configure --disable-pop").
+* Fix for logging reentrancy bug (affects "./configure --enable-debug" with "--debug").
+* Fix to ensure sockets are always non-blocking (affects "--scanner").
+* Allow "--verifier" scripts to reject addresses with a temporary "4xx" error code.
+* Automatic re-reading of secrets files.
+* Write to the Windows event log even if no write access to the registry.
+* Modification of set-group-id policy if not started as root.
+* Better checking of spool directory access on startup.
+* New "emailrelay-submit.sh" example script for submitting messages for "--pop-by-name".
+* The "--dont-listen" switch is now "--no-smtp".
+* Better IPv6 support (Linux only).
+
+1.3.2 -> 1.3.3
+--------------
+* No bind() for outgoing connections [bug-id 1051689].
+* Updated rpm spec file [bug-id 1224850].
+* Fix for gcc3.4 compilation error in "md5.cpp".
+* Fix for glob()/size_t compilation warning.
+* Documentation of "auth" switches corrected.
+* State-machine template type declaration modernised, possibly breaking older compilers.
+
+1.3.1 -> 1.3.2
+--------------
+* Fix for core dump when "--client-filter" pre-processing fails.
+* Revised code structure to prepare for asynchronous pre-processing.
+* Better diagnostics when pre-processor exec() fails.
+* Better cleanup of empty and orphaned files.
+
+1.3 -> 1.3.1
+------------
+* Windows resource leak from CreateProcess() fixed.
+* Windows dialog box double-close fix.
+* Some documentation for the "--scanner" switch.
+* New usage patterns section in the user guide.
+
+1.2 -> 1.3
+----------
+* Client protocol waits for a greeting from the server on startup [bug-id 842156].
+* Fix for incorrect backslash normalisation on "--verifier" command-lines containing spaces [bug-id 890646].
+* Verifier programs can now summarily abort a connection using an exit value of 100.
+* New "--anonymous" switch that reduces information leakage to the SMTP client and disables "VRFY".
+* Better validation of "MAIL-FROM" and "RCPT-TO" formatting.
+* Rewrite of low-level MD5 code.
+* Performance tuning.
+* Template "emailrelay.conf" gets installed in "/etc".
+* New switches for the "configure" script.
+* More JavaScript example scripts.
+
+1.1.2 -> 1.2
+------------
+* The "--filter" and "--verifier" arguments interpreted as command-lines; spaces in executable paths now need escaping.
+* The "--interface" switch applies to outgoing connections too.
+* New "--client-filter" switch to do synchronous message processing before sending.
+* Keeps authentication after a "rset" command.
+* Fix for dangling reference bug, seen after "quit" command on Windows.
+* JavaScript examples in the documentation.
+
+1.1.1 -> 1.1.2
+--------------
+* Earlier check for un-bindable ports on startup, and later fork()ing [bug-id 776972].
+* Resolved the file-descriptor kludge for "--verifier" on Windows.
+* Less strict about failing eight bit messages sent to servers with no "8BITMIME" extension.
+* Supplementary group memberships revoked at startup if root or suid.
+* Pre-processor ("--filter") program's standard output searched for a failure reason string.
+* Undocumented "--scanner" switch added for asynchronous processing by a separate network server.
+
+1.1.0 -> 1.1.1
+--------------
+* Restored the fix for building with gcc2.96.
+* Support for MinGW builds on Windows.
+* More reasonable size of the "--help --verbose" message box on Windows.
+* Windows "--icon" switch changed from "-i" to "-c" to avoid conflicting with "--interface".
+* Shows "next server address" correctly in the configuration report when using "--forward-to".
+* Fix for "make install" when "man2html" is not available.
+* Updated init script.
+
+1.0.2 -> 1.1.0
+--------------
+* In proxy mode unexpected client-side disconnects and timeouts do not leave ".bad" files [see also bug-id 659039].
+* By default proxy mode does not interpret addresses for local delivery ("--postmaster").
+* Polling option added ("--poll") to rescan the spool directory periodically.
+* New special exit code (103) for the pre-processor to trigger immediate polling; 100 to 107 now reserved.
+* Orphaned zero-length content files are deleted properly if the server-side dialogue is cut short.
+* The "--interface" switch applies to the "--admin" interface too.
+* Improved internal event architecture using slot/signal design pattern, and fewer singleton classes.
+* Event notification available through the administration interface.
+* New "--hidden" switch for Windows.
+* Syslog output includes process-id.
+* Support for Sun WorkShop 5.0 added.
+* Documentation overhaul.
+
+1.0.0 -> 1.0.2
+--------------
+* Support for trusted IP addresses, allowing certain clients to avoid authentication.
+* Address verifier interface extended to include authentication information.
+* New public mail relay section added to the user guide.
+* Example verifier scripts etc. added to the reference guide.
+
+1.0.0 -> 1.0.1
+--------------
+* In proxy mode unexpected client-side disconnects and timeouts result in ".bad" files [bug-id 659039].
+* Require successful "AUTH" before "MAIL FROM" when using "--server-auth".
+* Better word-wrap on "--help" output.
+* Use of RedHat's "functions" code, and support for "chkconfig", added to the "init.d" script.
+* Builds with gcc3.2 (1.0.0-pl5).
+* Fix for files left as "busy" after a connection failure in proxy mode [bug-id 631032] (1.0.0-pl3/4/5).
+* Trivial documentation fixes (1.0.0-pl3).
+* Fix for the double-dot escape bug in the client protocol [bug-id 611624] (1.0.0-pl2).
+* Fix build when using gcc2.96 rather than gcc2.95 (1.0.0-pl1).
+* Fix default spool directory in example scripts (1.0.0-pl1).
+
+0.9.9 -> 1.0.0
+--------------
+* Briefer "--help" output; works with "--verbose".
+* Option to listen on a specific network interface ("--interface").
+* Option for an external address verifier program ("--verifier").
+* Some Linux Standard Base stuff added to the "init.d" script.
+* Pid files world-readable and deleted on abnormal termination.
+* Compiles with gcc 3.0 and intel 6.0.
+* Autoconf tweak for MacOS X.
+* Corrected the "Received:" typo [bug-id 572236].
+* EHLO response parsing is now case-insensitive [bug-id 561522].
+* Fewer missing-secrets warnings [bug-id 564987].
+
+0.9.8 -> 0.9.9
+--------------
+* More flexible logging options ("--verbose" and "--debug" work better).
+* File Hierarchy Standard (FHS) option for "configure" ("--enable-fhs").
+* FHS-compatible RPMs.
+* Spool files writeable by pre-processor when server started as root.
+* Default directories in executables and scripts come from "configure".
+* The "init.d" script is renamed "emailrelay" (was "emailrelay.sh").
+* Man pages are gzipped when installed.
+* Fix for access violation under Windows NT when client disconnects.
+* Use of event log when compiled on Windows NT.
+* Fix for info-after-flush bug when using the administration interface. [rc2]
+* New "resubmit" script. [rc2]
+* Submit utility works under Windows. [rc2]
+* Improved Windows project files. [rc2]
+
+0.9.7 -> 0.9.8
+--------------
+* Fix for running pre-processor ("--filter") as root.
+* Ignore bogus "AUTH=LOGIN" lines in EHLO response.
+* Submit utility improved to work with mutt.
+* Installation of submit man page.
+
+0.9.6 -> 0.9.7
+--------------
+* CRAM-MD5 authentication mechanism added.
+* Revoke root permissions at start up, and reclaim them when needed.
+* Allow mail pre-processing ("--filter") when started as root.
+* Domain-override switch ("--domain") added.
+* Non-privileged user switch ("--user") added.
+* Better handling of NarrowPipe exception (ie. 8-bit message to 7-bit server).
+* Allow null return path in MAIL-FROM.
+* Reject recipients which look like "<user>@localhost" (as used by fetchmail for local delivery).
+* Treat recipients which look like "postmaster@localhost" or "postmaster@<fqdn>" as local postmaster.
+* Optional timestamps on log output ("--log-time").
+* Fix EHLO to HELO fallback for 501/502 responses in client protocol.
+* Submission utility "emailrelay-submit" added.
+* HTML4.0 compliant HTML documentation, using CSS.
+
+0.9.5 -> 0.9.6
+--------------
+* SMTP AUTHentication extension -- LOGIN mechanism only.
+* Client-side protocol timeout.
+* Client-side connection timeout.
+* Preprocessor can cancel further message processing.
+* Client's IP address recorded in envelope files.
+* Multiple hard-coded listening addresses supported at compile-time.
+* Fix for automatic reopening of stderr stream.
+
+0.9.4 -> 0.9.5
+--------------
+Windows fixes and improvements...
+* system-tray + dialog-box user interface
+* fix for dropped connections
+* fix for content file deletion
+* fix for directory iterator
+
+0.9.3 -> 0.9.4
+--------------
+* Fixed memory leak when no "--log" switch.
+* Windows build is more "gui" and less "command-line".
+* "Info" command added to the administration interface.
+* Doxygen files removed from binary RPM.
+
+0.9.2 -> 0.9.3
+--------------
+* Proxy mode ("--immediate" and "--as-proxy").
+* Message pre-processing ("--filter").
+* Message store classes better separated using abstract interfaces.
+* Improved notification script, with MIME encoding.
+* Builds with old 2.91 version of gcc.
+
+0.9.1 -> 0.9.2
+--------------
+* Better autoconf detection.
+* Workround for FreeBSD uname() feature.
+* Added missing ".sh_" files to the distribution.
+* Fixed a benign directory iterator bug.
+* Use of gcc's "exception" header.
+
+0.9 -> 0.9.1
+------------
+* Improved documentation from doxygen.
+* More complete use of namespaces.
+* Experimental compile-time support for IPv6.
+

doc/conf.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+import sys
+import os
+
+extensions = []
+templates_path = ['_templates']
+source_suffix = '.rst'
+master_doc = 'index'
+project = u'E-MailRelay'
+copyright = u'2023, Graeme Walker'
+author = u'Graeme Walker'
+version = u'2.5'
+release = u'2.5'
+language = None
+today_fmt = '%Y-%m-%d'
+exclude_patterns = []
+pygments_style = 'sphinx'
+todo_include_todos = False
+html_theme = 'alabaster'
+#html_logo = None
+#html_favicon = None
+html_static_path = ['_static']
+html_last_updated_fmt = ''
+html_show_sphinx = True
+html_show_copyright = True
+htmlhelp_basename = 'emailrelaydoc'
+latex_elements = {}
+latex_documents = []
+man_pages = []
+texinfo_documents = []

doc/developer.html

@@ -0,0 +1,397 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>E-MailRelay Developer Guide</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <link rel="stylesheet" href="emailrelay.css" type="text/css">
+ </head>
+ <body>
+  <!-- index:0::::E-MailRelay Developer Guide -->
+ <div class="div-main">
+  <h1><a class="a-header" name="H_1">E-MailRelay Developer Guide</a></h1> <!-- index:1:H:E-MailRelay Developer Guide -->
+   <h2><a class="a-header" name="SH_1_1">Principles</a></h2> <!-- index:2:SH:1:1:Principles -->
+    <p>
+     The main principles in the design of E-MailRelay can be summarised as:
+    </p>
+    <ul>
+     <li>Functionality without imposing policy</li>
+     <li>Minimal third-party dependencies</li>
+     <li>Windows/Unix portability without #ifdefs</li>
+     <li>Event-driven, non-blocking, single-threaded networking code</li>
+     <li>Multi-threading optional</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_2">Portability</a></h2> <!-- index:2:SH:1:2:Portability -->
+    <p>
+     The E-MailRelay code is written in C++11. Earlier versions of E-MailRelay used
+     C++03.
+    </p>
+
+    <p>
+     The header files <em>gdef.h</em> in <em>src/glib</em> is used to fix up some compiler
+     portability issues such as missing standard types, non-standard system headers
+     etc. Conditional compilation directives (<em>#ifdef</em> etc.) are largely confined
+     this file in order to improve readability.
+    </p>
+
+    <p>
+     Windows/Unix portability is generally addressed by providing a common class
+     declaration with two implementations. The implementations are put into separate
+     source files with a <em>_unix</em> or <em>_win32</em> suffix, and if necessary a 'pimple' (or
+     'Bridge') pattern is used to keep the o/s-specific details out of the header.
+     If only small parts of the implementation are o/s-specific then there can be
+     three source files per header. For example, <em>gsocket.cpp</em>, <em>gsocket_win32.cpp</em>
+     and <em>gsocket_unix.cpp</em> in the <em>src/gnet</em> directory.
+    </p>
+
+    <p>
+     Underscores in source file names are used exclusively to indicate build-time
+     alternatives.
+    </p>
+   <h2><a class="a-header" name="SH_1_3">Event model</a></h2> <!-- index:2:SH:1:3:Event model -->
+    <p>
+     The E-MailRelay server uses non-blocking socket i/o, with a select() or epoll()
+     event loop. This event model means that the server can handle multiple network
+     connections simultaneously from a single thread, and even if multi-threading is
+     disabled at build-time the only blocking occurs when external programs are
+     executed (see <em>--filter</em> and <em>--address-verifier</em>).
+    </p>
+
+    <p>
+     The advantages of a non-blocking event model are discussed in the well-known
+     <a href="http://www.kegel.com/c10k.html">C10K Problem</a> document.
+    </p>
+
+    <p>
+     This event model can make the code more complicated than the equivalent
+     multi-threaded approach since (for example) it is not possible to wait for a
+     complete line of input to be received from a remote SMTP client because there
+     might be other connections that need servicing half way through.
+    </p>
+
+    <p>
+     At higher levels the C++ slot/signal design pattern is used to propagate events
+     between objects (not to be confused with operating system signals). The
+     slot/signal implementation has been simplified compared to Qt or boost by not
+     supporting signal multicasting, so each signal connects to no more than one
+     slot. The implementation now uses std::function.
+    </p>
+
+    <p>
+     The synchronous slot/signal pattern needs some care when when the signalling
+     object gets destructed as a side-effect of raising a signal, and that situation
+     can be non-obvious precisely because of the slot/signal code decoupling. In
+     most cases signals are emitted at the end of a function and the stack unwinds
+     back to the event loop immediately afterwards, but in other situations,
+     particularly when emitting more than one signal, defensive measures are
+     required.
+    </p>
+   <h2><a class="a-header" name="SH_1_4">Module structure</a></h2> <!-- index:2:SH:1:4:Module structure -->
+    <p>
+     The main C++ libraries in the E-MailRelay code base are as follows:
+    </p>
+   <h3><a class="a-header"><em>glib</em></a></h3>
+      <dd>
+       Low-level classes for file-system abstraction, date and time representation,
+       string utility functions, logging, command line parsing etc.
+      </dd>
+   <h3><a class="a-header"><em>gssl</em></a></h3>
+      <dd>
+       A thin layer over the third-party TLS libraries.
+      </dd>
+   <h3><a class="a-header"><em>gnet</em></a></h3>
+      <dd>
+       Network and event-loop classes.
+      </dd>
+   <h3><a class="a-header"><em>gauth</em></a></h3>
+      <dd>
+       Implements various authentication mechanisms.
+      </dd>
+   <h3><a class="a-header"><em>gsmtp</em></a></h3>
+      <dd>
+       SMTP protocol classes.
+      </dd>
+   <h3><a class="a-header"><em>gpop</em></a></h3>
+      <dd>
+       POP3 protocol classes.
+      </dd>
+   <h3><a class="a-header"><em>gstore</em></a></h3>
+      <dd>
+       Message store classes.
+      </dd>
+   <h3><a class="a-header"><em>gfilters</em></a></h3>
+      <dd>
+       Built-in filters.
+      </dd>
+   <h3><a class="a-header"><em>gverifiers</em></a></h3>
+      <dd>
+       Built-in address verifiers.
+      </dd>
+    <p>
+     All of these libraries are portable between Unix-like systems and Windows.
+    </p>
+
+    <p>
+     Under Windows there is an additional library under <em>src/win32</em> for the user
+     interface implemented using the Microsoft Win32 API.
+    </p>
+   <h2><a class="a-header" name="SH_1_5">SMTP class structure</a></h2> <!-- index:2:SH:1:5:SMTP class structure -->
+    <p>
+     The message-store functionality uses three abstract interfaces: <em>MessageStore</em>,
+     <em>NewMessage</em> and <em>StoredMessage</em>. The <em>NewMessage</em> interface is used to create
+     messages within the store, and the <em>StoredMessage</em> interface is used for
+     reading and extracting messages from the store. The concrete implementation
+     classes based on these interfaces are respectively <em>FileStore</em>, <em>NewFile</em> and
+     <em>StoredFile</em>.
+    </p>
+
+    <p>
+     Protocol classes such as <em>GSmtp::ServerProtocol</em> receive network and timer
+     events from their container and use an abstract <em>Sender</em> interface to send
+     network data. This means that the protocols can be independent of the network
+     and event loop framework.
+    </p>
+
+    <p>
+     The interaction between the SMTP server protocol class and the message store is
+     mediated by the <em>ProtocolMessage</em> interface. Two main implementations of this
+     interface are available: one for normal spooling (<em>ProtocolMessageStore</em>), and
+     another for immediate forwarding (<em>ProtocolMessageForward</em>). The <em>Decorator</em>
+     pattern is used whereby the forwarding class uses an instance of the storage
+     class to do the message storing and filtering, while adding in an instance
+     of the <em>GSmtp::Client</em> class to do the forwarding.
+    </p>
+
+    <p>
+     Message filtering (<em>--filter</em>) is implemented via an abstract <em>GSmtp::Filter</em>
+     interface. Concrete implementations in the <em>GFilters</em> namespace are provided for
+     doing nothing, running an external executable program, talking to an external
+     network server, etc.
+    </p>
+
+    <p>
+     Address verifiers (<em>--address-verifier</em>) are implemented via an abstract
+     <em>GSmtp::Verifier</em> interface, with concrete implementations in the <em>GVerifiers</em>
+     namespace.
+    </p>
+
+    <p>
+     The protocol, processor and message-store interfaces are brought together by
+     the high-level <em>GSmtp::Server</em> and <em>GSmtp::Client</em> classes. Dependency
+     injection is used to create the concrete instances of the <em>MessageStore</em>,
+     <em>Filter</em> and <em>Verifier</em> interfaces.
+    </p>
+   <h2><a class="a-header" name="SH_1_6">Event handling and exceptions</a></h2> <!-- index:2:SH:1:6:Event handling and exceptions -->
+    <p>
+     The use of non-blocking i/o in the network library means that most processing
+     operates within the context of an i/o event or timeout callback, so the top
+     level of the call stack is nearly always the event loop code. This can make
+     catching C++ exceptions a bit awkward compared to a multi-threaded approach
+     because it is not possible to put a single catch block around a particular
+     high-level feature.
+    </p>
+
+    <p>
+     The event loop delivers asynchronous socket events to the <em>EventHandler</em>
+     interface, timer events to the <em>TimerBase</em> interface, and 'future' events to
+     the <em>FutureEventCallback</em> interface. If any of the these event handlers throws
+     an exception then the event loop catches it and delivers it back to an
+     exception handler through the <em>onException()</em> method of an associated
+     <em>ExceptionHandler</em> interface. If an exception is thrown out of _this_ callback
+     then the event loop code lets it propagate back to <em>main()</em>, typically
+     terminating the program.
+    </p>
+
+    <p>
+     However, sometimes there are objects that need to be more resilient to
+     exceptions. In particular, a network server should not terminate just because
+     one of its connections fails unexpectedly. In these cases the owning parent
+     object receives the exception notification together with an <em>ExceptionSource</em>
+     pointer that identifies the child object that threw the exception. This allows
+     the parent object to absorb the exception and delete the child, without the
+     exception killing the whole server.
+    </p>
+
+    <p>
+     Event sources in the event loop are typically held as a file descriptor and a
+     windows event handle, together known as a <em>Descriptor</em>. Event loop
+     implementations typically watch a set of Descriptors for events and call the
+     relevant EventHandler/ExceptionHandler code via the <em>EventEmitter</em> class.
+    </p>
+   <h2><a class="a-header" name="SH_1_7">Multi-threading</a></h2> <!-- index:2:SH:1:7:Multi-threading -->
+    <p>
+     Multi-threading is used to make DNS lookup and external program asynchronous so
+     unless disabled at build-time std::thread is used in a future/promise pattern to
+     wrap up <em>getaddrinfo()</em> and <em>waitpid()</em> system calls. The shared state comprises
+     only the parameters and return results from these system calls, and
+     synchronisation back to the main thread uses the main event loop (see
+     <em>GNet::FutureEvent</em>). Threading is not used elsewhere so the C/C++ run-time
+     library does not need to be thread-safe.
+    </p>
+   <h2><a class="a-header" name="SH_1_8">E-MailRelay GUI</a></h2> <!-- index:2:SH:1:8:E-MailRelay GUI -->
+    <p>
+     The optional GUI program <em>emailrelay-gui</em> uses the Qt toolkit for its user
+     interface components. The GUI can run as an installer or as a configuration
+     helper, depending on whether it can find an installation <em>payload</em>. Refer to
+     the comments in <em>src/gui/guimain.cpp</em> for more details.
+    </p>
+
+    <p>
+     The user interface runs as a stack of dialog-box pages with forward and back
+     buttons at the bottom. Once the stack has been completed by the user then each
+     page is asked to dump out its state as a set of key-value pairs (see
+     <em>src/gui/pages.cpp</em>). These key-value pairs are processed by an installer class
+     into a list of action objects (in the <em>Command</em> design pattern) and then the
+     action objects are run in turn. In order to display the progress of the
+     installation each action object is run within a timer callback so that the Qt
+     framework gets a chance to update the display between each one.
+    </p>
+
+    <p>
+     During development the user interface pages and the installer can be tested
+     separately since the interface between them is a simple text stream containing
+     key-value pairs.
+    </p>
+
+    <p>
+     When run in configure mode the GUI normally ends up simply editing the
+     <em>emailrelay.conf</em> file (or <em>emailrelay-start.bat</em> on Windows) and/or the
+     <em>emailrelay.auth</em> secrets file.
+    </p>
+
+    <p>
+     When run in install mode the GUI expects to unpack all the E-MailRelay files
+     from the payload into target directories. The payload is a simple directory
+     tree that lives alongside the GUI executable or inside the Mac application
+     bundle, and it contains a configuration file to tell the installer where
+     to copy its files.
+    </p>
+
+    <p>
+     When building the GUI program the library code shared with the main server
+     executable is compiled separately so that different GUI-specific compiler
+     options can be used. This is done as a 'unity build', concatenating the shared
+     code into one source file and compiling that for the GUI. (This technique
+     requires that private 'detail' namespaces are named rather than anonymous so
+     that there cannot be any name clashes within the combined anonymous namespace.)
+    </p>
+   <h2><a class="a-header" name="SH_1_9">Windows build</a></h2> <!-- index:2:SH:1:9:Windows build -->
+    <p>
+     E-MailRelay can be compiled on Windows using Microsoft Visual Studio C++ (MSVC)
+     or mingw-w64.
+    </p>
+
+    <p>
+     For MSVC builds there is a perl script (<em>winbuild.pl</em>) that creates <em>cmake</em>
+     files from the autotools makefiles, runs <em>cmake</em> to create the MSVC project
+     files and then runs <em>msbuild</em> to compile E-MailRelay. If perl, cmake, MSVC, Qt
+     and mbedTLS source are installed in the right way then the <em>winbuild.bat</em> batch
+     file should be able to do a complete MSVC release build in one go. After that
+     the <em>winbuild-install.bat</em> batch file can be used to create a distribution.
+    </p>
+
+    <p>
+     When building for a public release the E-MailRelay setup program should be
+     statically linked and copied into the distribution created by <em>winbuild.pl</em>.
+     This requires a static build of Qt: edit <em>msvc-desktop.conf</em> to use <em>/MT</em>;
+     run <em>configure.bat</em> with <em>-static -release</em>; run <em>nmake -f Makefile</em> for
+     <em>release</em> then <em>install</em>. Then build the E-MailRelay GUI using
+     <em>emailrelay-gui.pro</em>: <em>qmake CONFIG+='win static' emailrelay-gui.pro</em>;
+     then <em>mc messages.mc</em>; then copy <em>emailrelay-icon.ico</em>; and finally
+     <em>nmake -f Makefile.Release</em>.
+    </p>
+
+    <p>
+     For MinGW cross-builds use <em>./configure.sh -w64</em> and <em>make</em> on a Linux box and
+     copy the built executables and the MinGW run-time to the target. Any extra
+     run-time files can be identified by running <em>dumpbin /dependents</em> in the normal
+     way.
+    </p>
+   <h2><a class="a-header" name="SH_1_10">Windows packaging</a></h2> <!-- index:2:SH:1:10:Windows packaging -->
+    <p>
+     On Windows E-MailRelay is packaged as a zip file containing the executables
+     (including the emailrelay GUI as <em>emailrelay-setup.exe</em>), documentation, and a
+     <em>payload</em> directory tree. The payload contains many of the same files all over
+     again, and while this duplication is not ideal it is at least straightforward.
+    </p>
+
+    <p>
+     The Qt tool <em>windeployqt</em> is used to add run-time dependencies, such as the
+     platform DLL. (Public releases of Windows builds are normally statically linked,
+     so many of the DLLs added by <em>windeployqt</em> are not needed.)
+    </p>
+
+    <p>
+     To target ancient versions of Windows start with a cross-build using MinGW
+     for 32-bit (<em>./configure.sh -w32</em>); then <em>winbuild.pl mingw</em> can be used to
+     assemble a slimmed-down package for distribution.
+    </p>
+   <h2><a class="a-header" name="SH_1_11">Unix packaging</a></h2> <!-- index:2:SH:1:11:Unix packaging -->
+    <p>
+     On Unix-like operating systems it is more natural to use some sort of package
+     derived from the <em>make install</em> process rather than an installer program, so
+     the emailrelay GUI is not normally used.
+    </p>
+
+    <p>
+     Top-level makefile targets <em>dist</em>, <em>deb</em> and <em>rpm</em> can be used to create a
+     binary tarball, a debian package, and an RPM package respectively.
+    </p>
+   <h2><a class="a-header" name="SH_1_12">Internationalisation</a></h2> <!-- index:2:SH:1:12:Internationalisation -->
+    <p>
+     The GUI code has i18n support using the Qt framework, with the tr() function
+     used throughout the GUI source code. The GUI main() function loads translations
+     from the <em>translations</em> sub-directory (relative to the executable), although
+     that can be overridden with the <em>--qm</em> command-line option. Qt's <em>-reverse</em>
+     option can also be used to reverse the widgets when using RTL languages.
+    </p>
+
+    <p>
+     The non-GUI code has some i18n support by using gettext() via the inline txt()
+     and tx() functions defined in <em>src/glib/ggettext.h</em>. The configure script
+     detects gettext support in the C run-time library, but without trying different
+     compile and link options. See also <em>po/Makefile.am</em>.
+    </p>
+
+    <p>
+     On Windows the main server executable has a tabbed dialog-box as its user
+     interface, but that does not have any support for i18n.
+    </p>
+   <h2><a class="a-header" name="SH_1_13">Source control</a></h2> <!-- index:2:SH:1:13:Source control -->
+    <p>
+     The source code is stored in the SourceForge <em>svn</em> repository. A working
+     copy can be checked out as follows:
+    </p>
+
+      <div class="div-pre">
+       <pre>$ svn co https://svn.code.sf.net/p/emailrelay/code/trunk emailrelay</pre>
+      </div><!-- div-pre -->
+   <h2><a class="a-header" name="SH_1_14">Compile-time features</a></h2> <!-- index:2:SH:1:14:Compile-time features -->
+    <p>
+     Compile-time features can be selected with options passed to the <em>configure</em>
+     script. These include the following:
+    </p>
+
+    <ul>
+     <li>Configuration GUI (<em>--enable-gui</em>)</li>
+     <li>Multi-threading (<em>--enable-std-thread</em>)</li>
+     <li>TLS library (<em>--with-openssl</em>, <em>--with-mbedtls</em>)</li>
+     <li>Debug-level logging (<em>--enable-debug</em>)</li>
+     <li>Event loop using epoll (<em>--enable-epoll</em>)</li>
+     <li>PAM support (<em>--with-pam</em>)</li>
+    </ul>
+
+    <p>
+     Use <em>./configure --help</em> to see a complete list of options.
+    </p>
+
+
+
+    <div class="div-footer">
+     <p>
+      Copyright (C) 2001-2023 Graeme Walker
+     </p>
+    </div><!-- div-footer -->
+ </div> <!-- div-main -->
+ </body>
+</html>
+<!-- Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->

doc/developer.md

@@ -0,0 +1,328 @@
+E-MailRelay Developer Guide
+===========================
+
+Principles
+----------
+The main principles in the design of E-MailRelay can be summarised as:
+
+* Functionality without imposing policy
+* Minimal third-party dependencies
+* Windows/Unix portability without #ifdefs
+* Event-driven, non-blocking, single-threaded networking code
+* Multi-threading optional
+
+Portability
+-----------
+The E-MailRelay code is written in C++11. Earlier versions of E-MailRelay used
+C++03.
+
+The header files `gdef.h` in `src/glib` is used to fix up some compiler
+portability issues such as missing standard types, non-standard system headers
+etc. Conditional compilation directives (`#ifdef` etc.) are largely confined
+this file in order to improve readability.
+
+Windows/Unix portability is generally addressed by providing a common class
+declaration with two implementations. The implementations are put into separate
+source files with a `_unix` or `_win32` suffix, and if necessary a 'pimple' (or
+'Bridge') pattern is used to keep the o/s-specific details out of the header.
+If only small parts of the implementation are o/s-specific then there can be
+three source files per header. For example, `gsocket.cpp`, `gsocket_win32.cpp`
+and `gsocket_unix.cpp` in the `src/gnet` directory.
+
+Underscores in source file names are used exclusively to indicate build-time
+alternatives.
+
+Event model
+-----------
+The E-MailRelay server uses non-blocking socket i/o, with a select() or epoll()
+event loop. This event model means that the server can handle multiple network
+connections simultaneously from a single thread, and even if multi-threading is
+disabled at build-time the only blocking occurs when external programs are
+executed (see `--filter` and `--address-verifier`).
+
+The advantages of a non-blocking event model are discussed in the well-known
+[C10K Problem](http://www.kegel.com/c10k.html) document.
+
+This event model can make the code more complicated than the equivalent
+multi-threaded approach since (for example) it is not possible to wait for a
+complete line of input to be received from a remote [SMTP][] client because there
+might be other connections that need servicing half way through.
+
+At higher levels the C++ slot/signal design pattern is used to propagate events
+between objects (not to be confused with operating system signals). The
+slot/signal implementation has been simplified compared to Qt or boost by not
+supporting signal multicasting, so each signal connects to no more than one
+slot. The implementation now uses std::function.
+
+The synchronous slot/signal pattern needs some care when when the signalling
+object gets destructed as a side-effect of raising a signal, and that situation
+can be non-obvious precisely because of the slot/signal code decoupling. In
+most cases signals are emitted at the end of a function and the stack unwinds
+back to the event loop immediately afterwards, but in other situations,
+particularly when emitting more than one signal, defensive measures are
+required.
+
+Module structure
+----------------
+The main C++ libraries in the E-MailRelay code base are as follows:
+
+### "glib" ###
+
+    Low-level classes for file-system abstraction, date and time representation,
+    string utility functions, logging, command line parsing etc.
+
+
+### "gssl" ###
+
+    A thin layer over the third-party [TLS][] libraries.
+
+
+### "gnet" ###
+
+    Network and event-loop classes.
+
+
+### "gauth" ###
+
+    Implements various authentication mechanisms.
+
+
+### "gsmtp" ###
+
+    SMTP protocol classes.
+
+
+### "gpop" ###
+
+    POP3 protocol classes.
+
+
+### "gstore" ###
+
+    Message store classes.
+
+
+### "gfilters" ###
+
+    Built-in filters.
+
+
+### "gverifiers" ###
+
+    Built-in address verifiers.
+
+All of these libraries are portable between Unix-like systems and Windows.
+
+Under Windows there is an additional library under `src/win32` for the user
+interface implemented using the Microsoft Win32 API.
+
+SMTP class structure
+--------------------
+The message-store functionality uses three abstract interfaces: `MessageStore`,
+`NewMessage` and `StoredMessage`. The `NewMessage` interface is used to create
+messages within the store, and the `StoredMessage` interface is used for
+reading and extracting messages from the store. The concrete implementation
+classes based on these interfaces are respectively `FileStore`, `NewFile` and
+`StoredFile`.
+
+Protocol classes such as `GSmtp::ServerProtocol` receive network and timer
+events from their container and use an abstract `Sender` interface to send
+network data. This means that the protocols can be independent of the network
+and event loop framework.
+
+The interaction between the SMTP server protocol class and the message store is
+mediated by the `ProtocolMessage` interface. Two main implementations of this
+interface are available: one for normal spooling (`ProtocolMessageStore`), and
+another for immediate forwarding (`ProtocolMessageForward`). The `Decorator`
+pattern is used whereby the forwarding class uses an instance of the storage
+class to do the message storing and filtering, while adding in an instance
+of the `GSmtp::Client` class to do the forwarding.
+
+Message filtering (`--filter`) is implemented via an abstract `GSmtp::Filter`
+interface. Concrete implementations in the `GFilters` namespace are provided for
+doing nothing, running an external executable program, talking to an external
+network server, etc.
+
+Address verifiers (`--address-verifier`) are implemented via an abstract
+`GSmtp::Verifier` interface, with concrete implementations in the `GVerifiers`
+namespace.
+
+The protocol, processor and message-store interfaces are brought together by
+the high-level `GSmtp::Server` and `GSmtp::Client` classes. Dependency
+injection is used to create the concrete instances of the `MessageStore`,
+`Filter` and `Verifier` interfaces.
+
+Event handling and exceptions
+-----------------------------
+The use of non-blocking i/o in the network library means that most processing
+operates within the context of an i/o event or timeout callback, so the top
+level of the call stack is nearly always the event loop code. This can make
+catching C++ exceptions a bit awkward compared to a multi-threaded approach
+because it is not possible to put a single catch block around a particular
+high-level feature.
+
+The event loop delivers asynchronous socket events to the `EventHandler`
+interface, timer events to the `TimerBase` interface, and 'future' events to
+the `FutureEventCallback` interface. If any of the these event handlers throws
+an exception then the event loop catches it and delivers it back to an
+exception handler through the `onException()` method of an associated
+`ExceptionHandler` interface. If an exception is thrown out of _this_ callback
+then the event loop code lets it propagate back to `main()`, typically
+terminating the program.
+
+However, sometimes there are objects that need to be more resilient to
+exceptions. In particular, a network server should not terminate just because
+one of its connections fails unexpectedly. In these cases the owning parent
+object receives the exception notification together with an `ExceptionSource`
+pointer that identifies the child object that threw the exception. This allows
+the parent object to absorb the exception and delete the child, without the
+exception killing the whole server.
+
+Event sources in the event loop are typically held as a file descriptor and a
+windows event handle, together known as a `Descriptor`. Event loop
+implementations typically watch a set of Descriptors for events and call the
+relevant EventHandler/ExceptionHandler code via the `EventEmitter` class.
+
+Multi-threading
+---------------
+Multi-threading is used to make DNS lookup and external program asynchronous so
+unless disabled at build-time std::thread is used in a future/promise pattern to
+wrap up `getaddrinfo()` and `waitpid()` system calls. The shared state comprises
+only the parameters and return results from these system calls, and
+synchronisation back to the main thread uses the main event loop (see
+`GNet::FutureEvent`). Threading is not used elsewhere so the C/C++ run-time
+library does not need to be thread-safe.
+
+E-MailRelay GUI
+---------------
+The optional GUI program `emailrelay-gui` uses the Qt toolkit for its user
+interface components. The GUI can run as an installer or as a configuration
+helper, depending on whether it can find an installation `payload`. Refer to
+the comments in `src/gui/guimain.cpp` for more details.
+
+The user interface runs as a stack of dialog-box pages with forward and back
+buttons at the bottom. Once the stack has been completed by the user then each
+page is asked to dump out its state as a set of key-value pairs (see
+`src/gui/pages.cpp`). These key-value pairs are processed by an installer class
+into a list of action objects (in the `Command` design pattern) and then the
+action objects are run in turn. In order to display the progress of the
+installation each action object is run within a timer callback so that the Qt
+framework gets a chance to update the display between each one.
+
+During development the user interface pages and the installer can be tested
+separately since the interface between them is a simple text stream containing
+key-value pairs.
+
+When run in configure mode the GUI normally ends up simply editing the
+`emailrelay.conf` file (or `emailrelay-start.bat` on Windows) and/or the
+`emailrelay.auth` secrets file.
+
+When run in install mode the GUI expects to unpack all the E-MailRelay files
+from the payload into target directories. The payload is a simple directory
+tree that lives alongside the GUI executable or inside the Mac application
+bundle, and it contains a configuration file to tell the installer where
+to copy its files.
+
+When building the GUI program the library code shared with the main server
+executable is compiled separately so that different GUI-specific compiler
+options can be used. This is done as a 'unity build', concatenating the shared
+code into one source file and compiling that for the GUI. (This technique
+requires that private 'detail' namespaces are named rather than anonymous so
+that there cannot be any name clashes within the combined anonymous namespace.)
+
+Windows build
+-------------
+E-MailRelay can be compiled on Windows using Microsoft Visual Studio C++ (MSVC)
+or mingw-w64.
+
+For MSVC builds there is a perl script (`winbuild.pl`) that creates `cmake`
+files from the autotools makefiles, runs `cmake` to create the MSVC project
+files and then runs `msbuild` to compile E-MailRelay. If perl, cmake, MSVC, Qt
+and mbedTLS source are installed in the right way then the `winbuild.bat` batch
+file should be able to do a complete MSVC release build in one go. After that
+the `winbuild-install.bat` batch file can be used to create a distribution.
+
+When building for a public release the E-MailRelay setup program should be
+statically linked and copied into the distribution created by `winbuild.pl`.
+This requires a static build of Qt: edit `msvc-desktop.conf` to use `/MT`;
+run `configure.bat` with `-static -release`; run `nmake -f Makefile` for
+`release` then `install`. Then build the E-MailRelay GUI using
+`emailrelay-gui.pro`: `qmake CONFIG+='win static' emailrelay-gui.pro`;
+then `mc messages.mc`; then copy `emailrelay-icon.ico`; and finally
+`nmake -f Makefile.Release`.
+
+For MinGW cross-builds use `./configure.sh -w64` and `make` on a Linux box and
+copy the built executables and the MinGW run-time to the target. Any extra
+run-time files can be identified by running `dumpbin /dependents` in the normal
+way.
+
+Windows packaging
+-----------------
+On Windows E-MailRelay is packaged as a zip file containing the executables
+(including the emailrelay GUI as `emailrelay-setup.exe`), documentation, and a
+`payload` directory tree. The payload contains many of the same files all over
+again, and while this duplication is not ideal it is at least straightforward.
+
+The Qt tool `windeployqt` is used to add run-time dependencies, such as the
+platform DLL. (Public releases of Windows builds are normally statically linked,
+so many of the DLLs added by `windeployqt` are not needed.)
+
+To target ancient versions of Windows start with a cross-build using MinGW
+for 32-bit (`./configure.sh -w32`); then `winbuild.pl mingw` can be used to
+assemble a slimmed-down package for distribution.
+
+Unix packaging
+--------------
+On Unix-like operating systems it is more natural to use some sort of package
+derived from the `make install` process rather than an installer program, so
+the emailrelay GUI is not normally used.
+
+Top-level makefile targets `dist`, `deb` and `rpm` can be used to create a
+binary tarball, a debian package, and an RPM package respectively.
+
+Internationalisation
+--------------------
+The GUI code has i18n support using the Qt framework, with the tr() function
+used throughout the GUI source code. The GUI main() function loads translations
+from the `translations` sub-directory (relative to the executable), although
+that can be overridden with the `--qm` command-line option. Qt's `-reverse`
+option can also be used to reverse the widgets when using RTL languages.
+
+The non-GUI code has some i18n support by using gettext() via the inline txt()
+and tx() functions defined in `src/glib/ggettext.h`. The configure script
+detects gettext support in the C run-time library, but without trying different
+compile and link options. See also `po/Makefile.am`.
+
+On Windows the main server executable has a tabbed dialog-box as its user
+interface, but that does not have any support for i18n.
+
+Source control
+--------------
+The source code is stored in the SourceForge `svn` repository. A working
+copy can be checked out as follows:
+
+        $ svn co https://svn.code.sf.net/p/emailrelay/code/trunk emailrelay
+
+Compile-time features
+---------------------
+Compile-time features can be selected with options passed to the `configure`
+script. These include the following:
+
+* Configuration GUI (`--enable-gui`)
+* Multi-threading (`--enable-std-thread`)
+* TLS library (`--with-openssl`, `--with-mbedtls`)
+* Debug-level logging (`--enable-debug`)
+* Event loop using epoll (`--enable-epoll`)
+* [PAM][] support (`--with-pam`)
+
+Use `./configure --help` to see a complete list of options.
+
+
+
+
+[PAM]: https://en.wikipedia.org/wiki/Linux_PAM
+[SMTP]: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
+[TLS]: https://en.wikipedia.org/wiki/Transport_Layer_Security
+
+_____________________________________
+Copyright (C) 2001-2023 Graeme Walker

doc/developer.rst

@@ -0,0 +1,332 @@
+***************
+Developer Guide
+***************
+
+Principles
+==========
+The main principles in the design of E-MailRelay can be summarised as:
+
+* Functionality without imposing policy
+* Minimal third-party dependencies
+* Windows/Unix portability without #ifdefs
+* Event-driven, non-blocking, single-threaded networking code
+* Multi-threading optional
+
+Portability
+===========
+The E-MailRelay code is written in C++11. Earlier versions of E-MailRelay used
+C++03.
+
+The header files *gdef.h* in *src/glib* is used to fix up some compiler
+portability issues such as missing standard types, non-standard system headers
+etc. Conditional compilation directives (*#ifdef* etc.) are largely confined
+this file in order to improve readability.
+
+Windows/Unix portability is generally addressed by providing a common class
+declaration with two implementations. The implementations are put into separate
+source files with a *_unix* or *_win32* suffix, and if necessary a 'pimple' (or
+'Bridge') pattern is used to keep the o/s-specific details out of the header.
+If only small parts of the implementation are o/s-specific then there can be
+three source files per header. For example, *gsocket.cpp*, *gsocket_win32.cpp*
+and *gsocket_unix.cpp* in the *src/gnet* directory.
+
+Underscores in source file names are used exclusively to indicate build-time
+alternatives.
+
+Event model
+===========
+The E-MailRelay server uses non-blocking socket i/o, with a select() or epoll()
+event loop. This event model means that the server can handle multiple network
+connections simultaneously from a single thread, and even if multi-threading is
+disabled at build-time the only blocking occurs when external programs are
+executed (see *--filter* and *--address-verifier*).
+
+The advantages of a non-blocking event model are discussed in the well-known
+`C10K Problem <http://www.kegel.com/c10k.html>`_ document.
+
+This event model can make the code more complicated than the equivalent
+multi-threaded approach since (for example) it is not possible to wait for a
+complete line of input to be received from a remote SMTP_ client because there
+might be other connections that need servicing half way through.
+
+At higher levels the C++ slot/signal design pattern is used to propagate events
+between objects (not to be confused with operating system signals). The
+slot/signal implementation has been simplified compared to Qt or boost by not
+supporting signal multicasting, so each signal connects to no more than one
+slot. The implementation now uses std::function.
+
+The synchronous slot/signal pattern needs some care when when the signalling
+object gets destructed as a side-effect of raising a signal, and that situation
+can be non-obvious precisely because of the slot/signal code decoupling. In
+most cases signals are emitted at the end of a function and the stack unwinds
+back to the event loop immediately afterwards, but in other situations,
+particularly when emitting more than one signal, defensive measures are
+required.
+
+Module structure
+================
+The main C++ libraries in the E-MailRelay code base are as follows:
+
+"glib"
+------
+    Low-level classes for file-system abstraction, date and time representation,
+    string utility functions, logging, command line parsing etc.
+
+
+"gssl"
+------
+    A thin layer over the third-party TLS_ libraries.
+
+
+"gnet"
+------
+    Network and event-loop classes.
+
+
+"gauth"
+-------
+    Implements various authentication mechanisms.
+
+
+"gsmtp"
+-------
+    SMTP protocol classes.
+
+
+"gpop"
+------
+    POP3 protocol classes.
+
+
+"gstore"
+--------
+    Message store classes.
+
+
+"gfilters"
+----------
+    Built-in filters.
+
+
+"gverifiers"
+------------
+    Built-in address verifiers.
+
+All of these libraries are portable between Unix-like systems and Windows.
+
+Under Windows there is an additional library under *src/win32* for the user
+interface implemented using the Microsoft Win32 API.
+
+SMTP class structure
+====================
+The message-store functionality uses three abstract interfaces: *MessageStore*,
+*NewMessage* and *StoredMessage*. The *NewMessage* interface is used to create
+messages within the store, and the *StoredMessage* interface is used for
+reading and extracting messages from the store. The concrete implementation
+classes based on these interfaces are respectively *FileStore*, *NewFile* and
+\ *StoredFile*\ .
+
+Protocol classes such as *GSmtp::ServerProtocol* receive network and timer
+events from their container and use an abstract *Sender* interface to send
+network data. This means that the protocols can be independent of the network
+and event loop framework.
+
+The interaction between the SMTP server protocol class and the message store is
+mediated by the *ProtocolMessage* interface. Two main implementations of this
+interface are available: one for normal spooling (\ *ProtocolMessageStore*\ ), and
+another for immediate forwarding (\ *ProtocolMessageForward*\ ). The *Decorator*
+pattern is used whereby the forwarding class uses an instance of the storage
+class to do the message storing and filtering, while adding in an instance
+of the *GSmtp::Client* class to do the forwarding.
+
+Message filtering (\ *--filter*\ ) is implemented via an abstract *GSmtp::Filter*
+interface. Concrete implementations in the *GFilters* namespace are provided for
+doing nothing, running an external executable program, talking to an external
+network server, etc.
+
+Address verifiers (\ *--address-verifier*\ ) are implemented via an abstract
+*GSmtp::Verifier* interface, with concrete implementations in the *GVerifiers*
+namespace.
+
+The protocol, processor and message-store interfaces are brought together by
+the high-level *GSmtp::Server* and *GSmtp::Client* classes. Dependency
+injection is used to create the concrete instances of the *MessageStore*,
+*Filter* and *Verifier* interfaces.
+
+Event handling and exceptions
+=============================
+The use of non-blocking i/o in the network library means that most processing
+operates within the context of an i/o event or timeout callback, so the top
+level of the call stack is nearly always the event loop code. This can make
+catching C++ exceptions a bit awkward compared to a multi-threaded approach
+because it is not possible to put a single catch block around a particular
+high-level feature.
+
+The event loop delivers asynchronous socket events to the *EventHandler*
+interface, timer events to the *TimerBase* interface, and 'future' events to
+the *FutureEventCallback* interface. If any of the these event handlers throws
+an exception then the event loop catches it and delivers it back to an
+exception handler through the *onException()* method of an associated
+*ExceptionHandler* interface. If an exception is thrown out of _this_ callback
+then the event loop code lets it propagate back to *main()*, typically
+terminating the program.
+
+However, sometimes there are objects that need to be more resilient to
+exceptions. In particular, a network server should not terminate just because
+one of its connections fails unexpectedly. In these cases the owning parent
+object receives the exception notification together with an *ExceptionSource*
+pointer that identifies the child object that threw the exception. This allows
+the parent object to absorb the exception and delete the child, without the
+exception killing the whole server.
+
+Event sources in the event loop are typically held as a file descriptor and a
+windows event handle, together known as a *Descriptor*. Event loop
+implementations typically watch a set of Descriptors for events and call the
+relevant EventHandler/ExceptionHandler code via the *EventEmitter* class.
+
+Multi-threading
+===============
+Multi-threading is used to make DNS lookup and external program asynchronous so
+unless disabled at build-time std::thread is used in a future/promise pattern to
+wrap up *getaddrinfo()* and *waitpid()* system calls. The shared state comprises
+only the parameters and return results from these system calls, and
+synchronisation back to the main thread uses the main event loop (see
+\ *GNet::FutureEvent*\ ). Threading is not used elsewhere so the C/C++ run-time
+library does not need to be thread-safe.
+
+E-MailRelay GUI
+===============
+The optional GUI program *emailrelay-gui* uses the Qt toolkit for its user
+interface components. The GUI can run as an installer or as a configuration
+helper, depending on whether it can find an installation *payload*. Refer to
+the comments in *src/gui/guimain.cpp* for more details.
+
+The user interface runs as a stack of dialog-box pages with forward and back
+buttons at the bottom. Once the stack has been completed by the user then each
+page is asked to dump out its state as a set of key-value pairs (see
+\ *src/gui/pages.cpp*\ ). These key-value pairs are processed by an installer class
+into a list of action objects (in the *Command* design pattern) and then the
+action objects are run in turn. In order to display the progress of the
+installation each action object is run within a timer callback so that the Qt
+framework gets a chance to update the display between each one.
+
+During development the user interface pages and the installer can be tested
+separately since the interface between them is a simple text stream containing
+key-value pairs.
+
+When run in configure mode the GUI normally ends up simply editing the
+*emailrelay.conf* file (or *emailrelay-start.bat* on Windows) and/or the
+*emailrelay.auth* secrets file.
+
+When run in install mode the GUI expects to unpack all the E-MailRelay files
+from the payload into target directories. The payload is a simple directory
+tree that lives alongside the GUI executable or inside the Mac application
+bundle, and it contains a configuration file to tell the installer where
+to copy its files.
+
+When building the GUI program the library code shared with the main server
+executable is compiled separately so that different GUI-specific compiler
+options can be used. This is done as a 'unity build', concatenating the shared
+code into one source file and compiling that for the GUI. (This technique
+requires that private 'detail' namespaces are named rather than anonymous so
+that there cannot be any name clashes within the combined anonymous namespace.)
+
+Windows build
+=============
+E-MailRelay can be compiled on Windows using Microsoft Visual Studio C++ (MSVC)
+or mingw-w64.
+
+For MSVC builds there is a perl script (\ *winbuild.pl*\ ) that creates *cmake*
+files from the autotools makefiles, runs *cmake* to create the MSVC project
+files and then runs *msbuild* to compile E-MailRelay. If perl, cmake, MSVC, Qt
+and mbedTLS source are installed in the right way then the *winbuild.bat* batch
+file should be able to do a complete MSVC release build in one go. After that
+the *winbuild-install.bat* batch file can be used to create a distribution.
+
+When building for a public release the E-MailRelay setup program should be
+statically linked and copied into the distribution created by *winbuild.pl*.
+This requires a static build of Qt: edit *msvc-desktop.conf* to use */MT*;
+run *configure.bat* with *-static -release*; run *nmake -f Makefile* for
+*release* then *install*. Then build the E-MailRelay GUI using
+\ *emailrelay-gui.pro*\ : *qmake CONFIG+='win static' emailrelay-gui.pro*;
+then *mc messages.mc*; then copy *emailrelay-icon.ico*; and finally
+\ *nmake -f Makefile.Release*\ .
+
+For MinGW cross-builds use *./configure.sh -w64* and *make* on a Linux box and
+copy the built executables and the MinGW run-time to the target. Any extra
+run-time files can be identified by running *dumpbin /dependents* in the normal
+way.
+
+Windows packaging
+=================
+On Windows E-MailRelay is packaged as a zip file containing the executables
+(including the emailrelay GUI as *emailrelay-setup.exe*), documentation, and a
+*payload* directory tree. The payload contains many of the same files all over
+again, and while this duplication is not ideal it is at least straightforward.
+
+The Qt tool *windeployqt* is used to add run-time dependencies, such as the
+platform DLL. (Public releases of Windows builds are normally statically linked,
+so many of the DLLs added by *windeployqt* are not needed.)
+
+To target ancient versions of Windows start with a cross-build using MinGW
+for 32-bit (\ *./configure.sh -w32*\ ); then *winbuild.pl mingw* can be used to
+assemble a slimmed-down package for distribution.
+
+Unix packaging
+==============
+On Unix-like operating systems it is more natural to use some sort of package
+derived from the *make install* process rather than an installer program, so
+the emailrelay GUI is not normally used.
+
+Top-level makefile targets *dist*, *deb* and *rpm* can be used to create a
+binary tarball, a debian package, and an RPM package respectively.
+
+Internationalisation
+====================
+The GUI code has i18n support using the Qt framework, with the tr() function
+used throughout the GUI source code. The GUI main() function loads translations
+from the *translations* sub-directory (relative to the executable), although
+that can be overridden with the *--qm* command-line option. Qt's *-reverse*
+option can also be used to reverse the widgets when using RTL languages.
+
+The non-GUI code has some i18n support by using gettext() via the inline txt()
+and tx() functions defined in *src/glib/ggettext.h*. The configure script
+detects gettext support in the C run-time library, but without trying different
+compile and link options. See also *po/Makefile.am*.
+
+On Windows the main server executable has a tabbed dialog-box as its user
+interface, but that does not have any support for i18n.
+
+Source control
+==============
+The source code is stored in the SourceForge *svn* repository. A working
+copy can be checked out as follows:
+
+::
+
+    $ svn co https://svn.code.sf.net/p/emailrelay/code/trunk emailrelay
+
+
+Compile-time features
+=====================
+Compile-time features can be selected with options passed to the *configure*
+script. These include the following:
+
+* Configuration GUI (\ *--enable-gui*\ )
+* Multi-threading (\ *--enable-std-thread*\ )
+* TLS library (\ *--with-openssl*\ , *--with-mbedtls*)
+* Debug-level logging (\ *--enable-debug*\ )
+* Event loop using epoll (\ *--enable-epoll*\ )
+* PAM_ support (\ *--with-pam*\ )
+
+Use *./configure --help* to see a complete list of options.
+
+
+
+
+
+.. _PAM: https://en.wikipedia.org/wiki/Linux_PAM
+.. _SMTP: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
+.. _TLS: https://en.wikipedia.org/wiki/Transport_Layer_Security
+
+.. footer:: Copyright (C) 2001-2023 Graeme Walker

doc/developer.txt

@@ -1,68 +1,104 @@
-E-MailRelay Internals
-=====================
+E-MailRelay Developer Guide
+===========================
 
-Module structure
-----------------
-There are four main C++ libraries in the E-MailRelay code: "glib" provides
-low-level classes for file-system abstraction, date and time representation,
-string utility functions, logging, command line parsing etc., "gnet" provides
-network classes using the Berkley socket and Winsock APIs, "gsmtp" contains SMTP
-and message-store classes, and "gpop" contains POP3 classes. All four libraries
-are portable between POSIX-like systems (eg. Linux) and Windows.
+Principles
+----------
+The main principles in the design of E-MailRelay can be summarised as:
+* Functionality without imposing policy
+* Minimal third-party dependencies
+* Windows/Unix portability without #ifdefs
+* Event-driven, non-blocking, single-threaded networking code
+* Multi-threading optional
 
-Under Windows there is an additional library for event handling. Windows has
-historically built network event processing on top of the GUI event system which
-means that the "gnet" library has to be able to create GUI windows in order to
-process network events. The extra GUI and event classes are put into a separate
-library in the "src/win32" directory, using the namespace "GGui".
+Portability
+-----------
+The E-MailRelay code is written in C++11. Earlier versions of E-MailRelay used
+C++03.
+
+The header files "gdef.h" in "src/glib" is used to fix up some compiler
+portability issues such as missing standard types, non-standard system headers
+etc. Conditional compilation directives ("#ifdef" etc.) are largely confined
+this file in order to improve readability.
+
+Windows/Unix portability is generally addressed by providing a common class
+declaration with two implementations. The implementations are put into separate
+source files with a "_unix" or "_win32" suffix, and if necessary a 'pimple' (or
+'Bridge') pattern is used to keep the o/s-specific details out of the header.
+If only small parts of the implementation are o/s-specific then there can be
+three source files per header. For example, "gsocket.cpp", "gsocket_win32.cpp"
+and "gsocket_unix.cpp" in the "src/gnet" directory.
+
+Underscores in source file names are used exclusively to indicate build-time
+alternatives.
 
 Event model
 -----------
-The E-MailRelay server uses non-blocking socket i/o, with a select() event loop.
-This event model means that the server can handle multiple clients
-simultaneously from a single thread and the only significant blocking occurs
-when external programs are executed (see "--filter" and "--verifier").
+The E-MailRelay server uses non-blocking socket i/o, with a select() or epoll()
+event loop. This event model means that the server can handle multiple network
+connections simultaneously from a single thread, and even if multi-threading is
+disabled at build-time the only blocking occurs when external programs are
+executed (see "--filter" and "--address-verifier").
 
-See *C10K Problem* [http://www.kegel.com/c10k.html] for a discussion of
-different network event models.
+The advantages of a non-blocking event model are discussed in the well-known
+*C10K Problem* [http://www.kegel.com/c10k.html] document.
+
+This event model can make the code more complicated than the equivalent
+multi-threaded approach since (for example) it is not possible to wait for a
+complete line of input to be received from a remote SMTP client because there
+might be other connections that need servicing half way through.
 
 At higher levels the C++ slot/signal design pattern is used to propagate events
 between objects (not to be confused with operating system signals). The
 slot/signal implementation has been simplified compared to Qt or boost by not
 supporting signal multicasting, so each signal connects to no more than one
-slot. For historical reasons the slot/signal pattern is not used in the lowest
-layers of the network library.
+slot. The implementation now uses std::function.
 
-Event handling and exceptions
------------------------------
-The use of non-blocking i/o in the network library means that most processing
-operates within the context of an i/o event or timeout callback so the top level
-of the call stack is nearly always the event loop code. This can make using C++
-exceptions a bit awkward compared to a multi-threaded approach because it is not
-possible to put a single catch block around a particular high-level feature.
+The synchronous slot/signal pattern needs some care when when the signalling
+object gets destructed as a side-effect of raising a signal, and that situation
+can be non-obvious precisely because of the slot/signal code decoupling. In
+most cases signals are emitted at the end of a function and the stack unwinds
+back to the event loop immediately afterwards, but in other situations,
+particularly when emitting more than one signal, defensive measures are
+required.
 
-The event loop delivers all asynchronous events to the abstract "EventHandler"
-and "AbstractTimer" interfaces. If these callbacks throw exceptions then the
-event loop will catch them and deliver them back to the same interface through
-the virtual functions onException() and onTimerException() respectively. If
-exceptions are thrown out of _these_ callbacks then the event loop code lets
-them propagate back to main(), typically terminating the program.
+Module structure
+----------------
+The main C++ libraries in the E-MailRelay code base are as follows:
 
-The two callback interfaces are brought together by having a concrete "Timer"
-class that requires an "EventHandler" object to be associated with each timer.
-The "Timer" class routes any exceptions thrown out of the timeout callback to
-the designated "EventHandler" interface so that both i/o and timeout exceptions
-are delivered to the same place.
+# "glib"
+  Low-level classes for file-system abstraction, date and time representation,
+  string utility functions, logging, command line parsing etc.
 
-In common with other event-driven frameworks this leads to a programming
-model where objects are instantiated on the heap and the objects delete
-themselves when they receive certain events from the framework. In the
-"gnet" library the "ServerPeer" and "HeapClient" classes do this lifetime
-management; instances of these classes delete themselves when the associated
-network connection goes away or when an exception is thrown out their
-event-handling code.
+# "gssl"
+  A thin layer over the third-party TLS libraries.
 
-Core class structure
+# "gnet"
+  Network and event-loop classes.
+
+# "gauth"
+  Implements various authentication mechanisms.
+
+# "gsmtp"
+  SMTP protocol classes.
+
+# "gpop"
+  POP3 protocol classes.
+
+# "gstore"
+  Message store classes.
+
+# "gfilters"
+  Built-in filters.
+
+# "gverifiers"
+  Built-in address verifiers.
+
+All of these libraries are portable between Unix-like systems and Windows.
+
+Under Windows there is an additional library under "src/win32" for the user
+interface implemented using the Microsoft Win32 API.
+
+SMTP class structure
 --------------------
 The message-store functionality uses three abstract interfaces: "MessageStore",
 "NewMessage" and "StoredMessage". The "NewMessage" interface is used to create
@@ -73,223 +109,197 @@ classes based on these interfaces are respectively "FileStore", "NewFile" and
 
 Protocol classes such as "GSmtp::ServerProtocol" receive network and timer
 events from their container and use an abstract "Sender" interface to send
-network data. This means that the protocols can be largely independent of the
-network and event loop framework.
+network data. This means that the protocols can be independent of the network
+and event loop framework.
 
 The interaction between the SMTP server protocol class and the message store is
 mediated by the "ProtocolMessage" interface. Two main implementations of this
 interface are available: one for normal spooling ("ProtocolMessageStore"), and
 another for immediate forwarding ("ProtocolMessageForward"). The "Decorator"
 pattern is used whereby the forwarding class uses an instance of the storage
-class to do the message storing and pre-processing, while adding in an instance
+class to do the message storing and filtering, while adding in an instance
 of the "GSmtp::Client" class to do the forwarding.
 
-Message pre-processing (see "--filter") is implemented via an abstract
-"Processor" interface. Concrete implementations are provided for doing nothing,
-running an external executable program and talking to an external network server.
+Message filtering ("--filter") is implemented via an abstract "GSmtp::Filter"
+interface. Concrete implementations in the "GFilters" namespace are provided for
+doing nothing, running an external executable program, talking to an external
+network server, etc.
 
-The protocol, processor and message-store interfaces are brought together by the
-high-level "GSmtp::Server" and "GSmtp::Client" classes. Dependency injection is
-used to create the concrete instances of the "ProtocolMessage" and "Processor"
-interfaces.
+Address verifiers ("--address-verifier") are implemented via an abstract
+"GSmtp::Verifier" interface, with concrete implementations in the "GVerifiers"
+namespace.
 
-Simplified class diagrams for the *GNet* [gnet-classes.png] and
-*GSmtp* [gsmtp-classes.png] namespaces are available.
+The protocol, processor and message-store interfaces are brought together by
+the high-level "GSmtp::Server" and "GSmtp::Client" classes. Dependency
+injection is used to create the concrete instances of the "MessageStore",
+"Filter" and "Verifier" interfaces.
 
-Windows service
+Event handling and exceptions
+-----------------------------
+The use of non-blocking i/o in the network library means that most processing
+operates within the context of an i/o event or timeout callback, so the top
+level of the call stack is nearly always the event loop code. This can make
+catching C++ exceptions a bit awkward compared to a multi-threaded approach
+because it is not possible to put a single catch block around a particular
+high-level feature.
+
+The event loop delivers asynchronous socket events to the "EventHandler"
+interface, timer events to the "TimerBase" interface, and 'future' events to
+the "FutureEventCallback" interface. If any of the these event handlers throws
+an exception then the event loop catches it and delivers it back to an
+exception handler through the "onException()" method of an associated
+"ExceptionHandler" interface. If an exception is thrown out of _this_ callback
+then the event loop code lets it propagate back to "main()", typically
+terminating the program.
+
+However, sometimes there are objects that need to be more resilient to
+exceptions. In particular, a network server should not terminate just because
+one of its connections fails unexpectedly. In these cases the owning parent
+object receives the exception notification together with an "ExceptionSource"
+pointer that identifies the child object that threw the exception. This allows
+the parent object to absorb the exception and delete the child, without the
+exception killing the whole server.
+
+Event sources in the event loop are typically held as a file descriptor and a
+windows event handle, together known as a "Descriptor". Event loop
+implementations typically watch a set of Descriptors for events and call the
+relevant EventHandler/ExceptionHandler code via the "EventEmitter" class.
+
+Multi-threading
 ---------------
-To get E-MailRelay to run as a Windows service there is a service wrapper
-program called "emailrelay-service.exe". This program registers itself as
-a service when run with the "--install" commandline switch. When the service
-runs the wrapper starts the actual E-MailRelay server by looking for a batch
-file called "emailrelay-start.bat" in the same directory as service wrapper
-executable. It reads the contents of this batch file in order to construct the
-E-MailRelay command-line, adding "--no-daemon" and "--hidden" switches if they
-are not there already. The service name and display name can be put onto the
-wrapper's "--install" command-line, and it is the service name that is used to
-derive the name of the "start" batch file.
+Multi-threading is used to make DNS lookup and external program asynchronous so
+unless disabled at build-time std::thread is used in a future/promise pattern to
+wrap up "getaddrinfo()" and "waitpid()" system calls. The shared state comprises
+only the parameters and return results from these system calls, and
+synchronisation back to the main thread uses the main event loop (see
+"GNet::FutureEvent"). Threading is not used elsewhere so the C/C++ run-time
+library does not need to be thread-safe.
 
-Diagrams
---------
-Class diagrams:
-* *GNet namespace* [gnet-classes.png]
-* *GSmtp namespace* [gsmtp-classes.png]
+E-MailRelay GUI
+---------------
+The optional GUI program "emailrelay-gui" uses the Qt toolkit for its user
+interface components. The GUI can run as an installer or as a configuration
+helper, depending on whether it can find an installation "payload". Refer to
+the comments in "src/gui/guimain.cpp" for more details.
 
-State transition diagrams:
-* *GNet::Client* [gnet-client.png]
-* *GSmtp::ServerProtocol* [gsmtp-serverprotocol.png]
+The user interface runs as a stack of dialog-box pages with forward and back
+buttons at the bottom. Once the stack has been completed by the user then each
+page is asked to dump out its state as a set of key-value pairs (see
+"src/gui/pages.cpp"). These key-value pairs are processed by an installer class
+into a list of action objects (in the "Command" design pattern) and then the
+action objects are run in turn. In order to display the progress of the
+installation each action object is run within a timer callback so that the Qt
+framework gets a chance to update the display between each one.
 
-Sequence diagrams:
-* *Proxy mode forwarding* [sequence-3.png]
+During development the user interface pages and the installer can be tested
+separately since the interface between them is a simple text stream containing
+key-value pairs.
 
-Directory structure
--------------------
+When run in configure mode the GUI normally ends up simply editing the
+"emailrelay.conf" file (or "emailrelay-start.bat" on Windows) and/or the
+"emailrelay.auth" secrets file.
 
-# src
+When run in install mode the GUI expects to unpack all the E-MailRelay files
+from the payload into target directories. The payload is a simple directory
+tree that lives alongside the GUI executable or inside the Mac application
+bundle, and it contains a configuration file to tell the installer where
+to copy its files.
 
-  Parent directory for source code.
+When building the GUI program the library code shared with the main server
+executable is compiled separately so that different GUI-specific compiler
+options can be used. This is done as a 'unity build', concatenating the shared
+code into one source file and compiling that for the GUI. (This technique
+requires that private 'detail' namespaces are named rather than anonymous so
+that there cannot be any name clashes within the combined anonymous namespace.)
 
-# src/glib
+Windows build
+-------------
+E-MailRelay can be compiled on Windows using Microsoft Visual Studio C++ (MSVC)
+or mingw-w64.
 
-  A low-level class library, including classes for file-system abstraction,
-  date and time, string utility functions, logging, command line parsing etc.
+For MSVC builds there is a perl script ("winbuild.pl") that creates "cmake"
+files from the autotools makefiles, runs "cmake" to create the MSVC project
+files and then runs "msbuild" to compile E-MailRelay. If perl, cmake, MSVC, Qt
+and mbedTLS source are installed in the right way then the "winbuild.bat" batch
+file should be able to do a complete MSVC release build in one go. After that
+the "winbuild-install.bat" batch file can be used to create a distribution.
 
-# src/gnet
+When building for a public release the E-MailRelay setup program should be
+statically linked and copied into the distribution created by "winbuild.pl".
+This requires a static build of Qt: edit "msvc-desktop.conf" to use "/MT";
+run "configure.bat" with "-static -release"; run "nmake -f Makefile" for
+"release" then "install". Then build the E-MailRelay GUI using
+"emailrelay-gui.pro": "qmake CONFIG+='win static' emailrelay-gui.pro";
+then "mc messages.mc"; then copy "emailrelay-icon.ico"; and finally
+"nmake -f Makefile.Release".
 
-  A network library using Berkley sockets or Winsock.
+For MinGW cross-builds use "./configure.sh -w64" and "make" on a Linux box and
+copy the built executables and the MinGW run-time to the target. Any extra
+run-time files can be identified by running "dumpbin /dependents" in the normal
+way.
 
-# src/gsmtp
+Windows packaging
+-----------------
+On Windows E-MailRelay is packaged as a zip file containing the executables
+(including the emailrelay GUI as "emailrelay-setup.exe"), documentation, and a
+"payload" directory tree. The payload contains many of the same files all over
+again, and while this duplication is not ideal it is at least straightforward.
 
-  An SMTP library.
+The Qt tool "windeployqt" is used to add run-time dependencies, such as the
+platform DLL. (Public releases of Windows builds are normally statically linked,
+so many of the DLLs added by "windeployqt" are not needed.)
 
-# src/gpop
+To target ancient versions of Windows start with a cross-build using MinGW
+for 32-bit ("./configure.sh -w32"); then "winbuild.pl mingw" can be used to
+assemble a slimmed-down package for distribution.
 
-  A POP3 library.
+Unix packaging
+--------------
+On Unix-like operating systems it is more natural to use some sort of package
+derived from the "make install" process rather than an installer program, so
+the emailrelay GUI is not normally used.
 
-# src/win32
+Top-level makefile targets "dist", "deb" and "rpm" can be used to create a
+binary tarball, a debian package, and an RPM package respectively.
 
-  Additional classes for windows event processing.
+Internationalisation
+--------------------
+The GUI code has i18n support using the Qt framework, with the tr() function
+used throughout the GUI source code. The GUI main() function loads translations
+from the "translations" sub-directory (relative to the executable), although
+that can be overridden with the "--qm" command-line option. Qt's "-reverse"
+option can also be used to reverse the widgets when using RTL languages.
 
-# src/main
+The non-GUI code has some i18n support by using gettext() via the inline txt()
+and tx() functions defined in "src/glib/ggettext.h". The configure script
+detects gettext support in the C run-time library, but without trying different
+compile and link options. See also "po/Makefile.am".
 
-  Application-level classes for E-MailRelay.
+On Windows the main server executable has a tabbed dialog-box as its user
+interface, but that does not have any support for i18n.
 
-# src/gui
+Source control
+--------------
+The source code is stored in the SourceForge "svn" repository. A working
+copy can be checked out as follows:
 
-  Installation and configuration GUI program using Qt 4.
-
-# lib
-
-  Parent directory for ISO C++ fixups for various compilers.
-
-# test
-
-  Test scripts and utilities.
-
-Portability
------------
-The E-MailRelay code is written in ISO C++, although avoiding less-widely
-supported language features like "mutable", templated methods and "export".
-
-The header files "gdef.h" in "src/glib", and "gnet.h" in "src/gnet" are intended
-to be used to fix up compiler portability issues such as missing standard types,
-non-standard system headers etc. Conditional compilation directives ("#if"
-etc.) are largely confined to these headers in order to improve readability.
-
-Deficiencies in the standard headers files provided by older compilers are fixed
-up by files in the "lib" directory tree. For example, the msvc6.0 compiler
-sometimes does not put its names into the "std" namespace, even though the
-std-namespace headers are used. This can be worked round by additional "using"
-declarations in the "lib/msvc6.0" headers.  These work-rounds are kept out of
-the "src" tree because they are not necessary for more modern compilers.
-
-Windows/unix portability is generally addressed by providing a common class
-declaration with two implementations. Where necessary a "pimple" pattern is used
-to hide the system-specific parts of the declaration.
-
-A good example is the "G::Directory" class used for iterating through files in
-a directory. The header file "src/glib/gdirectory.h" is common to both systems,
-but two implementations are provided in "gdirectory_unix.cpp" and
-"gdirectory_win32.cpp". The unix implementation uses opendir() and glob(),
-while the windows implementation uses FindFirstFile().
-
-Sometimes only small parts of the implementation are system-specific. In
-these cases there are three source files per header. For example, "gsocket.cpp",
-"gsocket_win32.cpp" and "gsocket_unix.cpp" in the "src/gnet" directory.
+	$ svn co https://svn.code.sf.net/p/emailrelay/code/trunk emailrelay
 
 Compile-time features
 ---------------------
-Compile-time features can normally be selected with switches passed to the
-"configure" script. These include the following:
+Compile-time features can be selected with options passed to the "configure"
+script. These include the following:
 
-* Debug-level logging ("--enable-debug")
-* IPv6 (Linux only) ("--enable-ipv6")
 * Configuration GUI ("--enable-gui")
+* Multi-threading ("--enable-std-thread")
+* TLS library ("--with-openssl", "--with-mbedtls")
+* Debug-level logging ("--enable-debug")
+* Event loop using epoll ("--enable-epoll")
+* PAM support ("--with-pam")
 
-Use "./configure --help" to see a complete list.
-
-Patterns
---------
-Gang-of-four Design Patterns (ISBN 0-201-63361-2):
-
-+ Factory method
-
-  - GNet::EventLoop::create()
-  - GNet::Server::newPeer()
-  - GSmtp::MessageStore::newMessage()
-
-+ Iterator
-
-  - G::DirectoryIterator
-  - GNet::EventHandlerList::begin()/end()
-  - GSmtp::MessageStore::iterator()
-
-+ Singleton
-
-  - G::LogOutput
-  - GGui::ApplicationInstance
-  - GNet::EventLoop
-  - GNet::TimerList
-
-+ Facade
-
-  - G::File
-  - GNet::Address
-
-+ Decorator
-
-  - GSmtp::ProtocolMessage
-
-Lakos' Large Scale C++ Software Design patterns (ISBN 0-201-63362-0):
-
-+ Insulation; fully insulating concrete class (Meyer's Effective C++ Item 34, pimple pattern)
-
-  - G::DirectoryIterator
-  - GNet::Address
-  - GNet::Resolver
-  - GSmtp::ProtocolMessage
-
-+ Insulation; protocol class
-
-  - GNet::EventHandler
-  - GSmtp::NewMessage
-  - GSmtp::StoredMessage
-  - GSmtp::ProtocolMessage
-  - GSmtp::ServerProtocol::Sender
-  - GSmtp::ClientProtocol::Sender
-
-Meyer's More Effective C++ patterns (ISBN 0-201-63371-X):
-
-+ Reference counting (Item 29)
-
-  - GSmtp::MessageStore::Iterator
-  - G::Slot0
-
-+ Lazy evaluation (Item 17)
-
-  - GNet::EventHandlerList::list()
-  - G::Date::weekday()
-
-Other patterns:
-
-+ Finite state machine
-
-  - GSmtp::ServerProtocol
-
-+ Slot/signal
-
-  - G::Slot0
-  - G::Signal0
-
-+ Exception-safe assignment using swap
-
-  - G::Slot0
-
-Idioms
-------
-The "<<=" operator defined in "src/glib/gmemory.h" is used idiomatically
-to reassign a std::auto_ptr<> since reset() is not always available.
+Use "./configure --help" to see a complete list of options.
 
 
 
-Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved.
+_____________________________________
+Copyright (C) 2001-2023 Graeme Walker

doc/doxygen-missing.html

@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html>
 <html>
  <head>
   <title>E-MailRelay source code documentation missing</title>
@@ -7,8 +7,8 @@
  <body>
   <div class="div-main">
    <h1>E-MailRelay Source Code</h1>
-	<p>No <a class="a-href" href="http://www.doxygen.org">doxygen</a> documentation available locally, try <a class="a-href" href="http://emailrelay.sourceforge.net/doxygen/index.html">online</a>.</p>
+	<p>No <a class="a-href" href="http://www.doxygen.org">doxygen</a> documentation available locally, try <a class="a-href" href="http://emailrelay.sourceforge.net/doxygen/namespaces.html">online</a>.</p>
   </div>
  </body>
 </html>
-<!-- Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->

doc/doxygen_header.html

@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>E-MailRelay: $title</title>
-<meta name="robots" content="noindex,nofollow">
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<style type="text/css">
-<!--
-h1 { text-align: center; font-family: veranda, arial, helvetica, sans-serif; color: #09c ; }
-h2 { font-family: veranda, geneva, arial, helvetica, sans-serif; color: #09c ; }
-h3 { font-family: veranda, geneva, arial, helvetica, sans-serif; color: #09c ; }
-a { color: #09c }
-a:visited { color: #09c }
-a.qindex { color: #09c }
-a.qindex:visited { color: #09c }
-a.qindex:hover { background-color: #ccf }
-a.qindexHL { color: #09c ; background-color: #eeeeff ; }
-a.qindexHL:visited { color: #09c ; background-color: #eeeeff ; }
-a.qindexHL:hover { color: #09c ; background-color: #ccf; }
--->
-</style>
-</head>
-<body bgcolor="#ffffff">

doc/emailrelay-doxygen.css

@@ -0,0 +1,71 @@
+/*
+  Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
+*/
+
+/*
+	emailrelay-doxygen.css
+*/
+
+div#titlearea
+{
+	visibility: hidden ;
+	display: none ;
+}
+
+h1
+{
+	color: #09c ;
+}
+
+h2
+{
+	color: #09c ;
+}
+
+.title
+{
+	color: #09c ;
+}
+
+div#projectname
+{
+	color: #09c ;
+}
+
+pre.fragment
+{
+}
+
+pre.fragment a
+{
+	color: black ;
+}
+
+pre.fragment a:visited
+{
+	color: black ;
+}
+
+a.option
+{
+    color: black ;
+}
+
+a.option:visited
+{
+    color: black ;
+}
+
+code
+{
+	/* font-weight: bold ; */
+	background-color: #eee ;
+}
+
+p.startli
+{
+}
+
+li.footer
+{
+}

doc/emailrelay-filter-copy.1

@@ -1,42 +0,0 @@
-.\" Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-.\" 
-.\" This program is free software: you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation, either version 3 of the License, or 
-.\" (at your option) any later version.
-.\" 
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\" 
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
-.TH EMAILRELAY-FILTER-COPY 1 local
-.SH NAME
-emailrelay-filter-copy \- an E-MailRelay filter for pop-by-name
-.SH SYNOPSIS
-.B emailrelay-filter-copy
-.I <emailrelay-content-file>
-.LP
-.B emailrelay-filter-copy
-[--help]
-.SH DESCRIPTION
-The 
-.I emailrelay-filter-copy
-utility can be used as an 
-.B E-MailRelay
-.I "--filter" 
-pre-processor program to copy e-mail messages from the main spool 
-directory into all available sub-directories. When using the
-.I "--pop-by-name"
-feature of the 
-.B E-MailRelay
-server this results in messages being copied all POP clients.
-.LP
-Only the message envelope is copied; the content file stays in 
-the main directory.
-.SH SEE ALSO
-.BR emailrelay (1),
-.SH AUTHOR
-Graeme Walker, mailto:graeme_walker@users.sourceforge.net

doc/emailrelay-man.html

@@ -1,5 +1,4 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
 <HTML><HEAD><TITLE>Man page of EMAILRELAY</TITLE>
 </HEAD><BODY>
 <H1>EMAILRELAY</H1>
@@ -18,21 +17,21 @@ emailrelay - e-mail transfer agent and proxy
 [OPTIONS]
 <P>
 
-<B>emailrelay </B>
+<B>emailrelay</B>
 
 --as-server
 <P>
 
 <B>emailrelay</B>
 
---as-client 
+--as-client
 <I>server-address</I>
 
 <P>
 
 <B>emailrelay</B>
 
---as-proxy 
+--as-proxy
 <I>server-address</I>
 
 <A NAME="lbAD">&nbsp;</A>
@@ -41,18 +40,18 @@ emailrelay - e-mail transfer agent and proxy
 <I>emailrelay</I>
 
 is a simple SMTP proxy and store-and-forward message transfer agent.
-It does store-and-forward mail relay to a fixed next-hop server, without 
-any routing. 
+It does store-and-forward mail relay to a fixed next-hop server, without
+any routing.
 <P>
 
-It runs in two main modes: a storage daemon 
+It runs in two main modes: a storage daemon
 (<I>--as-server</I>)
 
-and a forwarding 
-agent 
+and a forwarding
+agent
 (<I>--as-client</I>).
 
-The storage daemon is an SMTP server which stores e-mail 
+The storage daemon is an SMTP server which stores e-mail
 messages in a local spool directory. The forwarding agent acts as an
 SMTP client sending the spooled e-mail messages on to the next
 SMTP server in the chain.
@@ -61,305 +60,353 @@ SMTP server in the chain.
 It can also run in a third mode, as a proxy server
 (<I>--as-proxy</I>).
 
-In this mode all messages are forwarded immediately to the next-hop
-server. Messages are only fully accepted from the sender once they
-have been successfully delivered to the next-hop server.
+In this mode all e-mail messages are spooled temporarily while the
+client is connected and forwarded as soon as the client
+disconnects.
 <A NAME="lbAE">&nbsp;</A>
 <H2>OPTIONS</H2>
 
+<A NAME="lbAF">&nbsp;</A>
+<H3>Basic options</H3>
+
 <DL COMPACT>
-<DT><B>-a, --admin </B><I>&lt;admin-port&gt;</I>
-
-<DD>
-Enables the administration interface and specifies its listening port number.
-<DT><B>-Q, --admin-terminate </B>
-
-<DD>
-Enables the terminate command on the admin interface.
-<DT><B>-A, --anonymous </B>
-
-<DD>
-Disables the smtp vrfy command and sends less verbose smtp responses.
 <DT><B>-q, --as-client </B><I>&lt;host:port&gt;</I>
 
 <DD>
-Runs as a client, forwarding spooled mail to &lt;host&gt;: equivalent to <I>--log</I> <I>--no-syslog</I> <I>--no-daemon</I> <I>--dont-serve</I> <I>--forward</I> <I>--forward-to</I>.
+This is equivalent to <I>--log</I>, <I>--no-syslog</I>, <I>--no-daemon</I>, <I>--dont-serve</I>, <I>--forward</I> and <I>--forward-to</I>. It is a convenient way of running a forwarding agent that forwards spooled mail messages and then terminates.
 <DT><B>-y, --as-proxy </B><I>&lt;host:port&gt;</I>
 
 <DD>
-Runs as a proxy: equivalent to <I>--log</I> <I>--close-stderr</I> <I>--immediate</I> <I>--forward-to</I>.
-<DT><B>-d, --as-server </B>
+This is equivalent to <I>--log</I>, <I>--close-stderr</I>, <I>--forward-on-disconnect</I> and <I>--forward-to</I>. It is a convenient way of running a store-and-forward daemon. Use <I>--log</I>, <I>--forward-on-disconnect</I> and <I>--forward-to</I> instead of <I>--as-proxy</I> to keep the standard error stream open.
+<DT><B>-d, --as-server</B>
 
 <DD>
-Runs as a server: equivalent to <I>--log</I> <I>--close-stderr</I>.
-<DT><B>-C, --client-auth </B><I>&lt;file&gt;</I>
-
-<DD>
-Enables smtp authentication with the remote server, using the given secrets file.
-<DT><B>-Y, --client-filter </B><I>&lt;program&gt;</I>
-
-<DD>
-Specifies an external program to process messages when they are forwarded.
-<DT><B>-j, --client-tls </B>
-
-<DD>
-Enables tls/ssl layer for smtp client (if openssl built in).
-<DT><B>-e, --close-stderr </B>
-
-<DD>
-Closes the standard error stream soon after start-up.
-<DT><B>-U, --connection-timeout </B><I>&lt;time&gt;</I>
-
-<DD>
-Sets the timeout (in seconds) when connecting to a remote server (default is 40).
-<DT><B>-g, --debug </B>
-
-<DD>
-Generates debug-level logging if compiled-in.
-<DT><B>-D, --domain </B><I>&lt;fqdn&gt;</I>
-
-<DD>
-Sets an override for the host's fully qualified domain name.
-<DT><B>-x, --dont-serve </B>
-
-<DD>
-Disables acting as a server on any port (part of <I>--as-client</I> and usually used with <I>--forward</I>).
-<DT><B>-z, --filter </B><I>&lt;program&gt;</I>
-
-<DD>
-Specifies an external program to process messages as they are stored.
-<DT><B>-W, --filter-timeout </B><I>&lt;time&gt;</I>
-
-<DD>
-Sets the timeout (in seconds) for running the <I>--filter</I> processor (default is 300).
-<DT><B>-f, --forward </B>
-
-<DD>
-Forwards stored mail on startup (requires <I>--forward-to</I>).
-<DT><B>-o, --forward-to </B><I>&lt;host:port&gt;</I>
-
-<DD>
-Specifies the remote smtp server (required by <I>--forward</I>, <I>--poll</I>, <I>--immediate</I> and <I>--admin</I>).
-<DT><B>-h, --help </B>
-
-<DD>
-Displays help text and exits.
-<DT><B>-m, --immediate </B>
-
-<DD>
-Enables immediate forwarding of messages as soon as they are received (requires <I>--forward-to</I>).
-<DT><B>-I, --interface </B><I>&lt;ip-address&gt;</I>
-
-<DD>
-Defines the listening interface for incoming connections.
-<DT><B>-l, --log </B>
-
-<DD>
-Writes log information on standard error and syslog.
-<DT><B>-L, --log-time </B>
-
-<DD>
-Adds a timestamp to the logging output.
-<DT><B>-t, --no-daemon </B>
-
-<DD>
-Does not detach from the terminal.
-<DT><B>-X, --no-smtp </B>
-
-<DD>
-Disables listening for smtp connections (usually used with <I>--admin</I> or <I>--pop</I>).
-<DT><B>-n, --no-syslog </B>
-
-<DD>
-Disables syslog output (always overridden by <I>--syslog</I>).
-<DT><B>-i, --pid-file </B><I>&lt;pid-file&gt;</I>
-
-<DD>
-Defines a file for storing the daemon process-id.
-<DT><B>-O, --poll </B><I>&lt;period&gt;</I>
-
-<DD>
-Enables polling of the spool directory for messages to be forwarded with the specified period (requires <I>--forward-to</I>).
-<DT><B>-B, --pop </B>
-
-<DD>
-Enables the pop server.
-<DT><B>-F, --pop-auth </B><I>&lt;file&gt;</I>
-
-<DD>
-Defines the pop server secrets file (default is <I>/etc/emailrelay.auth</I>).
-<DT><B>-J, --pop-by-name </B>
-
-<DD>
-Modifies the pop spool directory according to the user name (requires <I>--pop</I>).
-<DT><B>-G, --pop-no-delete </B>
-
-<DD>
-Disables message deletion via pop (requires <I>--pop</I>).
-<DT><B>-E, --pop-port </B><I>&lt;port&gt;</I>
-
-<DD>
-Specifies the pop listening port number (requires <I>--pop</I>).
-<DT><B>-p, --port </B><I>&lt;port&gt;</I>
-
-<DD>
-Specifies the smtp listening port number.
-<DT><B>-w, --prompt-timeout </B><I>&lt;time&gt;</I>
-
-<DD>
-Sets the timeout (in seconds) for getting an initial prompt from the server.
-<DT><B>-r, --remote-clients </B>
-
-<DD>
-Allows remote clients to connect.
-<DT><B>-T, --response-timeout </B><I>&lt;time&gt;</I>
-
-<DD>
-Sets the response timeout (in seconds) when talking to a remote server (default is 1800).
-<DT><B>-S, --server-auth </B><I>&lt;file&gt;</I>
-
-<DD>
-Enables authentication of remote clients, using the given secrets file.
-<DT><B>-K, --server-tls </B><I>&lt;pem-file&gt;</I>
-
-<DD>
-Enables tls/ssl layer for smtp server using the given openssl certificate file (if openssl built in).
+This is equivalent to <I>--log</I> and <I>--close-stderr</I>. It is a convenient way of running a background storage daemon that accepts mail messages and spools them. Use <I>--log</I> instead of <I>--as-server</I> to keep standard error stream open.
 <DT><B>-s, --spool-dir </B><I>&lt;dir&gt;</I>
 
 <DD>
-Specifies the spool directory (default is <I>/var/spool/emailrelay</I>).
-<DT><B>-k, --syslog </B>
+Specifies the directory used for holding mail messages that have been received but not yet forwarded.
+<DT><B>-h, --help</B>
 
 <DD>
-Forces syslog output if logging is enabled (overrides <I>--no-syslog</I>).
+Displays help text and then exits. Use with <I>--verbose</I> for more complete output.
+<DT><B>-V, --version</B>
+
+<DD>
+Displays version information and then exits.
+</DL>
+<A NAME="lbAG">&nbsp;</A>
+<H3>SMTP client options</H3>
+
+<DL COMPACT>
+<DT><B>-c, --client-smtp-config </B><I>&lt;config&gt;</I>
+
+<DD>
+Configures the SMTP client protocol using a comma-separated list of optional features, including 'pipelining', 'smtputf8strict', 'eightbitstrict' and 'binarymimestrict'.
+<DT><B>-f, --forward</B>
+
+<DD>
+Causes spooled mail messages to be forwarded when the program first starts.
+<DT><B>-1, --forward-on-disconnect</B>
+
+<DD>
+Causes spooled mail messages to be forwarded whenever a SMTP client connection disconnects.
+<DT><B>-o, --forward-to </B><I>&lt;host:port&gt;</I>
+
+<DD>
+Specifies the transport address of the remote SMTP server that spooled mail messages are forwarded to.
+<DT><B>-O, --poll </B><I>&lt;period&gt;</I>
+
+<DD>
+Causes forwarding of spooled mail messages to happen at regular intervals (with the time given in seconds).
+<DT><B>-Y, --client-filter </B><I>&lt;program&gt;</I>
+
+<DD>
+Runs the specified external filter program whenever a mail message is forwarded. The filter is passed the name of the message file in the spool directory so that it can edit it as required. A network filter can be specified as <I>net:&lt;tcp-address&gt;</I> and prefixes of <I>spam:</I>, <I>spam-edit:</I> and <I>exit:</I> are also allowed. The <I>spam:</I> and <I>spam-edit:</I> prefixes require a SpamAssassin daemon to be running. For store-and-forward applications the <I>--filter</I> option is normally more useful than <I>--client-filter</I>.
+<DT><B>-6, --client-interface </B><I>&lt;ip-address&gt;</I>
+
+<DD>
+Specifies the IP network address to be used to bind the local end of outgoing SMTP connections. By default the address will depend on the routing tables in the normal way. Use <I>0.0.0.0</I> to use only IPv4 addresses returned from DNS lookups of the <I>--forward-to</I> address, or <I>::</I> for IPv6.
+<DT><B>-U, --connection-timeout </B><I>&lt;time&gt;</I>
+
+<DD>
+Specifies a timeout (in seconds) for establishing a TCP connection to remote SMTP servers. The default is 40 seconds.
+<DT><B>--idle-timeout </B><I>&lt;time&gt;</I>
+
+<DD>
+Specifies a timeout (in seconds) for receiving network traffic from remote SMTP and POP clients. The default is 60 seconds.
+<DT><B>-T, --response-timeout </B><I>&lt;time&gt;</I>
+
+<DD>
+Specifies a timeout (in seconds) for getting responses from remote SMTP servers. The default is 60 seconds.
+<DT><B>--forward-to-all</B>
+
+<DD>
+Requires all recipient addresses to be accepted by the remote server before forwarding. This is currently the default behaviour  so this option is for forwards compatibility only.
+<DT><B>--forward-to-some</B>
+
+<DD>
+Allow forwarding to continue even if some recipient addresses on an e-mail envelope are rejected by the remote server.
+<DT><B>-m, --immediate</B>
+
+<DD>
+Causes mail messages to be forwarded as they are received, even before they have been accepted. This can be used to do proxying without store-and-forward, but in practice clients tend to to time out while waiting for their mail message to be accepted.
+</DL>
+<A NAME="lbAH">&nbsp;</A>
+<H3>SMTP server options</H3>
+
+<DL COMPACT>
+<DT><B>-p, --port </B><I>&lt;port&gt;</I>
+
+<DD>
+Sets the port number used for listening for incoming SMTP connections.
+<DT><B>-r, --remote-clients</B>
+
+<DD>
+Allows incoming connections from addresses that are not local. The default behaviour is to reject connections that are not local in order to prevent accidental exposure to the public internet, although a firewall should also be used. Local address ranges are defined in RFC-1918, RFC-6890 etc.
+<DT><B>--address-verifier </B><I>&lt;program&gt;</I>
+
+<DD>
+Runs the specified external program to verify a message recipient's e-mail address. A network verifier can be specified as <I>net:&lt;tcp-address&gt;</I>. The <I>account:</I> built-in address verifier can be used to check recipient addresses against the list of local system account names.
+<DT><B>-A, --anonymous, --anonymous=</B><I>&lt;scope&gt;</I>
+
+<DD>
+Disables the server's SMTP VRFY command, sends less verbose SMTP greeting and responses, stops <I>Received</I> lines being added to mail message content files, and stops the SMTP client protocol adding <I>AUTH=</I> to the <I>MAIL</I> command. For finer control use a comma-separated list of things to anonymise: <I>vrfy</I>, <I>server</I>, <I>content</I> and/or <I>client</I>, eg. <I>--anonymous</I>=server,content.
+<DT><B>-s, --delivery-dir </B><I>&lt;dir&gt;</I>
+
+<DD>
+Specifies the base directory for mailboxes when delivering  messages that have local recipients. This defaults to the main spool directory.
+<DT><B>--dnsbl </B><I>&lt;config&gt;</I>
+
+<DD>
+Specifies a list of DNSBL servers that are used to reject SMTP connections from blocked addresses. The configuration string is made up of comma-separated fields: the DNS server's transport address, a timeout in milliseconds, a rejection threshold, and then the list of DNSBL servers.
+<DT><B>-D, --domain </B><I>&lt;fqdn&gt;</I>
+
+<DD>
+Specifies the network name that is used in SMTP EHLO commands, <I>Received</I> lines, and for generating authentication challenges. The default is derived from a DNS lookup of the local hostname.
+<DT><B>-z, --filter </B><I>&lt;program&gt;</I>
+
+<DD>
+Runs the specified external filter program whenever a mail message is stored. The filter is passed the name of the message file in the spool directory so that it can edit it as required. The mail message is rejected if the filter program terminates with an exit code between 1 and 99. Use <I>net:&lt;tcp-address&gt;</I> to communicate with a filter daemon over the network, or <I>spam:&lt;tcp-address&gt;</I> for a spamassassin spamd daemon to accept or reject mail messages, or <I>spam-edit:&lt;tcp-address&gt;</I> to have spamassassin edit the message content without rejecting it, or <I>exit:&lt;number&gt;</I> to emulate a filter program that just exits.
+<DT><B>-W, --filter-timeout </B><I>&lt;time&gt;</I>
+
+<DD>
+Specifies a timeout (in seconds) for running a <I>--filter</I> program. The default is 60 seconds.
+<DT><B>-I, --interface </B><I>&lt;ip-address-list&gt;</I>
+
+<DD>
+Specifies the IP network addresses or interface names used to bind listening ports. By default listening ports for incoming SMTP, POP and administration connections will bind the 'any' address for IPv4 and for IPv6, ie. <I>0.0.0.0</I> and <I>::</I>. Multiple addresses can be specified by using the option more than once or by using a comma-separated list. Use a prefix of <I>smtp=</I>, <I>pop=</I> or <I>admin=</I> on addresses that should apply only to those types of listening port. Any link-local IPv6 addresses must include a zone name or scope id.  Interface names can be used instead of addresses, in which case all the addresses associated with that interface at startup will used for listening. When an interface name is decorated with a <I>-ipv4</I> or <I>-ipv6</I> suffix only their IPv4 or IPv6 addresses will be used (eg. <I>ppp0-ipv4</I>).  To inherit listening file descriptors from the parent process on unix use a syntax like this: <I>--interface</I> smtp=fd#3,smtp=fd#4,pop=fd#5.
+<DT><B>-w, --prompt-timeout </B><I>&lt;time&gt;</I>
+
+<DD>
+Specifies a timeout (in seconds) for getting the initial prompt from a remote SMTP server. If no prompt is received after this time then the SMTP dialog goes ahead without it.
+<DT><B>-Z, --server-smtp-config </B><I>&lt;config&gt;</I>
+
+<DD>
+Configures the SMTP server protocol using a comma-separated list of optional features, including 'pipelining', 'chunking', 'smtputf8', and 'smtputf8strict'.
+<DT><B>-M, --size </B><I>&lt;bytes&gt;</I>
+
+<DD>
+Limits the size of mail messages that can be submitted over SMTP.
+</DL>
+<A NAME="lbAI">&nbsp;</A>
+<H3>POP server options</H3>
+
+<DL COMPACT>
+<DT><B>-B, --pop</B>
+
+<DD>
+Enables the POP server, listening by default on port 110, providing access to spooled mail messages. Negotiated TLS using the POP <I>STLS</I> command will be enabled if the <I>--server-tls</I> option is also given.
+<DT><B>-J, --pop-by-name</B>
+
+<DD>
+Modifies the POP server's spool directory to be the sub-directory with the same name as the user-id used for POP authentication. This  allows POP clients to see only their own messages after they have  been moved into separate sub-directories typically by the built-in  <I>deliver:</I> or <I>copy:</I> filters. Content files can remain in the  main spool directory to save disk space; they will be deleted by  the POP server when it deletes the last matching envelope file.
+<DT><B>-G, --pop-no-delete</B>
+
+<DD>
+Disables the POP DELE command so that the command appears to succeed but mail messages are not deleted from the spool directory.
+<DT><B>-E, --pop-port </B><I>&lt;port&gt;</I>
+
+<DD>
+Sets the POP server's listening port number.
+</DL>
+<A NAME="lbAJ">&nbsp;</A>
+<H3>Admin server options</H3>
+
+<DL COMPACT>
+<DT><B>-a, --admin </B><I>&lt;port&gt;</I>
+
+<DD>
+Enables an administration interface on the specified listening port number. Use telnet or something similar to connect. The administration interface can be used to trigger forwarding of spooled mail messages if the <I>--forward-to</I> option is used.
+<DT><B>-Q, --admin-terminate</B>
+
+<DD>
+Enables the <I>terminate</I> command in the administration interface.
+</DL>
+<A NAME="lbAK">&nbsp;</A>
+<H3>Authentication options</H3>
+
+<DL COMPACT>
+<DT><B>-C, --client-auth </B><I>&lt;file&gt;</I>
+
+<DD>
+Enables SMTP client authentication with the remote server, using the client account details taken from the specified secrets file.  The secrets file should normally contain one line having between four and five space-separated fields. The first field must be <I>client</I>, the second field is the password type (<I>plain</I> or <I>md5</I>), the third is the xtext-encoded user-id and the fourth is the xtext-encoded password. Alternatively, the user-id and password fields can be Base64 encoded if the second field is <I>plain:b</I>. It is also possible to do without a secrets file and give the Base64 encoded user-id and  password directly on the command-line or in the configuration file formatted as <I>plain:&lt;base64-user-id&gt;:&lt;base64-password&gt;</I>. Note that putting these account details on the command-line is not recommended because it will make the password easily visible to all users on the  local machine.
+<DT><B>--client-auth-config </B><I>&lt;config&gt;</I>
+
+<DD>
+Configures the SMTP client authentication module using a semicolon-separated list of configuration items. Each item is a single-character key, followed by a colon and then a comma-separated list. A 'm' character introduces an ordered list of preferred authentication mechanisms and an 'x' introduces a list of mechanisms to avoid. An 'a' list and a 'd' list can be used similarly to prefer and avoid certain mechanisms once the session is encrypted with TLS.
+<DT><B>-S, --server-auth </B><I>&lt;file&gt;</I>
+
+<DD>
+Enables SMTP server authentication of remote SMTP clients. Account names and passwords are taken from the specified secrets file. The secrets file should contain lines that have four space-separated fields, starting with <I>server</I> in the first field; the second field is the password encoding (<I>plain</I> or <I>md5</I>), the third is the client user-id and the fourth is the password. The user-id is RFC-1891 xtext encoded, and the password is either xtext encoded or generated by <I>emailrelay-passwd</I>. Alternatively, the username and password can be Base64 encoded if the second field is <I>plain:b</I>. A special value of  <I>pam:</I> can be used for authentication using linux PAM.
+<DT><B>--server-auth-config </B><I>&lt;config&gt;</I>
+
+<DD>
+Configures the SMTP server authentication module using a semicolon-separated list of configuration items. Each item is a single-character key, followed by a colon and then a comma-separated list. A 'm' character introduces an ordered list of allowed authentication mechanisms and an 'x' introduces a list of mechanisms to deny. An 'a' list and a 'd' list can be used similarly to allow and deny mechanisms once the session is encrypted with TLS. In typical usage you might have an empty allow list for an unencrypted session and a single preferred mechanism once encrypted, <I>m:;a:plain</I>.
+<DT><B>-F, --pop-auth </B><I>&lt;file&gt;</I>
+
+<DD>
+Specifies a file containing valid POP account details. The file format is the same as for the SMTP server secrets file, ie. lines starting with <I>server</I>, with user-id and password in the third and fourth fields. A special value of <I>pam:</I> can be used for authentication using linux PAM.
+</DL>
+<A NAME="lbAL">&nbsp;</A>
+<H3>TLS options</H3>
+
+<DL COMPACT>
+<DT><B>-j, --client-tls</B>
+
+<DD>
+Enables negotiated TLS for outgoing SMTP connections; the SMTP STARTTLS command will be issued if the remote server supports it.
+<DT><B>--client-tls-certificate </B><I>&lt;pem-file&gt;</I>
+
+<DD>
+Defines the TLS certificate file when acting as a SMTP client. This file must contain the client's private key and certificate chain using the PEM file format. Alternatively, use this option twice with the first one specifying the key file and the second the certificate file. Keep the file permissions tight to avoid accidental exposure of the private key.
+<DT><B>-b, --client-tls-connection</B>
+
+<DD>
+Enables the use of a TLS tunnel for outgoing SMTP connections. This is for SMTP over TLS (SMTPS), not TLS negotiated within SMTP using STARTTLS.
+<DT><B>--client-tls-required</B>
+
+<DD>
+Makes the use of TLS mandatory for outgoing SMTP connections. The SMTP STARTTLS command will be used before mail messages are sent out. If the remote server does not allow STARTTLS then the SMTP connection will fail.
+<DT><B>--client-tls-server-name </B><I>&lt;hostname&gt;</I>
+
+<DD>
+Defines the target server hostname in the TLS handshake. With <I>--client-tls-connection</I> this can be used for SNI, allowing the remote server to adopt an appropriate identity.
+<DT><B>--client-tls-verify </B><I>&lt;ca-list&gt;</I>
+
+<DD>
+Enables verification of the remote SMTP server's certificate against any of the trusted CA certificates in the specified file or directory. In many use cases this should be a file containing just your self-signed root certificate. Specify <I>&lt;default&gt;</I> (including the angle brackets) for the TLS library's default set of trusted CAs.
+<DT><B>--client-tls-verify-name </B><I>&lt;cname&gt;</I>
+
+<DD>
+Enables verification of the CNAME within the remote SMTP server's certificate.
+<DT><B>-K, --server-tls</B>
+
+<DD>
+Enables TLS for incoming SMTP and POP connections. SMTP clients can then request TLS encryption by issuing the STARTTLS command. The <I>--server-tls-certificate</I> option must be used to define the server certificate.
+<DT><B>--server-tls-certificate </B><I>&lt;pem-file&gt;</I>
+
+<DD>
+Defines the TLS certificate file when acting as a SMTP or POP server. This file must contain the server's private key and certificate chain using the PEM file format. Alternatively, use this option twice with the first specifying the key file and the second the certificate  file. Keep the file permissions tight to avoid accidental exposure  of the private key.
+<DT><B>--server-tls-connection</B>
+
+<DD>
+Enables SMTP over TLS when acting as an SMTP server. This is for SMTP over TLS (SMTPS), not TLS negotiated within SMTP using STARTTLS.
+<DT><B>--server-tls-required</B>
+
+<DD>
+Makes the use of TLS mandatory for any incoming SMTP and POP connections. SMTP clients must use the STARTTLS command to establish a TLS session before they can issue SMTP AUTH or SMTP MAIL-TO commands.
+<DT><B>--server-tls-verify </B><I>&lt;ca-list&gt;</I>
+
+<DD>
+Enables verification of remote SMTP and POP clients' certificates against any of the trusted CA certificates in the specified file or directory. In many use cases this should be a file containing just your self-signed root certificate. Specify <I>&lt;default&gt;</I>  (including the angle brackets) for the TLS library's default set  of trusted CAs.
+<DT><B>-9, --tls-config </B><I>&lt;options&gt;</I>
+
+<DD>
+Selects and configures the low-level TLS library, using a comma-separated list of keywords. If OpenSSL and mbedTLS are both built in then keywords of <I>openssl</I> and <I>mbedtls</I> will select one or the other. Keywords like <I>tlsv1.0</I> can be used to set a minimum TLS protocol version, or <I>-tlsv1.2</I> to set a maximum version.
+</DL>
+<A NAME="lbAM">&nbsp;</A>
+<H3>Process options</H3>
+
+<DL COMPACT>
+<DT><B>-x, --dont-serve</B>
+
+<DD>
+Disables all network serving, including SMTP, POP and administration interfaces. The program will terminate as soon as any initial forwarding is complete.
+<DT><B>-H, --hidden</B>
+
+<DD>
+Windows only. Hides the application window and disables all message boxes, overriding any <I>--show</I> option. This is useful when running as a windows service.
+<DT><B>--localedir </B><I>&lt;dir&gt;</I>
+
+<DD>
+Enables localisation and specifies the locale base directory where message catalogues can be found. An empty directory can be used for the built-in default.
+<DT><B>-t, --no-daemon</B>
+
+<DD>
+Disables the normal backgrounding at startup so that the program runs in the foreground, without forking or detaching from the terminal.  On Windows this disables the system tray icon so the program uses a normal window; when the window is closed the program terminates.
+<DT><B>-X, --no-smtp</B>
+
+<DD>
+Disables listening for incoming SMTP connections.
+<DT><B>-i, --pid-file </B><I>&lt;path&gt;</I>
+
+<DD>
+Causes the process-id to be written into the specified file when the program starts up, typically after it has become a background daemon. The immediate parent directory is created if necessary.
 <DT><B>-u, --user </B><I>&lt;username&gt;</I>
 
 <DD>
-Names the effective user to switch to if started as root (default is <I>daemon</I>).
-<DT><B>-v, --verbose </B>
-
-<DD>
-Generates more verbose output (works with <I>--help</I> and <I>--log</I>).
-<DT><B>-Z, --verifier </B><I>&lt;program&gt;</I>
-
-<DD>
-Specifies an external program for address verification.
-<DT><B>-V, --version </B>
-
-<DD>
-Displays version information and exits.
+When started as root the program switches to a non-privileged effective user-id when idle or when running external filter scripts and address verifiers. This option can be used to define the non-privileged user-id. It also determines the group ownership of new files and sockets if the directory owner is not 'sticky'. Specify <I>root</I> to disable all user-id switching. Ignored on Windows.
 </DL>
-<A NAME="lbAF">&nbsp;</A>
-<H2>FILES</H2>
+<A NAME="lbAN">&nbsp;</A>
+<H3>Logging options</H3>
 
-GNU style...
-<BR>
+<DL COMPACT>
+<DT><B>-v, --verbose</B>
 
-/usr/local/etc/emailrelay.conf
-<BR>
+<DD>
+Enables more verbose logging when used with <I>--log</I>, and more verbose help when used with <I>--help</I>.
+<DT><B>-l, --log</B>
 
-/usr/local/etc/emailrelay.conf.template
-<BR>
+<DD>
+Enables logging to the standard error stream and to the syslog. The <I>--close-stderr</I> and <I>--no-syslog</I> options can be used to disable output to standard error stream and the syslog separately. Note that <I>--as-server</I>, <I>--as-client</I> and <I>--as-proxy</I> imply <I>--log</I>, and <I>--as-server</I> and <I>--as-proxy</I> also imply <I>--close-stderr</I>.
+<DT><B>-g, --debug</B>
 
-/usr/local/libexec/emailrelay/emailrelay-filter-copy
-<BR>
+<DD>
+Enables debug level logging, if built in. Debug messages are usually only useful when cross-referenced with the source code and they may expose plain-text passwords and mail message content.
+<DT><B>--log-address</B>
 
-/usr/local/libexec/emailrelay/emailrelay-poke
-<BR>
+<DD>
+Adds the network address of remote clients to the logging output.
+<DT><B>-N, --log-file </B><I>&lt;file&gt;</I>
 
-/usr/local/libexec/emailrelay/examples/*
-<BR>
+<DD>
+Redirects standard-error logging to the specified file. Logging to the log file is not affected by <I>--close-stderr</I>. The filename can include <I>%d</I> to get daily log files; the <I>%d</I> is replaced by the current date in the local timezone using a <I>YYYYMMDD</I> format.
+<DT><B>-L, --log-time</B>
 
-/usr/local/libexec/emailrelay/init/emailrelay
-<BR>
+<DD>
+Adds a timestamp to the logging output using the local timezone.
+<DT><B>-n, --no-syslog</B>
 
-/usr/local/man/man1/emailrelay*.1.gz
-<BR>
+<DD>
+Disables logging to the syslog. Note that <I>--as-client</I> implies <I>--no-syslog</I>.
+<DT><B>-k, --syslog, --syslog=</B><I>&lt;facility&gt;</I>
 
-/usr/local/sbin/emailrelay
-<BR>
+<DD>
+When used with <I>--log</I> this option enables logging to the syslog even if the <I>--no-syslog</I> option is also used. This is typically used as a convenient override when using <I>--as-client</I>.
+<DT><B>-e, --close-stderr</B>
 
-/usr/local/sbin/emailrelay-passwd
-<BR>
-
-/usr/local/sbin/emailrelay-submit
-<BR>
-
-/usr/local/share/emailrelay/doc/*
-<BR>
-
-/usr/local/share/emailrelay/doc/index.html
-<BR>
-
-/usr/local/share/emailrelay/doc/README
-<BR>
-
-/usr/local/var/spool/emailrelay/emailrelay.*.content
-<BR>
-
-/usr/local/var/spool/emailrelay/emailrelay.*.envelope
-<P>
-
-FHS style...
-<BR>
-
-/etc/emailrelay.conf
-<BR>
-
-/etc/emailrelay.conf.template
-<BR>
-
-/etc/init.d/emailrelay
-<BR>
-
-/usr/lib/emailrelay/emailrelay-filter-copy
-<BR>
-
-/usr/lib/emailrelay/emailrelay-poke
-<BR>
-
-/usr/lib/emailrelay/examples/*
-<BR>
-
-/usr/sbin/emailrelay
-<BR>
-
-/usr/sbin/emailrelay-passwd
-<BR>
-
-/usr/sbin/emailrelay-submit
-<BR>
-
-/usr/share/doc/emailrelay/*
-<BR>
-
-/usr/share/doc/emailrelay/index.html
-<BR>
-
-/usr/share/doc/emailrelay/README
-<BR>
-
-/usr/share/man/man1/emailrelay*.1.gz
-<BR>
-
-/var/spool/emailrelay/emailrelay.*.content
-<BR>
-
-/var/spool/emailrelay/emailrelay.*.envelope
-<A NAME="lbAG">&nbsp;</A>
+<DD>
+Causes the standard error stream to be closed soon after start-up. This is useful when operating as a background daemon and it is therefore implied by <I>--as-server</I> and <I>--as-proxy</I>.
+</DL>
+<A NAME="lbAO">&nbsp;</A>
 <H2>SEE ALSO</H2>
 
-E-MailRelay user guide, <A HREF="http://emailrelay.sourceforge.net/userguide.html">http://emailrelay.sourceforge.net/userguide.html</A> .
-<BR>
-
-E-MailRelay reference, <A HREF="http://emailrelay.sourceforge.net/reference.html">http://emailrelay.sourceforge.net/reference.html</A> .
-<BR>
-
 <B><A HREF="../man1/emailrelay-submit.1.html">emailrelay-submit</A></B>(1),
 
 <B><A HREF="../man1/emailrelay-passwd.1.html">emailrelay-passwd</A></B>(1),
 
-<A NAME="lbAH">&nbsp;</A>
+<A NAME="lbAP">&nbsp;</A>
 <H2>AUTHOR</H2>
 
 Graeme Walker, mailto:<A HREF="mailto:graeme_walker@users.sourceforge.net">graeme_walker@users.sourceforge.net</A>
@@ -372,15 +419,24 @@ Graeme Walker, mailto:<A HREF="mailto:graeme_walker@users.sourceforge.net">graem
 <DT><A HREF="#lbAC">SYNOPSIS</A><DD>
 <DT><A HREF="#lbAD">DESCRIPTION</A><DD>
 <DT><A HREF="#lbAE">OPTIONS</A><DD>
-<DT><A HREF="#lbAF">FILES</A><DD>
-<DT><A HREF="#lbAG">SEE ALSO</A><DD>
-<DT><A HREF="#lbAH">AUTHOR</A><DD>
+<DL>
+<DT><A HREF="#lbAF">Basic options</A><DD>
+<DT><A HREF="#lbAG">SMTP client options</A><DD>
+<DT><A HREF="#lbAH">SMTP server options</A><DD>
+<DT><A HREF="#lbAI">POP server options</A><DD>
+<DT><A HREF="#lbAJ">Admin server options</A><DD>
+<DT><A HREF="#lbAK">Authentication options</A><DD>
+<DT><A HREF="#lbAL">TLS options</A><DD>
+<DT><A HREF="#lbAM">Process options</A><DD>
+<DT><A HREF="#lbAN">Logging options</A><DD>
+</DL>
+<DT><A HREF="#lbAO">SEE ALSO</A><DD>
+<DT><A HREF="#lbAP">AUTHOR</A><DD>
 </DL>
 <HR>
 This document was created by
-<A HREF="lynxcgi:FOO/cgi-bin/man/man2html">man2html</A>,
+<A HREF="lynxcgi:./cgi-bin/man/man2html">man2html</A>,
 using the manual pages.<BR>
-Time: 00:56:15 GMT, September 19, 2007
 </BODY>
 </HTML>
-<!-- Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->

doc/emailrelay-passwd.1

@@ -1,8 +1,8 @@
-.\" Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
+.\" Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
 .\" 
 .\" This program is free software: you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation, either version 3 of the License, or 
+.\" the Free Software Foundation, either version 3 of the License, or
 .\" (at your option) any later version.
 .\" 
 .\" This program is distributed in the hope that it will be useful,
@@ -14,16 +14,16 @@
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .TH EMAILRELAY-PASSWD 1 local
 .SH NAME
-emailrelay-passwd \- a password encoding utility for E-MailRelay
+emailrelay-passwd \- a password encoding utility for emailrelay
 .SH SYNOPSIS
 .B emailrelay-passwd
 .SH DESCRIPTION
 .I emailrelay-passwd
 is a utility which reads a single plaintext password from the standard
 input, and writes out an encoded form onto the standard
-output. The encoded form is suitable for pasting into a CRAM-MD5
-line in an 
-.B emailrelay 
+output. The encoded form is suitable for pasting into a "md5"
+line in an
+.B emailrelay
 secrets file.
 .LP
 A secrets file containing two CRAM-MD5 passwords might look like
@@ -35,17 +35,31 @@ this:
 .br
 #
 .br
-server cram-md5 bob 1465267825.1002706143.2005162520.2739353706.4126076156.3423185672.2674269368.3056934447
-.br
-server cram-md5 alice 4039336516.3719314525.4148590512.4209236927.1897255360.1012201638.2279588408.1076355329
+server md5 alice Oqng9/H7wAyKgbuqw5VzG1bNO6feqtblyiNEi6QuN5dH
 .br
+server md5 bob Ot6SDdGj23eWjdEuKICgN8Nj9z/Vx9IV3ISz9VvmnaUB
+.SH OPTIONS
+.TP
+.B \-H, --hash \fI<function>\fR
+Specifies the hash function, such as MD5 or SHA1. MD5 is the default, and a hash function of NONE does simple xtext encoding. Other hash function may or may not be available, depending on the build.
+.TP
+.B \-h, --help
+Shows help text and exits.
+.TP
+.B \-b, --base64
+The input password is interpreted as being Base64 encoded.
+.TP
+.B \-d, --dotted
+Generates a dotted decimal format, for backwards compatibility.
+.TP
+.B \-p, --password \fI<pwd>\fR
+Specifies the password to be hashed. Beware of leaking sensitive passwords via command-line history or the process-table when using this option.
 .SH SEE ALSO
 .BR emailrelay (1),
 .BR emailrelay-submit (1),
-.BR emailrelay-poke (1)
 .br
-.B RFC2104
+.B RFC-2104
 .br
-.B RFC2195
+.B RFC-2195
 .SH AUTHOR
 Graeme Walker, mailto:graeme_walker@users.sourceforge.net

doc/emailrelay-poke.1

@@ -1,33 +0,0 @@
-.\" Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
-.\" 
-.\" This program is free software: you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation, either version 3 of the License, or 
-.\" (at your option) any later version.
-.\" 
-.\" This program is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\" 
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
-.TH EMAILRELAY-POKE 1 local
-.SH NAME
-emailrelay-poke \- forces an E-MailRelay server to deliver spooled mail
-.SH SYNOPSIS
-.B emailrelay-poke
-[ admin-port [ admin-command ] ]
-.SH DESCRIPTION
-.I emailrelay-poke
-is a lightweight utility which connects to the 
-.I emailrelay
-administration interface and executes the 
-.B flush
-command.
-.SH SEE ALSO
-.BR emailrelay (1),
-.BR emailrelay-submit (1),
-.BR emailrelay-passwd (1)
-.SH AUTHOR
-Graeme Walker, mailto:graeme_walker@users.sourceforge.net

doc/emailrelay-submit.1

@@ -1,8 +1,8 @@
-.\" Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
+.\" Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
 .\" 
 .\" This program is free software: you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation, either version 3 of the License, or 
+.\" the Free Software Foundation, either version 3 of the License, or
 .\" (at your option) any later version.
 .\" 
 .\" This program is distributed in the hope that it will be useful,
@@ -14,28 +14,76 @@
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .TH EMAILRELAY-SUBMIT 1 local
 .SH NAME
-emailrelay-submit \- a submission utility for E-MailRelay
+emailrelay-submit \- a submission utility for emailrelay
 .SH SYNOPSIS
 .B emailrelay-submit
-[--help] [--verbose] [--spool-dir 
-.IR spool-directory ] 
+[--help] [--verbose] [--spool-dir
+.IR spool-directory ]
 [--from
 .IR from-address ]
-.I to-address 
+.I to-address
 .RI [ to-address \ ...]
 .SH DESCRIPTION
 .I emailrelay-submit
-is a utility which reads an RFC822 e-mail message from the standard
-input, with SMTP envelope recipient addresses passed on the 
-command-line, and writes it into the 
-.B E-MailRelay 
+is a utility which reads an RFC-822 e-mail message from the standard
+input, with SMTP envelope recipient addresses passed on the
+command-line, and writes it into the
+.B E-MailRelay
 spool directory.
 .LP
-The verbose switch causes the path of the new content file
+The verbose option causes the path of the new content file
 to be printed.
+.SH OPTIONS
+.TP
+.B \-f, --from \fI<name>\fR
+Sets the envelope 'from' address.
+.TP
+.B \-h, --help
+Shows help text and exits.
+.TP
+.B \-s, --spool-dir \fI<dir>\fR
+Specifies the spool directory.
+.TP
+.B \-v, --verbose
+Prints the full path of the content file.
+.TP
+.B \-d, --content-date
+Adds a \fIDate:\fR content header if there is none.
+.TP
+.B \-F, --content-from
+Adds the envelope 'from' addresses as a \fIFrom:\fR content header.
+.TP
+.B \-I, --content-message-id \fI<domain-part>\fR
+Adds a \fIMessage-ID:\fR content header if there is none.
+.TP
+.B \-t, --content-to
+Adds the envelope 'to' addresses as \fITo:\fR content headers.
+.TP
+.B \-c, --copy
+Copies the envelope file into all sub-directories of the main spool directory.
+.TP
+.B \-n, --filename
+Prints the name of the content file.
+.TP
+.B \-V, --version
+Prints the version number and exits.
+.TP
+.B \-a, --auth \fI<name>\fR
+Sets the authentication value in the envelope file.
+.TP
+.B \-C, --content \fI<base64>\fR
+Sets a line of content. This can be a header line, a blank line or a line of the body text. The first blank line separates headers  from the body. The option value should be base64 encoded.
+.TP
+.B \-i, --from-auth-in \fI<name>\fR
+Sets the 'from-auth-in' value in the envelope file.
+.TP
+.B \-o, --from-auth-out \fI<name>\fR
+Sets the 'from-auth-out' value in the envelope file.
+.TP
+.B \-N, --no-stdin
+Ignores the standard-input. Typically used with \fI\fR\fI--content\fR\fI\fR.
 .SH SEE ALSO
 .BR emailrelay (1),
-.BR emailrelay-poke (1),
 .BR emailrelay-passwd (1)
 .SH AUTHOR
 Graeme Walker, mailto:graeme_walker@users.sourceforge.net

doc/emailrelay.1

@@ -1,8 +1,8 @@
-.\" Copyright (C) 2001-2007 Graeme Walker <graeme_walker@users.sourceforge.net>
+.\" Copyright (C) 2001-2023 Graeme Walker <graeme_walker@users.sourceforge.net>
 .\" 
 .\" This program is free software: you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation, either version 3 of the License, or 
+.\" the Free Software Foundation, either version 3 of the License, or
 .\" (at your option) any later version.
 .\" 
 .\" This program is distributed in the hope that it will be useful,
@@ -19,242 +19,264 @@ emailrelay \- e-mail transfer agent and proxy
 .B emailrelay
 [OPTIONS]
 .LP
-.B emailrelay 
+.B emailrelay
 --as-server
 .LP
 .B emailrelay
---as-client 
+--as-client
 .I server-address
 .LP
 .B emailrelay
---as-proxy 
+--as-proxy
 .I server-address
 .SH DESCRIPTION
 .I emailrelay
 is a simple SMTP proxy and store-and-forward message transfer agent.
-It does store-and-forward mail relay to a fixed next-hop server, without 
-any routing. 
+It does store-and-forward mail relay to a fixed next-hop server, without
+any routing.
 .LP
-It runs in two main modes: a storage daemon 
-.RI ( --as-server ) 
-and a forwarding 
-agent 
-.RI ( --as-client ). 
-The storage daemon is an SMTP server which stores e-mail 
+It runs in two main modes: a storage daemon
+.RI ( --as-server )
+and a forwarding
+agent
+.RI ( --as-client ).
+The storage daemon is an SMTP server which stores e-mail
 messages in a local spool directory. The forwarding agent acts as an
 SMTP client sending the spooled e-mail messages on to the next
 SMTP server in the chain.
 .LP
 It can also run in a third mode, as a proxy server
-.RI ( --as-proxy ). 
-In this mode all messages are forwarded immediately to the next-hop
-server. Messages are only fully accepted from the sender once they
-have been successfully delivered to the next-hop server.
+.RI ( --as-proxy ).
+In this mode all e-mail messages are spooled temporarily while the
+client is connected and forwarded as soon as the client
+disconnects.
 .SH OPTIONS
-.TP
-.B \-a, --admin \fI<admin-port>\fR
-Enables the administration interface and specifies its listening port number.
-.TP
-.B \-Q, --admin-terminate 
-Enables the terminate command on the admin interface.
-.TP
-.B \-A, --anonymous 
-Disables the smtp vrfy command and sends less verbose smtp responses.
+.SS Basic options
 .TP
 .B \-q, --as-client \fI<host:port>\fR
-Runs as a client, forwarding spooled mail to <host>: equivalent to \fI--log\fR \fI--no-syslog\fR \fI--no-daemon\fR \fI--dont-serve\fR \fI--forward\fR \fI--forward-to\fR.
+This is equivalent to \fI--log\fR, \fI--no-syslog\fR, \fI--no-daemon\fR, \fI--dont-serve\fR, \fI--forward\fR and \fI--forward-to\fR. It is a convenient way of running a forwarding agent that forwards spooled mail messages and then terminates.
 .TP
 .B \-y, --as-proxy \fI<host:port>\fR
-Runs as a proxy: equivalent to \fI--log\fR \fI--close-stderr\fR \fI--immediate\fR \fI--forward-to\fR.
+This is equivalent to \fI--log\fR, \fI--close-stderr\fR, \fI--forward-on-disconnect\fR and \fI--forward-to\fR. It is a convenient way of running a store-and-forward daemon. Use \fI--log\fR, \fI--forward-on-disconnect\fR and \fI--forward-to\fR instead of \fI--as-proxy\fR to keep the standard error stream open.
 .TP
-.B \-d, --as-server 
-Runs as a server: equivalent to \fI--log\fR \fI--close-stderr\fR.
-.TP
-.B \-C, --client-auth \fI<file>\fR
-Enables smtp authentication with the remote server, using the given secrets file.
-.TP
-.B \-Y, --client-filter \fI<program>\fR
-Specifies an external program to process messages when they are forwarded.
-.TP
-.B \-j, --client-tls 
-Enables tls/ssl layer for smtp client (if openssl built in).
-.TP
-.B \-e, --close-stderr 
-Closes the standard error stream soon after start-up.
-.TP
-.B \-U, --connection-timeout \fI<time>\fR
-Sets the timeout (in seconds) when connecting to a remote server (default is 40).
-.TP
-.B \-g, --debug 
-Generates debug-level logging if compiled-in.
-.TP
-.B \-D, --domain \fI<fqdn>\fR
-Sets an override for the host's fully qualified domain name.
-.TP
-.B \-x, --dont-serve 
-Disables acting as a server on any port (part of \fI--as-client\fR and usually used with \fI--forward\fR).
-.TP
-.B \-z, --filter \fI<program>\fR
-Specifies an external program to process messages as they are stored.
-.TP
-.B \-W, --filter-timeout \fI<time>\fR
-Sets the timeout (in seconds) for running the \fI--filter\fR processor (default is 300).
-.TP
-.B \-f, --forward 
-Forwards stored mail on startup (requires \fI--forward-to\fR).
-.TP
-.B \-o, --forward-to \fI<host:port>\fR
-Specifies the remote smtp server (required by \fI--forward\fR, \fI--poll\fR, \fI--immediate\fR and \fI--admin\fR).
-.TP
-.B \-h, --help 
-Displays help text and exits.
-.TP
-.B \-m, --immediate 
-Enables immediate forwarding of messages as soon as they are received (requires \fI--forward-to\fR).
-.TP
-.B \-I, --interface \fI<ip-address>\fR
-Defines the listening interface for incoming connections.
-.TP
-.B \-l, --log 
-Writes log information on standard error and syslog.
-.TP
-.B \-L, --log-time 
-Adds a timestamp to the logging output.
-.TP
-.B \-t, --no-daemon 
-Does not detach from the terminal.
-.TP
-.B \-X, --no-smtp 
-Disables listening for smtp connections (usually used with \fI--admin\fR or \fI--pop\fR).
-.TP
-.B \-n, --no-syslog 
-Disables syslog output (always overridden by \fI--syslog\fR).
-.TP
-.B \-i, --pid-file \fI<pid-file>\fR
-Defines a file for storing the daemon process-id.
-.TP
-.B \-O, --poll \fI<period>\fR
-Enables polling of the spool directory for messages to be forwarded with the specified period (requires \fI--forward-to\fR).
-.TP
-.B \-B, --pop 
-Enables the pop server.
-.TP
-.B \-F, --pop-auth \fI<file>\fR
-Defines the pop server secrets file (default is \fI/etc/emailrelay.auth\fR).
-.TP
-.B \-J, --pop-by-name 
-Modifies the pop spool directory according to the user name (requires \fI--pop\fR).
-.TP
-.B \-G, --pop-no-delete 
-Disables message deletion via pop (requires \fI--pop\fR).
-.TP
-.B \-E, --pop-port \fI<port>\fR
-Specifies the pop listening port number (requires \fI--pop\fR).
-.TP
-.B \-p, --port \fI<port>\fR
-Specifies the smtp listening port number.
-.TP
-.B \-w, --prompt-timeout \fI<time>\fR
-Sets the timeout (in seconds) for getting an initial prompt from the server.
-.TP
-.B \-r, --remote-clients 
-Allows remote clients to connect.
-.TP
-.B \-T, --response-timeout \fI<time>\fR
-Sets the response timeout (in seconds) when talking to a remote server (default is 1800).
-.TP
-.B \-S, --server-auth \fI<file>\fR
-Enables authentication of remote clients, using the given secrets file.
-.TP
-.B \-K, --server-tls \fI<pem-file>\fR
-Enables tls/ssl layer for smtp server using the given openssl certificate file (if openssl built in).
+.B \-d, --as-server
+This is equivalent to \fI--log\fR and \fI--close-stderr\fR. It is a convenient way of running a background storage daemon that accepts mail messages and spools them. Use \fI--log\fR instead of \fI--as-server\fR to keep standard error stream open.
 .TP
 .B \-s, --spool-dir \fI<dir>\fR
-Specifies the spool directory (default is \fI/var/spool/emailrelay\fR).
+Specifies the directory used for holding mail messages that have been received but not yet forwarded.
 .TP
-.B \-k, --syslog 
-Forces syslog output if logging is enabled (overrides \fI--no-syslog\fR).
+.B \-h, --help
+Displays help text and then exits. Use with \fI--verbose\fR for more complete output.
+.TP
+.B \-V, --version
+Displays version information and then exits.
+.SS SMTP client options
+.TP
+.B \-c, --client-smtp-config \fI<config>\fR
+Configures the SMTP client protocol using a comma-separated list of optional features, including 'pipelining', 'smtputf8strict', 'eightbitstrict' and 'binarymimestrict'.
+.TP
+.B \-f, --forward
+Causes spooled mail messages to be forwarded when the program first starts.
+.TP
+.B \-1, --forward-on-disconnect
+Causes spooled mail messages to be forwarded whenever a SMTP client connection disconnects.
+.TP
+.B \-o, --forward-to \fI<host:port>\fR
+Specifies the transport address of the remote SMTP server that spooled mail messages are forwarded to.
+.TP
+.B \-O, --poll \fI<period>\fR
+Causes forwarding of spooled mail messages to happen at regular intervals (with the time given in seconds).
+.TP
+.B \-Y, --client-filter \fI<program>\fR
+Runs the specified external filter program whenever a mail message is forwarded. The filter is passed the name of the message file in the spool directory so that it can edit it as required. A network filter can be specified as \fInet:<tcp-address>\fR and prefixes of \fIspam:\fR, \fIspam-edit:\fR and \fIexit:\fR are also allowed. The \fIspam:\fR and \fIspam-edit:\fR prefixes require a SpamAssassin daemon to be running. For store-and-forward applications the \fI--filter\fR option is normally more useful than \fI--client-filter\fR.
+.TP
+.B \-6, --client-interface \fI<ip-address>\fR
+Specifies the IP network address to be used to bind the local end of outgoing SMTP connections. By default the address will depend on the routing tables in the normal way. Use \fI0.0.0.0\fR to use only IPv4 addresses returned from DNS lookups of the \fI--forward-to\fR address, or \fI::\fR for IPv6.
+.TP
+.B \-U, --connection-timeout \fI<time>\fR
+Specifies a timeout (in seconds) for establishing a TCP connection to remote SMTP servers. The default is 40 seconds.
+.TP
+.B --idle-timeout \fI<time>\fR
+Specifies a timeout (in seconds) for receiving network traffic from remote SMTP and POP clients. The default is 60 seconds.
+.TP
+.B \-T, --response-timeout \fI<time>\fR
+Specifies a timeout (in seconds) for getting responses from remote SMTP servers. The default is 60 seconds.
+.TP
+.B --forward-to-all
+Requires all recipient addresses to be accepted by the remote server before forwarding. This is currently the default behaviour  so this option is for forwards compatibility only.
+.TP
+.B --forward-to-some
+Allow forwarding to continue even if some recipient addresses on an e-mail envelope are rejected by the remote server.
+.TP
+.B \-m, --immediate
+Causes mail messages to be forwarded as they are received, even before they have been accepted. This can be used to do proxying without store-and-forward, but in practice clients tend to to time out while waiting for their mail message to be accepted.
+.SS SMTP server options
+.TP
+.B \-p, --port \fI<port>\fR
+Sets the port number used for listening for incoming SMTP connections.
+.TP
+.B \-r, --remote-clients
+Allows incoming connections from addresses that are not local. The default behaviour is to reject connections that are not local in order to prevent accidental exposure to the public internet, although a firewall should also be used. Local address ranges are defined in RFC-1918, RFC-6890 etc.
+.TP
+.B --address-verifier \fI<program>\fR
+Runs the specified external program to verify a message recipient's e-mail address. A network verifier can be specified as \fInet:<tcp-address>\fR. The \fIaccount:\fR built-in address verifier can be used to check recipient addresses against the list of local system account names.
+.TP
+.B \-A, --anonymous, --anonymous=\fI<scope>\fR
+Disables the server's SMTP VRFY command, sends less verbose SMTP greeting and responses, stops \fIReceived\fR lines being added to mail message content files, and stops the SMTP client protocol adding \fIAUTH=\fR to the \fIMAIL\fR command. For finer control use a comma-separated list of things to anonymise: \fIvrfy\fR, \fIserver\fR, \fIcontent\fR and/or \fIclient\fR, eg. \fI--anonymous\fR=server\fR,content.
+.TP
+.B \-s, --delivery-dir \fI<dir>\fR
+Specifies the base directory for mailboxes when delivering  messages that have local recipients. This defaults to the main spool directory.
+.TP
+.B --dnsbl \fI<config>\fR
+Specifies a list of DNSBL servers that are used to reject SMTP connections from blocked addresses. The configuration string is made up of comma-separated fields: the DNS server's transport address, a timeout in milliseconds, a rejection threshold, and then the list of DNSBL servers.
+.TP
+.B \-D, --domain \fI<fqdn>\fR
+Specifies the network name that is used in SMTP EHLO commands, \fIReceived\fR lines, and for generating authentication challenges. The default is derived from a DNS lookup of the local hostname.
+.TP
+.B \-z, --filter \fI<program>\fR
+Runs the specified external filter program whenever a mail message is stored. The filter is passed the name of the message file in the spool directory so that it can edit it as required. The mail message is rejected if the filter program terminates with an exit code between 1 and 99. Use \fInet:<tcp-address>\fR to communicate with a filter daemon over the network, or \fIspam:<tcp-address>\fR for a spamassassin spamd daemon to accept or reject mail messages, or \fIspam-edit:<tcp-address>\fR to have spamassassin edit the message content without rejecting it, or \fIexit:<number>\fR to emulate a filter program that just exits.
+.TP
+.B \-W, --filter-timeout \fI<time>\fR
+Specifies a timeout (in seconds) for running a \fI--filter\fR program. The default is 60 seconds.
+.TP
+.B \-I, --interface \fI<ip-address-list>\fR
+Specifies the IP network addresses or interface names used to bind listening ports. By default listening ports for incoming SMTP, POP and administration connections will bind the 'any' address for IPv4 and for IPv6, ie. \fI0.0.0.0\fR and \fI::\fR. Multiple addresses can be specified by using the option more than once or by using a comma-separated list. Use a prefix of \fIsmtp=\fR, \fIpop=\fR or \fIadmin=\fR on addresses that should apply only to those types of listening port. Any link-local IPv6 addresses must include a zone name or scope id.  Interface names can be used instead of addresses, in which case all the addresses associated with that interface at startup will used for listening. When an interface name is decorated with a \fI-ipv4\fR or \fI-ipv6\fR suffix only their IPv4 or IPv6 addresses will be used (eg. \fIppp0-ipv4\fR).  To inherit listening file descriptors from the parent process on unix use a syntax like this: \fI--interface\fR smtp=fd#3,smtp=fd#4,pop=fd#5.
+.TP
+.B \-w, --prompt-timeout \fI<time>\fR
+Specifies a timeout (in seconds) for getting the initial prompt from a remote SMTP server. If no prompt is received after this time then the SMTP dialog goes ahead without it.
+.TP
+.B \-Z, --server-smtp-config \fI<config>\fR
+Configures the SMTP server protocol using a comma-separated list of optional features, including 'pipelining', 'chunking', 'smtputf8', and 'smtputf8strict'.
+.TP
+.B \-M, --size \fI<bytes>\fR
+Limits the size of mail messages that can be submitted over SMTP.
+.SS POP server options
+.TP
+.B \-B, --pop
+Enables the POP server, listening by default on port 110, providing access to spooled mail messages. Negotiated TLS using the POP \fISTLS\fR command will be enabled if the \fI--server-tls\fR option is also given.
+.TP
+.B \-J, --pop-by-name
+Modifies the POP server's spool directory to be the sub-directory with the same name as the user-id used for POP authentication. This  allows POP clients to see only their own messages after they have  been moved into separate sub-directories typically by the built-in  \fIdeliver:\fR or \fIcopy:\fR filters. Content files can remain in the  main spool directory to save disk space; they will be deleted by  the POP server when it deletes the last matching envelope file.
+.TP
+.B \-G, --pop-no-delete
+Disables the POP DELE command so that the command appears to succeed but mail messages are not deleted from the spool directory.
+.TP
+.B \-E, --pop-port \fI<port>\fR
+Sets the POP server's listening port number.
+.SS Admin server options
+.TP
+.B \-a, --admin \fI<port>\fR
+Enables an administration interface on the specified listening port number. Use telnet or something similar to connect. The administration interface can be used to trigger forwarding of spooled mail messages if the \fI--forward-to\fR option is used.
+.TP
+.B \-Q, --admin-terminate
+Enables the \fIterminate\fR command in the administration interface.
+.SS Authentication options
+.TP
+.B \-C, --client-auth \fI<file>\fR
+Enables SMTP client authentication with the remote server, using the client account details taken from the specified secrets file.  The secrets file should normally contain one line having between four and five space-separated fields. The first field must be \fIclient\fR, the second field is the password type (\fIplain\fR or \fImd5\fR), the third is the xtext-encoded user-id and the fourth is the xtext-encoded password. Alternatively, the user-id and password fields can be Base64 encoded if the second field is \fIplain:b\fR. It is also possible to do without a secrets file and give the Base64 encoded user-id and  password directly on the command-line or in the configuration file formatted as \fIplain:<base64-user-id>:<base64-password>\fR. Note that putting these account details on the command-line is not recommended because it will make the password easily visible to all users on the  local machine.
+.TP
+.B --client-auth-config \fI<config>\fR
+Configures the SMTP client authentication module using a semicolon-separated list of configuration items. Each item is a single-character key, followed by a colon and then a comma-separated list. A 'm' character introduces an ordered list of preferred authentication mechanisms and an 'x' introduces a list of mechanisms to avoid. An 'a' list and a 'd' list can be used similarly to prefer and avoid certain mechanisms once the session is encrypted with TLS.
+.TP
+.B \-S, --server-auth \fI<file>\fR
+Enables SMTP server authentication of remote SMTP clients. Account names and passwords are taken from the specified secrets file. The secrets file should contain lines that have four space-separated fields, starting with \fIserver\fR in the first field; the second field is the password encoding (\fIplain\fR or \fImd5\fR), the third is the client user-id and the fourth is the password. The user-id is RFC-1891 xtext encoded, and the password is either xtext encoded or generated by \fIemailrelay-passwd\fR. Alternatively, the username and password can be Base64 encoded if the second field is \fIplain:b\fR. A special value of  \fIpam:\fR can be used for authentication using linux PAM.
+.TP
+.B --server-auth-config \fI<config>\fR
+Configures the SMTP server authentication module using a semicolon-separated list of configuration items. Each item is a single-character key, followed by a colon and then a comma-separated list. A 'm' character introduces an ordered list of allowed authentication mechanisms and an 'x' introduces a list of mechanisms to deny. An 'a' list and a 'd' list can be used similarly to allow and deny mechanisms once the session is encrypted with TLS. In typical usage you might have an empty allow list for an unencrypted session and a single preferred mechanism once encrypted, \fIm:;a:plain\fR.
+.TP
+.B \-F, --pop-auth \fI<file>\fR
+Specifies a file containing valid POP account details. The file format is the same as for the SMTP server secrets file, ie. lines starting with \fIserver\fR, with user-id and password in the third and fourth fields. A special value of \fIpam:\fR can be used for authentication using linux PAM.
+.SS TLS options
+.TP
+.B \-j, --client-tls
+Enables negotiated TLS for outgoing SMTP connections; the SMTP STARTTLS command will be issued if the remote server supports it.
+.TP
+.B --client-tls-certificate \fI<pem-file>\fR
+Defines the TLS certificate file when acting as a SMTP client. This file must contain the client's private key and certificate chain using the PEM file format. Alternatively, use this option twice with the first one specifying the key file and the second the certificate file. Keep the file permissions tight to avoid accidental exposure of the private key.
+.TP
+.B \-b, --client-tls-connection
+Enables the use of a TLS tunnel for outgoing SMTP connections. This is for SMTP over TLS (SMTPS), not TLS negotiated within SMTP using STARTTLS.
+.TP
+.B --client-tls-required
+Makes the use of TLS mandatory for outgoing SMTP connections. The SMTP STARTTLS command will be used before mail messages are sent out. If the remote server does not allow STARTTLS then the SMTP connection will fail.
+.TP
+.B --client-tls-server-name \fI<hostname>\fR
+Defines the target server hostname in the TLS handshake. With \fI--client-tls-connection\fR this can be used for SNI, allowing the remote server to adopt an appropriate identity.
+.TP
+.B --client-tls-verify \fI<ca-list>\fR
+Enables verification of the remote SMTP server's certificate against any of the trusted CA certificates in the specified file or directory. In many use cases this should be a file containing just your self-signed root certificate. Specify \fI<default>\fR (including the angle brackets) for the TLS library's default set of trusted CAs.
+.TP
+.B --client-tls-verify-name \fI<cname>\fR
+Enables verification of the CNAME within the remote SMTP server's certificate.
+.TP
+.B \-K, --server-tls
+Enables TLS for incoming SMTP and POP connections. SMTP clients can then request TLS encryption by issuing the STARTTLS command. The \fI--server-tls-certificate\fR option must be used to define the server certificate.
+.TP
+.B --server-tls-certificate \fI<pem-file>\fR
+Defines the TLS certificate file when acting as a SMTP or POP server. This file must contain the server's private key and certificate chain using the PEM file format. Alternatively, use this option twice with the first specifying the key file and the second the certificate  file. Keep the file permissions tight to avoid accidental exposure  of the private key.
+.TP
+.B --server-tls-connection
+Enables SMTP over TLS when acting as an SMTP server. This is for SMTP over TLS (SMTPS), not TLS negotiated within SMTP using STARTTLS.
+.TP
+.B --server-tls-required
+Makes the use of TLS mandatory for any incoming SMTP and POP connections. SMTP clients must use the STARTTLS command to establish a TLS session before they can issue SMTP AUTH or SMTP MAIL-TO commands.
+.TP
+.B --server-tls-verify \fI<ca-list>\fR
+Enables verification of remote SMTP and POP clients' certificates against any of the trusted CA certificates in the specified file or directory. In many use cases this should be a file containing just your self-signed root certificate. Specify \fI<default>\fR  (including the angle brackets) for the TLS library's default set  of trusted CAs.
+.TP
+.B \-9, --tls-config \fI<options>\fR
+Selects and configures the low-level TLS library, using a comma-separated list of keywords. If OpenSSL and mbedTLS are both built in then keywords of \fIopenssl\fR and \fImbedtls\fR will select one or the other. Keywords like \fItlsv1.0\fR can be used to set a minimum TLS protocol version, or \fI-tlsv1.2\fR to set a maximum version.
+.SS Process options
+.TP
+.B \-x, --dont-serve
+Disables all network serving, including SMTP, POP and administration interfaces. The program will terminate as soon as any initial forwarding is complete.
+.TP
+.B \-H, --hidden
+Windows only. Hides the application window and disables all message boxes, overriding any \fI--show\fR option. This is useful when running as a windows service.
+.TP
+.B --localedir \fI<dir>\fR
+Enables localisation and specifies the locale base directory where message catalogues can be found. An empty directory can be used for the built-in default.
+.TP
+.B \-t, --no-daemon
+Disables the normal backgrounding at startup so that the program runs in the foreground, without forking or detaching from the terminal.  On Windows this disables the system tray icon so the program uses a normal window; when the window is closed the program terminates.
+.TP
+.B \-X, --no-smtp
+Disables listening for incoming SMTP connections.
+.TP
+.B \-i, --pid-file \fI<path>\fR
+Causes the process-id to be written into the specified file when the program starts up, typically after it has become a background daemon. The immediate parent directory is created if necessary.
 .TP
 .B \-u, --user \fI<username>\fR
-Names the effective user to switch to if started as root (default is \fIdaemon\fR).
+When started as root the program switches to a non-privileged effective user-id when idle or when running external filter scripts and address verifiers. This option can be used to define the non-privileged user-id. It also determines the group ownership of new files and sockets if the directory owner is not 'sticky'. Specify \fIroot\fR to disable all user-id switching. Ignored on Windows.
+.SS Logging options
 .TP
-.B \-v, --verbose 
-Generates more verbose output (works with \fI--help\fR and \fI--log\fR).
+.B \-v, --verbose
+Enables more verbose logging when used with \fI--log\fR, and more verbose help when used with \fI--help\fR.
 .TP
-.B \-Z, --verifier \fI<program>\fR
-Specifies an external program for address verification.
+.B \-l, --log
+Enables logging to the standard error stream and to the syslog. The \fI--close-stderr\fR and \fI--no-syslog\fR options can be used to disable output to standard error stream and the syslog separately. Note that \fI--as-server\fR, \fI--as-client\fR and \fI--as-proxy\fR imply \fI--log\fR, and \fI--as-server\fR and \fI--as-proxy\fR also imply \fI--close-stderr\fR.
 .TP
-.B \-V, --version 
-Displays version information and exits.
-.SH FILES
-GNU style...
-.br
-/usr/local/etc/emailrelay.conf
-.br
-/usr/local/etc/emailrelay.conf.template
-.br
-/usr/local/libexec/emailrelay/emailrelay-filter-copy
-.br
-/usr/local/libexec/emailrelay/emailrelay-poke
-.br
-/usr/local/libexec/emailrelay/examples/*
-.br
-/usr/local/libexec/emailrelay/init/emailrelay
-.br
-/usr/local/man/man1/emailrelay*.1.gz
-.br
-/usr/local/sbin/emailrelay
-.br
-/usr/local/sbin/emailrelay-passwd
-.br
-/usr/local/sbin/emailrelay-submit
-.br
-/usr/local/share/emailrelay/doc/*
-.br
-/usr/local/share/emailrelay/doc/index.html
-.br
-/usr/local/share/emailrelay/doc/README
-.br
-/usr/local/var/spool/emailrelay/emailrelay.*.content
-.br
-/usr/local/var/spool/emailrelay/emailrelay.*.envelope
-.LP
-FHS style...
-.br
-/etc/emailrelay.conf
-.br
-/etc/emailrelay.conf.template
-.br
-/etc/init.d/emailrelay
-.br
-/usr/lib/emailrelay/emailrelay-filter-copy
-.br
-/usr/lib/emailrelay/emailrelay-poke
-.br
-/usr/lib/emailrelay/examples/*
-.br
-/usr/sbin/emailrelay
-.br
-/usr/sbin/emailrelay-passwd
-.br
-/usr/sbin/emailrelay-submit
-.br
-/usr/share/doc/emailrelay/*
-.br
-/usr/share/doc/emailrelay/index.html
-.br
-/usr/share/doc/emailrelay/README
-.br
-/usr/share/man/man1/emailrelay*.1.gz
-.br
-/var/spool/emailrelay/emailrelay.*.content
-.br
-/var/spool/emailrelay/emailrelay.*.envelope
+.B \-g, --debug
+Enables debug level logging, if built in. Debug messages are usually only useful when cross-referenced with the source code and they may expose plain-text passwords and mail message content.
+.TP
+.B --log-address
+Adds the network address of remote clients to the logging output.
+.TP
+.B \-N, --log-file \fI<file>\fR
+Redirects standard-error logging to the specified file. Logging to the log file is not affected by \fI--close-stderr\fR. The filename can include \fI%d\fR to get daily log files; the \fI%d\fR is replaced by the current date in the local timezone using a \fIYYYYMMDD\fR format.
+.TP
+.B \-L, --log-time
+Adds a timestamp to the logging output using the local timezone.
+.TP
+.B \-n, --no-syslog
+Disables logging to the syslog. Note that \fI--as-client\fR implies \fI--no-syslog\fR.
+.TP
+.B \-k, --syslog, --syslog=\fI<facility>\fR
+When used with \fI--log\fR this option enables logging to the syslog even if the \fI--no-syslog\fR option is also used. This is typically used as a convenient override when using \fI--as-client\fR.
+.TP
+.B \-e, --close-stderr
+Causes the standard error stream to be closed soon after start-up. This is useful when operating as a background daemon and it is therefore implied by \fI--as-server\fR and \fI--as-proxy\fR.
 .SH SEE ALSO
-E-MailRelay user guide, http://emailrelay.sourceforge.net/userguide.html .
-.br
-E-MailRelay reference, http://emailrelay.sourceforge.net/reference.html .
-.br
 .BR emailrelay-submit (1),
 .BR emailrelay-passwd (1),
 .SH AUTHOR