Tue Feb 25 03:19:16 UTC 2014

3 files changed, 47 insertions, 44 deletions

diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index 403671761..d4ce05234 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 99560 2013-10-29 18:01:02Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 106168 2014-02-24 17:05:04Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=exim
 pkgver=4.82
-pkgrel=1
-pkgdesc="Message Transfer Agent"
+pkgrel=2
+pkgdesc='Message Transfer Agent'
 arch=('x86_64' 'i686')
 url='http://www.exim.org/'
 license=('GPL')
 backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim)
 install=exim.install
-depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
+depends=('gdbm' 'pcre' 'pam' 'openssl' 'libldap')
 provides=('smtp-server' 'smtp-forwarder')
 conflicts=('smtp-server' 'smtp-forwarder')
 options=('!makeflags')
-source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2"
+source=(http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2
         aliases
         exim.logrotate
         exim.Makefile
@@ -26,47 +26,49 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2
         exim@.service
         exim.socket
         exim-submission.socket)
-sha256sums=('46dedfb6ced2aa4a1eddc5d8ce46a790a961508bd389faa2e215302ae80d91cf'
-            '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
-            '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
-            'd33b8595e92ec812c9f6961f98e50b6a3986d5bd966ed4efec2c52c1fce47636'
-            '55719e8b823702b0054584326ca28349b7487e5be9e567ddc7a6e6259767e05b'
-            '652250d99479b58b7127ff60c29f28ca09ebac09cab7e54771d62ce38407012d'
-            'faad96dadbb2750faa5652d830f10d5a14be487a42e8db1cec797164acf14b73'
-            '3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26'
-            'd3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee')
+md5sums=('feb933baa4db773c2ef76b794c60b647'
+         '4874006f0585253ddab027d441009757'
+         'e18a535218718c5eb394ed5c9296fe06'
+         '2675c17fa9e5bb63c0862fe6fa633377'
+         '88cf76405367a6ed371d05db1d3c9565'
+         'be8fdcf7b2d6b6368a21705e69743265'
+         '6f5a5c2b0835b33f59d2513cce18c65b'
+         '101a726e4d3f4d0074710273f9808022'
+         '11b319ba0bd84911fa70e9bef2190715')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
-  cp "$srcdir/$pkgname.Makefile" Local/Makefile
+  cp ../$pkgname.Makefile Local/Makefile
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
-  install -Dm0644 $srcdir/exim.logrotate "${pkgdir}/etc/logrotate.d/exim"
-  install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8"
+  install -Dm0644 ../exim.logrotate "$pkgdir"/etc/logrotate.d/exim
+  install -Dm0644 doc/exim.8 "$pkgdir"/usr/share/man/man8/exim.8
 
-  mkdir -p "${pkgdir}/var/spool/exim/db" "${pkgdir}/etc/mail" \
-    "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,bin}
+  mkdir -p "$pkgdir"/var/spool/exim/db "$pkgdir"/etc/mail \
+    "$pkgdir"/var/log/exim "$pkgdir"/usr/{lib,bin}
 
-  chmod 770 "${pkgdir}/var/spool/exim" "${pkgdir}/var/spool/exim/db" "${pkgdir}/var/log/exim"
+  chmod 770 "$pkgdir"/var/spool/exim{,/db} "$pkgdir"/var/log/exim
 
   cd build-Linux-*
-  for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb exipick exiqsumm exigrep \
-    exim_dbmbuild exim exim_fixdb eximstats exinext exiqgrep exiwhat; do
-    install -m0755 "$i" "$pkgdir/usr/bin"
+  for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb \
+    exipick exiqsumm exigrep exim_dbmbuild exim exim_fixdb eximstats exinext \
+    exiqgrep exiwhat; do
+    install -m0755 "$i" "$pkgdir"/usr/bin
   done
 
-  cd "$srcdir/exim-$pkgver/src"
-  sed -e "s|/etc/aliases|/etc/mail/aliases|g" -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \
-    configure.default > "$pkgdir/etc/mail/exim.conf"
+  cd ../src
+  sed -e "s|/etc/aliases|/etc/mail/aliases|g" \
+    -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \
+    configure.default > "$pkgdir"/etc/mail/exim.conf
 
-  cp "$srcdir/aliases" "$pkgdir/etc/mail"
+  cp "$srcdir"/aliases "$pkgdir"/etc/mail
 
-  cd "$pkgdir/usr/bin"
+  cd "$pkgdir"/usr/bin
   for i in mailq newaliases rmail rsmtp runq sendmail; do
     ln -s exim "$i"
   done
@@ -74,11 +76,14 @@ package() {
   # fhs compliancy
   ln -s ../bin/exim ../lib/sendmail
 
-  install -Dm0644 "$srcdir/exim-submission@.service" \
-    "${pkgdir}/usr/lib/systemd/system/exim-submission@.service"
-  install -Dm0644 "$srcdir/exim.service" "${pkgdir}/usr/lib/systemd/system/exim.service"
-  install -Dm0644 "$srcdir/exim@.service" "${pkgdir}/usr/lib/systemd/system/exim@.service"
-  install -Dm0644 "$srcdir/exim.socket" "${pkgdir}/usr/lib/systemd/system/exim.socket"
-  install -Dm0644 "$srcdir/exim-submission.socket" \
-    "${pkgdir}/usr/lib/systemd/system/exim-submission.socket"
+  install -Dm0644 "$srcdir"/exim-submission@.service \
+    "$pkgdir"/usr/lib/systemd/system/exim-submission@.service
+  install -Dm0644 "$srcdir"/exim.service \
+    "$pkgdir"/usr/lib/systemd/system/exim.service
+  install -Dm0644 "$srcdir"/exim@.service \
+    "$pkgdir"/usr/lib/systemd/system/exim@.service
+  install -Dm0644 "$srcdir"/exim.socket \
+    "$pkgdir"/usr/lib/systemd/system/exim.socket
+  install -Dm0644 "$srcdir"/exim-submission.socket \
+    "$pkgdir"/usr/lib/systemd/system/exim-submission.socket
 }
diff --git a/community/exim/exim.Makefile b/community/exim/exim.Makefile
index 2bf77f434..efba5e379 100644
--- a/community/exim/exim.Makefile
+++ b/community/exim/exim.Makefile
@@ -1224,4 +1224,7 @@ PID_FILE_PATH=/var/run/exim.pid
 HAVE_IPV6=YES
 LOOKUP_LIBS=-lldap -llber
 EXTRALIBS_EXIM=-lpam
+
+USE_GDBM=yes
+DBMLIB=-lgdbm
 # End of EDITME for Exim 4.
diff --git a/community/exim/exim.install b/community/exim/exim.install
index d666be17f..4aea548e8 100644
--- a/community/exim/exim.install
+++ b/community/exim/exim.install
@@ -1,4 +1,3 @@
-# arg 1:  the new package version
 post_install() {
   getent group exim >/dev/null 2>&1 || groupadd -g 79 exim 
   if getent passwd exim > /dev/null 2>&1; then
@@ -12,14 +11,10 @@ post_install() {
   chmod u+s /usr/bin/exim
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-# arg 1:  the old package version
 pre_remove() {
   getent passwd exim >/dev/null 2>&1 && userdel exim
 }
-