testing/exim: add utf8 support with libidn, dsearch and apsswd lookup modules are moved to main binary, some cleanups.

5 files changed, 33 insertions, 50 deletions

diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD
index 45054a9f76..ff9dafcc75 100644
--- a/testing/exim/APKBUILD
+++ b/testing/exim/APKBUILD
@@ -1,28 +1,27 @@
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Contributor: Jesse Young <jlyo@jlyo.org>
 # Maintainer: Jesse Young <jlyo@jlyo.org>
 pkgname=exim
 pkgver=4.86
-pkgrel=1
+pkgrel=2
 pkgdesc="A Message Transfer Agent"
 url="http://www.exim.org/"
 arch="all"
 license="GPL2"
 options="suid"
 depends=
-pkgusers="mail"
-pkggroups="mail"
-depends_dev="db-dev pcre-dev openssl-dev libspf2-dev mariadb-dev postgresql-dev sqlite-dev"
-makedepends="bash gawk perl $depends_dev"
+pkgusers="exim"
+pkggroups="exim"
+depends_dev=""
+makedepends="bash gawk perl $depends_dev db-dev pcre-dev openssl-dev libspf2-dev mariadb-dev postgresql-dev sqlite-dev libidn-dev"
 install="exim.pre-install exim.post-upgrade"
-subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-dsearch $pkgname-passwd $pkgname-sqlite $pkgname-mysql $pkgname-postgresql $pkgname-utils $pkgname-scripts $pkgname-doc"
+subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $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
-	exim.logrotate
-	exim.pre-install
-	exim.post-upgrade"
+	exim.logrotate"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -54,8 +53,8 @@ package() {
 	install -m644 -D "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -m750 -D -g mail -d "$pkgdir"/usr/lib/exim
