network/exim: Updated for version 4.95.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 42 insertions, 39 deletions

diff --git a/network/exim/README.SBo b/network/exim/README.SBo
index b72f41afb405..c05477c70700 100644
--- a/network/exim/README.SBo
+++ b/network/exim/README.SBo
@@ -27,6 +27,6 @@ For including the JSON, PostgreSQL and Redis lookups you'll need the
 "jansson", "hiredis" and "postgresql" packages respectively, all available
 from SlackBuilds.org.
 
-WARNING: this package is intended as a drop-in replacement for Sendmail.
+WARNING: this package is intended as a drop-in replacement for Postfix.
 As a result, there are some inevitable filename conflicts between
-Sendmail and Exim. REMOVE SENDMAIL BEFORE INSTALLING THIS PACKAGE!
+Postfix and Exim. REMOVE POSTFIX BEFORE INSTALLING THIS PACKAGE!
diff --git a/network/exim/contrib/exim.cron b/network/exim/contrib/exim.cron
index b4b7751ea86e..ca15f5bb1704 100644
--- a/network/exim/contrib/exim.cron
+++ b/network/exim/contrib/exim.cron
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Exim's spool directory
 SPOOL=/var/spool/exim
diff --git a/network/exim/contrib/rc.exim b/network/exim/contrib/rc.exim
index d448ddd70839..72ff9cccd1d9 100644
--- a/network/exim/contrib/rc.exim
+++ b/network/exim/contrib/rc.exim
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Run SMTP listening daemon, do queue runs every 10 mins.
 EXIM_ARGS="-bd -q10m"
diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile
index fd9b38fd6ee2..edd9de5a7eb9 100644
--- a/network/exim/exim.Makefile
+++ b/network/exim/exim.Makefile
@@ -198,7 +198,7 @@ SPOOL_DIRECTORY=/var/spool/exim
 # the libraries and headers are installed, as the pkg-config .pc
 # specification should include all -L/-I information necessary.
 # Enabling the USE_*_PC options should be sufficient. If not using
-# pkg-config, then you have to specify the libraries, and you mmight
+# pkg-config, then you have to specify the libraries, and you might
 # need to specify the locations too.
 
 # Uncomment the following lines if you want
@@ -207,7 +207,7 @@ SPOOL_DIRECTORY=/var/spool/exim
 # Unless you do this, you must define one of USE_OPENSSL or USE_GNUTLS
 # below.
 
-# If you are buliding with TLS, the library configuration must be done:
+# If you are building with TLS, the library configuration must be done:
 
 # Uncomment this if you are using OpenSSL
 USE_OPENSSL=yes
@@ -276,6 +276,9 @@ USE_OPENSSL_PC=openssl
 # specified in INCLUDE.
 
 
+# Uncomment the following line to remove support for TLS Resumption
+# DISABLE_TLS_RESUME=yes
+
 
 ###############################################################################
 #           THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY                     #
@@ -412,6 +415,8 @@ LOOKUP_DSEARCH=yes
 # LOOKUP_JSON=yes
 LOOKUP_JSON_PC=jansson
 # LOOKUP_LDAP=yes
+# LOOKUP_LMDB=yes
+
 # LOOKUP_MYSQL=yes
 # LOOKUP_MYSQL_PC=mariadb
 # LOOKUP_NIS=yes
@@ -490,7 +495,8 @@ SUPPORT_DANE=yes
 # You do not need to use this for any lookup information added via pkg-config.
 
 # LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
+# LOOKUP_INCLUDE +=-I /usr/local/include
+# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 -llmdb
 
 # ...or just enable your favourite lookups and let GNUmake handle the rest
 
@@ -574,7 +580,6 @@ DISABLE_MAL_MKS=yes
 # DISABLE_DNSSEC=yes
 
 # To disable support for Events set DISABLE_EVENT to "yes"
-
 # DISABLE_EVENT=yes
 
 
@@ -583,6 +588,14 @@ DISABLE_MAL_MKS=yes
 # DISABLE_PIPE_CONNECT=yes
 
 
+# Uncomment the following to remove the fast-ramp two-phase-queue-run support
+# DISABLE_QUEUE_RAMP=yes
+
+# Uncomment the following lines to add SRS (Sender Rewriting Scheme) support
+# using only native facilities.  See EXPERIMENTAL_SRS_ALT for an alternative.
+# SUPPORT_SRS=yes
+
+
 #------------------------------------------------------------------------------
 # Compiling Exim with experimental features. These are documented in
 # experimental-spec.txt. "Experimental" means that the way these features are
@@ -594,21 +607,20 @@ DISABLE_MAL_MKS=yes
 
 # EXPERIMENTAL_DCC=yes
 
