<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/296b2a3bc0659c9ade1ebfa399423ca6dad08152">https://github.com/macports/macports-ports/commit/296b2a3bc0659c9ade1ebfa399423ca6dad08152</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 296b2a3bc06 Update sqlitebrowser with new variant +sqlcipher, and new Portfile for sqlcipher (#13697)
</span>296b2a3bc06 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 296b2a3bc0659c9ade1ebfa399423ca6dad08152
</span>Author: z7z8th <ybzhao1989@gmail.com>
AuthorDate: Wed Feb 2 14:17:29 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> Update sqlitebrowser with new variant +sqlcipher, and new Portfile for sqlcipher (#13697)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * sqlcipher: new port, version 4.4.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> SQLCipher extends the SQLite database library to add security
</span><span style='display:block; white-space:pre;color:#404040;'> enhancements.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> sqlcipher: remove obsolete flags from sqlite3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * sqlitebrowser: add variant +sqlcipher
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> +sqlcipher uses sqlcipher as the db engine to open encrypted sqlite
</span><span style='display:block; white-space:pre;color:#404040;'> databases.
</span><span style='display:block; white-space:pre;color:#404040;'> The default variant still uses sqlite3 as db engine.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> sqlitebrowser: increase revision for new variant
</span>---
databases/sqlcipher/Portfile | 99 ++++++++++++++++++++++++++++++++++++++++
databases/sqlitebrowser/Portfile | 24 +++++++++-
2 files changed, 121 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/sqlcipher/Portfile b/databases/sqlcipher/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e4709fc7052
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/sqlcipher/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,99 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name sqlcipher
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories databases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:ybzhao1989 @z7z8th} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description An security extesion to the embedded SQL database engine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description SQLCipher extends the SQLite database library to add \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ security enhancements that make it more suitable for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ encrypted local data storage like: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * on-the-fly encryption \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * tamper detection \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * memory sanitization \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * strong key derivation. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SQLite3 is an SQL database engine in a C library. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Programs that link the SQLite3 library can have SQL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ database access without running a separate RDBMS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process. The distribution comes with a standalone \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command-line access program (sqlite3) that can be used \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to administer an SQLite3 database and which serves as \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ an example of how to use the SQLite3 library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.zetetic.net/sqlcipher/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup sqlcipher sqlcipher 4.4.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bc0a00765058b864a95686d9efe9f24a2e68f6cb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 87458e0e16594b3ba6c7a1f046bc1ba783d002d35e0e7b61bb6b7bb862f362a7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17611236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.configure build_flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# enable sqlcipher security enhancements
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-prepend -DSQLITE_HAS_CODEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.type gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libedit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to enable `--enable-dynamic-extensions', re-genereate configure from configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args --enable-threadsafe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-editline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-tempstore=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AWK=/usr/bin/awk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # search in worksrcpath for sqlcipher/sqlite3.h first -- don't pick up an installed one!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -DSQLITE_DISABLE_INTRINSIC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_ENABLE_COLUMN_METADATA \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_ENABLE_FTS3_PARENTHESIS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_ENABLE_FTS4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_ENABLE_FTS5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_ENABLE_JSON1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_ENABLE_RTREE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_SECURE_DELETE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_ENABLE_STAT4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_ENABLE_UNLOCK_NOTIFY \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSQLITE_SOUNDEX \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/${name}.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-tools {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description A bundle of command-line tools for managing SQLite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ database files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}, including the sqldiff program and the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sqlite3_analyzer program.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts sqlite3-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args --with-tcl=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-tempstore=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target sqldiff sqlite3_analyzer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/sqldiff ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/sqlite3_analyzer ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/sqlitebrowser/Portfile b/databases/sqlitebrowser/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 18f4ea56e10..8109803bb80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/sqlitebrowser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/sqlitebrowser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup sqlitebrowser sqlitebrowser 3.12.2 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories databases
platforms darwin linux
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +60,20 @@ platform darwin {
</span> # Uses QSysInfo::buildAbi and QSysInfo::currentCpuArchitecture
qt5.min_version 5.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant sqlite3 conflicts sqlcipher description {Use sqlite3 as db engine} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant sqlcipher conflicts sqlite3 description {Use sqlcipher as db engine} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:sqlcipher
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append CONFIG+=sqlcipher
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use `-Dsqlcipher=1' for cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (![variant_isset sqlcipher]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
reinplace "s|libs/qscintilla/Qt4Qt5/qscintilla.pro||g" ${worksrcpath}/sqlitebrowser.pro
reinplace "s|-lqscintilla2|-lqscintilla2_qt5|g" ${worksrcpath}/src/src.pro
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +82,7 @@ platform darwin {
</span> }
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> qt5.depends_component \
qtmacextras
qt5.depends_build_component \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,6 +111,12 @@ platform linux {
</span> -DCMAKE_PREFIX_PATH=${prefix} \
-DQSCINTILLA_INCLUDE_DIR=${qt_includes_dir} \
-DQT_LIBRARY_DIR=${qt_libs_dir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant sqlcipher description {Use sqlcipher as db engine} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:sqlcipher
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -Dsqlcipher=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[info procs cmake.save_configure_cmd] ne ""} {
# create a .macports-$subport-configure.cmd file containing the cmake invocation details
# (provided by a pending update to cmake-1.1
</pre><pre style='margin:0'>
</pre>