5 files changed, 0 insertions, 133 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 08ff111c1bd1..94ff54345913 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 911ad834677b..44bbdf6108ec 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,4 @@
 AUX 252-no-stack-protector-bpf.patch 809 BLAKE2B 85a66835b0287c237f82a9e95b14fa5707f127e77af07bddcb036773d10f260372f326f10cc17602a453017da3573b966859c13cb611df4cacf3d0c00a03cdd6 SHA512 ea326d5abde0a089bbc79cb1d3aa9cb491fc18160cfdd9e6b9aebafb26ec0db26652ae1086b891f65c8938a6fa5765b03d56632e47474b7d9b58796fe27f6f7c
-AUX 252-tmpfiles-ub.patch 2892 BLAKE2B 0c65c90c0a631a48b7f3b8194350fb90e6915e0e7f32b0de87cfb83ca170f68576017efbe8a531fdeb01485ac6840a4c75628d1a384e750fc5094dff68dddcab SHA512 5c4fac1933a0b8443b80cff7069f21904773d486f30be24337f2b68234c708568ccd0f1ab216968ce71f760e4e27f85912971cdb9dd3ee724d7e6a2d8bc917d7
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit-r1.patch 1941 BLAKE2B 93f1a0ba8dd575359e5ab4bd04f99ed3172dbe1ba14d8cade6fc08b0158e66847900d8531898ee9ec3855ac3857cf07a3e10804a3cb67719f0e9378437eba836 SHA512 affbe58aa65ebca7c1c6d790f9f68ffc44bda70a08165f5298ee4a84ab1c16cf534950ac50ffdb61b647e5eb068f51c333a76e39d8336e21e5d1b0199192139c
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
diff --git a/sys-apps/systemd/files/252-tmpfiles-ub.patch b/sys-apps/systemd/files/252-tmpfiles-ub.patch
deleted file mode 100644
index df190d500e34..000000000000
--- a/sys-apps/systemd/files/252-tmpfiles-ub.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://github.com/systemd/systemd/pull/25957
-https://github.com/systemd/systemd/pull/25959
-https://github.com/systemd/systemd/commit/9f804ab04d566ff745849e1c4ced680a0447cf76
-https://github.com/systemd/systemd/commit/34680637e838415204850f77c93ca6ca219abaf1
-
-From 9f804ab04d566ff745849e1c4ced680a0447cf76 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 6 Jan 2023 10:58:32 +0000
-Subject: [PATCH] tmpfiles: avoid null free() for acl attributes
-
-When built with ACL support, we might be processing a tmpfiles
-entry where there's no cause for us to call parse_acls_from_arg,
-then we get to the end of parse_line without having ever populated
-i.{acl_access, acl_default}.
-
-Then we pass a null pointer into acl_free().
-
-From UBSAN w/ GCC 13.0.0_pre20230101:
-```
-$ systemd-tmpfiles --clean
-/var/tmp/portage/sys-apps/acl-2.3.1-r1/work/acl-2.3.1/libacl/acl_free.c:44:14: runtime error: applying non-zero offset 18446744073709551608 to null pointer
-    #0 0x7f65d868b482 in acl_free /var/tmp/portage/sys-apps/acl-2.3.1-r1/work/acl-2.3.1/libacl/acl_free.c:44
-    #1 0x55fe7e592249 in item_free_contents ../systemd-9999/src/tmpfiles/tmpfiles.c:2855
-    #2 0x55fe7e5a347a in parse_line ../systemd-9999/src/tmpfiles/tmpfiles.c:3158
-    #3 0x55fe7e5a347a in read_config_file ../systemd-9999/src/tmpfiles/tmpfiles.c:3897
-    #4 0x55fe7e590c61 in read_config_files ../systemd-9999/src/tmpfiles/tmpfiles.c:3985
-    #5 0x55fe7e590c61 in run ../systemd-9999/src/tmpfiles/tmpfiles.c:4157
-    #6 0x55fe7e590c61 in main ../systemd-9999/src/tmpfiles/tmpfiles.c:4218
-    #7 0x7f65d7ebe289  (/usr/lib64/libc.so.6+0x23289)
-    #8 0x7f65d7ebe344 in __libc_start_main (/usr/lib64/libc.so.6+0x23344)
-    #9 0x55fe7e591900 in _start (/usr/bin/systemd-tmpfiles+0x11900)
-```
---- a/src/tmpfiles/tmpfiles.c
-+++ b/src/tmpfiles/tmpfiles.c
-@@ -2852,8 +2852,11 @@ static void item_free_contents(Item *i) {
-         strv_free(i->xattrs);
- 
- #if HAVE_ACL
--        acl_free(i->acl_access);
--        acl_free(i->acl_default);
-+        if (i->acl_access)
-+                acl_free(i->acl_access);
-+
-+        if (i->acl_default)
-+                acl_free(i->acl_default);
- #endif
- }
- 
-
-From 34680637e838415204850f77c93ca6ca219abaf1 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 6 Jan 2023 12:30:36 +0100
-Subject: [PATCH] nspawn: guard acl_free() with a NULL check
-
-Inspired by #25957 there's one other place where we don't guard
-acl_free() calls with a NULL check.
-
-Fix that.
---- a/src/nspawn/nspawn-patch-uid.c
-+++ b/src/nspawn/nspawn-patch-uid.c
-@@ -181,7 +181,9 @@ static int patch_acls(int fd, const char *name, const struct stat *st, uid_t shi
- 
-         if (S_ISDIR(st->st_mode)) {
-                 acl_free(acl);
--                acl_free(shifted);
-+
-+                if (shifted)
-+                        acl_free(shifted);
- 
-                 acl = shifted = NULL;
- 
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 98707898d621..237e975fa196 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,3 @@
-DIST xdg-desktop-portal-1.15.0.tar.xz 521732 BLAKE2B a49ab7a1462771c628a24f9759e239dd3f8233b26c2a5f6e9fc848e00eb36c74a21cd1fd4d43af0c0f46782c46d6a822af86fd7b49fa1f77a1cbd96452a00348 SHA512 98b36841c54bdd5221c0719e9646abb7f117351ff780682591c269d2a57f7b1946deaef38c2caa6474e1048e283a68c55a791e8d2a0be000ca9e563ed98c28ef
 DIST xdg-desktop-portal-1.16.0.tar.xz 250524 BLAKE2B 9d5bd760621b114a19c1cc8895f91c43fcfed0dd067ba9678de0f11dc7835ec29c4a2c452274adbd36ee1318359caa8d7ca0c585558eb73a2a4e53528e6b02da SHA512 f7e7e96d3a6757901fbc4c0310aac0afbf37882c279a2859e06f63528049cd9b50dd2d55445d1386f03f62557c1a2ec81d4ee081200367d6269d2dffc75f0912
-EBUILD xdg-desktop-portal-1.15.0.ebuild 1705 BLAKE2B 787d37227f646a0990a9629cb603fd4c058f57ec204ee4f8d6c3b9f6fd337e3b31ff9dd762380e3f078f724b02e9be0cb4d0c64ac6a31a4656f1f857e7b402f7 SHA512 2a44b986668963f58a23dece2613787acf2ee6f880dbc7168bf8fcfbacfc83e6c250c37c3b30b7cc5f6fde0a2ca8caee93300ebf31773c0738704c74fa462b6b
 EBUILD xdg-desktop-portal-1.16.0.ebuild 1756 BLAKE2B e3a4ddda76a9400e68f4dbc6595266c05787f74afd07c9cc0b1ad9959a8b5f4be98ea8f9b85be21a6b0fbfb3186749adc462c48fd609a0652182f28331f2c097 SHA512 a97deb39f0f1d86fdeacabbece6131c5561f0a022c65ee2980122c748ee5cc59d9d9d9bc218a6c2deffc0b882435122995c89dc8293be8417cf9a36617fad010
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.15.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.15.0.ebuild
deleted file mode 100644
index b67a7798000d..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.15.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="geolocation screencast systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	dev-libs/json-glib
-	>=sys-fs/fuse-3.10.0:3[suid]
-	x11-libs/gdk-pixbuf
-	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-docbook-docs # requires flatpak
-		--disable-libportal # not packaged
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		$(use_enable geolocation geoclue)
-		$(use_enable screencast pipewire)
-		$(use_with systemd)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	if ! has_version gui-libs/xdg-desktop-portal-lxqt && ! has_version gui-libs/xdg-desktop-portal-wlr && \
-		! has_version kde-plasma/xdg-desktop-portal-kde && ! has_version sys-apps/xdg-desktop-portal-gnome && \
-		! has_version sys-apps/xdg-desktop-portal-gtk; then
-		elog "${PN} is not usable without any of the following XDP"
-		elog "implementations installed:"
-		elog "  gui-libs/xdg-desktop-portal-lxqt"
-		elog "  gui-libs/xdg-desktop-portal-wlr"
-		elog "  kde-plasma/xdg-desktop-portal-kde"
-		elog "  sys-apps/xdg-desktop-portal-gnome"
-		elog "  sys-apps/xdg-desktop-portal-gtk"
-	fi
-}