From c6290475318e2f19d865f3b773da160e53054782 Mon Sep 17 00:00:00 2001
From: Daniel Dizdarevic <daniel.dizdarevic@proton.me>
Date: Thu, 4 Jul 2024 21:12:17 +0200
Subject: [PATCH] Update to Mastodon 4.2.10

---
 RELEASE.md          | 13 +++++++------
 snap/snapcraft.yaml | 14 +++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index ab02cde..e00fc80 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,10 +1,12 @@
-# Unofficial snap for Mastodon 4.2.9
+# Unofficial snap for Mastodon 4.2.10
 
-See also the release notes for Mastodon: https://github.com/mastodon/mastodon/releases/tag/v4.2.9
+⚠️ This release is an important security release fixing a major security issue.
+
+See also the release notes for Mastodon: https://github.com/mastodon/mastodon/releases/tag/v4.2.10
 
 This release contains:
 
-* Mastodon 4.2.9
+* Mastodon 4.2.10
 * Node 16.20.2 (see [#25787](https://github.com/mastodon/mastodon/discussions/25787#discussioncomment-6382898))
 * Ruby 3.2.3
 * Bundle 2.4.13
@@ -13,12 +15,11 @@ This release contains:
 * PostgreSQL 16.3
 * Redis 7.2.5
 * Acme.sh 3.0.7
-* ImageMagick 7.1.1-33
+* ImageMagick 7.1.1-34
 * OpenSSL 1.1.1w
 * Curl 8.8.0
+* Logrotate 3.22.0
 * Jemalloc 5.3.0
 * musl-libc 1.2.5
 * mastodon-bird-ui 1.8.5
 * tangerine-ui 1.9.5
-
-The 4.2.9snap2 release also adds that an announcement is created every time the snap is updated.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 24d1501..ea23f2a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -9,7 +9,7 @@ description: |
   implements ActivityPub!)
 
 base: core20
-version: 4.2.9snap2
+version: 4.2.10snap1
 grade: stable
 confinement: strict
 
@@ -229,8 +229,8 @@ parts:
       - logrotate-customizations
       - ipv6loganon
     # NOTE: https://github.com/logrotate/logrotate/releases/latest
-    source: https://github.com/logrotate/logrotate/releases/download/3.21.0/logrotate-3.21.0.tar.gz
-    source-checksum: sha256/1680947a9431de1aaa629fedde358696ff49a808ae903feecf996682949e3cff
+    source: https://github.com/logrotate/logrotate/releases/download/3.22.0/logrotate-3.22.0.tar.gz
+    source-checksum: sha256/93154424e73094d923a54de0d358007457282df7e14ee999a7c10d153e2c347e
     plugin: autotools
     build-packages:
       - autoconf
@@ -612,8 +612,8 @@ parts:
     after:
       - imagemagick-customizations
     # NOTE: https://github.com/ImageMagick/ImageMagick/releases/latest
-    source: https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-33.tar.gz
-    source-checksum: sha256/3fe527ce04ee5485dc6f7726eccd05c962add5c5d91843c5abf6c608e4f55330
+    source: https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-34.tar.gz
+    source-checksum: sha256/19f4303774b56be182c576b266c34bc824fcaef1d1d243192344d015adb0ec28
     plugin: autotools
     build-packages:
       - build-essential
@@ -717,8 +717,8 @@ parts:
       - openssl1
       - imagemagick
     # NOTE: https://github.com/mastodon/mastodon/releases/latest
-    source: https://github.com/mastodon/mastodon/archive/refs/tags/v4.2.9.tar.gz
-    source-checksum: sha256/97c85f40407df92af02c578dacbe3ea21a68dfe5f061ef2db7dbe269e0333e6b
+    source: https://github.com/mastodon/mastodon/archive/refs/tags/v4.2.10.tar.gz
+    source-checksum: sha256/11b5a61fb09c16b96932300f746678dbe5a52a53ba16ecdaa6a0f4e7ab1e134b
     plugin: nil
     build-environment:
       - RUBY_BRANCH: "3.2" # NOTE: must be updated with ruby source