diff --git a/.forgejo/bin/check_ver.sh b/.forgejo/bin/check_ver.sh index 05c2b54..66c7fd0 100755 --- a/.forgejo/bin/check_ver.sh +++ b/.forgejo/bin/check_ver.sh @@ -18,30 +18,8 @@ for pkg in $owned_by_you; do downstream_version=$(sed -n "/^P:$pkg$/,/^$/p" APKINDEX | awk -F ':' '{if($1=="V"){print $2}}' | sort -V | tail -n 1) downstream_version=${downstream_version/-*} - # special cases - case $pkg in - forgejo-aneksajo)upstream_version=${upstream_version/-git-annex/_git};; - authentik) - upstream_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/projects/?name=$pkg&distribution=Alpine" | jq -r '.items.[].stable_versions' | jq -r ".[] | match(\"${downstream_version%.*}.*\").string" | head -n 1) - latest_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/packages/?name=$pkg&distribution=Alpine" | jq -r '.items.[].stable_version' ) - # append version number to signal that this is not latest major version - if [ "${upstream_version%.*}" != "${latest_version%.*}" ]; then - echo "$pkg${latest_version%.*} major version available" - echo "$pkg${latest_version%.*} $downstream_version $latest_version $repo" >> out_of_date - pkg=$pkg${upstream_version%.*} - fi - ;; - mastodon) - upstream_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/projects/?name=$pkg&distribution=Alpine" | jq -r '.items.[].stable_versions' | jq -r ".[] | match(\"${downstream_version%.*}.*\").string" | head -n 1) - latest_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/packages/?name=$pkg&distribution=Alpine" | jq -r '.items.[].stable_version' ) - # append version number to signal that this is not latest major version - if [ "${upstream_version%.*}" != "${latest_version%.*}" ]; then - echo "$pkg${latest_version%.*} major version available" - echo "$pkg${latest_version%.*} $downstream_version $latest_version $repo" >> out_of_date - pkg=$pkg${upstream_version%.*} - fi - ;; - esac + # special case for forgejo-aneksajo: + upstream_version=${upstream_version/-git-annex/_git} if [ -z "$upstream_version" ]; then echo "$pkg not in anitya" diff --git a/.forgejo/bin/create_issue.sh b/.forgejo/bin/create_issue.sh index 995e519..6369371 100755 --- a/.forgejo/bin/create_issue.sh +++ b/.forgejo/bin/create_issue.sh @@ -15,10 +15,10 @@ does_it_exist() { repo=$4 query="$repo/$name: upgrade to $upstream_version" - query="%22$(echo $query | sed 's| |%20|g' | sed 's|:|%3A|g' | sed 's|/|%2F|g' )%22" + query="$(echo $query | sed 's| |%20|g' | sed 's|:|%3A|g' | sed 's|/|%2F|g' )" result="$(curl --silent -X 'GET' \ - "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues&sort=latest" \ + "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \ -H 'accept: application/json' \ -H "Authorization: token $ISSUE_TOKEN" )" @@ -35,10 +35,10 @@ is_it_old() { repo=$4 query="$repo/$name: upgrade to" - query="%22$(echo $query | sed 's| |%20|g' | sed 's|:|%3A|g' | sed 's|/|%2F|g' )%22" + query="$(echo $query | sed 's| |%20|g' | sed 's|:|%3A|g' | sed 's|/|%2F|g' )" result="$(curl --silent -X 'GET' \ - "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues&sort=latest" \ + "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \ -H 'accept: application/json' \ -H "authorization: token $ISSUE_TOKEN" )" @@ -126,10 +126,10 @@ fi if [ -f not_in_anitya ]; then query="Add missing $repo packages to anitya" - query="%22$(echo $query | sed 's| |%20|g')%22" + query="$(echo $query | sed 's| |%20|g')" result="$(curl --silent -X 'GET' \ - "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues&sort=latest" \ + "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \ -H 'accept: application/json' \ -H "authorization: token $ISSUE_TOKEN" )" diff --git a/ilot/authentik/APKBUILD b/ilot/authentik/APKBUILD index 79b5870..5795101 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" @@ -32,7 +32,7 @@ depends=" py3-deepmerge py3-defusedxml py3-docker-py - py3-django + py3-django=>5 py3-django-countries py3-django-cte py3-django-filter @@ -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 @@ -127,7 +127,6 @@ source=" authentik-manage.sh fix-ak-bash.patch root-settings-csrf_trusted_origins.patch - go-downgrade-1.22.patch " builddir="$srcdir/"authentik-version-$pkgver subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc" @@ -202,7 +201,7 @@ with open(\"local.env.yml\", \"w\") as _config: pip install selenium drf_jsonschema_serializer pdoc --break-system-packages msg "Starting tests" - make test || true + coverage run manage.py test --keepdb authentik # TODO: Fix go-tests # make go-test @@ -284,7 +283,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 @@ -292,5 +291,4 @@ sha512sums=" f1a3cb215b6210fa7d857a452a9f2bc4dc0520e49b9fa7027547cff093d740a7e2548f1bf1f8831f7d5ccb80c8e523ee0c8bafcc4dc42d2788725f2137d21bee authentik-manage.sh 3d38076606d18a438a2d76cdd2067774d5471bb832e641050630726b4d7bd8b8c2218d25d7e987a1fb46ee6a4a81d13e899145f015b3c94204cece039c7fb182 fix-ak-bash.patch 5c60e54b6a7829d611af66f5cb8184a002b5ae927efbd024c054a7c176fcb9efcfbe5685279ffcf0390b0f0abb3bb03e02782c6867c2b38d1ad2d508aae83fa0 root-settings-csrf_trusted_origins.patch -badff70b19aad79cf16046bd46cb62db25c2a8b85b2673ce7c44c42eb60d42f6fcb1b9a7a7236c00f24803b25d3c66a4d64423f7ce14a59763b8415db292a5b9 go-downgrade-1.22.patch " diff --git a/ilot/authentik/go-downgrade-1.22.patch b/ilot/authentik/go-downgrade-1.22.patch deleted file mode 100644 index eeae018..0000000 --- a/ilot/authentik/go-downgrade-1.22.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/go.mod.orig b/go.mod -index 65490a2..13a611e 100644 ---- a/go.mod.orig -+++ b/go.mod -@@ -1,8 +1,6 @@ - module goauthentik.io - --go 1.23 -- --toolchain go1.23.0 -+go 1.22.2 - - require ( - beryju.io/ldap v0.1.0 -@@ -16,7 +14,7 @@ require ( - github.com/gorilla/handlers v1.5.2 - github.com/gorilla/mux v1.8.1 - github.com/gorilla/securecookie v1.1.2 -- github.com/gorilla/sessions v1.4.0 -+ github.com/gorilla/sessions v1.3.0 - github.com/gorilla/websocket v1.5.3 - github.com/jellydator/ttlcache/v3 v3.2.1 - github.com/mitchellh/mapstructure v1.5.0 -diff --git a/go.sum.orig b/go.sum -index 94edf9c..856c2ee 100644 ---- a/go.sum.orig -+++ b/go.sum -@@ -175,8 +175,8 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+ - github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= - github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= - github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= --github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ= --github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik= -+github.com/gorilla/sessions v1.3.0 h1:XYlkq7KcpOB2ZhHBPv5WpjMIxrQosiZanfoy1HLZFzg= -+github.com/gorilla/sessions v1.3.0/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ= - github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= - github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= - github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= diff --git a/ilot/authentik/go-downgrade-1.23.patch b/ilot/authentik/go-downgrade-1.23.patch new file mode 100644 index 0000000..e9f6ed7 --- /dev/null +++ b/ilot/authentik/go-downgrade-1.23.patch @@ -0,0 +1,12 @@ +diff --git a/go.mod.orig b/go.mod +index 13956cf..d9303bf 100644 +--- a/go.mod.orig ++++ b/go.mod +@@ -1,6 +1,6 @@ + module goauthentik.io + +-go 1.24.0 ++go 1.23.9 + + require ( + beryju.io/ldap v0.1.0 diff --git a/ilot/forgejo-aneksajo/APKBUILD b/ilot/forgejo-aneksajo/APKBUILD index d3a4462..d9e09b9 100644 --- a/ilot/forgejo-aneksajo/APKBUILD +++ b/ilot/forgejo-aneksajo/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Patrycja Rosa # Maintainer: Antoine Martin (ayakael) pkgname=forgejo-aneksajo -pkgver=11.0.0_git0 +pkgver=10.0.3_git0 _gittag=v${pkgver/_git/-git-annex} pkgrel=0 pkgdesc="Self-hosted Git service written in Go with git-annex support" @@ -60,7 +60,7 @@ build() { export CGO_LDFLAGS="$LDFLAGS" unset LDFLAGS ## make FHS compliant - local setting="forgejo.org/modules/setting" + local setting="code.gitea.io/gitea/modules/setting" export LDFLAGS="$LDFLAGS -X $setting.CustomConf=/etc/forgejo/app.ini" export LDFLAGS="$LDFLAGS -X $setting.AppWorkPath=/var/lib/forgejo/" @@ -106,7 +106,7 @@ package() { } sha512sums=" -07f72fcd3bb02a6bbfbcf73f8526c51f1f3fe39d2a504395dfb0997743a190bd210389d58114aaf546fb6d0fabaa80a54240632e11eeba35250b9e6b9b63f438 forgejo-aneksajo-v11.0.0-git-annex0.tar.gz +e32c919228df167374e8f3099e2e59bfab610aac6c87465318efe1cac446d014535e270f57b0bf8b2a7eb3843c5dcb189eac4dad2e230b57acd9096ead647eca forgejo-aneksajo-v10.0.3-git-annex0.tar.gz 497d8575f2eb5ac43baf82452e76007ef85e22cca2cc769f1cf55ffd03d7ce4d50ac4dc2b013e23086b7a5577fc6de5a4c7e5ec7c287f0e3528e908aaa2982aa forgejo-aneksajo.initd b537b41b6b3a945274a6028800f39787b48c318425a37cf5d40ace0d1b305444fd07f17b4acafcd31a629bedd7d008b0bb3e30f82ffeb3d7e7e947bdbe0ff4f3 forgejo-aneksajo.ini " diff --git a/ilot/listmonk/APKBUILD b/ilot/listmonk/APKBUILD index 704084b..1bf9721 100644 --- a/ilot/listmonk/APKBUILD +++ b/ilot/listmonk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=listmonk -pkgver=5.0.0 +pkgver=4.1.0 pkgrel=0 pkgdesc='Self-hosted newsletter and mailing list manager with a modern dashboard' arch="all" @@ -67,7 +67,7 @@ package() { ln -s /etc/listmonk/config.toml "$pkgdir"/usr/share/webapps/listmonk/config.toml } sha512sums=" -b0875124106ac737550eb340c209f079698c0b9e1f1e55c70eca113720dbc9dcfaac63aa65722299a1448a582cedf0f9ee20b24ea0625d4e780d83e0d6bab198 listmonk-5.0.0.tar.gz +936b33d6de1d69ee4e7f768810116ac997c516754aace0371089bc8106bebee944197864afc11b7bc5725afa9a4f195d6629957bfcdd37c847e3780aa34558ec listmonk-4.1.0.tar.gz 939450af4b23708e3d23a5a88fad4c24b957090bdd21351a6dd520959e52e45e5fcac117a3eafa280d9506616dae39ad3943589571f008cac5abe1ffd8062424 listmonk.sh 8e9c0b1f335c295fb741418246eb17c7566e5e4200a284c6483433e8ddbf5250aa692435211cf062ad1dfcdce3fae9148def28f03f2492d33fe5e66cbeebd4bd listmonk.openrc " 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 -"