From 5cf12d075471c63c38957ecde55a88c76cee6b43 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 8 Apr 2025 20:28:55 -0400 Subject: [PATCH 1/8] ilot/freescout: upgrade to 1.8.174 --- ilot/freescout/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ilot/freescout/APKBUILD b/ilot/freescout/APKBUILD index addb28b..1dbbedd 100644 --- a/ilot/freescout/APKBUILD +++ b/ilot/freescout/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) pkgname=freescout -pkgver=1.8.173 +pkgver=1.8.174 pkgrel=0 pkgdesc="Free self-hosted help desk & shared mailbox" arch="noarch" @@ -76,7 +76,7 @@ package() { install -m755 -D "$srcdir"/freescout-manage.sh "$pkgdir"/usr/bin/freescout-manage } sha512sums=" -1d349d2a84985e2ce9e767cdbf40943ffd1926db5e8b56cb9c3c4436f5a3c56f3c63265c4382acaadccf32965c0896e84eed3e2ef970ba2398a57440bf8dbeea freescout-1.8.173.tar.gz +c5ec40b3dd7f6f593a950d96632e69d8e0a43e17f566f3d83b52aa44e2aac8ef98c536e9408faa834051d7fb3f07e003642f5e6e2a25a69ea51cf7b96290fb1d freescout-1.8.174.tar.gz e4af6c85dc12f694bef2a02e4664e31ed50b2c109914d7ffad5001c2bbd764ef25b17ecaa59ff55ef41bccf17169bf910d1a08888364bdedd0ecc54d310e661f freescout.nginx 7ce9b3ee3a979db44f5e6d7daa69431e04a5281f364ae7be23e5a0a0547f96abc858d2a8010346be2fb99bd2355fb529e7030ed20d54f310249e61ed5db4d0ba freescout-manage.sh 0cba00b7d945ce84f72a2812d40028a073a5278856f610e46dbfe0ac78deff6bf5eba7643635fa4bc64d070c4d49eb47d24ea0a05ba1e6ea76690bfd77906366 rename-client-to-membre-fr-en.patch From 4299ab3906f895343828b6b077b10783fa8d9d97 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 8 Apr 2025 20:15:09 -0400 Subject: [PATCH 2/8] ilot/authentik: upgrade to 2025.2.4 --- ilot/authentik/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ilot/authentik/APKBUILD b/ilot/authentik/APKBUILD index 9018ff2..79b5870 100644 --- a/ilot/authentik/APKBUILD +++ b/ilot/authentik/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=authentik -pkgver=2025.2.3 +pkgver=2025.2.4 pkgrel=0 pkgdesc="An open-source Identity Provider focused on flexibility and versatility" url="https://github.com/goauthentik/authentik" @@ -284,7 +284,7 @@ pyc() { } sha512sums=" -20dc45060ebccab996c19cef96291baefdf0f9af609e7e3e58fbda55b3dfb75c46bcb25b51a1e3c48d768fcf5dd9a05612e7cdb06fdf5d904d90d546ef4607d6 authentik-2025.2.3.tar.gz +75928b3ab9ae126f3cbe88ff1256de8adba7add099b0d93615abb8c91a2b7f275e83664a232e8c5393c5031bd9757af2f20fdb9d0153dacdf9a482b6b4bb8b00 authentik-2025.2.4.tar.gz 4defb4fe3a4230f4aa517fbecd5e5b8bcef2a64e1b40615660ae9eec33597310a09df5e126f4d39ce7764bd1716c0a7040637699135c103cbc1879593c6c06f1 authentik.openrc 6cb03b9b69df39bb4539fe05c966536314d766b2e9307a92d87070ba5f5b7e7ab70f1b5ee1ab3c0c50c23454f9c5a4caec29e63fdf411bbb7a124ad687569b89 authentik-worker.openrc 351e6920d987861f8bf0d7ab2f942db716a8dbdad1f690ac662a6ef29ac0fd46cf817cf557de08f1c024703503d36bc8b46f0d9eb1ecaeb399dce4c3bb527d17 authentik-ldap.openrc From 01a273b577e5df012b33a5cd6436cab44da2ca33 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 6 May 2025 13:21:47 -0400 Subject: [PATCH 3/8] ilot/authentik: upgrade to 2025.4.0 --- ilot/authentik/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ilot/authentik/APKBUILD b/ilot/authentik/APKBUILD index 9018ff2..7b582d9 100644 --- a/ilot/authentik/APKBUILD +++ b/ilot/authentik/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=authentik -pkgver=2025.2.3 +pkgver=2025.4.0 pkgrel=0 pkgdesc="An open-source Identity Provider focused on flexibility and versatility" url="https://github.com/goauthentik/authentik" @@ -41,7 +41,7 @@ depends=" py3-django-prometheus py3-django-pglock py3-django-redis - py3-django-rest-framework~3.14.0 + py3-django-rest-framework py3-django-rest-framework-guardian py3-django-storages py3-django-tenants @@ -284,7 +284,7 @@ pyc() { } sha512sums=" -20dc45060ebccab996c19cef96291baefdf0f9af609e7e3e58fbda55b3dfb75c46bcb25b51a1e3c48d768fcf5dd9a05612e7cdb06fdf5d904d90d546ef4607d6 authentik-2025.2.3.tar.gz +bafaac41c7d9e4981cd78f86c8274c81bb609e98172e5d1551e64e00eb6c1c1b50309e924c918e26afd6b982a84af9f62fa721d75692243959f09119d7ac7c90 authentik-2025.4.0.tar.gz 4defb4fe3a4230f4aa517fbecd5e5b8bcef2a64e1b40615660ae9eec33597310a09df5e126f4d39ce7764bd1716c0a7040637699135c103cbc1879593c6c06f1 authentik.openrc 6cb03b9b69df39bb4539fe05c966536314d766b2e9307a92d87070ba5f5b7e7ab70f1b5ee1ab3c0c50c23454f9c5a4caec29e63fdf411bbb7a124ad687569b89 authentik-worker.openrc 351e6920d987861f8bf0d7ab2f942db716a8dbdad1f690ac662a6ef29ac0fd46cf817cf557de08f1c024703503d36bc8b46f0d9eb1ecaeb399dce4c3bb527d17 authentik-ldap.openrc From 5715272a5df94c6a1ebae7cf3858d1f24b80582e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 6 May 2025 13:22:12 -0400 Subject: [PATCH 4/8] ilot/py3-django-rest-framework: drop due to unneeded old version --- ilot/py3-django-rest-framework/APKBUILD | 59 ------------------------- 1 file changed, 59 deletions(-) delete mode 100644 ilot/py3-django-rest-framework/APKBUILD diff --git a/ilot/py3-django-rest-framework/APKBUILD b/ilot/py3-django-rest-framework/APKBUILD deleted file mode 100644 index 82a1497..0000000 --- a/ilot/py3-django-rest-framework/APKBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Contributor: Leonardo Arena -# Contributor: Justin Berthault -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-django-rest-framework -_pkgname=django-rest-framework -pkgver=3.14.0 -pkgrel=1 -pkgdesc="Web APIs for Django" -url="https://github.com/encode/django-rest-framework" -arch="noarch" -license="Custom" -depends=" - py3-django - py3-tz -" -makedepends=" - py3-setuptools - py3-gpep517 - py3-wheel -" -checkdepends=" - py3-pytest-django - py3-pytest-cov - py3-core-api - py3-jinja2 - py3-uritemplate - py3-django-guardian - py3-psycopg2 - py3-markdown - py3-yaml - py3-inflection -" -subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/encode/$_pkgname/archive/$pkgver.tar.gz" -options="!check" # Failing tests -builddir="$srcdir"/$_pkgname-$pkgver - -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 "$builddir"/.dist/*.whl - # test_urlpatterns: AssertionError: assert [] is not [] - # test_markdown: rather hard to decipher assertion error - .testenv/bin/python3 -m pytest -v -k 'not test_urlpatterns and not test_markdown' -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -c1012c656b427e0318b2056e2f984ddc75a5b4e85f375c76fba165ad06e285848eee1bc6dc76c097daec57d780efb2551110199d62ce636a03951aec13ab4013 py3-django-rest-framework-3.14.0.tar.gz -" From a6839d4f3f894cd4b09298d38b9553312047a2a9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 6 May 2025 14:02:48 -0400 Subject: [PATCH 5/8] ci: use nodejs-current --- .forgejo/workflows/build-aarch64.yaml | 4 ++-- .forgejo/workflows/build-x86_64.yaml | 4 ++-- .forgejo/workflows/check-ilot.yml | 2 +- .forgejo/workflows/lint.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/build-aarch64.yaml b/.forgejo/workflows/build-aarch64.yaml index 0364014..145407b 100644 --- a/.forgejo/workflows/build-aarch64.yaml +++ b/.forgejo/workflows/build-aarch64.yaml @@ -19,7 +19,7 @@ jobs: steps: - name: Environment setup run: | - doas apk add nodejs git patch curl net-tools + doas apk add nodejs-current git patch curl net-tools doas hostname host.docker.internal cd /etc/apk/keys doas curl -JO https://forge.ilot.io/api/packages/ilot/alpine/key @@ -47,7 +47,7 @@ jobs: GITHUB_EVENT_NUMBER: ${{ github.event.number }} steps: - name: Setting up environment - run: apk add nodejs curl findutils git gawk jq + run: apk add nodejs-current curl findutils git gawk jq - name: Repo pull uses: actions/checkout@v4 - name: Package download diff --git a/.forgejo/workflows/build-x86_64.yaml b/.forgejo/workflows/build-x86_64.yaml index c805199..ec280c1 100644 --- a/.forgejo/workflows/build-x86_64.yaml +++ b/.forgejo/workflows/build-x86_64.yaml @@ -19,7 +19,7 @@ jobs: steps: - name: Environment setup run: | - doas apk add nodejs git patch curl net-tools + doas apk add nodejs-current git patch curl net-tools doas hostname host.docker.internal cd /etc/apk/keys doas curl -JO https://forge.ilot.io/api/packages/ilot/alpine/key @@ -47,7 +47,7 @@ jobs: GITHUB_EVENT_NUMBER: ${{ github.event.number }} steps: - name: Setting up environment - run: apk add nodejs curl findutils git gawk jq + run: apk add nodejs-current curl findutils git gawk jq - name: Repo pull uses: actions/checkout@v4 - name: Package download diff --git a/.forgejo/workflows/check-ilot.yml b/.forgejo/workflows/check-ilot.yml index 4361dba..b57e80d 100644 --- a/.forgejo/workflows/check-ilot.yml +++ b/.forgejo/workflows/check-ilot.yml @@ -16,7 +16,7 @@ jobs: LABEL_NUMBER: 8 steps: - name: Environment setup - run: apk add grep coreutils gawk curl wget bash nodejs git jq sed + run: apk add grep coreutils gawk curl wget bash nodejs-current git jq sed - name: Get scripts uses: actions/checkout@v4 with: diff --git a/.forgejo/workflows/lint.yaml b/.forgejo/workflows/lint.yaml index 3614deb..12e99b7 100644 --- a/.forgejo/workflows/lint.yaml +++ b/.forgejo/workflows/lint.yaml @@ -14,7 +14,7 @@ jobs: CI_MERGE_REQUEST_PROJECT_URL: ${{ github.server_url }}/${{ github.repository }} CI_MERGE_REQUEST_TARGET_BRANCH_NAME: ${{ github.base_ref }} steps: - - run: doas apk add nodejs git + - run: doas apk add nodejs-current git - uses: actions/checkout@v4 with: fetch-depth: 500 From 7040314840e43780c73840dce4cf56e63a45a0c1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 9 May 2025 10:36:31 -0400 Subject: [PATCH 6/8] ci: upgrade image before pulling packages --- .forgejo/workflows/build-aarch64.yaml | 3 ++- .forgejo/workflows/build-x86_64.yaml | 3 ++- .forgejo/workflows/lint.yaml | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-aarch64.yaml b/.forgejo/workflows/build-aarch64.yaml index 145407b..2a4dfc0 100644 --- a/.forgejo/workflows/build-aarch64.yaml +++ b/.forgejo/workflows/build-aarch64.yaml @@ -19,7 +19,8 @@ jobs: steps: - name: Environment setup run: | - doas apk add nodejs-current git patch curl net-tools + doas apk upgrade -a + doas apk add nodejs git patch curl net-tools doas hostname host.docker.internal cd /etc/apk/keys doas curl -JO https://forge.ilot.io/api/packages/ilot/alpine/key diff --git a/.forgejo/workflows/build-x86_64.yaml b/.forgejo/workflows/build-x86_64.yaml index ec280c1..aaffb72 100644 --- a/.forgejo/workflows/build-x86_64.yaml +++ b/.forgejo/workflows/build-x86_64.yaml @@ -19,7 +19,8 @@ jobs: steps: - name: Environment setup run: | - doas apk add nodejs-current git patch curl net-tools + doas apk upgrade -a + doas apk add nodejs git patch curl net-tools doas hostname host.docker.internal cd /etc/apk/keys doas curl -JO https://forge.ilot.io/api/packages/ilot/alpine/key diff --git a/.forgejo/workflows/lint.yaml b/.forgejo/workflows/lint.yaml index 12e99b7..743cefc 100644 --- a/.forgejo/workflows/lint.yaml +++ b/.forgejo/workflows/lint.yaml @@ -14,7 +14,9 @@ jobs: CI_MERGE_REQUEST_PROJECT_URL: ${{ github.server_url }}/${{ github.repository }} CI_MERGE_REQUEST_TARGET_BRANCH_NAME: ${{ github.base_ref }} steps: - - run: doas apk add nodejs-current git + - run: | + doas apk upgrade -a + doas apk add nodejs git - uses: actions/checkout@v4 with: fetch-depth: 500 From cb6336c5730ebbc45b94226bd6c1b2df2ef189c9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 6 May 2025 13:21:47 -0400 Subject: [PATCH 7/8] ilot/authentik: upgrade to 2025.4.0 --- ilot/authentik/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ilot/authentik/APKBUILD b/ilot/authentik/APKBUILD index 79b5870..7b582d9 100644 --- a/ilot/authentik/APKBUILD +++ b/ilot/authentik/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=authentik -pkgver=2025.2.4 +pkgver=2025.4.0 pkgrel=0 pkgdesc="An open-source Identity Provider focused on flexibility and versatility" url="https://github.com/goauthentik/authentik" @@ -41,7 +41,7 @@ depends=" py3-django-prometheus py3-django-pglock py3-django-redis - py3-django-rest-framework~3.14.0 + py3-django-rest-framework py3-django-rest-framework-guardian py3-django-storages py3-django-tenants @@ -284,7 +284,7 @@ pyc() { } sha512sums=" -75928b3ab9ae126f3cbe88ff1256de8adba7add099b0d93615abb8c91a2b7f275e83664a232e8c5393c5031bd9757af2f20fdb9d0153dacdf9a482b6b4bb8b00 authentik-2025.2.4.tar.gz +bafaac41c7d9e4981cd78f86c8274c81bb609e98172e5d1551e64e00eb6c1c1b50309e924c918e26afd6b982a84af9f62fa721d75692243959f09119d7ac7c90 authentik-2025.4.0.tar.gz 4defb4fe3a4230f4aa517fbecd5e5b8bcef2a64e1b40615660ae9eec33597310a09df5e126f4d39ce7764bd1716c0a7040637699135c103cbc1879593c6c06f1 authentik.openrc 6cb03b9b69df39bb4539fe05c966536314d766b2e9307a92d87070ba5f5b7e7ab70f1b5ee1ab3c0c50c23454f9c5a4caec29e63fdf411bbb7a124ad687569b89 authentik-worker.openrc 351e6920d987861f8bf0d7ab2f942db716a8dbdad1f690ac662a6ef29ac0fd46cf817cf557de08f1c024703503d36bc8b46f0d9eb1ecaeb399dce4c3bb527d17 authentik-ldap.openrc From a8b92152f773282b2ca11112e3206de8d2281665 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 6 May 2025 13:22:12 -0400 Subject: [PATCH 8/8] ilot/py3-django-rest-framework: drop due to unneeded old version --- ilot/py3-django-rest-framework/APKBUILD | 59 ------------------------- 1 file changed, 59 deletions(-) delete mode 100644 ilot/py3-django-rest-framework/APKBUILD diff --git a/ilot/py3-django-rest-framework/APKBUILD b/ilot/py3-django-rest-framework/APKBUILD deleted file mode 100644 index 82a1497..0000000 --- a/ilot/py3-django-rest-framework/APKBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Contributor: Leonardo Arena -# Contributor: Justin Berthault -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-django-rest-framework -_pkgname=django-rest-framework -pkgver=3.14.0 -pkgrel=1 -pkgdesc="Web APIs for Django" -url="https://github.com/encode/django-rest-framework" -arch="noarch" -license="Custom" -depends=" - py3-django - py3-tz -" -makedepends=" - py3-setuptools - py3-gpep517 - py3-wheel -" -checkdepends=" - py3-pytest-django - py3-pytest-cov - py3-core-api - py3-jinja2 - py3-uritemplate - py3-django-guardian - py3-psycopg2 - py3-markdown - py3-yaml - py3-inflection -" -subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/encode/$_pkgname/archive/$pkgver.tar.gz" -options="!check" # Failing tests -builddir="$srcdir"/$_pkgname-$pkgver - -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 "$builddir"/.dist/*.whl - # test_urlpatterns: AssertionError: assert [] is not [] - # test_markdown: rather hard to decipher assertion error - .testenv/bin/python3 -m pytest -v -k 'not test_urlpatterns and not test_markdown' -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -c1012c656b427e0318b2056e2f984ddc75a5b4e85f375c76fba165ad06e285848eee1bc6dc76c097daec57d780efb2551110199d62ce636a03951aec13ab4013 py3-django-rest-framework-3.14.0.tar.gz -"