From 654112cc971c96f0384425142cd1df131838d3f3 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Fri, 14 Jun 2024 20:03:51 -0700
Subject: [PATCH 1/2] build/pkgs/gap/spkg-configure.m4: Reject GAP 4.13.0 or
 newer

---
 build/pkgs/gap/spkg-configure.m4 | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/build/pkgs/gap/spkg-configure.m4 b/build/pkgs/gap/spkg-configure.m4
index 72a0a999da7..d4c3680b430 100644
--- a/build/pkgs/gap/spkg-configure.m4
+++ b/build/pkgs/gap/spkg-configure.m4
@@ -3,19 +3,21 @@ SAGE_SPKG_CONFIGURE([gap], [
   sage_spkg_install_gap=yes
 
   m4_pushdef([GAP_MINVER],["4.12.2"])
+  m4_pushdef([GAP_LTVER],["4.13.0"])
 
   SAGE_SPKG_DEPCHECK([ncurses readline zlib], [
     AC_PATH_PROG(GAP, gap)
     AS_IF([test -n "${GAP}"], [
-      AC_MSG_CHECKING([for gap version GAP_MINVER or newer])
-
-      # GAP will later add the "user" path to the list of root paths
-      # so long as we don't initialize GAP with -r in Sage. But we
-      # don't want to include it in the hard-coded list.
+      AC_MSG_CHECKING([for gap version >= GAP_MINVER, < GAP_LTVER])
+      dnl GAP will later add the "user" path to the list of root paths
+      dnl so long as we don't initialize GAP with -r in Sage. But we
+      dnl don't want to include it in the hard-coded list.
       GAPRUN="${GAP} -r -q --bare --nointeract -c"
       _cmd='Display(GAPInfo.KernelInfo.KERNEL_VERSION);'
       GAP_VERSION=$( ${GAPRUN} "${_cmd}" 2>/dev/null )
-      AX_COMPARE_VERSION(["${GAP_VERSION}"], [ge], [GAP_MINVER], [
+      AX_COMPARE_VERSION(["${GAP_VERSION}"], [ge], [GAP_MINVER], [dnl
+       AC_MSG_RESULT([yes])
+       AX_COMPARE_VERSION(["${GAP_VERSION}"], [lt], [GAP_LTVER], [dnl
         AC_MSG_RESULT([yes])
         AC_MSG_CHECKING([for gap root paths])
         _cmd='Display(JoinStringsWithSeparator(GAPInfo.RootPaths,";"));'
@@ -66,18 +68,20 @@ SAGE_SPKG_CONFIGURE([gap], [
                 AC_LANG_POP
                 LIBS="${_old_libs}"
             ])
-          ], [
-            # The gap command itself failed
+          ], [dnl The gap command itself failed
             AC_MSG_RESULT([no (package check command failed)])
           ])
         ])
-      ],[
-        # Version too old
+      ], [dnl Version too new
         AC_MSG_RESULT([no])
       ])
+     ], [dnl Version too old
+       AC_MSG_RESULT([no])
+     ])
     ])
   ])
 
+  m4_popdef([GAP_LTVER])
   m4_popdef([GAP_MINVER])
 ],[],[],[
   # This is the post-check phase, where we make sage-conf

From 2faf15fc9e525d3961642f066182984bc5861c19 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Fri, 14 Jun 2024 20:09:50 -0700
Subject: [PATCH 2/2] build/pkgs/gap/distros/conda.txt: Set upper bound <4.13

---
 build/pkgs/gap/distros/conda.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/pkgs/gap/distros/conda.txt b/build/pkgs/gap/distros/conda.txt
index e1d9958012d..7f5f5034610 100644
--- a/build/pkgs/gap/distros/conda.txt
+++ b/build/pkgs/gap/distros/conda.txt
@@ -1 +1 @@
-gap-defaults>=4.12.2
+gap-defaults>=4.12.2,<4.13.0