From 6385c3a70d9b100fe14c50a5849e12143173f743 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 3 May 2026 19:48:05 +0200 Subject: [PATCH] www-apps/pleroma: add 2.10.2, drop 2.10.0-r1 (security) Signed-off-by: Haelwenn (lanodan) Monnier --- www-apps/pleroma/Manifest | 2 +- ...2.10.0-r1.ebuild => pleroma-2.10.2.ebuild} | 13 +++++----- www-apps/pleroma/pleroma-9999.ebuild | 26 ++++++++++++------- 3 files changed, 25 insertions(+), 16 deletions(-) rename www-apps/pleroma/{pleroma-2.10.0-r1.ebuild => pleroma-2.10.2.ebuild} (97%) diff --git a/www-apps/pleroma/Manifest b/www-apps/pleroma/Manifest index 9235d98a77..7dfd54c795 100644 --- a/www-apps/pleroma/Manifest +++ b/www-apps/pleroma/Manifest @@ -1 +1 @@ -DIST pleroma-2.10.0.tar.gz 33938786 BLAKE2B f28d1bf862577b0840eb2c29d29b4ef21017d4e2dce9acb9c34850075beca18f219588b2847078e4ec48bf83cd8307876da1d7033d7baabcab73ea78ae950f0b SHA512 effb4d4f08c102bab233ed363bd17d8883a78f667f49f44189e0dd5d43854631e23a826f8b9c3da8603f3bdf91110ee4922295e276d40e83c537ff0fb910c292 +DIST pleroma-2.10.2.tar.gz 33962686 BLAKE2B 346a4a0be470958a7fe42e9081b539d1dee0237023ceef38be48cb7ad115daea6a390fa30600506e3c4c8bc6259f16afcc5c16c4c9fb367f56c5b32396611ac8 SHA512 1742df8e87ff5c12a029c5c7510ad60aa480d02bb8af9f5e9b53cda14dd35ce4581bcc2dcb5d2166b32cd66019d42dfc9a4391ba998e73255fe956419f1f048d diff --git a/www-apps/pleroma/pleroma-2.10.0-r1.ebuild b/www-apps/pleroma/pleroma-2.10.2.ebuild similarity index 97% rename from www-apps/pleroma/pleroma-2.10.0-r1.ebuild rename to www-apps/pleroma/pleroma-2.10.2.ebuild index 3a1a8043b0..ea7f529258 100644 --- a/www-apps/pleroma/pleroma-2.10.0-r1.ebuild +++ b/www-apps/pleroma/pleroma-2.10.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit mix optfeature flag-o-matic +inherit mix optfeature flag-o-matic toolchain-funcs DESCRIPTION="ActivityPub social networking software compatible with other Fediverse software" HOMEPAGE="https://pleroma.social/" @@ -53,7 +53,6 @@ src_unpack() { [[ "${PV}" == *9999 ]] && git-r3_src_unpack cd "${S}" || die - eapply "${FILESDIR}/pleroma-2.10.0-vix_bump.patch" emix deps.get --only prod } @@ -78,15 +77,17 @@ src_prepare() { echo 'config :tzdata, :data_dir, "/var/lib/pleroma/tzdata"' >> config/prod.exs || die echo "import Config" > config/prod.secret.exs || die - - # Needs -fPIC under glibc for exile library - # https://bugs.gentoo.org/937130 - append-flags -fPIC } src_compile() { mkdir -p pleroma || die + tc-export CC + + # Needs -fPIC under glibc for exile library + # https://bugs.gentoo.org/937130 + append-flags -fPIC + use system-vips && export VIX_COMPILATION_MODE="PLATFORM_PROVIDED_LIBVIPS" use system-lexbor && export WITH_SYSTEM_LEXBOR=1 diff --git a/www-apps/pleroma/pleroma-9999.ebuild b/www-apps/pleroma/pleroma-9999.ebuild index db5c961d68..ea7f529258 100644 --- a/www-apps/pleroma/pleroma-9999.ebuild +++ b/www-apps/pleroma/pleroma-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 2022-2024 Haelwenn (lanodan) Monnier +# Copyright 2022-2026 Haelwenn (lanodan) Monnier # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit mix optfeature flag-o-matic +inherit mix optfeature flag-o-matic toolchain-funcs DESCRIPTION="ActivityPub social networking software compatible with other Fediverse software" HOMEPAGE="https://pleroma.social/" @@ -18,7 +18,7 @@ fi LICENSE="AGPL-3 CC-BY-SA-4.0 CC-BY-4.0" SLOT="otp" -IUSE="+system-lexbor" +IUSE="+system-lexbor +system-vips" # Requires network access (https) as long as elixir dependencies aren't packaged # said dependencies have their checksum verified via `mix.lock` @@ -35,10 +35,10 @@ BDEPEND=" " DEPEND=" dev-libs/glib - media-libs/vips:= sys-apps/file sys-libs/ncurses:= system-lexbor? ( dev-libs/lexbor ) + system-vips? ( media-libs/vips:= ) " RDEPEND=" ${DEPEND} @@ -77,16 +77,18 @@ src_prepare() { echo 'config :tzdata, :data_dir, "/var/lib/pleroma/tzdata"' >> config/prod.exs || die echo "import Config" > config/prod.secret.exs || die - - # Needs -fPIC under glibc for exile library - # https://bugs.gentoo.org/937130 - append-flags -fPIC } src_compile() { mkdir -p pleroma || die - export VIX_COMPILATION_MODE="PLATFORM_PROVIDED_LIBVIPS" + tc-export CC + + # Needs -fPIC under glibc for exile library + # https://bugs.gentoo.org/937130 + append-flags -fPIC + + use system-vips && export VIX_COMPILATION_MODE="PLATFORM_PROVIDED_LIBVIPS" use system-lexbor && export WITH_SYSTEM_LEXBOR=1 @@ -103,7 +105,12 @@ src_install() { doinitd ./pleroma/installation/init.d/pleroma + # Generated by Elixir, see lib/mix/lib/mix/tasks/release.init.ex + # Real executable needs to be in /opt/pleroma/bin due to usage of readlink to guess install path dosym /opt/pleroma/bin/pleroma /usr/bin/pleroma + + # Technically could be with regular binaries via dobin, + # but useless without the pleroma command, which has restricted access dosym /opt/pleroma/bin/pleroma_ctl /usr/bin/pleroma_ctl # This file controls console access @@ -118,6 +125,7 @@ src_install() { fperms 0750 /var/lib/pleroma fowners pleroma:pleroma /var/lib/pleroma + # So that www-apps/pleroma-fe (optional) doesn't ends up creating namespace conflicts dosym /opt/pleroma-fe/dist /var/lib/pleroma/static/frontends/pleroma-fe/gentoo }