From 5dcf37531362f4a2166d5111d1380b224be114a6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 19 Sep 2024 09:00:01 -0400 Subject: [PATCH] Fix patch --- ilot/authentik/APKBUILD | 2 +- ilot/authentik/go-downgrade-1.22.patch | 45 +++++++++++++------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/ilot/authentik/APKBUILD b/ilot/authentik/APKBUILD index 4d2a383..ef59b3b 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 -86a64ea55fe405606bf13b295096679b93cdfda13168805e2a0a1c26a019beb98c64d8ca7d6b43fcc6d7e03ab763ccdaed354db752aee311809ac4df884e6e24 go-downgrade-1.22.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 index 4edc7ad..eeae018 100644 --- a/ilot/authentik/go-downgrade-1.22.patch +++ b/ilot/authentik/go-downgrade-1.22.patch @@ -1,3 +1,26 @@ +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 @@ -13,25 +36,3 @@ index 94edf9c..856c2ee 100644 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/go.mod.orig b/go.mod -index 65490a2..48d7306 100644 ---- a/go.mod.orig -+++ b/go.mod -@@ -2,7 +2,7 @@ module goauthentik.io - - go 1.23 - --toolchain go1.23.0 -+toolchain go1.23.1 - - require ( - beryju.io/ldap v0.1.0 -@@ -16,7 +16,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