From 5e4cceb6d980e4be63876b50cb94054caee2468e Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Mon, 8 Nov 2021 15:41:46 -0600 Subject: [PATCH] dbmail-3.2.4 Backport: group_concat issue --- net-mail/dbmail/Manifest | 2 +- net-mail/dbmail/files/dbmail-3.2.4-group_concat.patch | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest index ddb55d1..187ec4f 100644 --- a/net-mail/dbmail/Manifest +++ b/net-mail/dbmail/Manifest @@ -5,7 +5,7 @@ AUX README.gentoo 1652 BLAKE2B beb9d27ac8de471d4ac8a3c4f626e7005d471477943b424b2 AUX dbmail-2.0.11-lcrypt.patch 642 BLAKE2B 211081aff5d1597054be134f091fce21d36e083d254f53803cb87de66b77cbd35160d548f3d7d6b43c8dfdb93cd4a533dda009f7ce9d5c7f69f5a8fe1fbe9835 SHA512 aa3c25ab2206f104e4de6b20929d55c0e3ceeebd41a670dea553797486696b145feee47f720f4043a1b1fa6b37c73c1684eeb467eace5142e1090a08b63044ff AUX dbmail-2.0.4-01_quota.patch 5108 BLAKE2B 4b6ccfef889abcc50679d23e1f250fa46097f0f344cc080f218e06ab36e4ba44e01c33ced11fe4b508fcff40c7656fe80b5d11b94178e8e1028285d38c73a002 SHA512 3cbc50be3d2766185a37e627e7e2b7f737a083821755b099b6fade2aa3163ca291b368346a961c32dd40892dd3de64c6fa901980fa8c5d54e573a3b9d7e1d050 AUX dbmail-2.0.4-fPIC.patch 2871 BLAKE2B 3c87fba8ccd33efc2b7d875f15c6e146f9493a7930b0e5103a0fa5da6c669a6ebaa86857e6bd8ce1ad9a52e0a4d1177c6133830c4f7b6b09b3a98f4f22ea610f SHA512 dffcc1f79bb1dd4e38aa1842c1aac38fde44ef56c0152013eecabb293154d2d0045596f13321f4c07aaee63e5cf02663305042db5842d612bef461c98fbb67ef -AUX dbmail-3.2.4-group_concat.patch 595 BLAKE2B f2f69454601f65dd9e5c65c3e82214ee80f4f5c88290d982eb93418c361bac6700e1f496dc8ff6929f3b9216a6fa2bb66f7e5ef1b0ac2aaedbb42ab2d1089937 SHA512 de505b816c6d36634fef04cf8dfbe70b8900daeb5a7c10e6b95e8631a0a2c852e1ce578c188f464eb6b1f4eb5b050ab577852963a042f2db8ccd03b305eed6d6 +AUX dbmail-3.2.4-group_concat.patch 678 BLAKE2B 3c4a6feba376308a05b24b47baf198e5f6a85d3ec697dc545ca31a8a03de25162dcb7ea50e268b96a31e13e37f593ea9288e2d407529e2e4bbf0eaa90cfeb12c SHA512 f0d5e77dfd5953478ebddb518c16813362e2d6466a1702a580bd89a6a486022433d184446b4de1038f4b19cadd7d76f5fbc172a8c4c8d080ff21ba47f164e283 AUX dbmail-3.2.5-crypt.patch 874 BLAKE2B bd550f1f0c0fe06b87c380a41a3a4a870978511871b4fd2d8367cf683d5fc0e7f66df2ae29abd94c7efca449294de69ea500e0e9f67c7d45c9216e1c64385d46 SHA512 abf0b859cadbb5eeceacd3c23edf7d94c90c70ebf6308de42ccb69e9bfbf59b0ac697f80476f2422647e5433d6f5ad4fc67262b302011b53c841e57fdb9ec39a AUX dbmail-3.2.5-debug.patch 1475 BLAKE2B c0c466c6dd1cb0f6479e81a280ad4746db7b36d175f6bca50649f4b7833ce527c269743267c0cecc92831d3d41297cfa468581741bdbd42f979b008764640170 SHA512 4be630f5c2cd9aaf2eb3cf37fa61c64c5bfe03f916d9de7936e212dcd16b8129fdf0d746fef0ca86b93552251bd21beaafca43e4564a2728861d59a1cc3b2207 AUX dbmail-imapd.initd 726 BLAKE2B 98627190c184c837480c7fcbe5ee2afa7118de0a299a89c9d7b9a38fdb0b389df734504f79bb361d52324000e1dd2e6d20c64af47e1d81e2808e2cb3c8acc028 SHA512 3a9b175dfa189d74a241f770f701e07d0555e94c45ab162256d60972e4368bea7f9f040f2fa0e1d35969253d8c17fedf1d68f11e975084146d41219067f46486 diff --git a/net-mail/dbmail/files/dbmail-3.2.4-group_concat.patch b/net-mail/dbmail/files/dbmail-3.2.4-group_concat.patch index 6a7f671..6f2b518 100644 --- a/net-mail/dbmail/files/dbmail-3.2.4-group_concat.patch +++ b/net-mail/dbmail/files/dbmail-3.2.4-group_concat.patch @@ -1,7 +1,7 @@ diff -uriN dbmail-3.2.4.orig/src/dm_mailboxstate.c dbmail-3.2.4/src/dm_mailboxstate.c --- dbmail-3.2.4.orig/src/dm_mailboxstate.c 2020-06-08 02:19:38.000000000 -0500 -+++ dbmail-3.2.4/src/dm_mailboxstate.c 2021-11-08 15:13:01.000000000 -0600 -@@ -233,7 +233,7 @@ ++++ dbmail-3.2.4/src/dm_mailboxstate.c 2021-11-08 15:40:45.000000000 -0600 +@@ -233,10 +233,10 @@ memset(query, 0, sizeof(query)); snprintf(query, DEF_QUERYSIZE-1, @@ -9,4 +9,8 @@ diff -uriN dbmail-3.2.4.orig/src/dm_mailboxstate.c dbmail-3.2.4/src/dm_mailboxst + "SELECT k.message_idnr, k.keyword FROM %skeywords k " "LEFT JOIN %smessages m ON k.message_idnr=m.message_idnr " "WHERE m.mailbox_idnr = ? %s " - "group by m.message_idnr", +- "group by m.message_idnr", ++ "group by k.message_idnr, k.keyword", + DBPFX, DBPFX, + filterCondition); +