testing/exim: Update to 4.86

3 files changed, 50 insertions, 23 deletions

diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD
index 8971d39775b..e5a72bfb248 100644
--- a/testing/exim/APKBUILD
+++ b/testing/exim/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jesse Young <jlyo@jlyo.org>
 # Maintainer: Jesse Young <jlyo@jlyo.org>
 pkgname=exim
-pkgver=4.85
-pkgrel=1
+pkgver=4.86
+pkgrel=0
 pkgdesc="A Message Transfer Agent"
 url="http://www.exim.org/"
 arch="all"
@@ -15,8 +15,8 @@ pkggroups="mail"
 depends_dev="db-dev pcre-dev openssl-dev libspf2-dev mariadb-dev postgresql-dev sqlite-dev"
 makedepends="bash gawk perl $depends_dev"
 install="exim.pre-install"
-subpackages="$pkgname-cdb $pkgname-dnsdb $pkgname-passwd $pkgname-sqlite $pkgname-mysql $pkgname-postgresql $pkgname-utils $pkgname-scripts $pkgname-doc"
-source="ftp://exim.inode.at/exim/exim4/$pkgname-$pkgver.tar.bz2
+subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-dsearch $pkgname-lsearch $pkgname-passwd $pkgname-sqlite $pkgname-mysql $pkgname-postgresql $pkgname-utils $pkgname-scripts $pkgname-doc"
+source="ftp://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.bz2
 	exim.Makefile
 	exim.confd
 	exim.initd
@@ -62,7 +62,7 @@ scripts() {
 	arch="noarch"
 	cd "$_builddir"
 	make	DESTDIR="$subpkgdir" \
-		INSTALL_ARG="exicyclog exim_checkaccess eximstats exiqgrep exigrep exinext exiqsumm exipick exiwhat" \
+		INSTALL_ARG="exicyclog exim_checkaccess eximstats exiqgrep exigrep exinext exiqsumm exipick exiwhat convert4r3 convert4r4" \
 		install || return 1
 	rm -fr "$subpkgdir"/etc
 }
@@ -101,6 +101,12 @@ cdb() {
 	_inst_lookup cdb
 }
 
