6 files changed, 56 insertions, 42 deletions
diff --git a/network/exim/contrib/exim.logrotate b/network/exim/contrib/exim.logrotate
index 36b542b5f4..9653b546d8 100644
--- a/network/exim/contrib/exim.logrotate
+++ b/network/exim/contrib/exim.logrotate
@@ -1,8 +1,8 @@
 /var/log/exim/*.log {
-    missingok
-    notifempty
-    sharedscripts
-    postrotate
-        /bin/kill -HUP $(cat /var/run/exim.pid 2>/dev/null) 2>/dev/null || /usr/bin/true
-    endscript
+	missingok
+	notifempty
+	sharedscripts
+	postrotate
+		pkill -F /var/run/exim.pid -HUP > /dev/null 2>&1 || true
+	endscript
 }
diff --git a/network/exim/contrib/rc.exim b/network/exim/contrib/rc.exim
new file mode 100644
index 0000000000..d448ddd708
--- /dev/null
+++ b/network/exim/contrib/rc.exim
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Run SMTP listening daemon, do queue runs every 10 mins.
+EXIM_ARGS="-bd -q10m"
+
+# Read alternative EXIM_ARGS line from /etc/default/exim.
+test -f /etc/default/exim && source /etc/default/exim
+
+case "$1" in
+  start)
+    echo "starting exim"
+    /usr/sbin/exim $EXIM_ARGS
+    ;;
+  stop)
+    echo "stopping exim"
+    pkill -F /var/run/exim.pid
+    ;;
+  reload)
+    echo "reloading exim"
+    pkill -F /var/run/exim.pid -HUP
+    ;;
+  restart)
+    $0 stop; sleep 2; $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|reload|restart}"
+    ;;
+esac
diff --git a/network/exim/contrib/rc.exim.new b/network/exim/contrib/rc.exim.new
deleted file mode 100644
index 3fb62f1bf3..0000000000
--- a/network/exim/contrib/rc.exim.new
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Start/stop/restart the Exim MTA
-
-# Run as SMTP listener daemon, do queue runs every 15 mins.
-EXIM_ARGS="-bd -q15m"
-
-case "$1" in
-  start)
-    echo "Starting Exim"
-    /usr/sbin/exim $EXIM_ARGS
-    ;;
-  stop)
-    echo "Stopping Exim"
-    pkill -f /usr/sbin/exim
-    ;;
-  reload)
-    echo "Reloading Exim config"
-    pkill -HUP -f /usr/sbin/exim
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart}"
-    ;;
-esac
diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile
index 858396440a..1f6fb19c4d 100644
--- a/network/exim/exim.Makefile
+++ b/network/exim/exim.Makefile
@@ -192,6 +192,11 @@ SPOOL_DIRECTORY=/var/spool/exim
 # least one type of lookup. You should consider whether you want to build
 # the Exim monitor or not.
 
+# If you need to override how pkg-config finds configuration files for
+# installed software, then you can set that here; wildcards will be expanded.
+
+# PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig : /opt/*/lib/pkgconfig
+
 
 #------------------------------------------------------------------------------
 # These settings determine which individual router drivers are included in the
@@ -488,6 +493,7 @@ WITH_CONTENT_SCAN=yes
 # Uncomment the following line to add DMARC checking capability, implemented
 # using libopendmarc libraries.  You must have SPF support enabled also.
 # EXPERIMENTAL_DMARC=yes
+# DMARC_TLD_FILE= /etc/exim/opendmarc.tlds
 # CFLAGS += -I/usr/local/include
 # LDFLAGS += -lopendmarc
 
@@ -1116,6 +1122,13 @@ USE_READLINE=yes
 # Note that this option adds to the size of the Exim binary, because the
 # dynamic loading library is not otherwise included.
 
+# If libreadline is not in the normal library paths, then because Exim is
+# setuid you'll need to ensure that the correct directory is stamped into
+# the binary so that dlopen will find it.
+# Eg, on macOS/Darwin with a third-party install of libreadline, perhaps:
+
+# EXTRALIBS_EXIM+=-Wl,-rpath,/usr/local/opt/readline/lib
+
 
 #------------------------------------------------------------------------------
 # Uncomment this setting to include IPv6 support.
diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild
index 7fe8b2e3cf..3d82fd21e8 100644
--- a/network/exim/exim.SlackBuild
+++ b/network/exim/exim.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exim
-VERSION=${VERSION:-4.89.1}
+VERSION=${VERSION:-4.90}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,7 +57,7 @@ fi
 set -e
 
 # Check if the exim user and group exist. If not, then bail.
-if [ "$(id -g exim 2> /dev/null)" != "222" -o "$(id -u exim 2> /dev/null)" != "222" ]; then
+if [ -z "$(getent group exim)" -o -z "$(getent passwd exim)" ]; then
   echo "  You must have an 'exim' user and group to run this script."
   echo "    # groupadd -g 222 exim"
   echo "    # useradd -d /var/spool/exim -g exim -s /bin/false -u 222 exim"
@@ -109,7 +109,7 @@ mkdir -p $PKG/usr/lib     # no LIBDIRSUFFIX here!
 
 # Install accompanying scripts and configs.
 mkdir -p $PKG/etc/{cron.daily,logrotate.d,rc.d}
-install -m 0755 $CWD/contrib/rc.exim.new    $PKG/etc/rc.d/rc.exim.new
+install -m 0644 $CWD/contrib/rc.exim        $PKG/etc/rc.d/rc.exim.new
 install -m 0755 $CWD/contrib/exim.cron      $PKG/etc/cron.daily/exim.new
 install -m 0644 $CWD/contrib/exim.logrotate $PKG/etc/logrotate.d/exim.new
 
@@ -121,8 +121,9 @@ chown -R exim.exim $PKG/var/{log,spool}/exim
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  $CWD/README.SBo ABOUT ACKNOWLEDGMENTS CHANGES CONTRIBUTING LICENCE* NOTICE README* doc \
+  ABOUT ACKNOWLEDGMENTS CHANGES CONTRIBUTING LICENCE* NOTICE README* doc \
   $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README.SBo > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Don't use the default config - make it part of the documentation.
diff --git a/network/exim/exim.info b/network/exim/exim.info
index cab0603154..df9aff1f98 100644
--- a/network/exim/exim.info
+++ b/network/exim/exim.info
@@ -1,8 +1,8 @@
 PRGNAM="exim"
-VERSION="4.89.1"
-HOMEPAGE="http://www.exim.org/"
-DOWNLOAD="ftp://ftp.exim.org/pub/exim/exim4/exim-4.89.1.tar.xz"
-MD5SUM="e5d48403fc93cd1ff2d3124c15af6018"
+VERSION="4.90"
+HOMEPAGE="https://www.exim.org/"
+DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.90.tar.xz"
+MD5SUM="02aad0b2692968ba7ea96d6e4253b898"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"