diff --git a/_service b/_service index cf505e7..dde45ae 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/kanidm/kanidm.git @PARENT_TAG@~git@TAG_OFFSET@.%h git - 1.1.0-alpha.8 + 1.1.0-alpha.9 v* v(\d+\.\d+\.\d+)-alpha\.(\d+) \1~alpha\2 diff --git a/cargo_config b/cargo_config index 6fb4ff4..aba9ab2 100644 --- a/cargo_config +++ b/cargo_config @@ -1,5 +1,15 @@ [source.crates-io] replace-with = "vendored-sources" +[source."https://github.com/Firstyear/authenticator-rs.git"] +git = "https://github.com/Firstyear/authenticator-rs.git" +branch = "webauthn-authenticator-rs" +replace-with = "vendored-sources" + +[source."https://github.com/kanidm/webauthn-rs.git"] +git = "https://github.com/kanidm/webauthn-rs.git" +rev = "7a8e6c6b351ab7544f08cf8ba48424baacee1360" +replace-with = "vendored-sources" + [source.vendored-sources] -directory = "vendor" \ No newline at end of file +directory = "vendor" diff --git a/kanidm-1.1.0~alpha8~git0.b6be0524.tar.xz b/kanidm-1.1.0~alpha8~git0.b6be0524.tar.xz deleted file mode 100644 index c0834c3..0000000 --- a/kanidm-1.1.0~alpha8~git0.b6be0524.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0b1003698ec85f3d5e867c622525e8882ea4c089528fa2e476a07cee8787829 -size 2951300 diff --git a/kanidm-1.1.0~alpha9~git2.ebab6c5f.tar.xz b/kanidm-1.1.0~alpha9~git2.ebab6c5f.tar.xz new file mode 100644 index 0000000..4a89455 --- /dev/null +++ b/kanidm-1.1.0~alpha9~git2.ebab6c5f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d64a2e77910a5f100511631ea95a5d37c117a257f81de57a13154ca08e28fd2f +size 3879292 diff --git a/kanidm.changes b/kanidm.changes index 5f93e27..575fb46 100644 --- a/kanidm.changes +++ b/kanidm.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 02 04:58:28 UTC 2022 - william.brown@suse.com + +- Update to version 1.1.0~alpha9~git2.ebab6c5f: + * Fix cargo.lock + Docker + * Fixing the Github Actions Kanidmd build (#963) + * (cargo-release) version 1.1.0-alpha.9 (#962) + * Improve radius to support eap-tls with ca-dir (#957) + * A pile of Wasm UI tweaks (#958) + * Bump types-requests from 2.28.3 to 2.28.6 in /kanidm_rlm_python (#960) + * Update validator requirement from ^0.15.0 to ^0.16.0 (#959) + * Bump types-requests from 2.28.3 to 2.28.6 in /pykanidm (#961) + * 383 164 authentication updates 9 (#956) + * Update libsqlite3-sys requirement from 0.24.2 to 0.25.0 in /kanidm_unix_int (#929) + ------------------------------------------------------------------- Sun May 01 05:33:09 UTC 2022 - william.brown@suse.com diff --git a/kanidm.spec b/kanidm.spec index 45cecfd..24e5e0f 100644 --- a/kanidm.spec +++ b/kanidm.spec @@ -19,7 +19,7 @@ %global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 Name: kanidm -Version: 1.1.0~alpha8~git0.b6be0524 +Version: 1.1.0~alpha9~git2.ebab6c5f 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+ @@ -173,21 +173,9 @@ install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_ssh_authorizedkeys.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_ssh_authorizedkeys.sh install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_unixd_status.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_unixd_status.sh -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/SUMMARY.md %{buildroot}%{_datadir}/kanidm/docs/SUMMARY.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/accounts_and_groups.md %{buildroot}%{_datadir}/kanidm/docs/accounts_and_groups.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/administrivia.md %{buildroot}%{_datadir}/kanidm/docs/administrivia.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/client_tools.md %{buildroot}%{_datadir}/kanidm/docs/client_tools.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/installing_the_server.md %{buildroot}%{_datadir}/kanidm/docs/installing_the_server.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/intro.md %{buildroot}%{_datadir}/kanidm/docs/intro.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/ldap.md %{buildroot}%{_datadir}/kanidm/docs/ldap.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/pam_and_nsswitch.md %{buildroot}%{_datadir}/kanidm/docs/pam_and_nsswitch.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/password_quality.md %{buildroot}%{_datadir}/kanidm/docs/password_quality.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/posix_accounts.md %{buildroot}%{_datadir}/kanidm/docs/posix_accounts.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/radius.md %{buildroot}%{_datadir}/kanidm/docs/radius.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/recycle_bin.md %{buildroot}%{_datadir}/kanidm/docs/recycle_bin.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/security_hardening.md %{buildroot}%{_datadir}/kanidm/docs/security_hardening.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/ssh_key_dist.md %{buildroot}%{_datadir}/kanidm/docs/ssh_key_dist.md -install -m 0644 %{_builddir}/%{name}-%{version}/kanidm_book/src/why_tls.md %{buildroot}%{_datadir}/kanidm/docs/why_tls.md +rm %{_builddir}/%{name}-%{version}/kanidm_book/src/DEVELOPER_README.md +cp %{_builddir}/%{name}-%{version}/DEVELOPER_README.md %{_builddir}/%{name}-%{version}/kanidm_book/src/DEVELOPER_README.md +cp -r %{_builddir}/%{name}-%{version}/kanidm_book/src/ %{buildroot}%{_datadir}/kanidm/docs/ ## TODO: Add /usr/share/kanidm/ui/pkg install -m 0644 %{_builddir}/%{name}-%{version}/kanidmd_web_ui/pkg/style.css %{buildroot}%{_datadir}/kanidm/ui/pkg/style.css diff --git a/vendor.tar.xz b/vendor.tar.xz index 28138d6..5959f03 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31798203a7a4afe1fe494923f2e16a907d86945254e70c5a2cd47f1166e3c137 -size 31757024 +oid sha256:7c8a5235db73a124904fa193d4ca69f1504b3ceff8a5b4c76725d5d3eb8a2508 +size 32300448