diff --git a/ilot/authentik/APKBUILD b/ilot/authentik/APKBUILD index 552b6dd..5b7c21d 100644 --- a/ilot/authentik/APKBUILD +++ b/ilot/authentik/APKBUILD @@ -261,5 +261,5 @@ sha512sums=" f1a3cb215b6210fa7d857a452a9f2bc4dc0520e49b9fa7027547cff093d740a7e2548f1bf1f8831f7d5ccb80c8e523ee0c8bafcc4dc42d2788725f2137d21bee authentik-manage.sh 3e47db684a3f353dcecdb7bab8836b9d5198766735d77f676a51d952141a0cf9903fcb92e6306c48d2522d7a1f3028b37247fdc1dc74d4d6e043da7eb4f36d49 fix-ak-bash.patch 5c60e54b6a7829d611af66f5cb8184a002b5ae927efbd024c054a7c176fcb9efcfbe5685279ffcf0390b0f0abb3bb03e02782c6867c2b38d1ad2d508aae83fa0 root-settings-csrf_trusted_origins.patch -2cf7df44edfdbd9b0887efdc2fb2005d199470af2c16d7d5aef635760d63c34c948b58eabdb856a786a7ed4b127d1a19109c2ce6f186055ca4f19ac2637721fd go-downgrade-1.22.patch +2664fcdb4193a6159852cc1f93a33b97f6bbc63fe371e8877a8f5ffd7f6f9e90ea4d84f743f45fa7c7d18193edb25842b1db9d5a872b3f26405dd1f5534aa9e7 go-downgrade-1.22.patch " diff --git a/ilot/authentik/go-downgrade-1.22.patch b/ilot/authentik/go-downgrade-1.22.patch index a476cab..34c8d2a 100644 --- a/ilot/authentik/go-downgrade-1.22.patch +++ b/ilot/authentik/go-downgrade-1.22.patch @@ -1,15 +1,110 @@ -diff --git a/go.mod.orig b/go.mod -index 65490a2..6de12af 100644 ---- a/go.mod.orig +diff --git a/go.mod b/go.mod +index 65490a258..ba583840a 100644 +--- a/go.mod +++ b/go.mod -@@ -1,8 +1,8 @@ +@@ -1,38 +1,37 @@ module goauthentik.io -go 1.23 -+go 1.22 - +- -toolchain go1.23.0 -+toolchain go1.22.0 ++go 1.22.2 require ( beryju.io/ldap v0.1.0 +- github.com/coreos/go-oidc/v3 v3.11.0 ++ github.com/coreos/go-oidc v2.2.1+incompatible + github.com/getsentry/sentry-go v0.28.1 + github.com/go-http-utils/etag v0.0.0-20161124023236-513ea8f21eb1 + github.com/go-ldap/ldap/v3 v3.4.8 + github.com/go-openapi/runtime v0.28.0 ++ github.com/go-openapi/strfmt v0.23.0 + github.com/golang-jwt/jwt/v5 v5.2.1 + github.com/google/uuid v1.6.0 + 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.2.2 + github.com/gorilla/websocket v1.5.3 +- github.com/jellydator/ttlcache/v3 v3.2.1 ++ github.com/jellydator/ttlcache/v3 v3.2.0 + github.com/mitchellh/mapstructure v1.5.0 + github.com/nmcclain/asn1-ber v0.0.0-20170104154839-2661553a0484 + github.com/pires/go-proxyproto v0.7.0 +- github.com/prometheus/client_golang v1.20.2 +- github.com/redis/go-redis/v9 v9.6.1 +- github.com/sethvargo/go-envconfig v1.1.0 ++ github.com/prometheus/client_golang v1.19.1 ++ github.com/redis/go-redis/v9 v9.5.3 ++ github.com/sethvargo/go-envconfig v1.0.3 + github.com/sirupsen/logrus v1.9.3 +- github.com/spf13/cobra v1.8.1 ++ github.com/spf13/cobra v1.8.0 + github.com/stretchr/testify v1.9.0 + github.com/wwt/guac v1.3.2 +- goauthentik.io/api/v3 v3.2024064.1 ++ goauthentik.io/api/v3 v3.2024060.5 + golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab +- golang.org/x/oauth2 v0.22.0 +- golang.org/x/sync v0.8.0 ++ golang.org/x/oauth2 v0.21.0 ++ golang.org/x/sync v0.7.0 + gopkg.in/yaml.v2 v2.4.0 + layeh.com/radius v0.0.0-20210819152912-ad72663a72ab + ) +@@ -41,14 +40,13 @@ require ( + github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect + github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect + github.com/beorn7/perks v1.0.1 // indirect +- github.com/cespare/xxhash/v2 v2.3.0 // indirect ++ github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/felixge/httpsnoop v1.0.3 // indirect + github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect + github.com/go-http-utils/fresh v0.0.0-20161124030543-7231e26a4b27 // indirect + github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a // indirect +- github.com/go-jose/go-jose/v4 v4.0.2 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-openapi/analysis v0.23.0 // indirect +@@ -57,28 +55,28 @@ require ( + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/loads v0.22.0 // indirect + github.com/go-openapi/spec v0.21.0 // indirect +- github.com/go-openapi/strfmt v0.23.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect + github.com/go-openapi/validate v0.24.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/josharian/intern v1.0.0 // indirect +- github.com/klauspost/compress v1.17.9 // indirect + github.com/mailru/easyjson v0.7.7 // indirect +- github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/oklog/ulid v1.3.1 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect +- github.com/prometheus/client_model v0.6.1 // indirect +- github.com/prometheus/common v0.55.0 // indirect +- github.com/prometheus/procfs v0.15.1 // indirect ++ github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac // indirect ++ github.com/prometheus/client_model v0.5.0 // indirect ++ github.com/prometheus/common v0.48.0 // indirect ++ github.com/prometheus/procfs v0.12.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.mongodb.org/mongo-driver v1.14.0 // indirect + go.opentelemetry.io/otel v1.24.0 // indirect + go.opentelemetry.io/otel/metric v1.24.0 // indirect + go.opentelemetry.io/otel/trace v1.24.0 // indirect +- golang.org/x/crypto v0.25.0 // indirect +- golang.org/x/sys v0.22.0 // indirect +- golang.org/x/text v0.16.0 // indirect +- google.golang.org/protobuf v1.34.2 // indirect ++ golang.org/x/crypto v0.21.0 // indirect ++ golang.org/x/net v0.23.0 // indirect ++ golang.org/x/sys v0.18.0 // indirect ++ golang.org/x/text v0.14.0 // indirect ++ google.golang.org/protobuf v1.33.0 // indirect ++ gopkg.in/square/go-jose.v2 v2.5.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + )