diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 1dfae53b9..d4874251e 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -31,7 +31,6 @@ jobs: libpam0g-dev \ libudev-dev \ libssl-dev \ - libsqlite3-dev \ pkg-config - name: "Run clippy (ignores errors, this is just a check)" diff --git a/.github/workflows/kanidm_individual_book.yml b/.github/workflows/kanidm_individual_book.yml index c8daedaf0..eb1ab71e1 100644 --- a/.github/workflows/kanidm_individual_book.yml +++ b/.github/workflows/kanidm_individual_book.yml @@ -30,9 +30,12 @@ jobs: - name: Install deps run: | sudo apt-get update - sudo apt-get install -y clang build-essential \ - librust-openssl-dev libssl-dev \ - libsqlite3-dev libudev-dev \ + sudo apt-get install -y \ + clang \ + build-essential \ + librust-openssl-dev \ + libssl-dev \ + libudev-dev \ libpam0g-dev - name: Setup mdBook uses: peaceiris/actions-mdbook@v1 diff --git a/.github/workflows/rust_build.yml b/.github/workflows/rust_build.yml index 11974c97d..a8beab7e2 100644 --- a/.github/workflows/rust_build.yml +++ b/.github/workflows/rust_build.yml @@ -32,8 +32,7 @@ jobs: sudo apt-get install -y \ libpam0g-dev \ libudev-dev \ - libssl-dev \ - libsqlite3-dev + libssl-dev - name: "Build the workspace" run: cargo build --workspace diff --git a/Cargo.toml b/Cargo.toml index 476fcf867..1eb750d5a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -159,7 +159,7 @@ reqwest = { version = "0.11.20", default-features = false, features = [ "native-tls-alpn", ] } rpassword = "^7.2.0" -rusqlite = "^0.28.0" +rusqlite = { version = "^0.28.0", features = ["array", "bundled"] } scim_proto = "^0.2.1" sd-notify = "^0.4.1" diff --git a/book/src/DEVELOPER_README.md b/book/src/DEVELOPER_README.md index 21dca8927..b0e40b06a 100644 --- a/book/src/DEVELOPER_README.md +++ b/book/src/DEVELOPER_README.md @@ -81,7 +81,7 @@ You need [rustup](https://rustup.rs/) to install a Rust toolchain. You will also need some system libraries to build this, which can be installed by running: ```bash -sudo apt-get install libsqlite3-dev libudev-dev libssl-dev pkg-config libpam0g-dev +sudo apt-get install libudev-dev libssl-dev pkg-config libpam0g-dev ``` Tested with Ubuntu 20.04 and 22.04. diff --git a/platform/debian/install_deps.sh b/platform/debian/install_deps.sh index aec4b76b1..d38f042b9 100755 --- a/platform/debian/install_deps.sh +++ b/platform/debian/install_deps.sh @@ -15,7 +15,6 @@ apt-get install -y \ libpam0g-dev \ libudev-dev \ libssl-dev \ - libsqlite3-dev \ pkg-config \ make \ devscripts \ @@ -27,7 +26,6 @@ else libpam0g-dev \ libudev-dev \ libssl-dev \ - libsqlite3-dev \ pkg-config \ make \ devscripts \ diff --git a/platform/debian/kanidm-unixd/control b/platform/debian/kanidm-unixd/control index 614e7a29d..24e1cda58 100644 --- a/platform/debian/kanidm-unixd/control +++ b/platform/debian/kanidm-unixd/control @@ -2,7 +2,7 @@ Source: kanidm-unixd Section: admin Priority: optional Maintainer: James Hodgkinson -Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, libsqlite3-dev, pkg-config, cargo, make +Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, pkg-config, cargo, make Standards-Version: 4.6.0 Homepage: https://kanidm.com Vcs-Git: https://github.com/kanidm/kanidm/ diff --git a/platform/debian/kanidm/control b/platform/debian/kanidm/control index 18e61e3b2..f1e404466 100644 --- a/platform/debian/kanidm/control +++ b/platform/debian/kanidm/control @@ -2,7 +2,7 @@ Source: kanidm Section: admin Priority: optional Maintainer: James Hodgkinson -Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, libsqlite3-dev, pkg-config, cargo, make +Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, pkg-config, cargo, make Standards-Version: 4.6.0 Homepage: https://kanidm.com Vcs-Git: https://github.com/kanidm/kanidm/ diff --git a/platform/debian/kanidmd/control b/platform/debian/kanidmd/control index 5fae4fcfc..e8c004abc 100644 --- a/platform/debian/kanidmd/control +++ b/platform/debian/kanidmd/control @@ -2,7 +2,7 @@ Source: kanidmd Section: admin Priority: optional Maintainer: James Hodgkinson -Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, libsqlite3-dev, pkg-config, cargo, make +Build-Depends: debhelper (>=10), libpam0g-dev, libudev-dev, libssl-dev, pkg-config, cargo, make Standards-Version: 4.6.0 Homepage: https://kanidm.com Vcs-Git: https://github.com/kanidm/kanidm/ diff --git a/scripts/install_ubuntu_dependencies.sh b/scripts/install_ubuntu_dependencies.sh index 4ed47e893..174877826 100755 --- a/scripts/install_ubuntu_dependencies.sh +++ b/scripts/install_ubuntu_dependencies.sh @@ -13,7 +13,6 @@ ${SUDOCMD} apt-get install -y \ libpam0g-dev \ libudev-dev \ libssl-dev \ - libsqlite3-dev \ pkg-config \ curl \ rsync \