From e10b778b424a288b0951c2ac93c6eb6d9a67eb15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9cate=20Moonlight?=
 <Kleidukos@users.noreply.github.com>
Date: Wed, 18 Oct 2023 16:21:22 +0200
Subject: [PATCH] Release Cabal-3.10.2.1 (#9350)

---
 Cabal/Cabal.cabal                     | 2 +-
 Cabal/ChangeLog.md                    | 3 +++
 Cabal/Makefile                        | 2 +-
 bootstrap/cabal-bootstrap-gen.cabal   | 2 +-
 bootstrap/linux-8.10.7.json           | 6 +++---
 bootstrap/linux-9.0.2.json            | 6 +++---
 bootstrap/linux-9.2.8.json            | 6 +++---
 bootstrap/linux-9.4.5.json            | 6 +++---
 cabal-testsuite/cabal-testsuite.cabal | 4 ++--
 doc/conf.py                           | 2 +-
 release-notes/Cabal-3.10.2.1.md       | 9 +++++++++
 11 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100644 release-notes/Cabal-3.10.2.1.md

diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index b669cf7092..9bf2bf1e51 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal
-version:       3.10.2.0
+version:       3.10.2.1
 copyright:     2003-2023, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE
diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md
index fd928c4de2..53bbfa768f 100644
--- a/Cabal/ChangeLog.md
+++ b/Cabal/ChangeLog.md
@@ -1,3 +1,6 @@
+# 3.10.2.1 [Hécate] (mailto:hecate+github@glitchbra.in) October 2023
+* See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.10.2.1.md
+
 # 3.10.2.0 [Hécate](mailto:hecate+github@glitchbra.in) August 2023
 * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.10.2.0.md
 
diff --git a/Cabal/Makefile b/Cabal/Makefile
index a76edf6206..7c85b735a4 100644
--- a/Cabal/Makefile
+++ b/Cabal/Makefile
@@ -1,4 +1,4 @@
-VERSION=3.10.2.0
+VERSION=3.10.2.1
 
 #KIND=devel
 KIND=rc
diff --git a/bootstrap/cabal-bootstrap-gen.cabal b/bootstrap/cabal-bootstrap-gen.cabal
index 7fa4c3149a..df75818bea 100644
--- a/bootstrap/cabal-bootstrap-gen.cabal
+++ b/bootstrap/cabal-bootstrap-gen.cabal
@@ -11,7 +11,7 @@ executable cabal-bootstrap-gen
     , aeson                  ^>=1.5.2.0  || ^>=2.0.3.0 || ^>=2.1.0.0
     , base                   ^>=4.12.0.0 || ^>=4.13.0.0 || ^>=4.14.0.0 || ^>=4.15.0.0 || ^>=4.16.0.0 || ^>=4.17.0.0
     , bytestring             ^>=0.10.8.2 || ^>=0.11.0.0
-    , Cabal                  ^>=3.2.0.0  || ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.8.1.0 || ^>=3.10.2.0
+    , Cabal                  ^>=3.2.0.0  || ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.8.1.0 || ^>=3.10.2.1
     , Cabal-syntax           ^>=3.8.1.0 || ^>=3.10.2.0
     , cabal-install-parsers  ^>=0.3.0.1  || ^>=0.4.5 || ^>=0.6
     , cabal-plan             ^>=0.7.0.0
diff --git a/bootstrap/linux-8.10.7.json b/bootstrap/linux-8.10.7.json
index 87d0aeb21a..f40dc2263c 100644
--- a/bootstrap/linux-8.10.7.json
+++ b/bootstrap/linux-8.10.7.json
@@ -102,7 +102,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         },
         {
             "cabal_sha256": "49d8a7f372d35363011591b253cae4c8db8b9ec594590448e20b7bed7acaee98",
@@ -120,7 +120,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         },
         {
             "cabal_sha256": "d50e055f45bd09a8238200ec64ffa0f17492c32cdb5807487894388ce1c2f839",
@@ -403,7 +403,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         }
     ]
 }
