From nobody Mon Feb 23 00:14:37 2026 X-Original-To: dev-commits-ports-main@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 4fK1Z54pK4z6SLky for ; Mon, 23 Feb 2026 00:14:37 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fK1Z52V1wz3rsv for ; Mon, 23 Feb 2026 00:14:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771805677; 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=5SKOhy/Fyu+RqDlfdmCNnobq4pE3GHtW82YS106IVoM=; b=jq8YLTzCO2WE6Q64IH1bhwLfOUpOO6NFRofLD+asiNOiiHOjoEMoYHIYR05mUgAWlYAzEj BV1TJ43NtvYhOOWrlEx4lIW43Ou5BNtOP86Al7ELJ/jQK1gqrT8S1e0WFrgeUiwDQVU++3 nklG4rAYwUUrNioLUmUZfUFDCqagt3u8zO3LuPDYfdF+7FOQwQtx5JkwGmxkJqpItnoP9l rOtBWVIxryTP5J0OvQskMPmf8NbnT3Zi1t3fboBy4FNPCkjQkM7qZUMEZ31BPjJtrHtPBd iOk7YXM4YzrkKkqHc2GjFR2eAx5Q5fn1ZEBiKwa4DEgq2HZKV0mE5k6qLz651w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771805677; a=rsa-sha256; cv=none; b=GSKyreGflPxcONSxEexuiOl2GzHatenWDEgM5byjJfpgR8ik24dvojENxFm5A/PdyFtLRe fWciso4NkKt3guQ69Prrtm1IBHXmC+kScMTsmdE753f6JBASZCycMP0Yxqi54peTTkQy4T LvFk7dgRxglPcIlaz8dTPq9adwqBgXGTVK94U9lI0Zd2tau62Z3ZSDcCbnCCDOpk6Q3Tpd bP5R2adG64iBc/KcOFlAnq5804RDoLZCCej1vo6VS4yyC37OEuZaIisbsw+QRJsskGAK2+ 9CQMdOSGeV7YP5vNhV2QeiMExlrKc/yl9R8XE2+cu2pK8lNQX/Xde1Nck+dUiw== 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=1771805677; 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=5SKOhy/Fyu+RqDlfdmCNnobq4pE3GHtW82YS106IVoM=; b=l2pfEUvFpU+ty/OQ4XqAUS0qfgmwozTK1+jbXRFF2H68VxQ2Ip7e49W33a9fOBPcLFe86M sgsnAKYZHm/0Rm8mNauk5sQNZXeo1QFZ1tPsXgcGSuytzIy9YvL/h9uknVn1KXbeggW6Xx NVajfYfEP6S176uEm8AjFX2pAJldoFgqBjd4gckj1JgB8vUBEplsNB0/dNW3OoETvX8CZi lFFIvb92PEvfXmM5Imdivx5Rk4ywrFap7MgX93S/JTXmo2Q82VeuECrZdaKI606S9HmlZ4 ZHZgV2YbIAuCDssyrg08DLPsOjeGqhsGujDeRXFfb7anK9M6M4VdX2Lh08no9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fK1Z521D7z16GT for ; Mon, 23 Feb 2026 00:14:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ba4a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 00:14:37 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 0ddb96793365 - main - databases/sqlcipher: Fix consumers List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ddb9679336517939e465eaa4798408656ba6322 Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 00:14:37 +0000 Message-Id: <699b9bed.3ba4a.e93ec95@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ddb9679336517939e465eaa4798408656ba6322 commit 0ddb9679336517939e465eaa4798408656ba6322 Author: Vladimir Druzenko AuthorDate: 2026-02-23 00:09:02 +0000 Commit: Vladimir Druzenko CommitDate: 2026-02-23 00:09:02 +0000 databases/sqlcipher: Fix consumers Rename installed files from *sqlite3* back to *sqlcipher*. Unbreak consumers: - finance/kmymoney - finance/skrooge - net-im/gurk-rs - net-im/qTox - net-p2p/retroshare - databases/py-sqlcipher3 While here improve port: - Use USES=localbase instead of CFLAGS+=-I${LOCALBASE}/include and LDFLAGS+=-L${LOCALBASE}/lib. - Split long lines. - Fix warnings from portclippy. - Sort CONFIGURE_ARGS and CPPFLAGS. PR: 292688 Approved by: portmgr (blanket - fix consumers) Fixes: 06c78b76ff27 (Update to 4.13.0) --- databases/sqlcipher/Makefile | 39 ++++++++++++++++------ .../files/patch-autosetup_sqlite-config.tcl | 17 ++++++++++ databases/sqlcipher/pkg-plist | 18 +++++----- 3 files changed, 54 insertions(+), 20 deletions(-) diff --git a/databases/sqlcipher/Makefile b/databases/sqlcipher/Makefile index e7fb8b9280a1..dbb403601fb7 100644 --- a/databases/sqlcipher/Makefile +++ b/databases/sqlcipher/Makefile @@ -10,25 +10,42 @@ WWW= https://www.zetetic.net/sqlcipher/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -USES= cpe libedit libtool ssl tcl:86,build +USES= cpe libedit libtool localbase:ldflags ssl tcl:86,build CPE_VENDOR= zetetic -USE_LDCONFIG= yes USE_GITHUB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tempstore=yes --disable-tcl --disable-readline --soname=legacy -CPPFLAGS+= -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_UNLOCK_NOTIFY \ - -DOMIT_MEMLOCK -DSQLITE_ENABLE_COLUMN_METADATA=1 \ - -DSQLITE_EXTRA_INIT=sqlcipher_extra_init \ - -DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown -LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} -lcrypto -CFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} - -CONFLICTS_INSTALL= sqlite3 +CONFIGURE_ARGS= --disable-readline \ + --disable-tcl \ + --dll-basename=libsqlcipher \ + --includedir=${PREFIX}/include/sqlcipher \ + --soname=libsqlcipher.so.0 \ + --with-tempstore=yes TEST_TARGET= test # tests fail to run, see https://github.com/sqlcipher/sqlcipher/issues/527 +CFLAGS+= -I${OPENSSLINC} +CPPFLAGS+= -DOMIT_MEMLOCK \ + -DSQLITE_ENABLE_COLUMN_METADATA=1 \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY \ + -DSQLITE_EXTRA_INIT=sqlcipher_extra_init \ + -DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown \ + -DSQLITE_HAS_CODEC +LDFLAGS+= -L${OPENSSLLIB} -lcrypto + post-install: + ${MV} ${STAGEDIR}${PREFIX}/bin/sqlite3 \ + ${STAGEDIR}${PREFIX}/bin/sqlcipher + ${MV} ${STAGEDIR}${PREFIX}/lib/libsqlite3.a \ + ${STAGEDIR}${PREFIX}/lib/libsqlcipher.a + ${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/sqlite3.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/sqlcipher.pc + ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/sqlite3.1 \ + ${STAGEDIR}${PREFIX}/share/man/man1/sqlcipher.1 + ${REINPLACE_CMD} -i "" -e 's|sqlite3|sqlcipher|g; \ + s|/usr/local/include|$${prefix}/include|g' \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/sqlcipher.pc @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so ${STAGEDIR}${PREFIX}/bin/* .include diff --git a/databases/sqlcipher/files/patch-autosetup_sqlite-config.tcl b/databases/sqlcipher/files/patch-autosetup_sqlite-config.tcl new file mode 100644 index 000000000000..22ec9bf2a057 --- /dev/null +++ b/databases/sqlcipher/files/patch-autosetup_sqlite-config.tcl @@ -0,0 +1,17 @@ +--- autosetup/sqlite-config.tcl.orig 2026-01-19 17:01:34 UTC ++++ autosetup/sqlite-config.tcl +@@ -884,12 +884,11 @@ proc sqlite-handle-soname {} { + none - "" { return 0 } + legacy { set soname libsqlite3.so.0 } + default { +- if {[string match libsqlite3.* $soname]} { +- # use it as-is +- } else { ++ if {[string match {[0-9]*} $soname]} { + # Assume it's a suffix + set soname "libsqlite3.so.${soname}" + } ++ # else use it as-is + } + } + proc-debug "soname=$soname" diff --git a/databases/sqlcipher/pkg-plist b/databases/sqlcipher/pkg-plist index f823c17abf48..a0125345276e 100644 --- a/databases/sqlcipher/pkg-plist +++ b/databases/sqlcipher/pkg-plist @@ -1,9 +1,9 @@ -bin/sqlite3 -include/sqlite3.h -include/sqlite3ext.h -lib/libsqlite3.a -lib/libsqlite3.so -lib/libsqlite3.so.0 -lib/libsqlite3.so.3.51.2 -libdata/pkgconfig/sqlite3.pc -share/man/man1/sqlite3.1.gz +bin/sqlcipher +include/sqlcipher/sqlite3.h +include/sqlcipher/sqlite3ext.h +lib/libsqlcipher.a +lib/libsqlcipher.so +lib/libsqlcipher.so.0 +lib/libsqlcipher.so.3.51.2 +libdata/pkgconfig/sqlcipher.pc +share/man/man1/sqlcipher.1.gz