mig5/bouquin-sqlcipher4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to latest sqlcipher and openssl

Browse source
This commit is contained in:
laggykiller 2025-08-26 05:11:15 +08:00
parent e9a893bdbf
commit d15a48be3e
No known key found for this signature in database
3 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
conanfile.py
View file

@ -2,5 +2,4 @@ from conan import ConanFile
class OpensslRecipe(ConanFile): class OpensslRecipe(ConanFile):
def requirements(self): def requirements(self):
self.requires("openssl/1.1.1w") self.requires("openssl/3.5.2")
# self.requires("openssl/3.2.1")

28
setup.py
View file

@ -26,10 +26,6 @@ sources = glob("src/*.c") + ["src/sqlcipher/sqlite3.c"]
library_dirs = [] library_dirs = []
include_dirs = ["./src"] include_dirs = ["./src"]
# Work around clang raising hard error for unused arguments
if sys.platform == "darwin":
os.environ["CFLAGS"] = "-Qunused-arguments"
def get_native_arch() -> str: def get_native_arch() -> str:
for k, v in CONAN_ARCHS.items(): for k, v in CONAN_ARCHS.items():
if platform.machine().lower() in v: if platform.machine().lower() in v:
@ -53,6 +49,7 @@ def install_openssl(arch: str) -> "dict[Any, Any]":
"""Install openssl using Conan. """Install openssl using Conan.
""" """
settings: list[str] = [] settings: list[str] = []
options: list[str] = []
if platform.system() == "Windows": if platform.system() == "Windows":
settings.append("os=Windows") settings.append("os=Windows")
@ -66,8 +63,8 @@ def install_openssl(arch: str) -> "dict[Any, Any]":
settings.append("compiler.libcxx=libc++") settings.append("compiler.libcxx=libc++")
elif platform.system() == "Linux": elif platform.system() == "Linux":
settings.append("os=Linux") settings.append("os=Linux")
settings.append(f"arch={arch}") settings.append(f"arch={arch}")
options.append("openssl/*:no_zlib=True")
build = ["missing"] build = ["missing"]
if os.path.isdir("/lib") and any(e.startswith("libc.musl") for e in os.listdir("/lib")): if os.path.isdir("/lib") and any(e.startswith("libc.musl") for e in os.listdir("/lib")):
@ -75,13 +72,15 @@ def install_openssl(arch: str) -> "dict[Any, Any]":
build.append("openssl*") build.append("openssl*")
subprocess.run(["conan", "profile", "detect", "-f"]) subprocess.run(["conan", "profile", "detect", "-f"])
# Latest openssl need center2.conan.io instead of center.conan.io
subprocess.run(["conan", "remote", "update", "conancenter", "--url=https://center2.conan.io"])
conan_output = os.path.join("conan_output", arch) conan_output = os.path.join("conan_output", arch)
result = subprocess.run([ result = subprocess.run([
"conan", "install", "conan", "install",
*[x for s in settings for x in ("-s", s)], *[x for s in settings for x in ("-s", s)],
*[x for b in build for x in ("-b", b)], *[x for b in build for x in ("-b", b)],
*[x for o in options for x in ("-o", o)],
"-of", conan_output, "--deployer=direct_deploy", "--format=json", "." "-of", conan_output, "--deployer=direct_deploy", "--format=json", "."
], stdout=subprocess.PIPE).stdout.decode() ], stdout=subprocess.PIPE).stdout.decode()
conan_info = json.loads(result) conan_info = json.loads(result)
@ -103,15 +102,6 @@ def add_deps(conan_info: "dict[Any, Any]") -> "tuple[list[str], list[str]]":
return library_dirs, include_dirs return library_dirs, include_dirs
def check_zlib_required(conan_info: "dict[Any, Any]") -> bool:
"""Check if zlib is required (openssl3)
"""
for dep in conan_info["graph"]["nodes"].values():
if dep.get("name") == "zlib":
return True
return False
def quote_argument(arg: str) -> str: def quote_argument(arg: str) -> str:
is_cibuildwheel = os.environ.get("CIBUILDWHEEL", "0") == "1" is_cibuildwheel = os.environ.get("CIBUILDWHEEL", "0") == "1"
@ -159,7 +149,6 @@ if __name__ == "__main__":
conan_info_arm = install_openssl("armv8") conan_info_arm = install_openssl("armv8")
conan_build_folder_arm: str = conan_info_arm["graph"]["nodes"]["0"]["build_folder"] conan_build_folder_arm: str = conan_info_arm["graph"]["nodes"]["0"]["build_folder"]
library_dirs_arm, include_dirs_arm = add_deps(conan_info_arm) library_dirs_arm, include_dirs_arm = add_deps(conan_info_arm)
zlib_required = check_zlib_required(conan_info_x64)
if get_native_arch() == "x86_64": if get_native_arch() == "x86_64":
lipo_dir_merge_src = conan_build_folder_x64 lipo_dir_merge_src = conan_build_folder_x64
@ -193,7 +182,8 @@ if __name__ == "__main__":
else: else:
conan_info = install_openssl(arch) conan_info = install_openssl(arch)
library_dirs, include_dirs = add_deps(conan_info) library_dirs, include_dirs = add_deps(conan_info)
zlib_required = check_zlib_required(conan_info)
extra_compile_args: "list[str]" = ["-Qunused-arguments"] if sys.platform == "darwin" else []
# Configure the linker # Configure the linker
extra_link_args: "list[str]" = [] extra_link_args: "list[str]" = []
@ -209,15 +199,13 @@ if __name__ == "__main__":
# Include math library, required for fts5, and crypto. # Include math library, required for fts5, and crypto.
extra_link_args.extend(["-lm", "-lcrypto"]) extra_link_args.extend(["-lm", "-lcrypto"])
if zlib_required:
extra_link_args.append("zlib.lib")
module = Extension( module = Extension(
name="sqlcipher3._sqlite3", name="sqlcipher3._sqlite3",
sources=sources, sources=sources,
define_macros=define_macros, define_macros=define_macros,
library_dirs=library_dirs, library_dirs=library_dirs,
include_dirs=include_dirs, include_dirs=include_dirs,
extra_compile_args=extra_compile_args,
extra_link_args=extra_link_args, extra_link_args=extra_link_args,
language="c", language="c",
) )

2
sqlcipher

@ -1 +1 @@
Subproject commit c5bd336ece77922433aaf6d6fe8cf203b0c299d5 Subproject commit d41a25f448ba08ce24c0a599cf322046bdaa135a