Date: Wednesday, August 5, 2015 @ 16:02:55
Author: spupykin
Revision: 137985
archrelease: copy trunk to community-i686, community-x86_64
Added:
dbmail/repos/community-i686/PKGBUILD
(from rev 137984, dbmail/trunk/PKGBUILD)
dbmail/repos/community-i686/dbmail-imapd.xinetd
(from rev 137984, dbmail/trunk/dbmail-imapd.xinetd)
dbmail/repos/community-i686/dbmail-lmtpd.xinetd
(from rev 137984, dbmail/trunk/dbmail-lmtpd.xinetd)
dbmail/repos/community-i686/dbmail-pop3d.xinetd
(from rev 137984, dbmail/trunk/dbmail-pop3d.xinetd)
dbmail/repos/community-i686/dbmail-timsieved.xinetd
(from rev 137984, dbmail/trunk/dbmail-timsieved.xinetd)
dbmail/repos/community-i686/no-sql-using.patch
(from rev 137984, dbmail/trunk/no-sql-using.patch)
dbmail/repos/community-i686/noop-fetch-response-fix2.patch
(from rev 137984, dbmail/trunk/noop-fetch-response-fix2.patch)
dbmail/repos/community-x86_64/PKGBUILD
(from rev 137984, dbmail/trunk/PKGBUILD)
dbmail/repos/community-x86_64/dbmail-imapd.xinetd
(from rev 137984, dbmail/trunk/dbmail-imapd.xinetd)
dbmail/repos/community-x86_64/dbmail-lmtpd.xinetd
(from rev 137984, dbmail/trunk/dbmail-lmtpd.xinetd)
dbmail/repos/community-x86_64/dbmail-pop3d.xinetd
(from rev 137984, dbmail/trunk/dbmail-pop3d.xinetd)
dbmail/repos/community-x86_64/dbmail-timsieved.xinetd
(from rev 137984, dbmail/trunk/dbmail-timsieved.xinetd)
dbmail/repos/community-x86_64/no-sql-using.patch
(from rev 137984, dbmail/trunk/no-sql-using.patch)
dbmail/repos/community-x86_64/noop-fetch-response-fix2.patch
(from rev 137984, dbmail/trunk/noop-fetch-response-fix2.patch)
Deleted:
dbmail/repos/community-i686/PKGBUILD
dbmail/repos/community-i686/dbmail-imapd.xinetd
dbmail/repos/community-i686/dbmail-lmtpd.xinetd
dbmail/repos/community-i686/dbmail-pop3d.xinetd
dbmail/repos/community-i686/dbmail-timsieved.xinetd
dbmail/repos/community-x86_64/PKGBUILD
dbmail/repos/community-x86_64/dbmail-imapd.xinetd
dbmail/repos/community-x86_64/dbmail-lmtpd.xinetd
dbmail/repos/community-x86_64/dbmail-pop3d.xinetd
dbmail/repos/community-x86_64/dbmail-timsieved.xinetd
-------------------------------------------------+
/PKGBUILD | 142 ++++++++++++++++++++++
/dbmail-imapd.xinetd | 26 ++++
/dbmail-lmtpd.xinetd | 26 ++++
/dbmail-pop3d.xinetd | 26 ++++
/dbmail-timsieved.xinetd | 30 ++++
community-i686/PKGBUILD | 61 ---------
community-i686/dbmail-imapd.xinetd | 13 --
community-i686/dbmail-lmtpd.xinetd | 13 --
community-i686/dbmail-pop3d.xinetd | 13 --
community-i686/dbmail-timsieved.xinetd | 15 --
community-i686/no-sql-using.patch | 51 +++++++
community-i686/noop-fetch-response-fix2.patch | 12 +
community-x86_64/PKGBUILD | 61 ---------
community-x86_64/dbmail-imapd.xinetd | 13 --
community-x86_64/dbmail-lmtpd.xinetd | 13 --
community-x86_64/dbmail-pop3d.xinetd | 13 --
community-x86_64/dbmail-timsieved.xinetd | 15 --
community-x86_64/no-sql-using.patch | 51 +++++++
community-x86_64/noop-fetch-response-fix2.patch | 12 +
19 files changed, 376 insertions(+), 230 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-08-05 14:02:31 UTC (rev 137984)
+++ community-i686/PKGBUILD 2015-08-05 14:02:55 UTC (rev 137985)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Sebastian Faltoni <sebastian.falt...@gmail.com>
-
-pkgname=dbmail
-pkgver=3.2.3
-pkgrel=1
-pkgdesc="Fast and scalable sql based mail services"
-arch=('i686' 'x86_64')
-depends=('gmime' 'libzdb' 'mhash' 'libevent')
-makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml'
'postgresql-libs>=8.4.1'
- 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git')
-optdepends=('libldap: for LDAP authentication'
- 'libsieve: for dbmail-sieve'
- 'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
-url="http://www.dbmail.org";
-license=('GPL')
-options=('zipman')
-backup=(etc/xinetd.d/dbmail-imapd
- etc/xinetd.d/dbmail-pop3d
- etc/xinetd.d/dbmail-lmtpd
- etc/xinetd.d/dbmail-timsieved)
-#source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_2"
-#source=("dbmail-$pkgver.tar.gz::http://git.dbmail.eu/paul/dbmail/snapshot/dbmail-$pkgver.tar.gz";
-source=("http://www.dbmail.org/download/3.2/dbmail-${pkgver}.tar.gz";
- "dbmail-imapd.xinetd"
- "dbmail-lmtpd.xinetd"
- "dbmail-pop3d.xinetd"
- "dbmail-timsieved.xinetd")
-md5sums=('4f140751642559395dfe3a6bb2cc9300'
- '890de13361afbdf4fed12d6d7eb53e66'
- '961593658cd596297d03d25eb9c9e98f'
- '4cb764894abd3914802e90602bf90a0c'
- 'e78dc86355f9aaf24590bc7c6611162f')
-
-build() {
- cd $srcdir/dbmail-${pkgver}/
- aclocal
- automake --add-missing
- autoreconf
- [ -f Makefile ] || ./configure \
- --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
- --with-ldap --with-sieve \
- --enable-systemd --enable-manpages
- make
-}
-
-package() {
- cd $srcdir/dbmail-${pkgver}/
- make DESTDIR=$pkgdir install
-
- install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
- mkdir $pkgdir/usr/share/dbmail
- cp -r sql/* $pkgdir/usr/share/dbmail/
- cp -a contrib $pkgdir/usr/share/dbmail/
- cp dbmail.schema $pkgdir/usr/share/dbmail/
-
- for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
- install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
- done
-}
Copied: dbmail/repos/community-i686/PKGBUILD (from rev 137984,
dbmail/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-08-05 14:02:55 UTC (rev 137985)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Sebastian Faltoni <sebastian.falt...@gmail.com>
+
+pkgname=dbmail
+pkgver=3.2.3
+pkgrel=2
+pkgdesc="Fast and scalable sql based mail services"
+arch=('i686' 'x86_64')
+depends=('gmime' 'libzdb' 'mhash' 'libevent')
+makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml'
'postgresql-libs>=8.4.1'
+ 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git')
+optdepends=('libldap: for LDAP authentication'
+ 'libsieve: for dbmail-sieve'
+ 'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
+url="http://www.dbmail.org";
+license=('GPL')
+options=('zipman')
+backup=(etc/xinetd.d/dbmail-imapd
+ etc/xinetd.d/dbmail-pop3d
+ etc/xinetd.d/dbmail-lmtpd
+ etc/xinetd.d/dbmail-timsieved)
+#source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_2"
+#source=("dbmail-$pkgver.tar.gz::http://git.dbmail.eu/paul/dbmail/snapshot/dbmail-$pkgver.tar.gz";
+source=("http://www.dbmail.org/download/3.2/dbmail-${pkgver}.tar.gz";
+ "dbmail-imapd.xinetd"
+ "dbmail-lmtpd.xinetd"
+ "dbmail-pop3d.xinetd"
+ "dbmail-timsieved.xinetd"
+ noop-fetch-response-fix2.patch
+ no-sql-using.patch)
+md5sums=('4f140751642559395dfe3a6bb2cc9300'
+ '890de13361afbdf4fed12d6d7eb53e66'
+ '961593658cd596297d03d25eb9c9e98f'
+ '4cb764894abd3914802e90602bf90a0c'
+ 'e78dc86355f9aaf24590bc7c6611162f'
+ '8c8efca631d3a4052ad18c12ce72a1ab'
+ '403da5e0703104b23d0f349b9ab8d2d0')
+
+prepare() {
+ cd $srcdir/dbmail-${pkgver}/
+ patch -p1 <$srcdir/noop-fetch-response-fix2.patch
+ patch -p1 <$srcdir/no-sql-using.patch
+}
+
+build() {
+ cd $srcdir/dbmail-${pkgver}/
+ aclocal
+ automake --add-missing
+ autoreconf
+ [ -f Makefile ] || ./configure \
+ --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
+ --with-ldap --with-sieve \
+ --enable-systemd --enable-manpages
+ make
+}
+
+package() {
+ cd $srcdir/dbmail-${pkgver}/
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
+ mkdir $pkgdir/usr/share/dbmail
+ cp -r sql/* $pkgdir/usr/share/dbmail/
+ cp -a contrib $pkgdir/usr/share/dbmail/
+ cp dbmail.schema $pkgdir/usr/share/dbmail/
+
+ for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
+ install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
+ done
+}
Deleted: community-i686/dbmail-imapd.xinetd
===================================================================
--- community-i686/dbmail-imapd.xinetd 2015-08-05 14:02:31 UTC (rev 137984)
+++ community-i686/dbmail-imapd.xinetd 2015-08-05 14:02:55 UTC (rev 137985)
@@ -1,13 +0,0 @@
-service imap
-{
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-imapd
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-i686/dbmail-imapd.xinetd (from rev 137984,
dbmail/trunk/dbmail-imapd.xinetd)
===================================================================
--- community-i686/dbmail-imapd.xinetd (rev 0)
+++ community-i686/dbmail-imapd.xinetd 2015-08-05 14:02:55 UTC (rev 137985)
@@ -0,0 +1,13 @@
+service imap
+{
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-imapd
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Deleted: community-i686/dbmail-lmtpd.xinetd
===================================================================
--- community-i686/dbmail-lmtpd.xinetd 2015-08-05 14:02:31 UTC (rev 137984)
+++ community-i686/dbmail-lmtpd.xinetd 2015-08-05 14:02:55 UTC (rev 137985)
@@ -1,13 +0,0 @@
-service lmtp
-{
- port = 24
- type = UNLISTED
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-lmtpd
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-}
Copied: dbmail/repos/community-i686/dbmail-lmtpd.xinetd (from rev 137984,
dbmail/trunk/dbmail-lmtpd.xinetd)
===================================================================
--- community-i686/dbmail-lmtpd.xinetd (rev 0)
+++ community-i686/dbmail-lmtpd.xinetd 2015-08-05 14:02:55 UTC (rev 137985)
@@ -0,0 +1,13 @@
+service lmtp
+{
+ port = 24
+ type = UNLISTED
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-lmtpd
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+}
Deleted: community-i686/dbmail-pop3d.xinetd
===================================================================
--- community-i686/dbmail-pop3d.xinetd 2015-08-05 14:02:31 UTC (rev 137984)
+++ community-i686/dbmail-pop3d.xinetd 2015-08-05 14:02:55 UTC (rev 137985)
@@ -1,13 +0,0 @@
-service pop3
-{
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-pop3d
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-i686/dbmail-pop3d.xinetd (from rev 137984,
dbmail/trunk/dbmail-pop3d.xinetd)
===================================================================
--- community-i686/dbmail-pop3d.xinetd (rev 0)
+++ community-i686/dbmail-pop3d.xinetd 2015-08-05 14:02:55 UTC (rev 137985)
@@ -0,0 +1,13 @@
+service pop3
+{
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-pop3d
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Deleted: community-i686/dbmail-timsieved.xinetd
===================================================================
--- community-i686/dbmail-timsieved.xinetd 2015-08-05 14:02:31 UTC (rev
137984)
+++ community-i686/dbmail-timsieved.xinetd 2015-08-05 14:02:55 UTC (rev
137985)
@@ -1,15 +0,0 @@
-service sieve
-{
-# port = 2000
-# type = UNLISTED
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-timsieved
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-i686/dbmail-timsieved.xinetd (from rev 137984,
dbmail/trunk/dbmail-timsieved.xinetd)
===================================================================
--- community-i686/dbmail-timsieved.xinetd (rev 0)
+++ community-i686/dbmail-timsieved.xinetd 2015-08-05 14:02:55 UTC (rev
137985)
@@ -0,0 +1,15 @@
+service sieve
+{
+# port = 2000
+# type = UNLISTED
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-timsieved
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Copied: dbmail/repos/community-i686/no-sql-using.patch (from rev 137984,
dbmail/trunk/no-sql-using.patch)
===================================================================
--- community-i686/no-sql-using.patch (rev 0)
+++ community-i686/no-sql-using.patch 2015-08-05 14:02:55 UTC (rev 137985)
@@ -0,0 +1,51 @@
+diff -wbBur dbmail-3.2.3/src/dm_imapsession.c
dbmail-3.2.3.q/src/dm_imapsession.c
+--- dbmail-3.2.3/src/dm_imapsession.c 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.q/src/dm_imapsession.c 2015-08-05 16:43:36.489596671
+0300
+@@ -988,7 +988,7 @@
+
+ snprintf(query, DEF_QUERYSIZE-1, "SELECT message_idnr,envelope "
+ "FROM %senvelope e "
+- "LEFT JOIN %smessages m USING (physmessage_id) "
++ "LEFT JOIN %smessages m "
+ "WHERE m.mailbox_idnr = %" PRIu64 " "
+ "AND message_idnr %s",
+ DBPFX, DBPFX,
+diff -wbBur dbmail-3.2.3/src/dm_mailbox.c dbmail-3.2.3.q/src/dm_mailbox.c
+--- dbmail-3.2.3/src/dm_mailbox.c 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.q/src/dm_mailbox.c 2015-08-05 16:41:58.912931125 +0300
+@@ -317,7 +317,7 @@
+ stmt = db_stmt_prepare(c,
+ "SELECT min(m.message_idnr),v.sortfield "
+ "FROM %smessages m "
+- "LEFT JOIN %sheader h USING (physmessage_id) "
++ "LEFT JOIN %sheader h "
+ "LEFT JOIN %sheadername n ON h.headername_id =
n.id "
+ "LEFT JOIN %sheadervalue v ON h.headervalue_id
= v.id "
+ "WHERE m.mailbox_idnr=? "
+@@ -355,7 +355,7 @@
+ stmt = db_stmt_prepare(c,
+ "SELECT m.message_idnr,v.sortfield "
+ "FROM %smessages m "
+- "LEFT JOIN %sheader h USING (physmessage_id) "
++ "LEFT JOIN %sheader h "
+ "LEFT JOIN %sheadername n ON h.headername_id =
n.id "
+ "LEFT JOIN %sheadervalue v ON h.headervalue_id
= v.id "
+ "WHERE m.mailbox_idnr = ? "
+@@ -1268,7 +1268,7 @@
+ op = "=";
+
+ p_string_printf(q,"SELECT message_idnr FROM
%smessages m "
+- "LEFT JOIN %sheader h USING
(physmessage_id) "
++ "LEFT JOIN %sheader h "
+ "LEFT JOIN %sheadername n ON
h.headername_id = n.id "
+ "LEFT JOIN %sheadervalue v ON
h.headervalue_id = v.id "
+ "WHERE m.mailbox_idnr=? AND
m.status IN (?,?) "
+@@ -1290,7 +1290,7 @@
+ case IST_HDR:
+
+ p_string_printf(q, "SELECT message_idnr FROM %smessages
m "
+- "LEFT JOIN %sheader h USING
(physmessage_id) "
++ "LEFT JOIN %sheader h "
+ "LEFT JOIN %sheadername n ON
h.headername_id = n.id "
+ "LEFT JOIN %sheadervalue v ON
h.headervalue_id = v.id "
+ "WHERE mailbox_idnr=? AND status IN
(?,?) "
Copied: dbmail/repos/community-i686/noop-fetch-response-fix2.patch (from rev
137984, dbmail/trunk/noop-fetch-response-fix2.patch)
===================================================================
--- community-i686/noop-fetch-response-fix2.patch
(rev 0)
+++ community-i686/noop-fetch-response-fix2.patch 2015-08-05 14:02:55 UTC
(rev 137985)
@@ -0,0 +1,12 @@
+diff -wbBur dbmail-3.2.3/src/dm_imapsession.c
dbmail-3.2.3.q/src/dm_imapsession.c
+--- dbmail-3.2.3/src/dm_imapsession.c 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.q/src/dm_imapsession.c 2015-07-22 14:10:36.473334443
+0300
+@@ -1413,7 +1413,7 @@
+ if (oldflags && (! MATCH(oldflags, newflags)))
+ flagschanged = true;
+
+- if (modseqchanged || flagschanged) {
++ if ((modseqchanged && self->mailbox->condstore) || self->use_uid ||
flagschanged) {
+ GList *plist = NULL;
+ char *response = NULL;
+ if (self->use_uid) {
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-08-05 14:02:31 UTC (rev 137984)
+++ community-x86_64/PKGBUILD 2015-08-05 14:02:55 UTC (rev 137985)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Sebastian Faltoni <sebastian.falt...@gmail.com>
-
-pkgname=dbmail
-pkgver=3.2.3
-pkgrel=1
-pkgdesc="Fast and scalable sql based mail services"
-arch=('i686' 'x86_64')
-depends=('gmime' 'libzdb' 'mhash' 'libevent')
-makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml'
'postgresql-libs>=8.4.1'
- 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git')
-optdepends=('libldap: for LDAP authentication'
- 'libsieve: for dbmail-sieve'
- 'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
-url="http://www.dbmail.org";
-license=('GPL')
-options=('zipman')
-backup=(etc/xinetd.d/dbmail-imapd
- etc/xinetd.d/dbmail-pop3d
- etc/xinetd.d/dbmail-lmtpd
- etc/xinetd.d/dbmail-timsieved)
-#source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_2"
-#source=("dbmail-$pkgver.tar.gz::http://git.dbmail.eu/paul/dbmail/snapshot/dbmail-$pkgver.tar.gz";
-source=("http://www.dbmail.org/download/3.2/dbmail-${pkgver}.tar.gz";
- "dbmail-imapd.xinetd"
- "dbmail-lmtpd.xinetd"
- "dbmail-pop3d.xinetd"
- "dbmail-timsieved.xinetd")
-md5sums=('4f140751642559395dfe3a6bb2cc9300'
- '890de13361afbdf4fed12d6d7eb53e66'
- '961593658cd596297d03d25eb9c9e98f'
- '4cb764894abd3914802e90602bf90a0c'
- 'e78dc86355f9aaf24590bc7c6611162f')
-
-build() {
- cd $srcdir/dbmail-${pkgver}/
- aclocal
- automake --add-missing
- autoreconf
- [ -f Makefile ] || ./configure \
- --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
- --with-ldap --with-sieve \
- --enable-systemd --enable-manpages
- make
-}
-
-package() {
- cd $srcdir/dbmail-${pkgver}/
- make DESTDIR=$pkgdir install
-
- install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
- mkdir $pkgdir/usr/share/dbmail
- cp -r sql/* $pkgdir/usr/share/dbmail/
- cp -a contrib $pkgdir/usr/share/dbmail/
- cp dbmail.schema $pkgdir/usr/share/dbmail/
-
- for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
- install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
- done
-}
Copied: dbmail/repos/community-x86_64/PKGBUILD (from rev 137984,
dbmail/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-08-05 14:02:55 UTC (rev 137985)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Sebastian Faltoni <sebastian.falt...@gmail.com>
+
+pkgname=dbmail
+pkgver=3.2.3
+pkgrel=2
+pkgdesc="Fast and scalable sql based mail services"
+arch=('i686' 'x86_64')
+depends=('gmime' 'libzdb' 'mhash' 'libevent')
+makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml'
'postgresql-libs>=8.4.1'
+ 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git')
+optdepends=('libldap: for LDAP authentication'
+ 'libsieve: for dbmail-sieve'
+ 'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
+url="http://www.dbmail.org";
+license=('GPL')
+options=('zipman')
+backup=(etc/xinetd.d/dbmail-imapd
+ etc/xinetd.d/dbmail-pop3d
+ etc/xinetd.d/dbmail-lmtpd
+ etc/xinetd.d/dbmail-timsieved)
+#source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_2"
+#source=("dbmail-$pkgver.tar.gz::http://git.dbmail.eu/paul/dbmail/snapshot/dbmail-$pkgver.tar.gz";
+source=("http://www.dbmail.org/download/3.2/dbmail-${pkgver}.tar.gz";
+ "dbmail-imapd.xinetd"
+ "dbmail-lmtpd.xinetd"
+ "dbmail-pop3d.xinetd"
+ "dbmail-timsieved.xinetd"
+ noop-fetch-response-fix2.patch
+ no-sql-using.patch)
+md5sums=('4f140751642559395dfe3a6bb2cc9300'
+ '890de13361afbdf4fed12d6d7eb53e66'
+ '961593658cd596297d03d25eb9c9e98f'
+ '4cb764894abd3914802e90602bf90a0c'
+ 'e78dc86355f9aaf24590bc7c6611162f'
+ '8c8efca631d3a4052ad18c12ce72a1ab'
+ '403da5e0703104b23d0f349b9ab8d2d0')
+
+prepare() {
+ cd $srcdir/dbmail-${pkgver}/
+ patch -p1 <$srcdir/noop-fetch-response-fix2.patch
+ patch -p1 <$srcdir/no-sql-using.patch
+}
+
+build() {
+ cd $srcdir/dbmail-${pkgver}/
+ aclocal
+ automake --add-missing
+ autoreconf
+ [ -f Makefile ] || ./configure \
+ --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
+ --with-ldap --with-sieve \
+ --enable-systemd --enable-manpages
+ make
+}
+
+package() {
+ cd $srcdir/dbmail-${pkgver}/
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
+ mkdir $pkgdir/usr/share/dbmail
+ cp -r sql/* $pkgdir/usr/share/dbmail/
+ cp -a contrib $pkgdir/usr/share/dbmail/
+ cp dbmail.schema $pkgdir/usr/share/dbmail/
+
+ for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
+ install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
+ done
+}
Deleted: community-x86_64/dbmail-imapd.xinetd
===================================================================
--- community-x86_64/dbmail-imapd.xinetd 2015-08-05 14:02:31 UTC (rev
137984)
+++ community-x86_64/dbmail-imapd.xinetd 2015-08-05 14:02:55 UTC (rev
137985)
@@ -1,13 +0,0 @@
-service imap
-{
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-imapd
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-x86_64/dbmail-imapd.xinetd (from rev 137984,
dbmail/trunk/dbmail-imapd.xinetd)
===================================================================
--- community-x86_64/dbmail-imapd.xinetd (rev 0)
+++ community-x86_64/dbmail-imapd.xinetd 2015-08-05 14:02:55 UTC (rev
137985)
@@ -0,0 +1,13 @@
+service imap
+{
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-imapd
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Deleted: community-x86_64/dbmail-lmtpd.xinetd
===================================================================
--- community-x86_64/dbmail-lmtpd.xinetd 2015-08-05 14:02:31 UTC (rev
137984)
+++ community-x86_64/dbmail-lmtpd.xinetd 2015-08-05 14:02:55 UTC (rev
137985)
@@ -1,13 +0,0 @@
-service lmtp
-{
- port = 24
- type = UNLISTED
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-lmtpd
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-}
Copied: dbmail/repos/community-x86_64/dbmail-lmtpd.xinetd (from rev 137984,
dbmail/trunk/dbmail-lmtpd.xinetd)
===================================================================
--- community-x86_64/dbmail-lmtpd.xinetd (rev 0)
+++ community-x86_64/dbmail-lmtpd.xinetd 2015-08-05 14:02:55 UTC (rev
137985)
@@ -0,0 +1,13 @@
+service lmtp
+{
+ port = 24
+ type = UNLISTED
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-lmtpd
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+}
Deleted: community-x86_64/dbmail-pop3d.xinetd
===================================================================
--- community-x86_64/dbmail-pop3d.xinetd 2015-08-05 14:02:31 UTC (rev
137984)
+++ community-x86_64/dbmail-pop3d.xinetd 2015-08-05 14:02:55 UTC (rev
137985)
@@ -1,13 +0,0 @@
-service pop3
-{
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-pop3d
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-x86_64/dbmail-pop3d.xinetd (from rev 137984,
dbmail/trunk/dbmail-pop3d.xinetd)
===================================================================
--- community-x86_64/dbmail-pop3d.xinetd (rev 0)
+++ community-x86_64/dbmail-pop3d.xinetd 2015-08-05 14:02:55 UTC (rev
137985)
@@ -0,0 +1,13 @@
+service pop3
+{
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-pop3d
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Deleted: community-x86_64/dbmail-timsieved.xinetd
===================================================================
--- community-x86_64/dbmail-timsieved.xinetd 2015-08-05 14:02:31 UTC (rev
137984)
+++ community-x86_64/dbmail-timsieved.xinetd 2015-08-05 14:02:55 UTC (rev
137985)
@@ -1,15 +0,0 @@
-service sieve
-{
-# port = 2000
-# type = UNLISTED
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-timsieved
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-x86_64/dbmail-timsieved.xinetd (from rev 137984,
dbmail/trunk/dbmail-timsieved.xinetd)
===================================================================
--- community-x86_64/dbmail-timsieved.xinetd (rev 0)
+++ community-x86_64/dbmail-timsieved.xinetd 2015-08-05 14:02:55 UTC (rev
137985)
@@ -0,0 +1,15 @@
+service sieve
+{
+# port = 2000
+# type = UNLISTED
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-timsieved
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Copied: dbmail/repos/community-x86_64/no-sql-using.patch (from rev 137984,
dbmail/trunk/no-sql-using.patch)
===================================================================
--- community-x86_64/no-sql-using.patch (rev 0)
+++ community-x86_64/no-sql-using.patch 2015-08-05 14:02:55 UTC (rev 137985)
@@ -0,0 +1,51 @@
+diff -wbBur dbmail-3.2.3/src/dm_imapsession.c
dbmail-3.2.3.q/src/dm_imapsession.c
+--- dbmail-3.2.3/src/dm_imapsession.c 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.q/src/dm_imapsession.c 2015-08-05 16:43:36.489596671
+0300
+@@ -988,7 +988,7 @@
+
+ snprintf(query, DEF_QUERYSIZE-1, "SELECT message_idnr,envelope "
+ "FROM %senvelope e "
+- "LEFT JOIN %smessages m USING (physmessage_id) "
++ "LEFT JOIN %smessages m "
+ "WHERE m.mailbox_idnr = %" PRIu64 " "
+ "AND message_idnr %s",
+ DBPFX, DBPFX,
+diff -wbBur dbmail-3.2.3/src/dm_mailbox.c dbmail-3.2.3.q/src/dm_mailbox.c
+--- dbmail-3.2.3/src/dm_mailbox.c 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.q/src/dm_mailbox.c 2015-08-05 16:41:58.912931125 +0300
+@@ -317,7 +317,7 @@
+ stmt = db_stmt_prepare(c,
+ "SELECT min(m.message_idnr),v.sortfield "
+ "FROM %smessages m "
+- "LEFT JOIN %sheader h USING (physmessage_id) "
++ "LEFT JOIN %sheader h "
+ "LEFT JOIN %sheadername n ON h.headername_id =
n.id "
+ "LEFT JOIN %sheadervalue v ON h.headervalue_id
= v.id "
+ "WHERE m.mailbox_idnr=? "
+@@ -355,7 +355,7 @@
+ stmt = db_stmt_prepare(c,
+ "SELECT m.message_idnr,v.sortfield "
+ "FROM %smessages m "
+- "LEFT JOIN %sheader h USING (physmessage_id) "
++ "LEFT JOIN %sheader h "
+ "LEFT JOIN %sheadername n ON h.headername_id =
n.id "
+ "LEFT JOIN %sheadervalue v ON h.headervalue_id
= v.id "
+ "WHERE m.mailbox_idnr = ? "
+@@ -1268,7 +1268,7 @@
+ op = "=";
+
+ p_string_printf(q,"SELECT message_idnr FROM
%smessages m "
+- "LEFT JOIN %sheader h USING
(physmessage_id) "
++ "LEFT JOIN %sheader h "
+ "LEFT JOIN %sheadername n ON
h.headername_id = n.id "
+ "LEFT JOIN %sheadervalue v ON
h.headervalue_id = v.id "
+ "WHERE m.mailbox_idnr=? AND
m.status IN (?,?) "
+@@ -1290,7 +1290,7 @@
+ case IST_HDR:
+
+ p_string_printf(q, "SELECT message_idnr FROM %smessages
m "
+- "LEFT JOIN %sheader h USING
(physmessage_id) "
++ "LEFT JOIN %sheader h "
+ "LEFT JOIN %sheadername n ON
h.headername_id = n.id "
+ "LEFT JOIN %sheadervalue v ON
h.headervalue_id = v.id "
+ "WHERE mailbox_idnr=? AND status IN
(?,?) "
Copied: dbmail/repos/community-x86_64/noop-fetch-response-fix2.patch (from rev
137984, dbmail/trunk/noop-fetch-response-fix2.patch)
===================================================================
--- community-x86_64/noop-fetch-response-fix2.patch
(rev 0)
+++ community-x86_64/noop-fetch-response-fix2.patch 2015-08-05 14:02:55 UTC
(rev 137985)
@@ -0,0 +1,12 @@
+diff -wbBur dbmail-3.2.3/src/dm_imapsession.c
dbmail-3.2.3.q/src/dm_imapsession.c
+--- dbmail-3.2.3/src/dm_imapsession.c 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.q/src/dm_imapsession.c 2015-07-22 14:10:36.473334443
+0300
+@@ -1413,7 +1413,7 @@
+ if (oldflags && (! MATCH(oldflags, newflags)))
+ flagschanged = true;
+
+- if (modseqchanged || flagschanged) {
++ if ((modseqchanged && self->mailbox->condstore) || self->use_uid ||
flagschanged) {
+ GList *plist = NULL;
+ char *response = NULL;
+ if (self->use_uid) {