-# Uncomment the following lines to add SRS (Sender rewriting scheme) support.
+# Uncomment the following lines to add SRS (Sender rewriting scheme) support
+# using the implementation in linbsrs_alt.
 # You need to have libsrs_alt installed on your system (srs.mirtol.com).
 # Depending on where it is installed you may have to edit the CFLAGS and
 # LDFLAGS lines.
 
-# EXPERIMENTAL_SRS=yes
+# EXPERIMENTAL_SRS_ALT=yes
 # CFLAGS  += -I/usr/local/include
 # LDFLAGS += -lsrs_alt
 
-# Uncomment the following lines to add SRS (Sender rewriting scheme) support
-# using only native facilities.
-# EXPERIMENTAL_SRS_NATIVE=yes
-
 # Uncomment the following line to add DMARC checking capability, implemented
 # using libopendmarc libraries. You must have SPF and DKIM support enabled also.
+# Library version libopendmarc-1.4.1-1.fc33.x86_64  (on Fedora 33) is known broken;
+# 1.3.2-3 works.  I seems that the OpenDMARC project broke their API.
 # SUPPORT_DMARC=yes
 # CFLAGS += -I/usr/local/include
 # LDFLAGS += -lopendmarc
@@ -632,22 +644,9 @@ DISABLE_MAL_MKS=yes
 # Uncomment the following to include extra information in fail DSN message (bounces)
 # EXPERIMENTAL_DSN_INFO=yes
 
-# Uncomment the following to add LMDB lookup support
-# You need to have LMDB installed on your system (https://github.com/LMDB/lmdb)
-# Depending on where it is installed you may have to edit the CFLAGS and LDFLAGS lines.
-# EXPERIMENTAL_LMDB=yes
-# CFLAGS += -I/usr/local/include
-# LDFLAGS += -llmdb
-
 # Uncomment the following line to add queuefile transport support
 # EXPERIMENTAL_QUEUEFILE=yes
 
-# Uncomment the following line to include support for TLS Resumption
-# EXPERIMENTAL_TLS_RESUME=yes
-
-# Uncomment the following to include the fast-ramp two-phase-queue-run support
-# EXPERIMENTAL_QUEUE_RAMP=yes
-
 ###############################################################################
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
 ###############################################################################
@@ -763,6 +762,13 @@ FIXED_NEVER_USERS=root
 
 # WHITELIST_D_MACROS=TLS:SPOOL
 
+# The next setting enables a main config option
+# "allow_insecure_tainted_data" to turn taint failures into warnings.
+# Though this option is new, it is deprecated already now, and will be
+# ignored in future releases of Exim. It is meant as mitigation for
+# upgrading old (possibly insecure) configurations to more secure ones.
+ALLOW_INSECURE_TAINTED_DATA=yes
+
 #------------------------------------------------------------------------------
 # Exim has support for the AUTH (authentication) extension of the SMTP
 # protocol, as defined by RFC 2554. If you don't know what SMTP authentication
diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild
index 68a6d239e4d6..04150351181b 100644
--- a/network/exim/exim.SlackBuild
+++ b/network/exim/exim.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Exim
 
-# Copyright 2012-2021 Thomas Morper, Nürnberg, Germany
+# Copyright 2012-2022 Thomas Morper, Nürnberg, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=exim
-VERSION=${VERSION:-4.94.2}
+VERSION=${VERSION:-4.95}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,11 +38,8 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" | sed 's/-RC/_RC/'
   exit 0
 fi
 
@@ -108,8 +105,8 @@ mv $(readlink -f $PKG/usr/sbin/exim) $PKG/usr/sbin/exim
 
 # Additional symlinks provide compatibility with sendmail.
 mkdir -p $PKG/usr/lib     # no LIBDIRSUFFIX here!
-( cd $PKG/usr/lib;  ln -s /usr/sbin/exim sendmail )
-( cd $PKG/usr/sbin; ln -s /usr/sbin/exim sendmail )
+ln -s ../sbin/exim $PKG/usr/lib/sendmail
+ln -s exim $PKG/usr/sbin/sendmail
 
 # Install accompanying scripts and configs.
 mkdir -p $PKG/etc/{cron.daily,logrotate.d,rc.d}
@@ -139,7 +136,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Adjust version info for release candidates.
-VERSION=${VERSION/-/_}
+VERSION=${VERSION/-RC/_RC}
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/exim/exim.info b/network/exim/exim.info
index 4fde761f5d98..1833d9e0b876 100644
--- a/network/exim/exim.info
+++ b/network/exim/exim.info
@@ -1,8 +1,8 @@
 PRGNAM="exim"
-VERSION="4.94.2"
+VERSION="4.95"
 HOMEPAGE="https://www.exim.org/"
-DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.94.2.tar.xz"
-MD5SUM="4fbf1ebb36f0f43bb94ed0848eb13256"
+DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.95.tar.xz"
+MD5SUM="b57515d34e97b0be12f7d38d316b15eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"