updates exim to 4.87

5 files changed, 34 insertions, 89 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..30302d6870e5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# ignore build files
+*.pkg.tar.xz
+*.sig
+src/
+pkg/
+
+# ignore sources
+exim-*.tar.bz2
diff --git a/PKGBUILD b/PKGBUILD
index 136404dbef9b..509ae5347da5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,12 @@
-# EXIM-MYSQL (compiled with mysql support)
-# Maintainer: Fabien Wang <fabienwang@free.fr>
-# Based on exim package
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
+# exim-mysql based on exim from community
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Lukas Fleischer <lfleischer@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=exim-mysql
-pkgver=4.86
+pkgver=4.87
 pkgrel=1
 pkgdesc='Message Transfer Agent'
 arch=('x86_64' 'i686')
@@ -15,11 +14,11 @@ url='http://www.exim.org/'
 license=('GPL')
 backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim)
 install=exim.install
-depends=('gdbm' 'pcre' 'pam' 'openssl' 'libldap' 'libmysqlclient' 'sqlite3' 'tcp_wrappers')
+depends=('gdbm' 'pcre' 'pam' 'openssl' 'libldap' 'libmysqlclient')
 provides=('smtp-server' 'smtp-forwarder')
-conflicts=('smtp-server' 'smtp-forwarder')
+conflicts=('exim' 'smtp-server' 'smtp-forwarder')
 options=('!makeflags')
