gentoo auto-resync : 08:03:2024 - 01:06:59

5 files changed, 7 insertions, 173 deletions

diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 48171421faed..09695e10b623 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,9 +1,5 @@
-AUX psmisc-23.4-fuser_regression_revert.patch 1577 BLAKE2B 89f346146ca2fb71bc5bee87f880abcc6e2e9c6b5c3e911fb806ced2a89ba096de6ce052bf238f1c8df948ec1fba5b979763fd2baa6e0a7b46ba977482f82501 SHA512 b129d3355a022b0bd743a06a4912b1ddea386af0d1551fadbe8155e1733ac03df3c795a4997759c4db6299196af3b49dfb2c9e6840dc33174ee1f4afe4ef9df7
-AUX psmisc-23.5-fix-killall-pidfd_send_signal.patch 1384 BLAKE2B 246636fe31d9602cd68310ed8c637fa2f62dfa98bdc9cc958bd2e7ab6eaf358dd516cc49db4bbbe892d62375d5f7613b04fa98532e225d9fdff2dc142e596459 SHA512 23117b10094be12b64545ccd1fa9c2e2901e0ab7ab4e84dc9428e27358fa83bff01b4e790f21e14b74c0db2dd01ee83ba6234cbf975f275d21677a0dbda1f444
-DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471
-DIST psmisc-23.5.tar.xz 394012 BLAKE2B 258b82c9fff3765f33cdcd4150489b3e585a47b9065b1cb4f5b432bea4aa7766aab15b160cfb948df9e835c7ac09a9f185d663ab1cd376bedea53bdaf73fd776 SHA512 e908220350491a595ceaf96025a9aa14d832cacc8901545d0864152053fedaf9dc10f45fb2870aa2a00e4d9d8947243038357e14a82b04ab5d20c53e7f841a8d
 DIST psmisc-23.6.tar.xz 424736 BLAKE2B 468bf4e84695efcedb832f890b6201b7bc4aca7c5aabaf30e67f4471671421897ee7cd67f01d4b3d60c3e1c63752eb7384e627e75fa7db290cd749da08e2f788 SHA512 4daffbd1726e50d9344f8578dd4c10f0b8f7971929ec667490de31122e5f3828747e1bafb3ed3c37ed7e1758ab9ec43b8f4556b676a416a8efbc7c6c88b6985d
-EBUILD psmisc-23.4-r1.ebuild 1890 BLAKE2B 08b7cbe1def7013fdf5729356db432091a680a7f862161c367fa384630b7cc8e9057fa28fba8768378a054fdba833b19f3dc5e81ceb950ee2ae08b712da485cc SHA512 a581d83fbdc3451025108e60033ce7c59dd89a3191d25cb4845fcef37415ab462b305504513911bce22fb03593480f53130e461c88753b81e2441f82f055456e
-EBUILD psmisc-23.5.ebuild 1956 BLAKE2B 77f5f9a2a053f69f067c41ffdb20f609d5b61c760aabff858b0d91f5e7a211c283e68ac24c19a22adb3b3f1fce38010511fc87451fb627dedc3bbcac348cd7f2 SHA512 74d69418870f9259e5af2c1c84e16cec3d3fa3e9cd920ca700c41ca427e87c2329fb6f62b038de9309c25de8aff5b9817a2f6ab66d868b754a8c3bfa5a093e60
+DIST psmisc-23.7.tar.xz 432208 BLAKE2B 5064f929bf320c3fe91d3e665479dcb0913b12f4dddd23e49e296509f89e29b5d147b411c33cca9892a43d955c8e431bccf00872ae86a9c9d2545295f05b69d7 SHA512 8180d24355b3b0f3102044916d078b1aa9a1af3d84f1e14db79e33e505390167012adbb1a8a5f47a692f3a14aba1eb5f1f8f37f328392e8635b89966af9b2128
 EBUILD psmisc-23.6.ebuild 1914 BLAKE2B a847477d8971db6defbef59701fa47fa9bc63edf4f28347496cd29223c77cf63962cda9575c0924950cea788293ef2d48bda931f1b34aa8c9ace19e8f97a171b SHA512 3582ae96dde5d3b74ac2cc30bcc5f1d117a200f45ccab8cf29b157e9ee16c7d76b2f1256d0d587dff86640d2dfdc683bbc27d72ea9afc324d3383f6ad36d6df3
