Pleroma patch release: 2.4.1

3 files changed, 47 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 466a52db2023..995d73149334 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pleroma-bin
 	pkgdesc = A microblogging server software that can federate (= exchange messages with) other servers that support ActivityPub.
-	pkgver = 2.4.0
-	pkgrel = 2
+	pkgver = 2.4.1
+	pkgrel = 1
 	url = https://pleroma.social/
 	install = pleroma.install
 	arch = x86_64
@@ -27,11 +27,11 @@ pkgbase = pleroma-bin
 	sha256sums = b5e844fab22dc4fafdec09c1f14437a06d3a12fae753fc0be968d22eaddfd6dc
 	sha256sums = 268952ef036ef65ab146a38ff20bbba35759c0f33510fe6ca15d6765285938ed
 	sha256sums = e299229268576c559d0155baccccf682c97b51bebab40a0b7ff3ab562ec62104
-	source_x86_64 = pleroma-x86_64-2.4.0.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/193204/artifacts/download?file_type=archive
-	sha256sums_x86_64 = 335857f4568c3fa911b7a9a1d5340b0e9ea7fde32f18af2a0cf645081ec0a5df
-	source_aarch64 = pleroma-aarch64-2.4.0.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/193208/artifacts/download?file_type=archive
-	sha256sums_aarch64 = dc3fa4552d43606cc998c9e63963c3c258f15fed002db3aa3f122b9ec378db56
-	source_armv7h = pleroma-armv7h-2.4.0.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/193206/artifacts/download?file_type=archive
-	sha256sums_armv7h = a757c6a60ad4f11e354323c44f8f576bd5c8219ca4ca99cbd8a5b5706237731f
+	source_x86_64 = pleroma-x86_64-2.4.1.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/195594/artifacts/download?file_type=archive
+	sha256sums_x86_64 = 9acc05d81115ee60025f9c9c8fe4ab204b7d50c907ccf85b22f8e71884a73d43
+	source_aarch64 = pleroma-aarch64-2.4.1.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/195598/artifacts/download?file_type=archive
+	sha256sums_aarch64 = b547cb25631d5e9b3f0f1fb50603cdb4c21c250b331259874f783c3b812fdb30
+	source_armv7h = pleroma-armv7h-2.4.1.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/195596/artifacts/download?file_type=archive
+	sha256sums_armv7h = c13c701e70cccf37d91a06f220f3f91219ccdfffce35630651023a8542a8e705
 
 pkgname = pleroma-bin
diff --git a/PKGBUILD b/PKGBUILD
index 9b9f1ce2637e..bb328aab38f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Faye Jackson <justalittleepsilon ant gmail dot com>
 
 pkgname=pleroma-bin
-pkgver=2.4.0
-pkgrel=2
+pkgver=2.4.1
+pkgrel=1
 pkgdesc='A microblogging server software that can federate (= exchange messages with) other servers that support ActivityPub.'
 url='https://pleroma.social/'
 license=('AGPL' 'CCPL:cc-by-4.0' 'CCPL:cc-by-sa-4.0')
@@ -17,9 +17,9 @@ provides=(pleroma)
 conflicts=(pleroma)
 backup=('etc/pleroma/config.exs')
 install=pleroma.install
