Date: Saturday, June 13, 2020 @ 01:50:49
Author: spupykin
Revision: 642684
archrelease: copy trunk to community-x86_64
Added:
dbmail/repos/community-x86_64/PKGBUILD
(from rev 642683, dbmail/trunk/PKGBUILD)
dbmail/repos/community-x86_64/build-fix.patch
(from rev 642683, dbmail/trunk/build-fix.patch)
dbmail/repos/community-x86_64/dbmail-imapd.xinetd
(from rev 642683, dbmail/trunk/dbmail-imapd.xinetd)
dbmail/repos/community-x86_64/dbmail-lmtpd.xinetd
(from rev 642683, dbmail/trunk/dbmail-lmtpd.xinetd)
dbmail/repos/community-x86_64/dbmail-pop3d.xinetd
(from rev 642683, dbmail/trunk/dbmail-pop3d.xinetd)
dbmail/repos/community-x86_64/dbmail-timsieved.xinetd
(from rev 642683, dbmail/trunk/dbmail-timsieved.xinetd)
dbmail/repos/community-x86_64/log-imap.patch
(from rev 642683, dbmail/trunk/log-imap.patch)
dbmail/repos/community-x86_64/noop-fetch-response-fix2.patch
(from rev 642683, dbmail/trunk/noop-fetch-response-fix2.patch)
Deleted:
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
dbmail/repos/community-x86_64/log-imap.patch
dbmail/repos/community-x86_64/noop-fetch-response-fix2.patch
--------------------------------+
PKGBUILD | 143 +++++++++++++++++++--------------------
build-fix.patch | 23 ++++++
dbmail-imapd.xinetd | 26 +++----
dbmail-lmtpd.xinetd | 26 +++----
dbmail-pop3d.xinetd | 26 +++----
dbmail-timsieved.xinetd | 30 ++++----
log-imap.patch | 94 ++++++++++++-------------
noop-fetch-response-fix2.patch | 24 +++---
8 files changed, 209 insertions(+), 183 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-13 01:50:29 UTC (rev 642683)
+++ PKGBUILD 2020-06-13 01:50:49 UTC (rev 642684)
@@ -1,70 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Sebastian Faltoni <sebastian.falt...@gmail.com>
-
-pkgname=dbmail
-pkgver=3.2.3
-pkgrel=11
-pkgdesc="Fast and scalable sql based mail services"
-arch=('x86_64')
-depends=('gmime' 'libzdb' 'mhash' 'libevent')
-makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml'
'postgresql-libs>=8.4.1'
- 'sqlite' 'mariadb-libs' '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
- log-imap.patch)
-md5sums=('4f140751642559395dfe3a6bb2cc9300'
- '890de13361afbdf4fed12d6d7eb53e66'
- '961593658cd596297d03d25eb9c9e98f'
- '4cb764894abd3914802e90602bf90a0c'
- 'e78dc86355f9aaf24590bc7c6611162f'
- '8c8efca631d3a4052ad18c12ce72a1ab'
- 'e01223ad8e9c1a0faea40f18ea064b66')
-
-prepare() {
- cd "$srcdir"/dbmail-${pkgver}/
- patch -p1 <"$srcdir"/noop-fetch-response-fix2.patch
-# patch -p1 <"$srcdir"/log-imap.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
-}
Copied: dbmail/repos/community-x86_64/PKGBUILD (from rev 642683,
dbmail/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-13 01:50:49 UTC (rev 642684)
@@ -0,0 +1,73 @@
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Sebastian Faltoni <sebastian.falt...@gmail.com>
+
+pkgname=dbmail
+pkgver=3.2.3
+pkgrel=12
+pkgdesc="Fast and scalable sql based mail services"
+arch=('x86_64')
+depends=('gmime' 'libzdb' 'mhash' 'libevent')
+makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml'
'postgresql-libs>=8.4.1'
+ 'sqlite' 'mariadb-libs' 'libldap>=2.4.18' 'libsieve' 'git')
+optdepends=('libldap: for LDAP authentication'
+ 'libsieve: for dbmail-sieve')
+# 'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
+url="https://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=("https://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
+ log-imap.patch
+ build-fix.patch)
+md5sums=('4f140751642559395dfe3a6bb2cc9300'
+ '890de13361afbdf4fed12d6d7eb53e66'
+ '961593658cd596297d03d25eb9c9e98f'
+ '4cb764894abd3914802e90602bf90a0c'
+ 'e78dc86355f9aaf24590bc7c6611162f'
+ '8c8efca631d3a4052ad18c12ce72a1ab'
+ 'e01223ad8e9c1a0faea40f18ea064b66'
+ '89735cd814f4db7dd04f67b2b8c3f5e2')
+
+prepare() {
+ cd "$srcdir"/dbmail-${pkgver}/
+ patch -p1 <"$srcdir"/noop-fetch-response-fix2.patch
+ patch -p1 <"$srcdir"/build-fix.patch
+# patch -p1 <"$srcdir"/log-imap.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
+}
Copied: dbmail/repos/community-x86_64/build-fix.patch (from rev 642683,
dbmail/trunk/build-fix.patch)
===================================================================
--- build-fix.patch (rev 0)
+++ build-fix.patch 2020-06-13 01:50:49 UTC (rev 642684)
@@ -0,0 +1,23 @@
+diff -wbBur dbmail-3.2.3/acinclude.m4 dbmail-3.2.3.my/acinclude.m4
+--- dbmail-3.2.3/acinclude.m4 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.my/acinclude.m4 2020-06-13 04:42:26.966434453 +0300
+@@ -291,6 +291,7 @@
+ [ZDBLIB="-lzdb"],
+ [ZDBLIB="failed"],
+ [[
++#include <stdbool.h>
+ #include <URL.h>
+ #include <ResultSet.h>
+ #include <PreparedStatement.h>
+diff -wbBur dbmail-3.2.3/src/dm_tls.c dbmail-3.2.3.my/src/dm_tls.c
+--- dbmail-3.2.3/src/dm_tls.c 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.my/src/dm_tls.c 2020-06-13 04:40:52.196435575 +0300
+@@ -31,7 +31,7 @@
+ #define THIS_MODULE "tls"
+
+
+-SSL_CTX *tls_context;
++extern SSL_CTX *tls_context;
+
+ /* Create the initial SSL context structure */
+ SSL_CTX *tls_init(void) {
Deleted: dbmail-imapd.xinetd
===================================================================
--- dbmail-imapd.xinetd 2020-06-13 01:50:29 UTC (rev 642683)
+++ dbmail-imapd.xinetd 2020-06-13 01:50:49 UTC (rev 642684)
@@ -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 642683,
dbmail/trunk/dbmail-imapd.xinetd)
===================================================================
--- dbmail-imapd.xinetd (rev 0)
+++ dbmail-imapd.xinetd 2020-06-13 01:50:49 UTC (rev 642684)
@@ -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: dbmail-lmtpd.xinetd
===================================================================
--- dbmail-lmtpd.xinetd 2020-06-13 01:50:29 UTC (rev 642683)
+++ dbmail-lmtpd.xinetd 2020-06-13 01:50:49 UTC (rev 642684)
@@ -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 642683,
dbmail/trunk/dbmail-lmtpd.xinetd)
===================================================================
--- dbmail-lmtpd.xinetd (rev 0)
+++ dbmail-lmtpd.xinetd 2020-06-13 01:50:49 UTC (rev 642684)
@@ -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: dbmail-pop3d.xinetd
===================================================================
--- dbmail-pop3d.xinetd 2020-06-13 01:50:29 UTC (rev 642683)
+++ dbmail-pop3d.xinetd 2020-06-13 01:50:49 UTC (rev 642684)
@@ -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 642683,
dbmail/trunk/dbmail-pop3d.xinetd)
===================================================================
--- dbmail-pop3d.xinetd (rev 0)
+++ dbmail-pop3d.xinetd 2020-06-13 01:50:49 UTC (rev 642684)
@@ -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: dbmail-timsieved.xinetd
===================================================================
--- dbmail-timsieved.xinetd 2020-06-13 01:50:29 UTC (rev 642683)
+++ dbmail-timsieved.xinetd 2020-06-13 01:50:49 UTC (rev 642684)
@@ -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 642683,
dbmail/trunk/dbmail-timsieved.xinetd)
===================================================================
--- dbmail-timsieved.xinetd (rev 0)
+++ dbmail-timsieved.xinetd 2020-06-13 01:50:49 UTC (rev 642684)
@@ -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
+}
Deleted: log-imap.patch
===================================================================
--- log-imap.patch 2020-06-13 01:50:29 UTC (rev 642683)
+++ log-imap.patch 2020-06-13 01:50:49 UTC (rev 642684)
@@ -1,47 +0,0 @@
-diff -wbBur dbmail-3.2.3/src/dm_debug.c dbmail-3.2.3.my/src/dm_debug.c
---- dbmail-3.2.3/src/dm_debug.c 2015-01-25 13:20:50.000000000 +0300
-+++ dbmail-3.2.3.my/src/dm_debug.c 2016-04-08 19:51:11.837835259 +0300
-@@ -98,7 +98,8 @@
- "Notice",
- "Info",
- "Debug",
-- "Database"
-+ "Database",
-+ "Network"
- };
- return Trace_Text[ilogb((double) level)];
- }
-diff -wbBur dbmail-3.2.3/src/dm_debug.h dbmail-3.2.3.my/src/dm_debug.h
---- dbmail-3.2.3/src/dm_debug.h 2015-01-25 13:20:50.000000000 +0300
-+++ dbmail-3.2.3.my/src/dm_debug.h 2016-04-08 18:54:33.797752209 +0300
-@@ -36,7 +36,8 @@
- TRACE_NOTICE = 32,
- TRACE_INFO = 64,
- TRACE_DEBUG = 128,
-- TRACE_DATABASE = 256 // Logs at Debug Level
-+ TRACE_DATABASE = 256, // Logs at Debug Level
-+ TRACE_NETWORK = 512 // Logs at Debug Level
- } Trace_T;
-
-
-diff -wbBur dbmail-3.2.3/src/imap4.c dbmail-3.2.3.my/src/imap4.c
---- dbmail-3.2.3/src/imap4.c 2015-01-25 13:20:50.000000000 +0300
-+++ dbmail-3.2.3.my/src/imap4.c 2016-04-08 20:01:05.247849764 +0300
-@@ -784,6 +784,16 @@
-
- imap_unescape_args(session);
-
-- TRACE(TRACE_INFO, "dispatch [%s]...\n",
IMAP_COMMANDS[session->command_type]);
-+ char caddr_buf[64];
-+ TRACE(TRACE_NETWORK, "Dispatch: client:%s, uid:%d, cmd:%s, rxed: %u,
txed: %u\n",
-+ inet_ntop(session->ci->sock->caddr.sa_family,
-+ (const void*)&((struct
sockaddr_in*)&session->ci->sock->caddr)->sin_addr,
-+ caddr_buf,
-+ session->ci->sock->caddr_len),
-+ (int)session->userid,
-+ IMAP_COMMANDS[session->command_type],
-+ (unsigned)session->ci->bytes_rx,
-+ (unsigned)session->ci->bytes_tx);
-+
- return (*imap_handler_functions[session->command_type]) (session);
- }
Copied: dbmail/repos/community-x86_64/log-imap.patch (from rev 642683,
dbmail/trunk/log-imap.patch)
===================================================================
--- log-imap.patch (rev 0)
+++ log-imap.patch 2020-06-13 01:50:49 UTC (rev 642684)
@@ -0,0 +1,47 @@
+diff -wbBur dbmail-3.2.3/src/dm_debug.c dbmail-3.2.3.my/src/dm_debug.c
+--- dbmail-3.2.3/src/dm_debug.c 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.my/src/dm_debug.c 2016-04-08 19:51:11.837835259 +0300
+@@ -98,7 +98,8 @@
+ "Notice",
+ "Info",
+ "Debug",
+- "Database"
++ "Database",
++ "Network"
+ };
+ return Trace_Text[ilogb((double) level)];
+ }
+diff -wbBur dbmail-3.2.3/src/dm_debug.h dbmail-3.2.3.my/src/dm_debug.h
+--- dbmail-3.2.3/src/dm_debug.h 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.my/src/dm_debug.h 2016-04-08 18:54:33.797752209 +0300
+@@ -36,7 +36,8 @@
+ TRACE_NOTICE = 32,
+ TRACE_INFO = 64,
+ TRACE_DEBUG = 128,
+- TRACE_DATABASE = 256 // Logs at Debug Level
++ TRACE_DATABASE = 256, // Logs at Debug Level
++ TRACE_NETWORK = 512 // Logs at Debug Level
+ } Trace_T;
+
+
+diff -wbBur dbmail-3.2.3/src/imap4.c dbmail-3.2.3.my/src/imap4.c
+--- dbmail-3.2.3/src/imap4.c 2015-01-25 13:20:50.000000000 +0300
++++ dbmail-3.2.3.my/src/imap4.c 2016-04-08 20:01:05.247849764 +0300
+@@ -784,6 +784,16 @@
+
+ imap_unescape_args(session);
+
+- TRACE(TRACE_INFO, "dispatch [%s]...\n",
IMAP_COMMANDS[session->command_type]);
++ char caddr_buf[64];
++ TRACE(TRACE_NETWORK, "Dispatch: client:%s, uid:%d, cmd:%s, rxed: %u,
txed: %u\n",
++ inet_ntop(session->ci->sock->caddr.sa_family,
++ (const void*)&((struct
sockaddr_in*)&session->ci->sock->caddr)->sin_addr,
++ caddr_buf,
++ session->ci->sock->caddr_len),
++ (int)session->userid,
++ IMAP_COMMANDS[session->command_type],
++ (unsigned)session->ci->bytes_rx,
++ (unsigned)session->ci->bytes_tx);
++
+ return (*imap_handler_functions[session->command_type]) (session);
+ }
Deleted: noop-fetch-response-fix2.patch
===================================================================
--- noop-fetch-response-fix2.patch 2020-06-13 01:50:29 UTC (rev 642683)
+++ noop-fetch-response-fix2.patch 2020-06-13 01:50:49 UTC (rev 642684)
@@ -1,12 +0,0 @@
-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) {
Copied: dbmail/repos/community-x86_64/noop-fetch-response-fix2.patch (from rev
642683, dbmail/trunk/noop-fetch-response-fix2.patch)
===================================================================
--- noop-fetch-response-fix2.patch (rev 0)
+++ noop-fetch-response-fix2.patch 2020-06-13 01:50:49 UTC (rev 642684)
@@ -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) {
