merged in drupal core security update 10.2.10

BlackflySolutions · Oct 17, 2024 · 11799e6 · 11799e6
2 parents 104c755 + db841e7
commit 11799e6
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 33 deletions.
diff --git a/10.2/php8.2/apache-bookworm/Dockerfile b/10.2/php8.2/apache-bookworm/Dockerfile
diff --git a/10.2/php8.2/apache-bullseye/Dockerfile b/10.2/php8.2/apache-bullseye/Dockerfile
diff --git a/10.2/php8.2/fpm-alpine3.19/Dockerfile b/10.2/php8.2/fpm-alpine3.19/Dockerfile
diff --git a/10.2/php8.2/fpm-alpine3.20/Dockerfile b/10.2/php8.2/fpm-alpine3.20/Dockerfile
diff --git a/10.2/php8.2/fpm-bookworm/Dockerfile b/10.2/php8.2/fpm-bookworm/Dockerfile
diff --git a/10.2/php8.2/fpm-bullseye/Dockerfile b/10.2/php8.2/fpm-bullseye/Dockerfile
diff --git a/10.2/php8.3/apache-bookworm/Dockerfile b/10.2/php8.3/apache-bookworm/Dockerfile
diff --git a/10.2/php8.3/apache-bullseye/Dockerfile b/10.2/php8.3/apache-bullseye/Dockerfile
diff --git a/10.2/php8.3/fpm-alpine3.19/Dockerfile b/10.2/php8.3/fpm-alpine3.19/Dockerfile
diff --git a/10.2/php8.3/fpm-alpine3.20/Dockerfile b/10.2/php8.3/fpm-alpine3.20/Dockerfile
diff --git a/10.2/php8.3/fpm-bookworm/Dockerfile b/10.2/php8.3/fpm-bookworm/Dockerfile
diff --git a/10.2/php8.3/fpm-bullseye/Dockerfile b/10.2/php8.3/fpm-bullseye/Dockerfile
diff --git a/versions.json b/versions.json
@@ -36,11 +36,11 @@
   },
   "10.2": {
     "civicrmVersion": "5.78.2",
-    "version": "10.2.9",
-    "url": "https://ftp.drupal.org/files/projects/drupal-10.2.9.tar.gz",
-    "md5": "599453278ecdae4a673b0d05e91c3b44",
-    "date": 1728387439,
-    "notes": "https://www.drupal.org/project/drupal/releases/10.2.9",
+    "version": "10.2.10",
+    "url": "https://ftp.drupal.org/files/projects/drupal-10.2.10.tar.gz",
+    "md5": "623f85ec86a92ce6c5cabb41d331be6b",
+    "date": 1729096989,
+    "notes": "https://www.drupal.org/project/drupal/releases/10.2.10",
     "phpVersions": [
       "8.3",
       "8.2"

diff --git a/versions.sh b/versions.sh
@@ -61,7 +61,7 @@ releases="$(
 				# add a key for the appropriate "X.Y" or "X.Y-rc" value
 				| .folder = (.version | ([ split("[.-]"; "") | if .[0] == "7" then .[0] else .[0,1] end ] | join(".")) + if index("-") then "-rc" else "" end)
 				# filter to *just* versions that the upstream file claims are actually supported ("supported_branches")
-				| select((.folder | rtrimstr("-rc")) as $ver | $versions | index($ver) | not|not)
+				| select((.folder | rtrimstr("-rc")) | IN($versions[]) | not|not)
 			) as $rel ({}; .[$rel.version] = $rel)
 			| to_entries
 			# put all releases in sorted order
@@ -116,14 +116,14 @@ for version in "${versions[@]}"; do
 				[
 					# https://www.drupal.org/project/drupal/releases/10.2.0-rc1#php-deps
 					# Drupal now supports PHP 8.3 and recommends at least PHP 8.2.
-					if [ "7", "10.0" ] | index(env.version) then empty else
+					if env.version | IN("7", "10.0") then empty else
 						"8.3"
 					end,
 					# https://www.drupal.org/node/3413288 ("Drupal 11 will require PHP 8.3")
-					if [ "7", "10.0", "10.2", "10.3" ] | index(env.version) then
+					if env.version | IN("7", "10.0", "10.2", "10.3") then
 						"8.2"
 					else empty end,
-					if [ "7", "10.0" ] | index(env.version) then
+					if env.version | IN("7", "10.0") then
 						"8.1"
 					else empty end,
 					# https://www.drupal.org/docs/system-requirements/php-requirements