From f50302545c478202e2d64cce0002c55f0c60a1a8bce78675cddb44a52021679b Mon Sep 17 00:00:00 2001 From: William Brown Date: Tue, 1 Aug 2023 10:00:41 +0000 Subject: [PATCH 1/2] Accepting request 1101674 from home:firstyear:branches:network:idm - Update to version 1.1.0~beta13~git2.5d1e2f9: * Resolve build failiures when selinux is enabled (#1927) * Resolve issue with publishing (#1925) * Set dev version (#1924) * Release 1.1.0-beta.13 (#1922) * 20230731 release (#1921) * Improve default shells for distros (#1920) * 20230728 techdebt paydown (#1909) * chasing weirdness (#1910) * chore(deps-dev): bump mkdocs-material from 9.1.19 to 9.1.21 in /pykanidm (#1918) * chore(deps): bump serde_json from 1.0.103 to 1.0.104 (#1917) * chore(deps): bump serde from 1.0.174 to 1.0.178 (#1916) * chore(deps): bump tikv-jemallocator from 0.5.0 to 0.5.4 (#1915) * chore(deps-dev): bump mkdocs from 1.4.3 to 1.5.1 in /pykanidm (#1913) * chore(deps-dev): bump pylint-pydantic from 0.2.3 to 0.2.4 in /pykanidm (#1912) * chore(deps): bump pydantic from 2.0.3 to 2.1.1 in /pykanidm (#1911) * 20230727 unix int modularity (#1907) * bumping action version (#1908) * 68 20230720 replication improvements (#1905) * Resolve compilation issue with tpm enabled on linux (#1902) * Improve service file for host installs (#1901) * 20230720 unix int modular (#1881) * fixing up pydantic things (#1885) * 1788 admin unix socket (#1880) * chore(deps-dev): bump pylint-pydantic from 0.2.1 to 0.2.3 in /pykanidm (#1900) * chore(deps-dev): bump ruff from 0.0.278 to 0.0.280 in /pykanidm (#1899) * chore(deps-dev): bump mkdocstrings-python in /pykanidm (#1898) * chore(deps-dev): bump mkdocs-material from 9.1.18 to 9.1.19 in /pykanidm (#1897) * chore(deps): bump async-trait from 0.1.71 to 0.1.72 (#1895) * chore(deps-dev): bump types-toml from 0.10.8.6 to 0.10.8.7 in /pykanidm (#1896) OBS-URL: https://build.opensuse.org/request/show/1101674 OBS-URL: https://build.opensuse.org/package/show/network:idm/kanidm?expand=0&rev=29 --- _service | 10 +- _servicedata | 2 +- cargo_config | 2 +- kanidm-1.1.0~alpha12~git0.bcdbb18.tar.zst | 3 - kanidm-1.1.0~beta13~git2.5d1e2f9.tar.zst | 3 + kanidm.changes | 254 ++++++++++++++++++++++ kanidm.spec | 58 ++--- vendor.tar.zst | 4 +- 8 files changed, 289 insertions(+), 47 deletions(-) delete mode 100644 kanidm-1.1.0~alpha12~git0.bcdbb18.tar.zst create mode 100644 kanidm-1.1.0~beta13~git2.5d1e2f9.tar.zst diff --git a/_service b/_service index ba28b8a..f0e4a1d 100644 --- a/_service +++ b/_service @@ -3,10 +3,10 @@ https://github.com/kanidm/kanidm.git @PARENT_TAG@~git@TAG_OFFSET@.%h git - 1.1.0-alpha.12 + 1.1.0-beta.13 v* - v(\d+\.\d+\.\d+)-alpha\.(\d+) - \1~alpha\2 + v(\d+\.\d+\.\d+)-([a-z]+)\.(\d+) + \1~\2\3 enable william.brown@suse.com @@ -17,9 +17,9 @@ - kanidm + kanidm-*.tar.zst zst - true + false kanidm diff --git a/_servicedata b/_servicedata index 1150da5..835e1bb 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/kanidm/kanidm.git - bcdbb1837adc8e18064b93cb0bc3ed15c27e7702 \ No newline at end of file + 5d1e2f90e6901017ab3ef9b5fbc10e25a5451fd2 \ No newline at end of file diff --git a/cargo_config b/cargo_config index ff8f3ff..b63fa57 100644 --- a/cargo_config +++ b/cargo_config @@ -1,7 +1,7 @@ [source.crates-io] replace-with = "vendored-sources" -[source."https://github.com/QnnOkabayashi/tracing-forest.git"] +[source."git+https://github.com/QnnOkabayashi/tracing-forest.git?rev=77daf8c8abf010b87d45ece2bf656983c6f8cecb"] git = "https://github.com/QnnOkabayashi/tracing-forest.git" rev = "77daf8c8abf010b87d45ece2bf656983c6f8cecb" replace-with = "vendored-sources" diff --git a/kanidm-1.1.0~alpha12~git0.bcdbb18.tar.zst b/kanidm-1.1.0~alpha12~git0.bcdbb18.tar.zst deleted file mode 100644 index fa693f3..0000000 --- a/kanidm-1.1.0~alpha12~git0.bcdbb18.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:013da24c499564fd7d3bf9453d844d96e9667ae84283e93ec7d17af58e0fc5b7 -size 5133219 diff --git a/kanidm-1.1.0~beta13~git2.5d1e2f9.tar.zst b/kanidm-1.1.0~beta13~git2.5d1e2f9.tar.zst new file mode 100644 index 0000000..5c63538 --- /dev/null +++ b/kanidm-1.1.0~beta13~git2.5d1e2f9.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88bc204ab251cf05f9003a2175e42c0d82cee146243240a4a3ac434a3bf0969c +size 6382994 diff --git a/kanidm.changes b/kanidm.changes index 61e5d82..8a00216 100644 --- a/kanidm.changes +++ b/kanidm.changes @@ -1,3 +1,257 @@ +------------------------------------------------------------------- +Tue Aug 01 09:12:42 UTC 2023 - william.brown@suse.com + +- Update to version 1.1.0~beta13~git2.5d1e2f9: + * Resolve build failiures when selinux is enabled (#1927) + * Resolve issue with publishing (#1925) + * Set dev version (#1924) + * Release 1.1.0-beta.13 (#1922) + * 20230731 release (#1921) + * Improve default shells for distros (#1920) + * 20230728 techdebt paydown (#1909) + * chasing weirdness (#1910) + * chore(deps-dev): bump mkdocs-material from 9.1.19 to 9.1.21 in /pykanidm (#1918) + * chore(deps): bump serde_json from 1.0.103 to 1.0.104 (#1917) + * chore(deps): bump serde from 1.0.174 to 1.0.178 (#1916) + * chore(deps): bump tikv-jemallocator from 0.5.0 to 0.5.4 (#1915) + * chore(deps-dev): bump mkdocs from 1.4.3 to 1.5.1 in /pykanidm (#1913) + * chore(deps-dev): bump pylint-pydantic from 0.2.3 to 0.2.4 in /pykanidm (#1912) + * chore(deps): bump pydantic from 2.0.3 to 2.1.1 in /pykanidm (#1911) + * 20230727 unix int modularity (#1907) + * bumping action version (#1908) + * 68 20230720 replication improvements (#1905) + * Resolve compilation issue with tpm enabled on linux (#1902) + * Improve service file for host installs (#1901) + * 20230720 unix int modular (#1881) + * fixing up pydantic things (#1885) + * 1788 admin unix socket (#1880) + * chore(deps-dev): bump pylint-pydantic from 0.2.1 to 0.2.3 in /pykanidm (#1900) + * chore(deps-dev): bump ruff from 0.0.278 to 0.0.280 in /pykanidm (#1899) + * chore(deps-dev): bump mkdocstrings-python in /pykanidm (#1898) + * chore(deps-dev): bump mkdocs-material from 9.1.18 to 9.1.19 in /pykanidm (#1897) + * chore(deps): bump async-trait from 0.1.71 to 0.1.72 (#1895) + * chore(deps-dev): bump types-toml from 0.10.8.6 to 0.10.8.7 in /pykanidm (#1896) + * chore(deps): bump axum from 0.6.18 to 0.6.19 (#1894) + * chore(deps): bump clap from 4.3.12 to 4.3.19 (#1893) + * chore(deps): bump axum-macros from 0.3.7 to 0.3.8 (#1892) + * chore(deps): bump serde from 1.0.171 to 1.0.174 (#1891) + * chore(deps): bump uuid from 1.4.0 to 1.4.1 (#1890) + * chore(deps): bump quote from 1.0.31 to 1.0.32 (#1889) + * chore(deps): bump tower-http from 0.4.1 to 0.4.3 (#1888) + * chore(deps): bump syn from 2.0.26 to 2.0.27 (#1887) + * chore(deps): bump urlencoding from 2.1.2 to 2.1.3 (#1886) + * added hsts header middleware (#1882) + * chore(deps): bump aiohttp from 3.8.4 to 3.8.5 in /pykanidm (#1883) + * 1785 allow sync attr yielding via partial write admin (#1879) + * Alter filter generation to exclude empty conditions (#1877) + * Revert to opensuse based radius container. (#1878) + * Unix gid duplicate fix (#1876) + * Refactor docker_build_kanidm to be more isolated (v13) (#1872) + * Sync account import improvements (#1873) + * chore(deps): bump quote from 1.0.29 to 1.0.31 (#1870) + * chore(deps-dev): bump black from 23.3.0 to 23.7.0 in /pykanidm (#1859) + * Add a newline to fix links in LLDAP section of the README (#1871) + * chore(deps): bump dyn-clone from 1.0.11 to 1.0.12 (#1869) + * chore(deps): bump pydantic from 1.10.11 to 2.0.3 in /pykanidm (#1858) + * chore(deps): bump serde_json from 1.0.102 to 1.0.103 (#1868) + * Fix missing slash in tag (#1853) + * chore(deps): bump argon2 from 0.5.0 to 0.5.1 (#1867) + * chore(deps): bump syn from 2.0.25 to 2.0.26 (#1866) + * chore(deps): bump paste from 1.0.13 to 1.0.14 (#1864) + * chore(deps-dev): bump pylint-pydantic from 0.2.0 to 0.2.1 in /pykanidm (#1863) + * chore(deps): bump clap from 4.3.11 to 4.3.12 (#1862) + * chore(deps-dev): bump pytest-asyncio from 0.21.0 to 0.21.1 in /pykanidm (#1861) + * chore(deps): bump proc-macro2 from 1.0.64 to 1.0.66 (#1860) + * chore(deps-dev): bump ruff from 0.0.277 to 0.0.278 in /pykanidm (#1857) + * chore(deps-dev): bump mkdocstrings-python in /pykanidm (#1856) + * chore(deps): bump actions/upload-pages-artifact from 1 to 2 (#1855) + * Revert "something something token permissions (#1850)" (#1852) + * something something token permissions (#1850) + * Upgraded clap, removing atty as a dependency (#1849) + * Ensure we dont use std hashmaps (#1848) + * Improve selinux in tasks daemon (#1847) + * Resolve issue with order of operations causing group memberships to disappear (#1845) + * headless webdriver testing, starting on brotli feature (#1844) + * chore(deps-dev): bump mkdocs-material from 9.1.17 to 9.1.18 in /pykanidm (#1835) + * chore(deps): bump serde from 1.0.166 to 1.0.170 (#1843) + * Fix a typo in the unix daemon debug (#1822) + * chore(deps-dev): bump ruff from 0.0.275 to 0.0.277 in /pykanidm (#1833) + * chore(deps): bump serde-wasm-bindgen from 0.4.5 to 0.5.0 (#1842) + * chore(deps): bump proc-macro2 from 1.0.63 to 1.0.64 (#1841) + * chore(deps): bump syn from 2.0.23 to 2.0.25 (#1840) + * chore(deps): bump async-trait from 0.1.69 to 0.1.71 (#1839) + * chore(deps): bump regex from 1.8.4 to 1.9.1 (#1838) + * chore(deps): bump is-terminal from 0.4.8 to 0.4.9 (#1837) + * chore(deps): bump serde_json from 1.0.99 to 1.0.100 (#1836) + * Allow Authorization header in CORS preflight response (#1831) + * chore(deps): bump pydantic from 1.10.10 to 1.10.11 in /pykanidm (#1834) + * chore(deps-dev): bump pylint-pydantic from 0.1.8 to 0.2.0 in /pykanidm (#1832) + * Add preflight headers (#1829) + * Persist nonce through refresh to support client (#1826) + * Cleanup spa handling (#1825) + * 1792 public oauth clients (#1821) + * 1812 1813 post axum cleanup (#1817) + * Fix diagram colours (#1815) + * Converting from tide to axum (#1797) + * Add client UX for redirecting to an external portal for synced accounts (#1791) + * Add cors policy (#1807) + * Improve tasks daemon shutdown (#1806) + * Improve durability of migrations (#1804) + * clippy-izing an unsafe in pam (#1795) + * chore(deps): bump pydantic from 1.10.9 to 1.10.10 in /pykanidm (#1803) + * chore(deps): bump uuid from 1.3.4 to 1.4.0 (#1802) + * chore(deps): bump tokio from 1.28.2 to 1.29.1 (#1801) + * chore(deps): bump syn from 2.0.20 to 2.0.23 (#1800) + * chore(deps): bump whoami from 1.4.0 to 1.4.1 (#1799) + * chore(deps): bump quote from 1.0.28 to 1.0.29 (#1798) + * 20230629 tpm keygen ... again (#1793) + * Fixing the kanidmd healthcheck (#1789) + * Name change history (#1727) + * 20230628 tpm minor issue with key regen (#1790) + * Still trying to fix the docs. (#1709) + * Improve cli to support multi-domain handling. (#1786) + * Started chasing noise, found some code to delete... (#1768) + * Improve tpm key generation - improve unix config for tpms. (#1782) + * chore(deps-dev): bump pytest from 7.3.2 to 7.4.0 in /pykanidm (#1771) + * chore(deps-dev): bump mkdocs-material from 9.1.16 to 9.1.17 in /pykanidm (#1773) + * chore(deps-dev): bump mypy from 1.3.0 to 1.4.1 in /pykanidm (#1784) + * chore(deps): bump serde_json from 1.0.97 to 1.0.99 (#1778) + * chore(deps): bump syn from 2.0.18 to 2.0.20 (#1779) + * chore(deps): bump authlib from 1.2.0 to 1.2.1 in /pykanidm (#1777) + * chore(deps): bump proc-macro2 from 1.0.60 to 1.0.63 (#1776) + * chore(deps): bump libc from 0.2.146 to 0.2.147 (#1774) + * chore(deps): bump gloo-net from 0.2.6 to 0.3.0 (#1772) + * chore(deps-dev): bump ruff from 0.0.272 to 0.0.275 in /pykanidm (#1770) + * Fix debian packaging (#1742) + * Remove r2d2 - sad beep noises (#1766) + * Kanidmd is a bit noisy (#1765) + * Ux improvements - Allow enrolling other devices (#1764) + * Make argon2id default pw hasher - improve parameter detection (#1762) + * chore(deps): bump openssl from 0.10.54 to 0.10.55 (#1761) + * Implement tpm binding of cached password hashes (#1754) + * Mention client configuration in tool installation guide (#1756) + * Remove scripts that are no longer required (#1759) + * OAuth2 secret JSON (#1758) + * Allow account locking with expire-at 'epoch' and 'now' (#1757) + * Resolve codespell issues (#1753) + * Add tls generator to main kanidmd (#1743) + * Fix block_on in ssh authorised keys (#1752) + * chore(deps-dev): bump mkdocs-material from 9.1.15 to 9.1.16 in /pykanidm (#1751) + * chore(deps): bump gloo from 0.8.0 to 0.8.1 (#1750) + * chore(deps-dev): bump pytest-mock from 3.10.0 to 3.11.1 in /pykanidm (#1749) + * chore(deps): bump hashbrown from 0.13.2 to 0.14.0 (#1748) + * 1737 1739 sync - map uidnumbers mail (#1741) + * Add support for argon2id (#1736) + * Disable neon on linux (#1740) + * 20230614 unix account security - move account name deny to unixd (#1733) + * fixed return value of add_ava_int (#1735) + * unix_integration: also check running SELinux mode (#1704) + * added pre_cand entries to both pre_modify and pre_batch_modify plugin functions (#1732) + * 20230608 ldap sync (#1728) + * Add acp allowing service accounts to clear their own sessions (#1731) + * Declare when no applications are available (#1730) + * Fix ip addr parse (#1729) + * X-Forwarded-For catcher - improve ip addr parsing (#1725) + * chore(deps): bump proc-macro2 from 1.0.59 to 1.0.60 (#1723) + * chore(deps): bump url from 2.3.1 to 2.4.0 (#1722) + * chore(deps-dev): bump pytest from 7.3.1 to 7.3.2 in /pykanidm (#1719) + * chore(deps): bump libc from 0.2.145 to 0.2.146 (#1721) + * chore(deps-dev): bump ruff from 0.0.270 to 0.0.272 in /pykanidm (#1720) + * docs: fix typo in sync concepts (#1715) + * chore(deps): bump regex from 1.8.3 to 1.8.4 (#1718) + * chore(deps): bump pydantic from 1.10.8 to 1.10.9 in /pykanidm (#1717) + * chore(deps): bump serde from 1.0.163 to 1.0.164 (#1716) + * Absolutely minimal implementation (#1711) + * Add further incremental replication tests (#1707) + * Save two more kay strokes (#1708) + * Documentation root directory 404 (#1706) + * chore(deps-dev): bump mkdocstrings-python in /pykanidm (#1697) + * Improve diagnostic and docs of ldap bind requiring posix password (#1702) + * #1680 redux - trying to fix docs again (#1692) + * Automatically login & reauth (#1691) + * chore(deps-dev): bump coverage from 7.2.6 to 7.2.7 in /pykanidm (#1698) + * chore(deps): bump libc from 0.2.144 to 0.2.145 (#1701) + * chore(deps): bump openssl from 0.10.52 to 0.10.54 (#1700) + * chore(deps): bump csv from 1.2.1 to 1.2.2 (#1699) + * chore(deps): bump syn from 2.0.17 to 2.0.18 (#1696) + * chore(deps): bump chrono from 0.4.24 to 0.4.26 (#1695) + * chore(deps-dev): bump mkdocs-material from 9.1.14 to 9.1.15 in /pykanidm (#1694) + * chore(deps): bump openssl-sys from 0.9.87 to 0.9.88 (#1693) + * Documentation root directory 404 (#1681) + * Crono expression parser fix (#1682) + * Document OpenID connect setup for Miniflux (#1683) + * chore(deps): bump cryptography from 39.0.1 to 41.0.0 in /pykanidm (#1684) + * Improve the readme (#1679) + * Move the socket startup to localise it to the acceptor (#1678) + * SELinux support for kanidm-unixd-tasks daemon (#1661) + * Resolve ability to delete ssh keys with spaces in tags (#1674) + * Adding mdbook-template back for bookgen (#1660) + * chore(deps-dev): bump coverage from 7.2.5 to 7.2.6 in /pykanidm (#1669) + * chore(deps-dev): bump mkdocstrings from 0.21.2 to 0.22.0 in /pykanidm (#1671) + * 20230526 incremental replication improvements (#1659) + * chore(deps): bump regex from 1.8.1 to 1.8.3 (#1670) + * chore(deps): bump hashbrown from 0.12.3 to 0.13.2 (#1668) + * chore(deps-dev): bump mkdocstrings-python in /pykanidm (#1667) + * chore(deps): bump tokio from 1.28.1 to 1.28.2 (#1666) + * chore(deps-dev): bump ruff from 0.0.269 to 0.0.270 in /pykanidm (#1665) + * chore(deps): bump quote from 1.0.27 to 1.0.28 (#1664) + * chore(deps): bump pydantic from 1.10.7 to 1.10.8 in /pykanidm (#1663) + * fixing get-tags-action in book build (#1657) + * Add more replication tests, improve some handling of tombstones. (#1656) + * Bring back CpuOptLevel x86_64_v1 (#1590) + * Doc fixes (#1658) + * Identifiable tokens (#1623) + * Add version tag to makefile images (#1654) + * during service account recovery, remove incompatible credentials (#1650) + * signal handling for tasks daemon (#1651) + * Time travelling (#1648) + * chore(deps): bump requests from 2.28.2 to 2.31.0 in /pykanidm (#1649) + * 20230508 replication incremental (#1620) + * chore(deps-dev): bump mkdocs-material from 9.1.12 to 9.1.14 in /pykanidm (#1642) + * chore(deps): bump wasm-bindgen from 0.2.85 to 0.2.86 (#1647) + * chore(deps): bump js-sys from 0.3.62 to 0.3.63 (#1646) + * chore(deps): bump uuid from 1.3.2 to 1.3.3 (#1645) + * chore(deps): bump proc-macro2 from 1.0.56 to 1.0.58 (#1644) + * chore(deps): bump reqwest from 0.11.17 to 0.11.18 (#1643) + * chore(deps-dev): bump ruff from 0.0.267 to 0.0.269 in /pykanidm (#1641) + * Fix use-reset-token command hint (#1639) + * chore(deps): bump pymdown-extensions from 9.9.2 to 10.0 in /pykanidm (#1638) + * chore(deps-dev): bump mypy from 1.2.0 to 1.3.0 in /pykanidm (#1636) + * chore(deps): bump wasm-bindgen-test from 0.3.34 to 0.3.35 (#1635) + * chore(deps-dev): bump ruff from 0.0.265 to 0.0.267 in /pykanidm (#1634) + * chore(deps): bump syn from 2.0.15 to 2.0.16 (#1633) + * chore(deps): bump quote from 1.0.26 to 1.0.27 (#1628) + * chore(deps): bump serde from 1.0.162 to 1.0.163 (#1632) + * chore(deps-dev): bump mkdocs-material from 9.1.9 to 9.1.12 in /pykanidm (#1631) + * chore(deps): bump tokio from 1.28.0 to 1.28.1 (#1629) + * chore(deps): bump web-sys from 0.3.61 to 0.3.62 (#1627) + * chore(deps-dev): bump mkdocstrings-python in /pykanidm (#1626) + * chore(deps): bump libc from 0.2.143 to 0.2.144 (#1625) + * chore(deps): bump js-sys from 0.3.61 to 0.3.62 (#1624) + * Update policy (#1619) + * fixing up some spelling errors (#1618) + * Update RELEASE_NOTES.md (#1616) + * 20230505 replication groundwork - ruv consistency improvements (#1606) + * chore(deps-dev): bump ruff from 0.0.263 to 0.0.265 in /pykanidm (#1608) + * chore(deps-dev): bump mkdocs-material from 9.1.8 to 9.1.9 in /pykanidm (#1609) + * chore(deps-dev): bump mkdocstrings-python in /pykanidm (#1611) + * chore(deps): bump serde from 1.0.160 to 1.0.162 (#1613) + * chore(deps): bump libc from 0.2.142 to 0.2.143 (#1612) + * chore(deps): bump pkg-config from 0.3.26 to 0.3.27 (#1610) + * chore(deps-dev): bump mkdocs from 1.4.2 to 1.4.3 in /pykanidm (#1607) + * github pages ... something is definitely going weird. (#1605) + * token permissions! (#1604) + * Using github actions might actually push a change (#1603) + * looks like that's a bug (#1602) + * fix things (#1601) + * 20230506 ignore some references (#1600) + * Harden migrate session to prevent duplicate migration errors (#1599) + * reducing action concurrency load (#1598) + * more testing cleanup (#1595) + * Document that you need to tell Nginx or other proxies to use HTTP 1.1… (#1592) + * sccache github actions fixes (#1593) + * Start next dev cycle (#1589) + ------------------------------------------------------------------- Mon May 01 01:18:44 UTC 2023 - william.brown@suse.com diff --git a/kanidm.spec b/kanidm.spec index ba661f1..51f1ae7 100644 --- a/kanidm.spec +++ b/kanidm.spec @@ -16,10 +16,8 @@ # -%global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 - Name: kanidm -Version: 1.1.0~alpha12~git0.bcdbb18 +Version: 1.1.0~beta13~git2.5d1e2f9 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+ @@ -28,13 +26,15 @@ Source: kanidm-%{version}.tar.zst Source1: vendor.tar.zst Source2: cargo_config -ExcludeArch: %ix86 s390x ppc ppc64 ppc64le armhfp armv6l armv7l armv7hl - -BuildRequires: cargo +BuildRequires: cargo-packaging +BuildRequires: libselinux-devel BuildRequires: libudev-devel +BuildRequires: llvm-clang > 14 BuildRequires: pam-devel -BuildRequires: rust >= 1.64.0 +BuildRequires: rust >= 1.69.0 BuildRequires: sqlite-devel +BuildRequires: tpm2-0-tss-devel +# BuildRequires: tpm2-openssl BuildRequires: zstd %if 0%{?rhel} > 7 || 0%{?fedora} @@ -42,16 +42,13 @@ BuildRequires: openssl-devel BuildRequires: systemd %{?systemd_requires} %else -BuildRequires: pkgconfig(openssl) +BuildRequires: libopenssl-3-devel %endif Requires: %{name}-clients Requires: %{name}-unixd-clients -#### START BUNDLE METADATA -### See cargo lock2rpmprovides -# currently not needed in suse. -#### END BUNDLE METADATA +ExclusiveArch: %{rust_tier1_arches} %description An identity management platform written in rust that supports RADIUS, SSH Key management @@ -76,6 +73,8 @@ Server for kanidm providing the main authentication and identity service Summary: Client nsswitch/pam/ssh integration for consuming kanidm License: MPL-2.0 Requires: %{name}-clients +Requires: system-user-tss +Requires: tpm2.0-tools %description unixd-clients A localhost resolver and libraries that allow a system to resolve posix @@ -88,7 +87,6 @@ License: MPL-2.0 %description docs Documentation for using and configuring Kanidm. - %define configdir %{_sysconfdir}/%{name} %prep @@ -97,21 +95,21 @@ Documentation for using and configuring Kanidm. 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 '{}' \; %build -export RUSTFLAGS="%{rustflags}" -# Allow building on older compliers with deps that have newer features. -# export RUSTC_BOOTSTRAP=1 - -# Set our build profile +# Set our build profile, this will autodetect our cpu flags 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/ +# Show linking info for debugging +# export RUSTC_LOG='rustc_codegen_ssa::back::link=info' +# Dump the target features of this cpu. +rustc --print target-cpus +# Override buildflags, we want to use clang + lld here. It's much better/faster than bfd. +%define build_rustflags -C linker=clang -C link-arg=-fuse-ld=/usr/lib/rustlib/%{_arch}-unknown-linux-gnu/bin/gcc-ld/ld.lld -C debuginfo=2 -C incremental=false + +%{cargo_build} --features=kanidm_unix_int/tpm,kanidm_unix_int/selinux %install install -D -d -m 0755 %{buildroot}%{_sysconfdir} @@ -130,8 +128,6 @@ install -D -d -m 0755 %{buildroot}/%_lib/security install -D -d -m 0755 %{buildroot}%{_datadir}/kanidm install -D -d -m 0755 %{buildroot}%{_datadir}/kanidm/docs/ install -D -d -m 0755 %{buildroot}%{_datadir}/kanidm/ui/ -install -D -d -m 0755 %{buildroot}%{_datadir}/kanidm/ui/pkg -install -D -d -m 0755 %{buildroot}%{_datadir}/kanidm/ui/pkg/external install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidmd %{buildroot}%{_sbindir}/kanidmd install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidm %{buildroot}%{_bindir}/kanidm @@ -150,7 +146,7 @@ install -m 0644 %{_builddir}/%{name}-%{version}/target/release/libpam_kanidm.so install -m 0644 %{_builddir}/%{name}-%{version}/platform/opensuse/kanidmd.service %{buildroot}%{_unitdir}/kanidmd.service install -m 0644 %{_builddir}/%{name}-%{version}/platform/opensuse/kanidm-unixd.service %{buildroot}%{_unitdir}/kanidm-unixd.service 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 0644 %{_builddir}/%{name}-%{version}/examples/server.toml %{buildroot}%{configdir}/server.toml 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 @@ -165,15 +161,7 @@ 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 cp -r %{_builddir}/%{name}-%{version}/book/src/ %{buildroot}%{_datadir}/kanidm/docs/ - -## TODO: Add /usr/share/kanidm/ui/pkg -install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/style.css %{buildroot}%{_datadir}/kanidm/ui/pkg/style.css -install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/kanidmd_web_ui.js %{buildroot}%{_datadir}/kanidm/ui/pkg/kanidmd_web_ui.js -install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/kanidmd_web_ui_bg.wasm %{buildroot}%{_datadir}/kanidm/ui/pkg/kanidmd_web_ui_bg.wasm -install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/package.json %{buildroot}%{_datadir}/kanidm/ui/pkg/package.json -install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/external/bootstrap.min.css %{buildroot}%{_datadir}/kanidm/ui/pkg/external/bootstrap.min.css -install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/external/bootstrap.bundle.min.js %{buildroot}%{_datadir}/kanidm/ui/pkg/external/bootstrap.bundle.min.js -install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/external/confetti.js %{buildroot}%{_datadir}/kanidm/ui/pkg/external/confetti.js +cp -r %{_builddir}/%{name}-%{version}/server/web_ui/pkg %{buildroot}%{_datadir}/kanidm/ui/pkg ## End install diff --git a/vendor.tar.zst b/vendor.tar.zst index 0beb52f..3c41058 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7977e5a912a9425c5a1004451ac1686a48d58eb54de110de7699074267ae776a -size 75233448 +oid sha256:c01e2e350e6961e6f5acddef24f6053e5617b9fd885a4c937b4a9b76cd1ed246 +size 87116285 From 89a21ff7d0c602cc20b00756de7e61987c237778cb7390a0931f7569d2b68bda Mon Sep 17 00:00:00 2001 From: William Brown Date: Tue, 1 Aug 2023 10:43:54 +0000 Subject: [PATCH 2/2] Accepting request 1101709 from home:firstyear:branches:network:idm OBS-URL: https://build.opensuse.org/request/show/1101709 OBS-URL: https://build.opensuse.org/package/show/network:idm/kanidm?expand=0&rev=30 --- kanidm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kanidm.spec b/kanidm.spec index 51f1ae7..c12d95b 100644 --- a/kanidm.spec +++ b/kanidm.spec @@ -29,7 +29,7 @@ Source2: cargo_config BuildRequires: cargo-packaging BuildRequires: libselinux-devel BuildRequires: libudev-devel -BuildRequires: llvm-clang > 14 +BuildRequires: llvm-clang >= 13 BuildRequires: pam-devel BuildRequires: rust >= 1.69.0 BuildRequires: sqlite-devel