4 files changed, 26 insertions, 29 deletions
diff --git a/network/exim/exim-4.82.1-version.patch b/network/exim/exim-4.82.1-version.patch
deleted file mode 100644
index 8f24defd08..0000000000
--- a/network/exim/exim-4.82.1-version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -u -r exim-4.82.1-orig/src/version.sh exim-4.82.1/src/version.sh
---- exim-4.82.1-orig/src/version.sh	2014-05-26 22:45:04.000000000 +0200
-+++ exim-4.82.1/src/version.sh	2014-05-28 16:14:14.952290924 +0200
-@@ -1,4 +1,4 @@
- # automatically generated file - see ../scripts/reversion
--EXIM_RELEASE_VERSION="4.82"
--EXIM_VARIANT_VERSION="_1-5b7a7c0-XX"
-+EXIM_RELEASE_VERSION="4.82.1"
-+EXIM_VARIANT_VERSION=""
- EXIM_COMPILE_NUMBER="1"
diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile
index 8340b38c72..f4834c0dd0 100644
--- a/network/exim/exim.Makefile
+++ b/network/exim/exim.Makefile
@@ -425,6 +425,17 @@ WITH_CONTENT_SCAN=yes
 
 # DISABLE_DKIM=yes
 
+#------------------------------------------------------------------------------
+# Uncomment the following line to remove Per-Recipient-Data-Response support.
+
+# DISABLE_PRDR=yes
+
+#------------------------------------------------------------------------------
+# Uncomment the following line to remove OCSP stapling support in TLS,
+# from Exim.  Note it can only be supported when built with
+# GnuTLS 3.1.3 or later, or OpenSSL
+
+# DISABLE_OCSP=yes
 
 #------------------------------------------------------------------------------
 # By default, Exim has support for checking the AD bit in a DNS response, to
@@ -470,19 +481,12 @@ WITH_CONTENT_SCAN=yes
 # CFLAGS  += -I/opt/brightmail/bsdk-6.0/include
 # LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib
 
-# Uncomment the following line to add OCSP stapling support in TLS, if Exim
-# was built using OpenSSL.
-
-# EXPERIMENTAL_OCSP=yes
-
 # Uncomment the following line to add DMARC checking capability, implemented
 # using libopendmarc libraries.
 # EXPERIMENTAL_DMARC=yes
 # CFLAGS += -I/usr/local/include
 # LDFLAGS += -lopendmarc
 
-# Uncomment the following line to add Per-Recipient-Data-Response support.
-# EXPERIMENTAL_PRDR=yes
 
 # Uncomment the following line to support Transport post-delivery actions,
 # eg. for logging to a database.
@@ -495,6 +499,15 @@ WITH_CONTENT_SCAN=yes
 # CFLAGS += -I/usr/local/include
 # LDFLAGS += -lhiredis
 
+# Uncomment the following line to enable Experimental Proxy Protocol
+# EXPERIMENTAL_PROXY=yes
+
+# Uncomment the following line to enable support for checking certiticate
+# ownership
+# EXPERIMENTAL_CERTNAMES=yes
+
+# Uncomment the following line to add DSN support
+# EXPERIMENTAL_DSN=yes
 
 ###############################################################################
 #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild
index c6296dfcd9..02c9647eea 100644
--- a/network/exim/exim.SlackBuild
+++ b/network/exim/exim.SlackBuild
@@ -1,5 +1,4 @@
 #!/bin/sh
-# vim: ts=2 sts=2 sw=2 et
 
 # Slackware build script for Exim
 
@@ -24,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exim
-VERSION=${VERSION:-4.82.1}
+VERSION=${VERSION:-4.83}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,10 +72,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# change version string from CVS identifier to official version
-test "$VERSION" = "4.82.1" && patch -p1 < $CWD/exim-4.82.1-version.patch || true
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # This is our custom config for an all-purpose Exim daemon.
 # The SQL- and LDAP-lookups will not be built by default,
@@ -129,9 +125,7 @@ mkdir -p -m 0750 $PKG/var/spool/exim/{db,input,msglog}
 chown -R exim.exim $PKG/var/{log,spool}/exim
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ABOUT ACKNOWLEDGMENTS CHANGES LICENCE NOTICE README* doc \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT ACKNOWLEDGMENTS CHANGES LICENCE NOTICE README* doc $PKG/usr/doc/$PRGNAM-$VERSION
 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 a68a1d66f6..bec6ddb531 100644
--- a/network/exim/exim.info
+++ b/network/exim/exim.info
@@ -1,8 +1,8 @@
 PRGNAM="exim"
-VERSION="4.82.1"
+VERSION="4.83"
 HOMEPAGE="http://www.exim.org/"
-DOWNLOAD="ftp://ftp.exim.org/pub/exim/exim4/exim-4.82.1.tar.bz2"
-MD5SUM="4544696ce6689ba9141a0697f25a74cb"
+DOWNLOAD="ftp://ftp.exim.org/pub/exim/exim4/exim-4.83.tar.bz2"
+MD5SUM="fc6790f346a50a3c87be96b335b9c8ae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""