From 11196316291f49af2bacd1b4531e0a548729dea2 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Tue, 3 Jun 2014 03:32:55 +0000
Subject: Tue Jun  3 03:28:08 UTC 2014

---
 community/dbmail/PKGBUILD              | 18 +++++++++---------
 community/dbmail/dbmail-7-systemd.diff | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'community/dbmail')

diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index a5b65c902..e9f7fdb0c 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 107773 2014-03-19 12:02:14Z spupykin $
+# $Id: PKGBUILD 112473 2014-06-02 14:02:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
-pkgver=3.1.13
+pkgver=3.1.15
 pkgrel=1
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64')
@@ -21,30 +21,30 @@ backup=(etc/xinetd.d/dbmail-imapd
 	etc/xinetd.d/dbmail-lmtpd
 	etc/xinetd.d/dbmail-timsieved)
 #source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_1"
-source=("http://www.dbmail.org/download/3.1/dbmail-${pkgver}.tar.gz"
+#source=("http://www.dbmail.org/download/3.1/dbmail-${pkgver}.tar.gz"
+source=("dbmail-$pkgver.tar.gz::http://git.dbmail.eu/paul/dbmail/snapshot/dbmail-$pkgver.tar.gz"
 	"dbmail-imapd.xinetd"
 	"dbmail-lmtpd.xinetd"
 	"dbmail-pop3d.xinetd"
 	"dbmail-timsieved.xinetd"
 	"dbmail-7-systemd.diff")
-md5sums=('528f718a9c3909fbd5c0d77f9dfcb68b'
+md5sums=('84d1af55891f0e2259e5f11462ddd997'
          '890de13361afbdf4fed12d6d7eb53e66'
          '961593658cd596297d03d25eb9c9e98f'
          '4cb764894abd3914802e90602bf90a0c'
          'e78dc86355f9aaf24590bc7c6611162f'
-         'a781a4ebe2dd75ed635c9b4a239b38d8')
+         '225d7ddcc357b4fd65e4b6a2719d0476')
 
 prepare() {
   cd $srcdir/dbmail-${pkgver}/
   patch -Rp1 <$srcdir/dbmail-7-systemd.diff
-  aclocal
-  automake --add-missing
-  autoreconf
 }
 
 build() {
   cd $srcdir/dbmail-${pkgver}/
-  automake
+  aclocal
+  automake --add-missing
+  autoreconf
   [ -f Makefile ] || ./configure \
     --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
     --with-ldap --with-sieve \
diff --git a/community/dbmail/dbmail-7-systemd.diff b/community/dbmail/dbmail-7-systemd.diff
index 097949694..7931a06dc 100644
--- a/community/dbmail/dbmail-7-systemd.diff
+++ b/community/dbmail/dbmail-7-systemd.diff
@@ -1,6 +1,6 @@
-diff -wbBurN dbmail.git/configure.in dbmail-3.1.5/configure.in
---- dbmail.git/configure.in	2013-09-05 18:07:48.661707165 +0400
-+++ dbmail-3.1.5/configure.in	2013-09-09 15:05:17.639600103 +0400
+diff -wbBurN dbmail.git/configure.ac dbmail-3.1.5/configure.ac
+--- dbmail.git/configure.ac	2013-09-05 18:07:48.661707165 +0400
++++ dbmail-3.1.5/configure.ac	2013-09-09 15:05:17.639600103 +0400
 @@ -44,10 +44,6 @@
      AS_HELP_STRING([--enable-manpages], [Enable building and installation of man pages]))
  AM_CONDITIONAL(MANPAGES, [ test "$enable_manpages" = "yes" ])
@@ -29,7 +29,7 @@ diff -wbBurN dbmail.git/systemd/dbmail-imapd.service.in dbmail-3.1.5/systemd/dbm
 @@ -1,11 +0,0 @@
 -[Unit]
 -Description=DBMail Imap Server
--After=syslog.target network.target mysqld.service postgresql.service
+-After=network.target mysqld.service postgresql.service
 -
 -[Service]
 -Type=forking
@@ -44,7 +44,7 @@ diff -wbBurN dbmail.git/systemd/dbmail-lmtpd.service.in dbmail-3.1.5/systemd/dbm
 @@ -1,11 +0,0 @@
 -[Unit]
 -Description=DBMail LMTP Server
--After=syslog.target network.target mysqld.service postgresql.service
+-After=network.target mysqld.service postgresql.service
 -
 -[Service]
 -Type=forking
@@ -59,7 +59,7 @@ diff -wbBurN dbmail.git/systemd/dbmail-pop3d.service.in dbmail-3.1.5/systemd/dbm
 @@ -1,11 +0,0 @@
 -[Unit]
 -Description=DBMail pop3 Server
--After=syslog.target network.target mysqld.service postgresql.service
+-After=network.target mysqld.service postgresql.service
 -
 -[Service]
 -Type=forking
@@ -74,7 +74,7 @@ diff -wbBurN dbmail.git/systemd/dbmail-timsieved.service.in dbmail-3.1.5/systemd
 @@ -1,11 +0,0 @@
 -[Unit]
 -Description=DBMail Sieve Server
--After=syslog.target network.target mysqld.service postgresql.service
+-After=network.target mysqld.service postgresql.service
 -
 -[Service]
 -Type=forking
-- 
cgit v1.2.3-54-g00ecf