2.5.0 git

4 files changed, 45 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e89e2d373f38..f388a2a0721d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pleroma-git
-	pkgdesc = A microblogging server software that can federate (= exchange messages with) other servers that support ActivityPub.
-	pkgver = 2.4.1.r0.g0b2119d4a
+	pkgdesc = A microblogging server software that can federate other servers that support ActivityPub
+	pkgver = 2.5.50.2023.02.09
 	pkgrel = 1
 	url = https://git.pleroma.social/pleroma/pleroma
 	install = pleroma.install
@@ -9,8 +9,13 @@ pkgbase = pleroma-git
 	license = CCPL:cc-by-4.0
 	license = CCPL:cc-by-sa-4.0
 	makedepends = elixir
+	makedepends = erlang
+	makedepends = cmake
+	makedepends = rebar
 	depends = ncurses
 	depends = file
+	depends = libxcrypt-compat
+	depends = openssl-1.1
 	optdepends = postgresql: local postgresql database support
 	optdepends = imagemagick: Pleroma.Upload.Filters.Mogrify, Pleroma.Upload.Filters.Mogrifun support
 	optdepends = ffmpeg: media preview proxy support for videos
@@ -21,9 +26,9 @@ pkgbase = pleroma-git
 	source = pleroma.tmpfiles
 	source = pleroma.service
 	source = COPYING
-	source = git+https://git.pleroma.social/pleroma/pleroma.git#branch=stable
+	source = git+https://git.pleroma.social/pleroma/pleroma.git
 	sha256sums = 4df8a0099dada9bf652fb07677a9c6a66cad1f26498f08a55d8acb0186b78979
-	sha256sums = b5e844fab22dc4fafdec09c1f14437a06d3a12fae753fc0be968d22eaddfd6dc
+	sha256sums = b6e6ad0f2c3caea38a30dddb303728271d6b56c13a2f4d82959b871844811f4c
 	sha256sums = 268952ef036ef65ab146a38ff20bbba35759c0f33510fe6ca15d6765285938ed
 	sha256sums = e299229268576c559d0155baccccf682c97b51bebab40a0b7ff3ab562ec62104
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 33f14be56797..980d009c0606 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,55 @@
-# Maintainer: xerus <27f at pm dot me>
+# Maintainer: Guoyi Zhang <myname at malacology dot net>
+# Contributor: xerus <27f at pm dot me>
+# Contributor: gudzpoz <gudzpoz ant live dot com>
+# Contributor: Bjoern Franke <bjo+aur@schafweide.org>
 
+pkgname=pleroma-git
 _pkgname=pleroma
-pkgname=${_pkgname}-git
-pkgver=2.4.1.r0.g0b2119d4a
+pkgver=2.5.50.2023.02.09
 pkgrel=1
-pkgdesc='A microblogging server software that can federate (= exchange messages with) other servers that support ActivityPub.'
+pkgdesc='A microblogging server software that can federate other servers that support ActivityPub'
 url='https://git.pleroma.social/pleroma/pleroma'
 license=('AGPL' 'CCPL:cc-by-4.0' 'CCPL:cc-by-sa-4.0')
 arch=(any)
-makedepends=(elixir)
-depends=(ncurses file)
+makedepends=(elixir erlang cmake rebar)
+depends=(ncurses file libxcrypt-compat openssl-1.1)
 optdepends=('postgresql: local postgresql database support'
             'imagemagick: Pleroma.Upload.Filters.Mogrify, Pleroma.Upload.Filters.Mogrifun support'
             'ffmpeg: media preview proxy support for videos'
             'perl-image-exiftool: supporting stripping location (GPS) data from uploaded images with Pleroma.Upload.Filters.Exiftool')
-provides=("${_pkgname}")
+provides=("$_pkgname")
 backup=('etc/pleroma/config.exs')
 install=pleroma.install
 source=('pleroma.sysusers'
         'pleroma.tmpfiles'
         'pleroma.service'
         'COPYING'
-        "git+${url}.git#branch=stable")
+        "git+${url}.git")
 sha256sums=('4df8a0099dada9bf652fb07677a9c6a66cad1f26498f08a55d8acb0186b78979'
-            'b5e844fab22dc4fafdec09c1f14437a06d3a12fae753fc0be968d22eaddfd6dc'
+            'b6e6ad0f2c3caea38a30dddb303728271d6b56c13a2f4d82959b871844811f4c'
             '268952ef036ef65ab146a38ff20bbba35759c0f33510fe6ca15d6765285938ed'
             'e299229268576c559d0155baccccf682c97b51bebab40a0b7ff3ab562ec62104'
             'SKIP')
-
-package() {
-    mkdir -p "${pkgdir}/opt/pleroma"
-
-    cd "$srcdir"
-    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"
-
-    cd "${_pkgname}"
+pkgver() {
+    cd $_pkgname
+    printf "$(cat mix.exs | grep 'version:' | sed 's/"/ /g' | awk '{print $3}').%s" "$(TZ=UTC git log --no-walk --pretty='%cd' --decorate=full --date=format-local:%Y.%m.%d | head -n 1)"
+}
+build() {
+    cd $_pkgname
     mix local.hex --force
-    mix deps.get
     mix local.rebar --force
-    MIX_ENV=prod mix pleroma.instance gen
-    mv config/{generated_config.exs,prod.secret.exs}
+    mix deps.get --only prod
 }
-
-pkgver() {
-  cd "${_pkgname}"
-  git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+package() { 
+    cd "$srcdir"
+    install -Dm 755 pleroma.sysusers "${pkgdir}/usr/lib/sysusers.d/pleroma.conf"
+    install -Dm 755 pleroma.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/pleroma.conf"
+    install -Dm 755 pleroma.service "${pkgdir}/usr/lib/systemd/system/pleroma.service"
+    install -Dm 644 COPYING ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE
+    
+    mkdir -p $pkgdir/opt/pleroma
+    cd ${_pkgname}
+    mix release --path $pkgdir/opt/pleroma 
 }
+
+
diff --git a/pleroma.install b/pleroma.install
index e607f721210d..fbc3f08b232f 100644
--- a/pleroma.install
+++ b/pleroma.install
@@ -42,25 +42,10 @@ pre_upgrade() {
 }
 
 post_upgrade() {
-    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 "\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 /opt/pleroma\n"
+    printf ">>> sudo -Hu pleroma /opt/pleroma/bin/pleroma_ctl migrate\n"
 
     printf "\nAfter all these, you may start pleroma with:\n"
     printf ">>> sudo systemctl start pleroma\n"
diff --git a/pleroma.tmpfiles b/pleroma.tmpfiles
index 22f62c76e3dc..c07a6de39623 100644
--- a/pleroma.tmpfiles
+++ b/pleroma.tmpfiles
@@ -1,6 +1,4 @@
 d /etc/pleroma 0750 pleroma pleroma -
 d /var/lib/pleroma/uploads 0750 pleroma pleroma -
 d /var/lib/pleroma/static 0755 pleroma pleroma -
-d /opt/pleroma/tmp 0750 pleroma pleroma -
-
-f /opt/pleroma/lib/tzdata-1.0.5/priv/latest_remote_poll.txt 0640 pleroma pleroma -
+d /opt/pleroma 0750 pleroma pleroma -