diff --git a/bootstrap/linux-9.0.2.json b/bootstrap/linux-9.0.2.json
index 381044d632..787917300e 100644
--- a/bootstrap/linux-9.0.2.json
+++ b/bootstrap/linux-9.0.2.json
@@ -102,7 +102,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         },
         {
             "cabal_sha256": "49d8a7f372d35363011591b253cae4c8db8b9ec594590448e20b7bed7acaee98",
@@ -120,7 +120,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         },
         {
             "cabal_sha256": "d50e055f45bd09a8238200ec64ffa0f17492c32cdb5807487894388ce1c2f839",
@@ -403,7 +403,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         }
     ]
 }
diff --git a/bootstrap/linux-9.2.8.json b/bootstrap/linux-9.2.8.json
index f9485f8555..4b1a641f25 100644
--- a/bootstrap/linux-9.2.8.json
+++ b/bootstrap/linux-9.2.8.json
@@ -102,7 +102,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         },
         {
             "cabal_sha256": "49d8a7f372d35363011591b253cae4c8db8b9ec594590448e20b7bed7acaee98",
@@ -120,7 +120,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         },
         {
             "cabal_sha256": "d50e055f45bd09a8238200ec64ffa0f17492c32cdb5807487894388ce1c2f839",
@@ -394,7 +394,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         }
     ]
 }
diff --git a/bootstrap/linux-9.4.5.json b/bootstrap/linux-9.4.5.json
index dc533481ea..0302f82e5b 100644
--- a/bootstrap/linux-9.4.5.json
+++ b/bootstrap/linux-9.4.5.json
@@ -101,7 +101,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         },
         {
             "cabal_sha256": null,
@@ -110,7 +110,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         },
         {
             "cabal_sha256": "d50e055f45bd09a8238200ec64ffa0f17492c32cdb5807487894388ce1c2f839",
@@ -375,7 +375,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.10.2.0"
+            "version": "3.10.2.1"
         }
     ]
 }
diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
index ce93b72d7c..98eb82a8d8 100644
--- a/cabal-testsuite/cabal-testsuite.cabal
+++ b/cabal-testsuite/cabal-testsuite.cabal
@@ -28,7 +28,7 @@ common shared
   build-depends:
     , base >= 4.9 && <4.19
     -- this needs to match the in-tree lib:Cabal version
-    , Cabal ^>= 3.10.2.0
+    , Cabal ^>= 3.10.2.1
     , Cabal-syntax ^>= 3.10.2.0
 
   ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
@@ -115,6 +115,6 @@ custom-setup
   -- and due to Custom complexity and ConstraintSetupCabalMaxVersion
   -- it has to be the latest release version plus
   -- you have to use the latest cabal-install release
-  setup-depends: Cabal == 3.10.2.0,
+  setup-depends: Cabal == 3.10.2.1,
                  Cabal-syntax == 3.10.2.0,
                  base, filepath, directory
diff --git a/doc/conf.py b/doc/conf.py
index 2fc7bfe269..4d4161ed80 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -13,7 +13,7 @@ import sphinx_rtd_theme
 sys.path.insert(0, os.path.abspath('.'))
 import cabaldomain
 
-version = "3.10.2.0"
+version = "3.10.2.1"
 
 extensions = [
     'sphinx.ext.extlinks',
diff --git a/release-notes/Cabal-3.10.2.1.md b/release-notes/Cabal-3.10.2.1.md
new file mode 100644
index 0000000000..1615b3fcfe
--- /dev/null
+++ b/release-notes/Cabal-3.10.2.1.md
@@ -0,0 +1,9 @@
+Cabal and Cabal-syntax 3.10.2.1 changelog and release notes
+---
+
+## Release 3.10.2.0 is strictly a bug-fix release, with the fixes listed below
+
+- Relax extension .c requirement for c-sources [#9285](https://github.com/haskell/cabal/pull/9285)
+
+We will be tightening the behaviour of Cabal in the future, when users list files ending with extensions other than `.c` in the `c-sources` field of their cabal file. These files were never processed properly.
+This PR displays more warnings and prepares the transition.
-- 
GitLab