[arch-commits] Commit in dbmail/trunk (PKGBUILD no-sql-using.patch)

[Sergej Pupykin]

    Date: Thursday, August 6, 2015 @ 16:22:48
  Author: spupykin
Revision: 138022

Modified:
  dbmail/trunk/PKGBUILD
Deleted:
  dbmail/trunk/no-sql-using.patch

--------------------+
 PKGBUILD           |    9 +++------
 no-sql-using.patch |   51 ---------------------------------------------------
 2 files changed, 3 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-06 13:47:04 UTC (rev 138021)
+++ PKGBUILD	2015-08-06 14:22:48 UTC (rev 138022)
@@ -4,7 +4,7 @@
 
 pkgname=dbmail
 pkgver=3.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64')
 depends=('gmime' 'libzdb' 'mhash' 'libevent')
@@ -27,20 +27,17 @@
 	"dbmail-lmtpd.xinetd"
 	"dbmail-pop3d.xinetd"
 	"dbmail-timsieved.xinetd"
-	noop-fetch-response-fix2.patch
-	no-sql-using.patch)
+	noop-fetch-response-fix2.patch)
 md5sums=('4f140751642559395dfe3a6bb2cc9300'
          '890de13361afbdf4fed12d6d7eb53e66'
          '961593658cd596297d03d25eb9c9e98f'
          '4cb764894abd3914802e90602bf90a0c'
          'e78dc86355f9aaf24590bc7c6611162f'
-         '8c8efca631d3a4052ad18c12ce72a1ab'
-         '403da5e0703104b23d0f349b9ab8d2d0')
+         '8c8efca631d3a4052ad18c12ce72a1ab')
 
 prepare() {
   cd $srcdir/dbmail-${pkgver}/
   patch -p1 <$srcdir/noop-fetch-response-fix2.patch
-  patch -p1 <$srcdir/no-sql-using.patch
 }
 
 build() {

Deleted: no-sql-using.patch
===================================================================
--- no-sql-using.patch	2015-08-06 13:47:04 UTC (rev 138021)
+++ no-sql-using.patch	2015-08-06 14:22:48 UTC (rev 138022)
@@ -1,51 +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-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 (?,?) "