From 15ee34b6dbb69ee9359f9f0c07f6cac032155451 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 31 Mar 2025 16:44:49 -0400 Subject: [PATCH 1/3] ilot/py3-kadmin-rs: new aport --- ilot/py3-kadmin-rs/APKBUILD | 56 +++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 ilot/py3-kadmin-rs/APKBUILD diff --git a/ilot/py3-kadmin-rs/APKBUILD b/ilot/py3-kadmin-rs/APKBUILD new file mode 100644 index 0000000..fae9ad1 --- /dev/null +++ b/ilot/py3-kadmin-rs/APKBUILD @@ -0,0 +1,56 @@ +# Contributor: Antoine Martin (ayakael) +# Maintainer: Antoine Martin (ayakael) +pkgname=py3-kadmin-rs +pkgver=0.5.3 +pkgrel=0 +pkgdesc="Rust and Python interfaces to the Kerberos administration interface (kadm5)" +url="https://github.com/authentik-community/kadmin-rs" +arch="all" +license="MIT" +checkdepends="py3-pytest py3-k5test" +makedepends=" + cargo + cargo-auditable + clang-libclang + py3-setuptools + py3-setuptools-rust + py3-gpep517 + py3-wheel + poetry + python3-dev + sccache + " +source="$pkgname-$pkgver.tar.gz::https://github.com/authentik-community/kadmin-rs/archive/refs/tags/kadmin/version/$pkgver.tar.gz" +builddir="$srcdir"/kadmin-rs-kadmin-version-$pkgver +subpackages="$pkgname-pyc" + +prepare() { + default_prepare + + cargo fetch --target="$CTARGET" --locked +} + + +build() { + cargo auditable build --release --locked + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + cargo test --locked + + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m unittest python/tests/test_*.py +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +61d3ddfe619827cef83af944b2281f2cf6966d95c3d4a5883b82169bf1f34e6b7173cfa086198e3e0f9a227590a497dcb1c9b209cd4d0c6d361fdfce9b98eec0 py3-kadmin-rs-0.5.3.tar.gz +" -- 2.47.2 From feb77db19f6da703ac77bafd6227aa8f144a1fb3 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 31 Mar 2025 16:45:01 -0400 Subject: [PATCH 2/3] ilot/authentik: upgrade to 2024.12.4 --- ilot/authentik/APKBUILD | 8 ++++---- ilot/authentik/fix-ak-bash.patch | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ilot/authentik/APKBUILD b/ilot/authentik/APKBUILD index 42b271d..11bfae8 100644 --- a/ilot/authentik/APKBUILD +++ b/ilot/authentik/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=authentik -pkgver=2024.10.5 +pkgver=2024.12.4 pkgrel=0 pkgdesc="An open-source Identity Provider focused on flexibility and versatility" url="https://github.com/goauthentik/authentik" @@ -59,7 +59,7 @@ depends=" py3-jsonpatch py3-jwt py3-jwcrypto - py3-kadmin + py3-kadmin-rs py3-kubernetes py3-ldap3 py3-lxml @@ -283,13 +283,13 @@ pyc() { } sha512sums=" -f6e04ac1d1ac3a46e6d0f89548c0c2748f2214c551157e65f9071721dfdccac53c98b1664ecd1bc70650b4fceec47c5a5ab805da34e82ccc86d6a64087441702 authentik-2024.10.5.tar.gz +a99ad8d908a0014b87def6c5a6a59226d39e1f76ddff0fbd1ab18dec5c73780180d1bafb6374907cf163e1fe0336ac6c5f86989cee90e60d02df2c1eed9d7e63 authentik-2024.12.4.tar.gz 4defb4fe3a4230f4aa517fbecd5e5b8bcef2a64e1b40615660ae9eec33597310a09df5e126f4d39ce7764bd1716c0a7040637699135c103cbc1879593c6c06f1 authentik.openrc 6cb03b9b69df39bb4539fe05c966536314d766b2e9307a92d87070ba5f5b7e7ab70f1b5ee1ab3c0c50c23454f9c5a4caec29e63fdf411bbb7a124ad687569b89 authentik-worker.openrc 351e6920d987861f8bf0d7ab2f942db716a8dbdad1f690ac662a6ef29ac0fd46cf817cf557de08f1c024703503d36bc8b46f0d9eb1ecaeb399dce4c3bb527d17 authentik-ldap.openrc 89ee5f0ffdade1c153f3a56ff75b25a7104aa81d8c7a97802a8f4b0eab34850cee39f874dabe0f3c6da3f71d6a0f938f5e8904169e8cdd34d407c8984adee6b0 authentik-ldap.conf f1a3cb215b6210fa7d857a452a9f2bc4dc0520e49b9fa7027547cff093d740a7e2548f1bf1f8831f7d5ccb80c8e523ee0c8bafcc4dc42d2788725f2137d21bee authentik-manage.sh -3e47db684a3f353dcecdb7bab8836b9d5198766735d77f676a51d952141a0cf9903fcb92e6306c48d2522d7a1f3028b37247fdc1dc74d4d6e043da7eb4f36d49 fix-ak-bash.patch +3d38076606d18a438a2d76cdd2067774d5471bb832e641050630726b4d7bd8b8c2218d25d7e987a1fb46ee6a4a81d13e899145f015b3c94204cece039c7fb182 fix-ak-bash.patch 5c60e54b6a7829d611af66f5cb8184a002b5ae927efbd024c054a7c176fcb9efcfbe5685279ffcf0390b0f0abb3bb03e02782c6867c2b38d1ad2d508aae83fa0 root-settings-csrf_trusted_origins.patch badff70b19aad79cf16046bd46cb62db25c2a8b85b2673ce7c44c42eb60d42f6fcb1b9a7a7236c00f24803b25d3c66a4d64423f7ce14a59763b8415db292a5b9 go-downgrade-1.22.patch " diff --git a/ilot/authentik/fix-ak-bash.patch b/ilot/authentik/fix-ak-bash.patch index c6afafb..080b29f 100644 --- a/ilot/authentik/fix-ak-bash.patch +++ b/ilot/authentik/fix-ak-bash.patch @@ -1,10 +1,10 @@ diff --git a/lifecycle/ak.orig b/lifecycle/ak -index 615bfe9..1646274 100755 +index 44dc480..49a0cef 100755 --- a/lifecycle/ak.orig +++ b/lifecycle/ak @@ -1,4 +1,4 @@ --#!/usr/bin/env -S bash -e +-#!/usr/bin/env -S bash +#!/usr/bin/env bash + set -e -o pipefail MODE_FILE="${TMPDIR}/authentik-mode" - function log { -- 2.47.2 From 2871da32a765c117ade7afd209847d23187e38ca Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 31 Mar 2025 16:45:20 -0400 Subject: [PATCH 3/3] ilot/py3-kadmin: remove in favor of py3-kadmin-rs --- ilot/py3-kadmin/APKBUILD | 40 ------------------- .../py3-kadmin/fix-int-conversion-error.patch | 13 ------ 2 files changed, 53 deletions(-) delete mode 100644 ilot/py3-kadmin/APKBUILD delete mode 100644 ilot/py3-kadmin/fix-int-conversion-error.patch diff --git a/ilot/py3-kadmin/APKBUILD b/ilot/py3-kadmin/APKBUILD deleted file mode 100644 index 894a945..0000000 --- a/ilot/py3-kadmin/APKBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-kadmin -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=kadmin -pkgver=0.2.0 -pkgrel=0 -pkgdesc="Python module for kerberos admin (kadm5)" -url="https://github.com/authentik-community/python-kadmin" -arch="all" -license="MIT" -checkdepends="py3-pytest py3-k5test" -makedepends="py3-setuptools py3-gpep517 py3-wheel poetry python3-dev" -source=" - $pkgname-$pkgver.tar.gz::https://github.com/authentik-community/python-kadmin/archive/refs/tags/v$pkgver.tar.gz - fix-int-conversion-error.patch" -builddir="$srcdir"/python-kadmin-$pkgver -subpackages="$pkgname-pyc" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 test/tests.py -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -b405e914cb296f2bfe4f78d2791329804a0db02816182517b59ed1452a21d51dafe303609fddafbbeea57128bba4bcdfcd9b363f193ae0402cc52cf1b3b9020e py3-kadmin-0.2.0.tar.gz -e17223f8597d51ea099f5d4483dd72545b7d64ad76895553a6b7112416536aae93a59a2fd7aea044420495ab8146db7290abd826b268b2d6e518442c3c85c506 fix-int-conversion-error.patch -" diff --git a/ilot/py3-kadmin/fix-int-conversion-error.patch b/ilot/py3-kadmin/fix-int-conversion-error.patch deleted file mode 100644 index 445b76b..0000000 --- a/ilot/py3-kadmin/fix-int-conversion-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/PyKAdminPolicyObject.c.orig b/src/PyKAdminPolicyObject.c -index 0bf3ee8..68387c4 100644 ---- a/src/PyKAdminPolicyObject.c.orig -+++ b/src/PyKAdminPolicyObject.c -@@ -120,7 +120,7 @@ PyTypeObject PyKAdminPolicyObject_Type = { - sizeof(PyKAdminPolicyObject), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - (destructor)PyKAdminPolicyObject_dealloc, /*tp_dealloc*/ -- KAdminPolicyObject_print, /*tp_print*/ -+ 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ -- 2.47.2