From 1a9498af4f8d6c58883e84fe999b2971559dd944 Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Thu, 7 Nov 2024 12:26:15 -0500
Subject: [PATCH] Upgrade to 2.41.1

---
 .github/workflows/build.yml     | 2 +-
 .gitlab-ci.yml                  | 2 +-
 packaging/deb/changelog         | 2 +-
 packaging/deb/rules             | 4 ++--
 packaging/rpm/ondemand-dex.spec | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d690c0f..6c0ea17 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
           - x86_64
           - aarch64
           - ppc64le
-        version: ["v2.36.0"]
+        version: ["v2.41.1"]
         exclude:
           # Avoid very slow builds
           - dist: amzn2023
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7eb1815..2ec0995 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 
 variables:
   GIT_STRATEGY: clone
-  VERSION: v2.36.0
+  VERSION: v2.41.1
   OOD_BUILD_REPO: '4.0'
   OOD_PACKAGING_DEBUG: 'true'
   OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand-sha512.sec
diff --git a/packaging/deb/changelog b/packaging/deb/changelog
index 30534d7..7b0cc0d 100644
--- a/packaging/deb/changelog
+++ b/packaging/deb/changelog
@@ -1,4 +1,4 @@
-ondemand-dex (2.36.0-1) UNRELEASED; urgency=low
+ondemand-dex (2.41.1-1) UNRELEASED; urgency=low
 
   * Initial release. Closes: #nnnn
     <nnnn is the bug number of your ITP>
diff --git a/packaging/deb/rules b/packaging/deb/rules
index 9ca3956..3116b76 100755
--- a/packaging/deb/rules
+++ b/packaging/deb/rules
@@ -6,8 +6,8 @@
 # Output every command that modifies files on the build system.
 export DH_VERBOSE = 1
 #
-export SESSION_COMMIT = 82479354556858119d1ce2e00136cfa6a0028105
-export GO_VERSION = 1.19.2
+export SESSION_COMMIT = b7c545653bff08205a503447485254a31895d42e
+export GO_VERSION = 1.21.13
 export BUILDDIR = $(CURDIR)/build
 export DEX_VERSION = $(VERSION:v%=%)
 export GOPATH = /tmp/go
diff --git a/packaging/rpm/ondemand-dex.spec b/packaging/rpm/ondemand-dex.spec
index 1694a0e..88dd392 100644
--- a/packaging/rpm/ondemand-dex.spec
+++ b/packaging/rpm/ondemand-dex.spec
@@ -1,7 +1,7 @@
 %{!?package_release: %define package_release 1}
-%{!?package_version: %define package_version 2.36.0}
+%{!?package_version: %define package_version 2.41.1}
 
-%define go_version 1.19.2
+%define go_version 1.21.13
 %ifarch x86_64
 %define platform amd64
 %endif
@@ -31,7 +31,7 @@ Source1:    https://github.com/dexidp/dex/archive/v%{version}.tar.gz
 Source2:    https://dl.google.com/go/go%{go_version}.linux-%{platform}.tar.gz
 # Adds session support
 # Original commit: https://github.com/juliantaylor/dex/commit/b3fc3e6c2295c0af166803bdde0977ed170d1d40
-Source5:    https://github.com/OSC/dex/commit/82479354556858119d1ce2e00136cfa6a0028105.patch
+Source5:    https://github.com/OSC/dex/commit/b7c545653bff08205a503447485254a31895d42e.patch
 
 BuildRequires:  ondemand-scldevel
 BuildRequires:  systemd