diff --git a/_servicedata b/_servicedata index 51e30bb..da33330 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/kanidm/kanidm.git - 74f5c0f0f118ad863da786ba610175de606126a7 \ No newline at end of file + 122b6afd878e92c1b68b2d8dc594c099f2db0af0 \ No newline at end of file diff --git a/cargo_config b/cargo_config deleted file mode 100644 index 0feb7bb..0000000 --- a/cargo_config +++ /dev/null @@ -1,15 +0,0 @@ -[source.crates-io] -replace-with = "vendored-sources" - -[source."git+https://github.com/dnaeon/rust-sshkeys.git?rev=fa5bd02dd6e90ee724fdb981253c1e7726a7f534"] -git = "https://github.com/dnaeon/rust-sshkeys.git" -rev = "fa5bd02dd6e90ee724fdb981253c1e7726a7f534" -replace-with = "vendored-sources" - -[source."git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c"] -git = "https://github.com/kanidm/webauthn-rs.git" -rev = "2218d2055c0c900ef57b398423eee5e8d5521f4c" -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" diff --git a/kanidm-1.1.0~rc15~git2.74f5c0f.tar.zst b/kanidm-1.1.0~rc15~git2.74f5c0f.tar.zst deleted file mode 100644 index 955606a..0000000 --- a/kanidm-1.1.0~rc15~git2.74f5c0f.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a0f1eb178a222cb2eaaeff2dead0a5bc0bcf8f24c213238fb31333b785b370d -size 10001905 diff --git a/kanidm-1.1.0~rc15~git8.122b6af.tar.zst b/kanidm-1.1.0~rc15~git8.122b6af.tar.zst new file mode 100644 index 0000000..4a47740 --- /dev/null +++ b/kanidm-1.1.0~rc15~git8.122b6af.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e472eb87ba915db98a75f6f660cbab200fe1695e84c725b5c84c540c418012a2 +size 10001899 diff --git a/kanidm.changes b/kanidm.changes index ab92ebb..b84c7c8 100644 --- a/kanidm.changes +++ b/kanidm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 24 01:18:23 UTC 2024 - william.brown@suse.com + +- Update to version 1.1.0~rc15~git8.122b6af: + * Remove unused import that breaks builds on newer rust versions + * Update to latest webauthn-rs version + * fix version + * Fix maint branch versions + * Disable inconsistent test (#2278) + ------------------------------------------------------------------- Tue Oct 31 12:02:37 UTC 2023 - william.brown@suse.com diff --git a/kanidm.spec b/kanidm.spec index 569ae8f..628a08d 100644 --- a/kanidm.spec +++ b/kanidm.spec @@ -1,7 +1,7 @@ # # spec file for package kanidm # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,13 @@ Name: kanidm -Version: 1.1.0~rc15~git2.74f5c0f +Version: 1.1.0~rc15~git8.122b6af Release: 0 Summary: A identity management service and clients. License: ( Apache-2.0 OR BSL-1.0 ) AND ( Apache-2.0 OR ISC OR MIT ) AND ( Apache-2.0 OR MIT ) AND ( Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT ) AND ( CC0-1.0 OR Apache-2.0 ) AND ( MIT OR Apache-2.0 OR Zlib ) AND ( Unlicense OR MIT ) AND ( Zlib OR Apache-2.0 OR MIT ) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND ISC AND MIT AND MPL-2.0 AND MPL-2.0+ URL: https://github.com/Firstyear/kanidm Source: kanidm-%{version}.tar.zst Source1: vendor.tar.zst -Source2: cargo_config BuildRequires: cargo >= 1.69.0 BuildRequires: libselinux-devel @@ -99,9 +98,6 @@ Documentation for using and configuring Kanidm. %setup -q %setup -qa1 -mkdir .cargo -cp %{SOURCE2} .cargo/config - # Remove exec bits to prevent an issue in fedora shebang checking find vendor -type f -name \*.rs -exec chmod -x '{}' \; diff --git a/vendor.tar.zst b/vendor.tar.zst index d2322b7..f3fbaa9 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30b74ddd7ac0e8f962ef131e54c6066e3370a9d1cba6e601c1e62eab30fd2cbd -size 62357099 +oid sha256:a55b8b153fd54e060d9bbb7fa2ab25090c73d4b2b30af3543ec90a966ad5bb16 +size 62700165