From nobody Fri Apr 12 08:39:54 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VG93v0s5Qz5GyD9; Fri, 12 Apr 2024 08:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VG93v0Q1dz46TD; Fri, 12 Apr 2024 08:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712911195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIk5rLMp+lFlr88dKw2d0EdF1y+1bGY7gW6iJwpzXBI=; b=haiY0SvS/AfcFXkgvFbQC8T3b/oWz12bsYC6+ukURIVcAVR2jf0F8UvzjNdLKfExXxFJJe gXm4BnqkOcYC3c6HBgQrfXl7jLP2wO4gt0MQR0c0y3SECPYbHsYW+sG6gkCQWbB3WR8CsP kIaswGDuTMkgIJma26zd7m+paZdnUbPd9Qr2xL4b6PgtG/s8CG0G4b/C13VKuU86Tgi8m7 Lybk6TpB+FOCRe5c8icEV4O7MS1Dl+QdJ+PHp+XRI4ob8SwwV3s9iZSe495dsu0oOxQzhO mWJvyGqjfCloxsnRvNDB+mTzMzAQmFa6UVKTbqUJd8g47TRDo0TY8fOEjFV99Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712911195; a=rsa-sha256; cv=none; b=rgKTcYLGf3D0TeuKKJuTXrNthKE/s0ioErAIejROp663ScMZmur5aMTAARHtXa51mKzXxr 89kpvS6Mgmlvw7j2usAM0HG+jk/XexbX2aGEqwrH8QfhlyRPJqkJr2faMr09vY0S8M0JrY Mu38fTnTlHGpZPago9DPniI5M8r76+qdAYXTDwGkYquWJxo7cSpCh+bf1CBajBBzw7Yaq6 IBz3C9yprWS7H0QRO+56kfLL7I0qxnQyB3guq3uWm1g641/l9ia+vihsy+OFSbqCvQ/bR4 nWOQaorEpJSd4l6BYhiGYisJlQJt6kNluq8X0NsysHR0k1ELiZAnb8pNB0jIkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712911195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CIk5rLMp+lFlr88dKw2d0EdF1y+1bGY7gW6iJwpzXBI=; b=BN58D58UTLh5K6BqnTfIb2viQR8fVCqrexbeUqL/Y8k72SRD8k+M+a5AG6quZlgLW53wB2 LN1on4kS6JUOFZTaHkZwKQNx0sSOZZ+g7I+YJrEtaKtfSnbQd6o+7Vn3GElPDQAYNGqY/Y v8AYPEPTWUglLUFVDibijh+qASc5HgOKTQlQ+qoZxw4n4NGz2imFpYPW6dVrlDQsZ8DOAH vDD7+kIuywhLkdi3GM9xGWxmC6sbWosEveMqUKFTo1/1qRn7/QA3FOpfMteQ2r2p3GAy9r GGD+Y3axRuCNAvs5YMn6x3YChM5aVKwYyWICVn9vMbybPAxUTdmS/jATeaa85A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VG93v026dzjW1; Fri, 12 Apr 2024 08:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43C8dsue095349; Fri, 12 Apr 2024 08:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43C8dsFA095346; Fri, 12 Apr 2024 08:39:54 GMT (envelope-from git) Date: Fri, 12 Apr 2024 08:39:54 GMT Message-Id: <202404120839.43C8dsFA095346@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 7f9936379856 - 2024Q2 - databases/evolution-data-server: make usable when sqlite3 has option DQS disabled List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 7f9936379856372d8dd8d7a7eb005a0fd94b1b6b Auto-Submitted: auto-generated The branch 2024Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f9936379856372d8dd8d7a7eb005a0fd94b1b6b commit 7f9936379856372d8dd8d7a7eb005a0fd94b1b6b Author: Robert Clausecker AuthorDate: 2024-04-08 09:52:26 +0000 Commit: Robert Clausecker CommitDate: 2024-04-12 08:39:16 +0000 databases/evolution-data-server: make usable when sqlite3 has option DQS disabled This port uses "%s" in some SQL queries where '%s' should have been used. When the DQS (double-quoted string) misfeatures of SQLite3 is disabled, these queries fail and cause the error "no such column: %s". Change these queries to fix evolution. PR: 278249 Approved by: fluffy (gnome) MFH: 2024Q2 (cherry picked from commit 50154e657e63e12df3938dcd7dc15b7e340f5a6f) --- databases/evolution-data-server/Makefile | 2 +- .../files/patch-src_camel_camel-db.c | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index e1208fc20932..e56f1c5cd37e 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= evolution-data-server DISTVERSION= 3.44.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome diff --git a/databases/evolution-data-server/files/patch-src_camel_camel-db.c b/databases/evolution-data-server/files/patch-src_camel_camel-db.c new file mode 100644 index 000000000000..2ff44c2cb5e8 --- /dev/null +++ b/databases/evolution-data-server/files/patch-src_camel_camel-db.c @@ -0,0 +1,36 @@ +Allow evolution to be used when databases/sqlite3 has been compiled +with option DQS disabled. + +--- src/camel/camel-db.c.orig 2024-04-08 09:37:09 UTC ++++ src/camel/camel-db.c +@@ -1823,8 +1823,8 @@ camel_db_migrate_folder_prepare (CamelDB *cdb, + "mail_to , mail_cc , mlist , followup_flag , " + "followup_completed_on , followup_due_by , " + "part , labels , usertags , cinfo , bdata , '', '', " +- "strftime(\"%%s\", 'now'), " +- "strftime(\"%%s\", 'now') FROM %Q", ++ "strftime('%%s', 'now'), " ++ "strftime('%%s', 'now') FROM %Q", + folder_name, folder_name); + ret = camel_db_add_to_transaction (cdb, table_creation_query, error); + sqlite3_free (table_creation_query); +@@ -2093,8 +2093,8 @@ camel_db_write_message_info_record (CamelDB *cdb, + "%Q, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, " + "%lld, %lld, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, " + "%Q, %Q, %Q, %Q, %Q, %Q, %Q, " +- "strftime(\"%%s\", 'now'), " +- "strftime(\"%%s\", 'now') )", ++ "strftime('%%s', 'now'), " ++ "strftime('%%s', 'now') )", + folder_name, + record->uid, + record->flags, +@@ -2578,7 +2578,7 @@ camel_db_rename_folder (CamelDB *cdb, + ret = camel_db_add_to_transaction (cdb, cmd, error); + sqlite3_free (cmd); + +- cmd = sqlite3_mprintf ("UPDATE %Q SET modified=strftime(\"%%s\", 'now'), created=strftime(\"%%s\", 'now')", new_folder_name); ++ cmd = sqlite3_mprintf ("UPDATE %Q SET modified=strftime('%%s', 'now'), created=strftime('%%s', 'now')", new_folder_name); + ret = camel_db_add_to_transaction (cdb, cmd, error); + sqlite3_free (cmd); +