-	install -m750 -D -o mail -d "$pkgdir"/var/log/exim
+	install -m750 -D -g exim -d "$pkgdir"/usr/lib/exim
+	install -m750 -D -o exim -d "$pkgdir"/var/log/exim
 }
 
 scripts() {
@@ -115,39 +114,21 @@ dnsdb() {
 	_inst_lookup dnsdb
 }
 
-passwd() {
-	pkgdesc="passwd support for exim"
-	depends="exim"
-	_inst_lookup passwd
-}
-
-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="797f248ef3e0c0e2f178e915f88fc4e9  exim-4.86.tar.bz2
-73b2641c77c2ce07d935afe39ebd0084  exim.Makefile
+85348d0fed6b35f5c0b4241023269a19  exim.Makefile
 7fac36b4683fe9e2bd1969ebfded4206  exim.confd
-6c7ea5b5d180e398f3fb0dd0c5f3b22f  exim.initd
-2aeee003b9526472608bdc4194fb95de  exim.logrotate
-5d98a55beab23793dfa503995aa29905  exim.pre-install
-038f3285d40f49512fdf178758ccbe5b  exim.post-upgrade"
+7145f5f92ee5cea37b90576e61195cb1  exim.initd
+2eff3af519bdf8acf0292fffe89871a5  exim.logrotate"
 sha256sums="f1ccf2ce2ea51b7fbbf160e7e0e41d24ca401cf44a185128ad99ea04635fc456  exim-4.86.tar.bz2
-e522e9fb0753ef4becc32b9f6e476b25643b8232519b1bedaf90034d01fe68e0  exim.Makefile
+9afac834b73fe6cdf3b45efdb89428a790e2a2b68bdbaafecd8d9fcfbe2ef35d  exim.Makefile
 02ccb013b3f29183969dceb2dc1285cfacc18b1e8a8a052ace7bc85171ea1a27  exim.confd
-171171b454d51b861c30c9ce84af8885d79ac0f287799290dfdda53f3a6cbe7e  exim.initd
-71aa7865eea47bb65737cf65e01a73054f34d2feab23d5905619ca1c079041d6  exim.logrotate
-50dc0ed25acce493f87057530de2ca110eaa218b59cc1bba0f08f881d6660a1a  exim.pre-install
-4426e7962f027bcf4808d96ee37f2de148030e42ada6cabddcc05e765ac7f3ec  exim.post-upgrade"
+4872b9bb29ee3cf06e71ef0e3c703279ab8ef46f72153b61fb9ce93fcb63a3fd  exim.initd
+b5a6d449cb1998beb44d4144ef97e66a98b46d164445989a6d624c80549f24bc  exim.logrotate"
 sha512sums="0b90cd1b4d99bbb976336ccf9c2c3375f453a74bb306f1b0215f7ecca80fbda83cf5cc38c502516c2903c5d753f1f559c534fc4f4b1b32ee3300db86de6610ab  exim-4.86.tar.bz2
-afd8a7969bcfa7a51fd8012e3f1127b9f00219e09dba4bae95f402083cdc99746a58818cb5943eb601ad5bfbc2ca8e1fd8b8b1bb6015c5b79e02da4bf09c0349  exim.Makefile
+0a3d5908f397c34c21e8a82c8d5d5e02644f30e7323f1da7acce2ebe74918da5eefe04945a5a0f3edf21881d04d1bf1e470e6bac5b6de930a6b82a4e012ce7a5  exim.Makefile
 dfc5e5e266c8a249728c7924f66223eadadf69e38b7ad3ae41197fcdb545a4c3a835939941dff41a948f7e26cbab9d5f1a8c412d27b87a0596c0f9d4f0e43eec  exim.confd
-afcd96eab622c02897d9e0d79dc34aa3f67b0153b1019f6338f3574d8bc59093e791208b6d2785299dd2fc86cab2d5226c1cc2e6b4aca7302914f7d2e06eb901  exim.initd
-b5d197c7da4318d2040395fe7eb9046442604a695530fc861594d0cb38e6ad7f5e56ac1204639c18ac93a005f56ea3d8054ac5c823c54c4cc21fd77266080407  exim.logrotate
-37464fb55f58db11799df2b0a95cf5d6ef4ad2ca9951d970a5261d59aa008d0db5d3310d33ff6dacddef885d387f6c8482bd1d6025826d1dc4d9afc21af02731  exim.pre-install
-dc79ba01166b0ca7bcb94eb55492daeafc5031ce1901d6908b585fd3b3625cb4ebfcb4b11b12ce204e04bbcffb33ea44c8a93f580e22a8ad812909744d6d67dd  exim.post-upgrade"
+0be62b48d5df089bd28445e6a679d40bf303baccb94b9f94a89df455996973a897dc2506b15272658a3e828fb274a64d5368988ba6d604388153fd1339fa3138  exim.initd
+28e748693a6a72d9943fa9c342ff041fe650fa6977f468dee127e845e6c2a91872ce33fb6f5698838906bde3ed92de7a91cdb0349cedc40b806261867e8c06cb  exim.logrotate"
diff --git a/testing/exim/exim.Makefile b/testing/exim/exim.Makefile
index 2f90c447b5..68d21d8c7b 100644
--- a/testing/exim/exim.Makefile
+++ b/testing/exim/exim.Makefile
@@ -1,6 +1,6 @@
 BIN_DIRECTORY=/usr/sbin
 CONFIGURE_FILE=/etc/exim/exim.conf
-EXIM_USER=ref:mail
+EXIM_USER=ref:exim
 SPOOL_DIRECTORY=/var/spool/exim
 ROUTER_ACCEPT=yes
 ROUTER_DNSLOOKUP=yes
@@ -19,10 +19,10 @@ LOOKUP_MODULE_DIR=/usr/lib/exim/
 CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
 LOOKUP_DBM=2
 LOOKUP_LSEARCH=yes
-LOOKUP_DSEARCH=2
+LOOKUP_DSEARCH=yes
 LOOKUP_CDB=2
 LOOKUP_DNSDB=2
-LOOKUP_PASSWD=2
+LOOKUP_PASSWD=yes
 LOOKUP_MYSQL=2
 LOOKUP_MYSQL_INCLUDE=-I/usr/include/mysql
 LOOKUP_MYSQL_LIBS=-lmysqlclient
@@ -42,6 +42,8 @@ EXPERIMENTAL_PROXY=yes
 EXPERIMENTAL_CERTNAMES=yes
 EXPERIMENTAL_DANE=yes
 EXPERIMENTAL_SOCKS=yes
+EXPERIMENTAL_INTERNATIONAL=yes
+LDFLAGS += -lidn
 FIXED_NEVER_USERS=root
 AUTH_CRAM_MD5=yes
 AUTH_DOVECOT=yes
@@ -52,7 +54,7 @@ HEADERS_CHARSET="ISO-8859-1"
 EXTRALIBS_EXIM=-export-dynamic -rdynamic -ldl 
 SUPPORT_TLS=yes
 USE_OPENSSL_PC=openssl
-LOG_FILE_PATH=syslog:/var/log/exim/%slog
+LOG_FILE_PATH=/var/log/exim/%slog
 SYSLOG_LOG_PID=no
 EXICYCLOG_MAX=10
 COMPRESS_COMMAND=/bin/gzip
@@ -63,7 +65,7 @@ NO_SYMLINK=yes
 SYSTEM_ALIASES_FILE=/etc/mail/aliases
 TMPDIR="/tmp"
 MAKE_SHELL=/bin/bash
-PID_FILE_PATH=/var/run/exim.pid
+PID_FILE_PATH=/run/exim.pid
 HAVE_IPV6=YES
 CONFIGURE_FILE_USE_NODE=yes
 CONFIGURE_FILE_USE_EUID=yes
diff --git a/testing/exim/exim.initd b/testing/exim/exim.initd
index 15a74897d7..ef0ddc5a73 100644
--- a/testing/exim/exim.initd
+++ b/testing/exim/exim.initd
@@ -1,10 +1,9 @@
 #!/sbin/openrc-run
 
-name="$SVCNAME"
-pidfile="/var/run/$SVCNAME.pid"
-command="/usr/sbin/$SVCNAME"
+pidfile="/run/exim.pid"
+command="/usr/sbin/exim"
 command_args="${EXIM_OPTS:--bd -q15m}"
-required_files="/etc/exim/${SVCNAME}.conf"
+required_files="/etc/exim/exim.conf"
 extra_started_commands="reload"
 
 depend() {
diff --git a/testing/exim/exim.logrotate b/testing/exim/exim.logrotate
index 4b75dae2a3..fb5f5d07d2 100644
--- a/testing/exim/exim.logrotate
+++ b/testing/exim/exim.logrotate
@@ -5,7 +5,7 @@
 	compress
 	delaycompress
 	notifempty
-	create 640 mail mail
+	create 640 exim mail
 	sharedscripts
 	postrotate
 		/etc/init.d/exim --quiet --ifstarted reload
diff --git a/testing/exim/exim.pre-install b/testing/exim/exim.pre-install
index c06f297e91..9edcbc81ef 100644
--- a/testing/exim/exim.pre-install
+++ b/testing/exim/exim.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-addgroup -S -g 12 mail > /dev/null 2>&1
-adduser  -S -u 8 -h /var/spool/mail -s /sbin/nologin -g mail -G mail -D mail > /dev/null 2>&1
+addgroup -S exim 2>/dev/null
+adduser  -H -S -u 43 -h /var/spool/exim -s /sbin/nologin -g Exim -G exim -D exim 2>/dev/null
+addgroup exim mail 2>/dev/null
 
 exit 0