commit: 3e5a89cfc048384ddf35268840fea1ebc3e6ee91 Author: Christopher Fore <csfore <AT> posteo <DOT> net> AuthorDate: Sat Apr 20 18:52:49 2024 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Apr 21 07:46:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5a89cf
sys-apps/flatpak: add 1.12.9, 1.14.6, security bump - Tests skipped (restricted) - Fixed trivial QA warnings - Changed order of HOMEPAGE, SRC_URI, and DESCRIPTION Bug: https://bugs.gentoo.org/930202 Signed-off-by: Christopher Fore <csfore <AT> posteo.net> Closes: https://github.com/gentoo/gentoo/pull/36334 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> sys-apps/flatpak/Manifest | 2 + sys-apps/flatpak/flatpak-1.12.9.ebuild | 108 +++++++++++++++++++++++++++++ sys-apps/flatpak/flatpak-1.14.6.ebuild | 120 +++++++++++++++++++++++++++++++++ 3 files changed, 230 insertions(+) diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest index 56ef409d4835..dc467e2313ab 100644 --- a/sys-apps/flatpak/Manifest +++ b/sys-apps/flatpak/Manifest @@ -1,3 +1,5 @@ DIST flatpak-1.12.8.tar.xz 1568984 BLAKE2B 6db457eba6b5c03ae4b7037e55f0537821152a80cad8746939fe93008922a9a33ff9f08635613e56a84f2d151826130c497c1e9f7f1e41a5b2dc215882f2eb14 SHA512 5a37d94e12c18a746b222c1ddbd20bddfb22079af1d3a79dc819cdb25f04774c9e4b3a51f9b5ed64f210317e7ec9fb97324ae38ec3430c6a515ba4042805fc57 +DIST flatpak-1.12.9.tar.xz 1572536 BLAKE2B bd9b116bf0e51e60d1e0c420c4c4553a0ebc55a667bce23a0f3116da0dd566c7ffdb063c0b63f466b9b6e451b3c7791daf40cb5d13e2535d988b58cfc947341f SHA512 9103acfed4cb25e6ff4a9d023864845cc565f688b1a4b49b0c8c2605eda9a142f33a37ad2ce670c5f7bd30a398027c141adf2a6f6d0d7549b2bfca82214d3f85 DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe SHA512 3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0 DIST flatpak-1.14.5.tar.xz 1637692 BLAKE2B 180dc094ef3feef1ccefceb562836f55f6e875016588a5984435ea3157498a8746305c16aa2c83044c107fd7f0e8f6c034c326b4ae29ade1c657e82cff353d47 SHA512 552deaaf3e6712a56f33698c20e6b8225c8893fe9a375af897fd99e19c487bf79b19c3e4ce3b00f3caf90020019ff67c628ca6a8f2ae1e6e01db397d2081ab2b +DIST flatpak-1.14.6.tar.xz 1644056 BLAKE2B 68bc8bdaf1d1c8a6046a06f800d41c1603e691e60a90f070c694501d50ee6fba3ad1978e222d22a9f99e2b85de9154e670149227b0f2ea6543483c2d103b5093 SHA512 d858682dbf539afe1b91087b6a0e0ebeea6658a0ef02c96d68259f3d8c58d1e6d02dd8b69db1b3c55f6d5df0f4d7e41c6165f668f09763dd3f9c3beb48f8bcf5 diff --git a/sys-apps/flatpak/flatpak-1.12.9.ebuild b/sys-apps/flatpak/flatpak-1.12.9.ebuild new file mode 100644 index 000000000000..5d1d9025a7c6 --- /dev/null +++ b/sys-apps/flatpak/flatpak-1.12.9.ebuild @@ -0,0 +1,108 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10,11} ) + +inherit linux-info python-any-r1 + +DESCRIPTION="Linux application sandboxing and distribution framework" +HOMEPAGE="https://flatpak.org/"; +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"; + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="doc introspection policykit seccomp systemd X" +RESTRICT="test" + +RDEPEND=" + acct-group/flatpak + acct-user/flatpak + >=app-arch/libarchive-2.8:= + app-arch/zstd:= + >=app-crypt/gpgme-1.1.8:= + >=dev-libs/appstream-glib-0.5.10:= + >=dev-libs/glib-2.56:2= + >=dev-libs/libxml2-2.4:= + dev-libs/json-glib:= + dev-libs/libassuan:= + >=dev-util/ostree-2020.8:=[gpg(+)] + || ( + dev-util/ostree[curl] + dev-util/ostree[soup] + ) + >=gnome-base/dconf-0.26:= + gnome-base/gsettings-desktop-schemas + >=net-libs/libsoup-2.4:2.4= + >=sys-apps/bubblewrap-0.5.0 + sys-apps/dbus + >=sys-fs/fuse-2.9.9:0= + sys-apps/xdg-dbus-proxy + X? ( + x11-apps/xauth + x11-libs/libXau:= + ) + x11-libs/gdk-pixbuf:2= + policykit? ( >=sys-auth/polkit-0.98:= ) + seccomp? ( sys-libs/libseccomp:= ) + systemd? ( sys-apps/systemd:= ) +" + +DEPEND="${RDEPEND}" +# pyparsing version pinned for https://bugs.gentoo.org/825230 +BDEPEND=" + >=dev-build/automake-1.13.4 + >=sys-devel/gettext-0.18.2 + virtual/pkgconfig + dev-util/gdbus-codegen + app-alternatives/yacc + introspection? ( >=dev-libs/gobject-introspection-1.40 ) + doc? ( + >=dev-util/gtk-doc-1.20 + dev-libs/libxslt + ) + $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') +" + +PDEPEND="sys-apps/xdg-desktop-portal" + +python_check_deps() { + python_has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" +} + +pkg_setup() { + local CONFIG_CHECK="~USER_NS" + linux-info_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + default + # This line fails because locales are in /usr/lib/locale/locale-archive. + sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die +} + +src_configure() { + local myeconfargs=( + --enable-sandboxed-triggers + --localstatedir="${EPREFIX}"/var + --with-system-bubblewrap + --with-system-dbus-proxy + $(use_enable X xauth) + $(use_enable doc documentation) + $(use_enable doc gtk-doc) + $(use_enable introspection) + $(use_enable policykit system-helper) + $(use_enable seccomp) + $(use_with systemd) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + # resolve conflict with acct-user/flatpak for #856706 + rm -rf "${ED}/usr/lib/sysusers.d" +} diff --git a/sys-apps/flatpak/flatpak-1.14.6.ebuild b/sys-apps/flatpak/flatpak-1.14.6.ebuild new file mode 100644 index 000000000000..d8cfe2b1993d --- /dev/null +++ b/sys-apps/flatpak/flatpak-1.14.6.ebuild @@ -0,0 +1,120 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit linux-info python-any-r1 systemd tmpfiles + +DESCRIPTION="Linux application sandboxing and distribution framework" +HOMEPAGE="https://flatpak.org/"; +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"; + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="doc introspection policykit seccomp systemd X" +RESTRICT="test" + +RDEPEND=" + acct-group/flatpak + acct-user/flatpak + >=app-arch/libarchive-2.8:= + app-arch/zstd:= + >=app-crypt/gpgme-1.1.8:= + >=dev-libs/appstream-0.12:= + >=dev-libs/appstream-glib-0.5.10:= + >=dev-libs/glib-2.56:2= + >=dev-libs/libxml2-2.4:= + dev-libs/json-glib:= + dev-libs/libassuan:= + >=dev-util/ostree-2020.8:=[gpg(+)] + dev-util/ostree[curl] + >=gnome-base/dconf-0.26:= + gnome-base/gsettings-desktop-schemas + net-misc/curl:= + >=sys-apps/bubblewrap-0.5.0 + sys-apps/dbus + >=sys-fs/fuse-3.1.1:3= + sys-apps/xdg-dbus-proxy + X? ( + x11-apps/xauth + x11-libs/libXau:= + ) + x11-libs/gdk-pixbuf:2= + policykit? ( >=sys-auth/polkit-0.98:= ) + seccomp? ( sys-libs/libseccomp:= ) + systemd? ( sys-apps/systemd:= ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-build/automake-1.13.4 + >=sys-devel/gettext-0.18.2 + virtual/pkgconfig + dev-util/gdbus-codegen + app-alternatives/yacc + $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') + introspection? ( >=dev-libs/gobject-introspection-1.40 ) + doc? ( + app-text/xmlto + dev-libs/libxslt + ) +" + +PDEPEND="sys-apps/xdg-desktop-portal" + +PATCHES=( + "${FILESDIR}"/${PN}-1.14.4-fuse-3-slotted.patch +) + +python_check_deps() { + python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" +} + +pkg_setup() { + local CONFIG_CHECK="~USER_NS" + linux-info_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + default + # This line fails because locales are in /usr/lib/locale/locale-archive. + sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die +} + +src_configure() { + local myeconfargs=( + --enable-sandboxed-triggers + --localstatedir="${EPREFIX}"/var + --with-system-bubblewrap + --with-system-dbus-proxy + --with-tmpfilesdir="/usr/lib/tmpfiles.d" + $(use_enable X xauth) + $(use_enable doc documentation) + $(use_enable doc docbook-docs) + $(use_enable introspection) + $(use_enable policykit system-helper) + $(use_enable seccomp) + $(use_with systemd) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + # https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303 + find "${ED}" -name '*.la' -delete || die + # resolve conflict with acct-user/flatpak for #856706 + rm -rf "${ED}/usr/lib/sysusers.d" + + if use systemd; then + systemd_dounit "${FILESDIR}"/flatpak-update.{service,timer} + fi +} + +pkg_postinst() { + tmpfiles_process flatpak.conf +}