+EBUILD psmisc-23.7.ebuild 1922 BLAKE2B 08afe3bebcdb47bc0e18bd5a24a7c9790fd728129413608f2916394b9a3818483b283b3a2b8abfac4c24d37ce8e403ec4f049d787d3efc2880f4240221c2ed4c SHA512 510796280d792e1548a9d4b0f84a78e7c6f1104fc4097dcf4266fecabd8c8acdd81a04043fb2ca0945e338160da5f5c5ee9f3bcb2fd5138b293d34fed498133f
 MISC metadata.xml 387 BLAKE2B 86be283c90e1b90bd40313187a4caa0ec871807fe1045649f2bff8934ee9537a348ee096a63ed2cfb2991724bf79e8dc7dd65d5cb4812216bbd10ebf5e400a71 SHA512 8594d6e68c03adf48e92947d47a3b477768fd296d8db62cfcae8982dcc872e947780bfdb11a4f3b1658b00928eccd2d7b58b03eea388c51806a45ae47e8c59d5
diff --git a/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch b/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
deleted file mode 100644
index 59b2bfcef1de..000000000000
--- a/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://gitlab.com/psmisc/psmisc/-/issues/35
-
-diff --git a/ChangeLog b/ChangeLog
-index df45ae3..be20ca0 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -5,8 +5,6 @@ Changes in 23.4
- 	* pstree: fix layout when using -C !24
- 	* pstree: add time namespace !25
- 	* pstree: Dynamically link to selinux and use attr
--	* fuser: Get less confused about duplicate dev_id !10
--	* fuser: Only check pathname on non-block devices !31
- 
- Changes in 23.3
- ===============
-diff --git a/src/fuser.c b/src/fuser.c
-index 03e6237..f9d78db 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1566,7 +1566,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head,
- 	struct stat st, lst;
- 	char *dirpath;
- 	char filepath[PATH_MAX];
--	char real_filepath[PATH_MAX];
- 
- 	if (asprintf(&dirpath, "/proc/%d/%s", pid, dirname) < 0)
-         return;
-@@ -1605,17 +1604,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head,
- 			     dev_tmp = dev_tmp->next) {
- 				if (thedev != dev_tmp->device)
- 					continue;
--
--				/* check the paths match if it is not a block device */
--				if (! S_ISBLK(dev_tmp->name->st.st_mode)) {
--				    if (readlink(filepath, real_filepath, PATH_MAX-1) < 0) {
--					if (strncmp(dev_tmp->name->filename, filepath, strlen(dev_tmp->name->filename)) != 0)
--					    continue;
--				    } else {
--					if (strncmp(dev_tmp->name->filename, real_filepath, strlen(dev_tmp->name->filename)) != 0)
--					    continue;
--				    }
--				}
- 				if (access == ACCESS_FILE
- 				    && (lstat(filepath, &lst) == 0)
- 				    && (lst.st_mode & S_IWUSR)) {
diff --git a/sys-process/psmisc/files/psmisc-23.5-fix-killall-pidfd_send_signal.patch b/sys-process/psmisc/files/psmisc-23.5-fix-killall-pidfd_send_signal.patch
deleted file mode 100644
index 0fc9c30a9635..000000000000
--- a/sys-process/psmisc/files/psmisc-23.5-fix-killall-pidfd_send_signal.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://gitlab.com/psmisc/psmisc/-/commit/6892e321e7042e3df60a5501a1c59d076e8a856f
-
-From 6892e321e7042e3df60a5501a1c59d076e8a856f Mon Sep 17 00:00:00 2001
-From: Craig Small <csmall@dropbear.xyz>
-Date: Mon, 18 Jul 2022 20:16:42 +1000
-Subject: [PATCH] killall: use kill if pidfd_send_signal() fails
-
-The pidfd_send_signal() system call appeared in Linux 5.1
-If psmisc is build on a system before then, or a non-Linux
-system, then kill() is used instead. However if psmisc is
-built on a Linux >= 5.1 system but run on a < 5.1 Linux
-system the system call fails and killall doesn't work.
-
-The fix, as proposed by Peter T. Breuer, is to try
-pidfd_send_signal() and if the return value is < 0 and
-errno is ENOSYS then we know at runtime the system call
-failed and we fall through to trusty old kill().
-
-Note, this means that killall on systems below 5.1 still
-have the race PID condition that the pidfd calls fix.
-
-References:
- https://bugs.debian.org/1015228
---- a/src/killall.c
-+++ b/src/killall.c
-@@ -326,7 +326,12 @@ my_send_signal(
- {
- #ifdef __NR_pidfd_send_signal
-     if (pid > 0) /* Not PGID */
--        return syscall(__NR_pidfd_send_signal, pidfd, sig, NULL, 0);
-+    {
-+	int ret = syscall(__NR_pidfd_send_signal, pidfd, sig, NULL, 0);
-+	if (ret >= 0 || errno != ENOSYS)
-+	    return ret;
-+	// fall through if no such syscall
-+    }
- #endif
-     return kill(pid, sig);
- }
-GitLab
diff --git a/sys-process/psmisc/psmisc-23.4-r1.ebuild b/sys-process/psmisc/psmisc-23.4-r1.ebuild
deleted file mode 100644
index 0dfa46b26f57..000000000000
--- a/sys-process/psmisc/psmisc-23.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 nls selinux test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!=app-i18n/man-pages-l10n-4.0.0-r0
-	>=sys-libs/ncurses-5.7-r7:=
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-build/libtool-2.2.6b
-	nls? ( sys-devel/gettext )
-	test? ( dev-util/dejagnu )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=(
-	# https://gitlab.com/psmisc/psmisc/-/issues/35
-	"${FILESDIR}/${PN}-23.4-fuser_regression_revert.patch"
-)
-
-src_configure() {
-	if tc-is-cross-compiler ; then
-		# This isn't ideal but upstream don't provide a placement
-		# when malloc is missing anyway, leading to errors like:
-		# pslog.c:(.text.startup+0x108): undefined reference to `rpl_malloc'
-		# See https://sourceforge.net/p/psmisc/bugs/71/
-		# (and https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html)
-		export ac_cv_func_malloc_0_nonnull=yes \
-			ac_cv_func_realloc_0_nonnull=yes
-	fi
-
-	# bug #802414
-	touch testsuite/global-conf.exp || die
-
-	local myeconfargs=(
-		--disable-harden-flags
-		$(use_enable ipv6)
-		$(use_enable nls)
-		$(use_enable selinux)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	use X || rm -f "${ED}"/usr/bin/pstree.x11
-
-	[[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
-	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-
-	# fuser is needed by init.d scripts; use * wildcard for #458250
-	dodir /bin
-	mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
-}
diff --git a/sys-process/psmisc/psmisc-23.5.ebuild b/sys-process/psmisc/psmisc-23.7.ebuild
index a84a716f7b52..50827dfb481c 100644
--- a/sys-process/psmisc/psmisc-23.5.ebuild
+++ b/sys-process/psmisc/psmisc-23.7.ebuild
@@ -12,12 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls selinux test X"
+IUSE="apparmor nls selinux test X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!=app-i18n/man-pages-l10n-4.0.0-r0
 	>=sys-libs/ncurses-5.7-r7:=
+	apparmor? ( sys-libs/libapparmor )
 	nls? ( virtual/libintl )
 	selinux? ( sys-libs/libselinux )
 "
@@ -30,10 +31,6 @@ BDEPEND="
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-killall-pidfd_send_signal.patch
-)
-
 src_configure() {
 	if tc-is-cross-compiler ; then
 		# This isn't ideal but upstream don't provide a placement
@@ -45,14 +42,12 @@ src_configure() {
 			ac_cv_func_realloc_0_nonnull=yes
 	fi
 
-	# No longer needed in > 23.5
-	# https://gitlab.com/psmisc/psmisc/-/commit/3fac667430341bdcec733da6eacd88b03813467a
-	# bug #802414
-	touch testsuite/global-conf.exp || die
-
 	local myeconfargs=(
+		# Hardening flags are set by our toolchain alraedy. Setting these
+		# in packages means toolchain & users can't set something tougher.
 		--disable-harden-flags
 		--enable-ipv6
+		$(use_enable apparmor)
 		$(use_enable nls)
 		$(use_enable selinux)
 	)