From nobody Mon Dec 02 14:32:54 2024 X-Original-To: dev-commits-ports-all@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 4Y25qB37gvz5fvKT; Mon, 02 Dec 2024 14:32:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y25qB2SzTz4HYQ; Mon, 2 Dec 2024 14:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733149974; 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=Emrp+QOS6ZvrSj53t+WYcpUsFVIP+STTbqcNbcbI93Y=; b=YO4z7BsihOC6Wp6BZNeZrL/fddlogsIK6279XyQRSDwciljeMpY/OMrmNtU1P6Kwj2iinx w2ZCgzm0bD0BQ5j9w1Jt6Y9yDrpy+moD3CiBs+eSMuCKzh9344gNVOy4AINMdjlZEo2PFA mqYPLOAqcWV5SoCRW6CnQWrQ9BneNiG9mG2KIq3ZYQEOUCmsDf3CSAU2QrTLIOhqBwoK1A pwKBjCwX6jQG1W+X3w3Ouj3EKNhfkhLr54hMfS7wSTvICl1PQGlOzAc1Pvt4CkpzINRP8o CAONP1TTcbtbRvCil1HrlAEE5TBgLVyAKb3vGasB++yUd+2SdVzZUygZCbRSNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733149974; 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=Emrp+QOS6ZvrSj53t+WYcpUsFVIP+STTbqcNbcbI93Y=; b=kAFsGCJwkKHnApPCRXdKLEy0J0EDbT3jywil0CgfPdW9oviXnLuEM77zhMO2VaEbb68hMQ 1KQV/WMdMbB5jHvJ7bvtWmM/oZiQiXZM0JbxvFHzaPGxnq+o0W157KYjMg9pXjzLXNq3I6 KD7912CrDeUgMgzRe2vPGoslKE4gowRz9Ip8kLKMiZWWq04Z3b1AbXY4c0tMtPUuVjm1N9 l+pSNH0MkXFoSiFYw//nBgXjI1UXrHadza5u/QBJUP9WplVr4HunLYIIciio/GwyG6H4by NkJANvy9kgpRZ4wg5CbD9mCMb5n4IB3pCKIuJYUfcWmm7D/bfXPFgvXuiqrYmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733149974; a=rsa-sha256; cv=none; b=pBC1rqbkWZH01TBvUzRKaSfZbHD8OGbp926BMuIYm/ii+ljzgK7LUbOGgh+7AEzqumw+eY 4sNpMKLiDP7J5b0owulQwv9ZMDurfl5iH+FI/33BjT8A1nT34WgoNj2lUkuFeb8whUpPB+ ofKNzrzm1bEVeC0udPirEQT68dL5K0DNdrnaJfLBeUEUuAytFEa/gJBmkW1nwWD2R+OlSh +zf5UglDt01xAHbPsYJEivHWqZEm6Ezgl68MHMG9UEP0AdLA63Anxb24stktwkCWxQxCVe R5S2QPAXkI8vaQD6hLOrVJWOToyTz+W9pZPhFd0Oq29ts+ZtRzodYLJx0iYPGQ== 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 4Y25qB1n8pzhRd; Mon, 2 Dec 2024 14:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B2EWss9064245; Mon, 2 Dec 2024 14:32:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2EWsxq064242; Mon, 2 Dec 2024 14:32:54 GMT (envelope-from git) Date: Mon, 2 Dec 2024 14:32:54 GMT Message-Id: <202412021432.4B2EWsxq064242@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: df3b68919789 - 2024Q4 - mail/dspam: fix with sqlite3 with DQS option enabled List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: df3b689197893f41375bee6c6bb93820560cb072 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=df3b689197893f41375bee6c6bb93820560cb072 commit df3b689197893f41375bee6c6bb93820560cb072 Author: Pavel Volkov AuthorDate: 2024-11-30 11:04:15 +0000 Commit: Robert Clausecker CommitDate: 2024-12-02 14:32:26 +0000 mail/dspam: fix with sqlite3 with DQS option enabled Use single quotes for strings in SQL statements to avoid them failing. PR: 279418 Approved by: portmgr (build fix blanket) MFH: 2024Q4 (cherry picked from commit 9655fa3e957a034ffca3780d87116cbdcc3fdbc9) --- mail/dspam/Makefile | 2 +- mail/dspam/files/patch-src_sqlite3__drv.c | 38 +++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index c556d22cff05..47afdf6e1418 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -4,7 +4,7 @@ PORTNAME= dspam PORTVERSION= 3.10.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/mail/dspam/files/patch-src_sqlite3__drv.c b/mail/dspam/files/patch-src_sqlite3__drv.c new file mode 100644 index 000000000000..0479d074a6c4 --- /dev/null +++ b/mail/dspam/files/patch-src_sqlite3__drv.c @@ -0,0 +1,38 @@ +--- src/sqlite3_drv.c.orig 2024-06-01 03:59:05 UTC ++++ src/sqlite3_drv.c +@@ -918,7 +918,7 @@ _ds_get_signature (DSPAM_CTX * CTX, struct _ds_spam_si + } + + snprintf (query, sizeof (query), +- "SELECT data FROM dspam_signature_data WHERE signature=\"%s\"", ++ "SELECT data FROM dspam_signature_data WHERE signature='%s'", + signature); + + if ((sqlite3_prepare(s->dbh, query, -1, &stmt, &query_tail)) +@@ -967,7 +967,7 @@ _ds_set_signature (DSPAM_CTX * CTX, struct _ds_spam_si + + snprintf (scratch, sizeof (scratch), + "INSERT INTO dspam_signature_data (signature,created_on,data)" +- " VALUES (\"%s\",date('now'),?)", signature); ++ " VALUES ('%s',date('now'),?)", signature); + + if ((sqlite3_prepare(s->dbh, scratch, -1, &stmt, &query_tail))!=SQLITE_OK) + { +@@ -1001,7 +1001,7 @@ _ds_delete_signature (DSPAM_CTX * CTX, const char *sig + } + + snprintf (query, sizeof (query), +- "DELETE FROM dspam_signature_data WHERE signature=\"%s\"", ++ "DELETE FROM dspam_signature_data WHERE signature='%s'", + signature); + + if ((sqlite3_exec(s->dbh, query, NULL, NULL, &err))!=SQLITE_OK) +@@ -1028,7 +1028,7 @@ _ds_verify_signature (DSPAM_CTX * CTX, const char *sig + } + + snprintf (query, sizeof (query), +- "SELECT signature FROM dspam_signature_data WHERE signature=\"%s\"", ++ "SELECT signature FROM dspam_signature_data WHERE signature='%s'", + signature); + + if ((sqlite3_get_table(s->dbh, query, &row, &nrow, &ncolumn, &err))!=SQLITE_OK) {