-source=(http://exim.mirror.fr/exim/exim4/exim-${pkgver}.tar.gz
+source=(http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2
         aliases
         exim.logrotate
         exim.Makefile
@@ -28,74 +27,11 @@ source=(http://exim.mirror.fr/exim/exim4/exim-${pkgver}.tar.gz
         exim@.service
         exim.socket
         exim-submission.socket)
-md5sums=('4dca35aac41aefef9d6e98fe337d55a2'
-         '4874006f0585253ddab027d441009757'
-         'e18a535218718c5eb394ed5c9296fe06'
-         '2675c17fa9e5bb63c0862fe6fa633377'
-         '88cf76405367a6ed371d05db1d3c9565'
-         'be8fdcf7b2d6b6368a21705e69743265'
-         '6f5a5c2b0835b33f59d2513cce18c65b'
-         '101a726e4d3f4d0074710273f9808022'
-         '11b319ba0bd84911fa70e9bef2190715')
 
 build() {
   cd exim-$pkgver
 
-  echo "
-BIN_DIRECTORY=/usr/bin
-CONFIGURE_FILE=/etc/mail/exim.conf
-EXIM_USER=exim
-EXIM_GROUP=exim
-SPOOL_DIRECTORY=/var/spool/exim
-INCLUDE=-I/usr/include
-ROUTER_ACCEPT=yes
-ROUTER_DNSLOOKUP=yes
-ROUTER_IPLITERAL=yes
-ROUTER_MANUALROUTE=yes
-ROUTER_QUERYPROGRAM=yes
-ROUTER_REDIRECT=yes
-TRANSPORT_APPENDFILE=yes
-TRANSPORT_AUTOREPLY=yes
-TRANSPORT_PIPE=yes
-TRANSPORT_SMTP=yes
-SUPPORT_MAILDIR=yes
-LOOKUP_DBM=yes
-LOOKUP_LSEARCH=yes
-LOOKUP_MYSQL=yes
-LOOKUP_SQLITE=yes
-PCRE_LIBS=-lpcre
-LOOKUP_INCLUDE=-I /usr/include/mysql
-LOOKUP_LIBS=-L/usr/lib -lmysqlclient -lsqlite3
-WITH_CONTENT_SCAN=yes
-FIXED_NEVER_USERS=root
-AUTH_CRAM_MD5=yes
-AUTH_DOVECOT=yes
-AUTH_PLAINTEXT=yes
-AUTH_SPA=yes
-HEADERS_CHARSET=\"UTF-8\"
-SUPPORT_TLS=yes
-TLS_LIBS=-L/usr/lib -lssl -lcrypto
-TLS_INCLUDE=-I/usr/include/openssl
-LOG_FILE_PATH=/var/log/exim/%slog
-COMPRESS_COMMAND=/bin/gzip
-COMPRESS_SUFFIX=gz
-ZCAT_COMMAND=/bin/zcat
-SUPPORT_PAM=yes
-CFLAGS=-O -I/usr/include
-EXTRALIBS_EXIM=-L/usr/lib -lwrap -lpam
-SYSTEM_ALIASES_FILE=/etc/mail/aliases
-CHOWN_COMMAND=/bin/chown
-CHGRP_COMMAND=/bin/chgrp
-CHMOD_COMMAND=/bin/chmod
-MV_COMMAND=/bin/mv
-RM_COMMAND=/bin/rm
-TOUCH_COMMAND=/bin/touch
-PERL_COMMAND=/usr/bin/perl
-TMPDIR=\"/tmp\"
-PID_FILE_PATH=/var/run/exim.pid
-MAX_NAMED_LIST=16
-SUPPORT_MOVE_FROZEN_MESSAGES=yes">"Local/Makefile"
-
+  cp ../exim.Makefile Local/Makefile
   make
 }
 
@@ -109,6 +45,8 @@ package() {
     "$pkgdir"/var/log/exim "$pkgdir"/usr/{lib,bin}
 
   chmod 770 "$pkgdir"/var/spool/exim{,/db} "$pkgdir"/var/log/exim
+  chown 0:79 "$pkgdir"/var/spool/exim "$pkgdir"/var/log/exim
+  chown 79:79 "$pkgdir"/var/spool/exim/db
 
   cd build-Linux-*
   for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb \
@@ -144,12 +82,12 @@ package() {
     "$pkgdir"/usr/lib/systemd/system/exim-submission.socket
 }
 
-pre_build() {
-  groupadd -g 79 exim
-  useradd -u 79 -g exim -d /var/spool/exim -s /bin/false exim
-}
-
-post_remove() {
-  groupdel exim
-  userdel exim
-}
+sha512sums=('2b0d5c82133315c444e29abd182e0866482c904db1abe5ffe9a3008c2174f52eca850a433c069b4102874dc32bbe4af112beac94ffa154f1c06615c24deb47a4'
+            '9cc0fe81b2110aecdd3d494650d051f773c2c83611692c4e5d365b89dcddd08b16af5b8f5f4ac3e3f553c36198846a05793d8fd01113f62d2ab761f555409201'
+            'd8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81'
+            '72f15f2f59382be82b4e361dd780a39d8f263822d424c4ea252fa2568a090b44ae15263cc53b0df9369061f62738824d026646185c6f63ad09759e388b078c57'
+            'dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f'
+            'e2fc3966c320460a26fbbf83e98df725587dc126dfe9d7a84c3285eb4b22a061b30499425c70f3d73cf13aa81c194274004efd20ce1316836463b982117909f8'
+            '11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a'
+            'db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae'
+            '4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d')
diff --git a/aliases b/aliases
index 5a76ff7d5786..3f76693d0bf6 100644
--- a/aliases
+++ b/aliases
@@ -1,4 +1,4 @@
-#  
+#
 #  /etc/mail/aliases
 #
 #  NOTE:  Make sure you run 'newaliases' after modifying this file
diff --git a/exim.Makefile b/exim.Makefile
index efba5e3791a6..781d8adc51bc 100644
--- a/exim.Makefile
+++ b/exim.Makefile
@@ -290,7 +290,7 @@ LOOKUP_DNSDB=yes
 LOOKUP_DSEARCH=yes
 # LOOKUP_IBASE=yes
 LOOKUP_LDAP=yes
-# LOOKUP_MYSQL=yes
+LOOKUP_MYSQL=yes
 # LOOKUP_NIS=yes
 # LOOKUP_NISPLUS=yes
 # LOOKUP_ORACLE=yes
@@ -1222,7 +1222,8 @@ PID_FILE_PATH=/var/run/exim.pid
 # ENABLE_DISABLE_FSYNC=yes
 
 HAVE_IPV6=YES
-LOOKUP_LIBS=-lldap -llber
+LOOKUP_INCLUDE=-I /usr/include/mysql
+LOOKUP_LIBS=-lldap -llber -L/usr/lib -lmysqlclient
 EXTRALIBS_EXIM=-lpam
 
 USE_GDBM=yes
diff --git a/exim.install b/exim.install
index 4aea548e8442..4933f61160e8 100644
--- a/exim.install
+++ b/exim.install
@@ -1,13 +1,11 @@
 post_install() {
-  getent group exim >/dev/null 2>&1 || groupadd -g 79 exim 
+  getent group exim >/dev/null 2>&1 || groupadd -g 79 exim
   if getent passwd exim > /dev/null 2>&1; then
     usr/sbin/usermod -d /var/spool/exim -c 'Exim MTA' -s /sbin/nologin exim > /dev/null 2>&1
   else
-    usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim 
+    usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim
   fi
   passwd -l exim > /dev/null
-  chown root.exim /var/spool/exim /var/log/exim
-  chown exim.exim /var/spool/exim/db
   chmod u+s /usr/bin/exim
 }