-source_x86_64=("pleroma-x86_64-${pkgver}.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/193204/artifacts/download?file_type=archive")
-source_aarch64=("pleroma-aarch64-${pkgver}.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/193208/artifacts/download?file_type=archive")
-source_armv7h=("pleroma-armv7h-${pkgver}.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/193206/artifacts/download?file_type=archive")
+source_x86_64=("pleroma-x86_64-${pkgver}.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/195594/artifacts/download?file_type=archive")
+source_aarch64=("pleroma-aarch64-${pkgver}.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/195598/artifacts/download?file_type=archive")
+source_armv7h=("pleroma-armv7h-${pkgver}.zip::https://git.pleroma.social/pleroma/pleroma/-/jobs/195596/artifacts/download?file_type=archive")
 source=('pleroma.sysusers'
         'pleroma.tmpfiles'
         'pleroma.service'
@@ -28,18 +28,18 @@ sha256sums=('4df8a0099dada9bf652fb07677a9c6a66cad1f26498f08a55d8acb0186b78979'
             'b5e844fab22dc4fafdec09c1f14437a06d3a12fae753fc0be968d22eaddfd6dc'
             '268952ef036ef65ab146a38ff20bbba35759c0f33510fe6ca15d6765285938ed'
             'e299229268576c559d0155baccccf682c97b51bebab40a0b7ff3ab562ec62104')
-sha256sums_x86_64=('335857f4568c3fa911b7a9a1d5340b0e9ea7fde32f18af2a0cf645081ec0a5df')
-sha256sums_aarch64=('dc3fa4552d43606cc998c9e63963c3c258f15fed002db3aa3f122b9ec378db56')
-sha256sums_armv7h=('a757c6a60ad4f11e354323c44f8f576bd5c8219ca4ca99cbd8a5b5706237731f')
+sha256sums_x86_64=('9acc05d81115ee60025f9c9c8fe4ab204b7d50c907ccf85b22f8e71884a73d43')
+sha256sums_aarch64=('b547cb25631d5e9b3f0f1fb50603cdb4c21c250b331259874f783c3b812fdb30')
+sha256sums_armv7h=('c13c701e70cccf37d91a06f220f3f91219ccdfffce35630651023a8542a8e705')
 
 package() {
-	cd "$srcdir"
+    cd "$srcdir"
 
-	mkdir -p "${pkgdir}/opt/pleroma"
+    mkdir -p "${pkgdir}/opt/pleroma"
     find release -executable -exec chmod a+rx {} \;
-	cp -r release/* "${pkgdir}/opt/pleroma"
-	install -Dm 644 pleroma.sysusers "${pkgdir}/usr/lib/sysusers.d/pleroma.conf"
-	install -Dm 644 pleroma.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/pleroma.conf"
+    cp -r release/* "${pkgdir}/opt/pleroma"
+    install -Dm 644 pleroma.sysusers "${pkgdir}/usr/lib/sysusers.d/pleroma.conf"
+    install -Dm 644 pleroma.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/pleroma.conf"
     install -Dm 644 pleroma.service "${pkgdir}/usr/lib/systemd/system/pleroma.service"
     install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/pleroma.install b/pleroma.install
index 80ec165dbaed..ffb85d3221ae 100644
--- a/pleroma.install
+++ b/pleroma.install
@@ -34,6 +34,31 @@ post_install() {
 	printf "Check https://docs-develop.pleroma.social/backend/installation/otp_en/#post-installation for post-installation steps.\n"
 }
 
+pre_upgrade() {
+    systemctl stop pleroma.service
+}
+
 post_upgrade() {
-    post_install $1
+    username="pleroma"
+    home_dir="/opt/${username}"
+    migration_needed="false"
+
+    printf "Procedures to upgrade from version $2 to version $1:\n\n"
+    case "$2" in
+    "2.4.0-1")
+        ;&
+    "2.4.0-2")
+        printf "Check https://pleroma.social/announcements/2021/08/29/pleroma-patch-release-2-4-1/ for upgrade notes.\n"
+        ;&
+    esac
+
+    if [ "$migration_needed" = "true" ]; then
+        printf "\nYou will need to migrate your database as the above upgrade notes state.\n"
+        printf "Ensure your postgresql database, whether local or remote, is up,  and run the following command:\n"
+        printf ">>> cd \"$home_dir\"\n"
+        printf ">>> sudo -Hu \"$username\" ./bin/pleroma_ctl migrate\n"
+    fi
+
+    printf "\nAfter all these, you may start pleroma with:\n"
+    printf ">>> sudo systemctl start pleroma\n"
 }