diff --git a/_service b/_service index d3e85c4..e1b33ac 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/kanidm/kanidm.git @PARENT_TAG@~git@TAG_OFFSET@.%h git - v1.1.0-alpha.6 + v1.1.0-alpha.7 v* v(\d+\.\d+\.\d+)-alpha\.(\d+) \1~alpha\2 @@ -16,13 +16,11 @@ xz - kanidm diff --git a/cargo_config b/cargo_config index 5987e53..6fb4ff4 100644 --- a/cargo_config +++ b/cargo_config @@ -1,10 +1,5 @@ [source.crates-io] replace-with = "vendored-sources" -[source."https://github.com/yewstack/yew"] -git = "https://github.com/yewstack/yew" -rev = "1280dfd8315b893e96727b5ca5ad852919563823" -replace-with = "vendored-sources" - [source.vendored-sources] -directory = "vendor" +directory = "vendor" \ No newline at end of file diff --git a/kanidm-1.1.0~alpha6~git0.c9f4b1d.tar.xz b/kanidm-1.1.0~alpha6~git0.c9f4b1d.tar.xz deleted file mode 100644 index e102680..0000000 --- a/kanidm-1.1.0~alpha6~git0.c9f4b1d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb971febceb5575fe5d2d828a15fb07226d386673f585cd6de6e86812bd0664f -size 2618836 diff --git a/kanidm-1.1.0~alpha7~git0.c8468199.tar.xz b/kanidm-1.1.0~alpha7~git0.c8468199.tar.xz new file mode 100644 index 0000000..89fc711 --- /dev/null +++ b/kanidm-1.1.0~alpha7~git0.c8468199.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f5d952edf348f08c0e2dbbc25ce411f453a531295a11418d1db77ea8c650bca +size 2921912 diff --git a/kanidm.changes b/kanidm.changes index 8e4e9dc..c88a6e8 100644 --- a/kanidm.changes +++ b/kanidm.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Jan 07 00:59:36 UTC 2022 - wbrown@suse.de + +- resolve bsc#1194119 (CVE-2021-45710) + +------------------------------------------------------------------- +Fri Dec 31 00:11:55 UTC 2021 - wbrown@suse.de + +- Update to version 1.1.0~alpha7~git0.c8468199: + * (cargo-release) version 1.1.0-alpha.7 + * Pre-release update and cleanup (#631) + * Improve autofocus to oauth2 (#630) + * Finalise email changes for oidc (#629) + * Temp use env filter (#628) + * 20211216 tracing cleanup (#627) + * Art attribution + * Refactor of value and addition of base types for business attributes (#626) + * Add xmas logo + * Add rinstall file (#625) + ------------------------------------------------------------------- Fri Oct 01 02:10:02 UTC 2021 - wbrown@suse.de diff --git a/kanidm.spec b/kanidm.spec index 564a38d..fb4e631 100644 --- a/kanidm.spec +++ b/kanidm.spec @@ -1,7 +1,7 @@ # # spec file for package kanidm # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 Name: kanidm -Version: 1.1.0~alpha6~git0.c9f4b1d +Version: 1.1.0~alpha7~git0.c8468199 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+ @@ -108,9 +108,9 @@ export RUSTFLAGS="%{rustflags}" export KANIDM_BUILD_PROFILE=release_suse_generic cargo build --offline --release # Now, move the completions to easier to install locations. -mkdir %{_builddir}/%{name}-%{version}/target/release/_completions -cp %{_builddir}/%{name}-%{version}/target/release/build/*/out/_kanidm* %{_builddir}/%{name}-%{version}/target/release/_completions/ -cp %{_builddir}/%{name}-%{version}/target/release/build/*/out/kanidm*.bash %{_builddir}/%{name}-%{version}/target/release/_completions/ +# mkdir %{_builddir}/%{name}-%{version}/target/release/_completions +# cp %{_builddir}/%{name}-%{version}/target/release/build/*/out/_kanidm* %{_builddir}/%{name}-%{version}/target/release/_completions/ +# cp %{_builddir}/%{name}-%{version}/target/release/build/*/out/kanidm*.bash %{_builddir}/%{name}-%{version}/target/release/_completions/ %install install -D -d -m 0755 %{buildroot}%{_sysconfdir} @@ -154,23 +154,23 @@ install -m 0644 %{_builddir}/%{name}-%{version}/platform/opensuse/kanidm-unixd.s install -m 0644 %{_builddir}/%{name}-%{version}/platform/opensuse/kanidm-unixd-tasks.service %{buildroot}%{_unitdir}/kanidm-unixd-tasks.service install -m 0640 %{_builddir}/%{name}-%{version}/examples/server.toml %{buildroot}%{configdir}/server.toml -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/_kanidmd %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidmd -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/_kanidm %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/_kanidm_badlist_preprocess %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_badlist_preprocess -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/_kanidm_ssh_authorizedkeys_direct %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_ssh_authorizedkeys_direct -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/_kanidm_cache_clear %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_cache_clear -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/_kanidm_cache_invalidate %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_cache_invalidate -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/_kanidm_ssh_authorizedkeys %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_ssh_authorizedkeys -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/_kanidm_unixd_status %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_unixd_status +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidmd %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidmd +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_badlist_preprocess %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_badlist_preprocess +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_ssh_authorizedkeys_direct %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_ssh_authorizedkeys_direct +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_cache_clear %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_cache_clear +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_cache_invalidate %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_cache_invalidate +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_ssh_authorizedkeys %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_ssh_authorizedkeys +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_unixd_status %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_unixd_status -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/kanidmd.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidmd.sh -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/kanidm.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm.sh -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/kanidm_badlist_preprocess.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_badlist_preprocess.sh -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/kanidm_ssh_authorizedkeys_direct.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_ssh_authorizedkeys_direct.sh -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/kanidm_cache_clear.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_cache_clear.sh -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/kanidm_cache_invalidate.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_cache_invalidate.sh -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/kanidm_ssh_authorizedkeys.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_ssh_authorizedkeys.sh -install -m 0755 %{_builddir}/%{name}-%{version}/target/release/_completions/kanidm_unixd_status.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_unixd_status.sh +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidmd.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidmd.sh +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm.sh +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_badlist_preprocess.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_badlist_preprocess.sh +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_ssh_authorizedkeys_direct.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_ssh_authorizedkeys_direct.sh +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_cache_clear.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_cache_clear.sh +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_cache_invalidate.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_cache_invalidate.sh +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 diff --git a/vendor.tar.xz b/vendor.tar.xz index c729bcf..1080d45 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d0f1b0fa171a22c22f3b5a8fdf9c4100063773ae826fd81afa5b8024b1c71cc -size 28435832 +oid sha256:737766061af047fbe6e05691e7cdbbe49759f686b009a4e9edfb18ccbfbbeb3c +size 31072128