+dbmdb() {
+	pkgdesc="dbmdb support for exim"
+	depends="exim"
+	_inst_lookup dbmdb
+}
+
 dnsdb() {
 	pkgdesc="dnsdb support for exim"
 	depends="exim"
@@ -113,25 +119,36 @@ passwd() {
 	_inst_lookup passwd
 }
 
+lsearch() {
+	pkgdesc="lsearch support for exim"
+	depends="exim"
+	_inst_lookup lsearch
+}
+
+dsearch() {
+	pkgdesc="dsearch support for exim"
+	depends="exim"
+	_inst_lookup dsearch
+}
+
 _inst_lookup() {
 	install -D -m755 "$_builddir"/build-Linux-*/lookups/$1.so "$subpkgdir"/usr/lib/exim/$1.so
 }
-
-md5sums="ebae28762b6f125726283dc9434e8709  exim-4.85.tar.bz2
-950c23ffa293dd50a50fc12664f62566  exim.Makefile
+md5sums="797f248ef3e0c0e2f178e915f88fc4e9  exim-4.86.tar.bz2
+0be1e158f62e640207434fd5cfabc4cd  exim.Makefile
 f442b68d435598831bab8536ade071b8  exim.confd
-90299d636a780e7585796a4b4ad45858  exim.initd
+e0fa6d1083540e714842e4b1a55d4ada  exim.initd
 2aeee003b9526472608bdc4194fb95de  exim.logrotate
 a58ceadf9f3fa8b06bbadb01bc731dc8  exim.pre-install"
-sha256sums="13211f2bbc5400d095a9b4be075eb1347e0d98676fdfe4be8a3b4d56281daaa4  exim-4.85.tar.bz2
-43ec8f9f24017eec90225678dcc13181cb7831a403773eb92b7400d396d94077  exim.Makefile
+sha256sums="f1ccf2ce2ea51b7fbbf160e7e0e41d24ca401cf44a185128ad99ea04635fc456  exim-4.86.tar.bz2
+05c4fb0c655a4129340fe7f93cabb6566fc68e1bd8b1f81a3f57ceffcf8276cb  exim.Makefile
 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401  exim.confd
-4efe727a597a35a1f1e4e4731f769a9789d979a70ea916714d6bbae67151d42f  exim.initd
+d94efedd5b36d40dc7a0b87dcc6acc01ab2886799e8b7d71a86aa81d2e01b02c  exim.initd
 71aa7865eea47bb65737cf65e01a73054f34d2feab23d5905619ca1c079041d6  exim.logrotate
 3470a7f2860b0c01549577edf446fc13cdcf3e10e1b52875eee666017227db03  exim.pre-install"
-sha512sums="2c5846528ee98e4aff5dbabe49dfa5ba6753fa64154b9671a7849db8a17773917fe13bcb9e5f732c43d7479debfadd8012b8650823eb12504a6b1b28be456161  exim-4.85.tar.bz2
-2329ab156a663c33094f675fb50763123d4f92e402e55ae1d8c21394b14b25b2c05b6bce78dd6a59e623b355304a4523928ec00a6140acd8402712b6508952c8  exim.Makefile
+sha512sums="0b90cd1b4d99bbb976336ccf9c2c3375f453a74bb306f1b0215f7ecca80fbda83cf5cc38c502516c2903c5d753f1f559c534fc4f4b1b32ee3300db86de6610ab  exim-4.86.tar.bz2
+ff4aa735c9050a7a848c6eb2be5ec38685d3f4bf4bbc005616bf3321f0d98895071e423bc590a551ffd895315e2e91446f6bc9c665aa78a52d9016ef14b8b13f  exim.Makefile
 24bae5bba1b41e59247cd7089c3f9ffcc5f4b26c3da1b21f755724a7ee5c99a05e324437c965ae86170056cc63b9bcdc41f624a747ab31b887d69cff620f2155  exim.confd
-4ba91019a63cf35cad827ef9d77e0fca6453c88c7f834da3cf5a8e251b558f61ec74eb05ad25f1c8cbbbe78c11a09924fb2fa955b69816b3e61d2f32798a7467  exim.initd
+5a656df7b15f8007114e1788bff15e87d4b113e2b46a46da24b94f8e8d5997f06d921086ea3d75761ca126829159784d3ef859d6b90a6bfcf5ec1fb370a0df11  exim.initd
 b5d197c7da4318d2040395fe7eb9046442604a695530fc861594d0cb38e6ad7f5e56ac1204639c18ac93a005f56ea3d8054ac5c823c54c4cc21fd77266080407  exim.logrotate
 6b6e85f392cd338602653b86f88daedf90a735e04f9bbcbac83df357ec881f436a74aedd91db21bd1e2e510eedea39587ae473efa7be9b75c6e2efe0472cf28d  exim.pre-install"
diff --git a/testing/exim/exim.Makefile b/testing/exim/exim.Makefile
index 431792dfbf2..a91d601a6a1 100644
--- a/testing/exim/exim.Makefile
+++ b/testing/exim/exim.Makefile
@@ -8,6 +8,7 @@ ROUTER_IPLITERAL=yes
 ROUTER_MANUALROUTE=yes
 ROUTER_QUERYPROGRAM=yes
 ROUTER_REDIRECT=yes
+ROUTER_IPLOOKUP=yes
 TRANSPORT_APPENDFILE=yes
 TRANSPORT_AUTOREPLY=yes
 TRANSPORT_PIPE=yes
@@ -16,9 +17,9 @@ TRANSPORT_LMTP=yes
 SUPPORT_MAILDIR=yes
 LOOKUP_MODULE_DIR=/usr/lib/exim/
 CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
-LOOKUP_DBM=yes
-LOOKUP_LSEARCH=yes
-LOOKUP_DSEARCH=yes
+LOOKUP_DBM=2
+LOOKUP_LSEARCH=2
+LOOKUP_DSEARCH=2
 LOOKUP_CDB=2
 LOOKUP_DNSDB=2
 LOOKUP_PASSWD=2
@@ -29,32 +30,41 @@ LOOKUP_PGSQL=2
 LOOKUP_PGSQL_INCLUDE=-I/usr/include/postgresql
 LOOKUP_PGSQL_LIBS=-lpq
 LOOKUP_SQLITE=2
-LOOKUP_SQLITE_LIBS=-lsqlite3
+LOOKUP_SQLITE_PC=sqlite3
+PCRE_CONFIG=yes
 PCRE_LIBS=-lpcre
 WITH_CONTENT_SCAN=yes
 WITH_OLD_DEMIME=yes
 EXPERIMENTAL_SPF=yes
 LDFLAGS += -lspf2
+EXPERIMENTAL_EVENT=yes
+EXPERIMENTAL_PROXY=yes
+EXPERIMENTAL_CERTNAMES=yes
+EXPERIMENTAL_DANE=yes
+EXPERIMENTAL_SOCKS=yes
 FIXED_NEVER_USERS=root
 AUTH_CRAM_MD5=yes
 AUTH_DOVECOT=yes
 AUTH_PLAINTEXT=yes
 AUTH_SPA=yes
+AUTH_TLS=yes
 HEADERS_CHARSET="ISO-8859-1"
 EXTRALIBS_EXIM=-export-dynamic -rdynamic -ldl 
 SUPPORT_TLS=yes
-TLS_LIBS=-lssl -lcrypto
+USE_OPENSSL_PC=openssl
 LOG_FILE_PATH=syslog:/var/log/exim/%slog
 SYSLOG_LOG_PID=no
 EXICYCLOG_MAX=10
 COMPRESS_COMMAND=/bin/gzip
 COMPRESS_SUFFIX=gz
-ZCAT_COMMAND=/bin/zcat
+ZCAT_COMMAND=
 EXPAND_DLFUNC=yes
 NO_SYMLINK=yes
 SYSTEM_ALIASES_FILE=/etc/mail/aliases
 TMPDIR="/tmp"
 MAKE_SHELL=/bin/bash
-MAX_NAMED_LIST=16
 PID_FILE_PATH=/var/run/exim.pid
 HAVE_IPV6=YES
+CONFIGURE_FILE_USE_NODE=yes
+CONFIGURE_FILE_USE_EUID=yes
+SUPPORT_MOVE_FROZEN_MESSAGES=yes
diff --git a/testing/exim/exim.initd b/testing/exim/exim.initd
index 1ba07a6cbe6..8e287052ca0 100644
--- a/testing/exim/exim.initd
+++ b/testing/exim/exim.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 extra_started_commands="reload"