gentoo resync : 20.03.2021

3 files changed, 98 insertions, 0 deletions

diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 9ffe46dcb284..dd91db3888a8 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,5 +1,7 @@
+AUX psmisc-23.4-fuser_regression_revert.patch 1577 BLAKE2B 89f346146ca2fb71bc5bee87f880abcc6e2e9c6b5c3e911fb806ced2a89ba096de6ce052bf238f1c8df948ec1fba5b979763fd2baa6e0a7b46ba977482f82501 SHA512 b129d3355a022b0bd743a06a4912b1ddea386af0d1551fadbe8155e1733ac03df3c795a4997759c4db6299196af3b49dfb2c9e6840dc33174ee1f4afe4ef9df7
 DIST psmisc-23.3.tar.xz 311896 BLAKE2B f38360dfb037a758633a8ff25af1de70be83ae5b2f2afe856ce237ade7bd2720f7c270c5af884313177022aa70f408dfce0c39e5d847057a6fdba98e3363561c SHA512 791ffef78d87b092d653da98710b338017466a9e1e1935968b9f0194ccef8da941317aa0c39d821d46b20d95d6539ccf78e5ebb71ad1032ae62337a397180d58
 DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471
 EBUILD psmisc-23.3-r1.ebuild 1150 BLAKE2B b3ef07952efb80a7e13a5683e23949e06db15ee298e029bae355438fc7a49a4fbc1a30c8bde47502715062d36181dcbbdb9f830af41a1afb11889f013faaf186 SHA512 bc76d36a24722841f9078fb5a72e41e5e0df3e9489524cba257ef02d1aecf50c281cc883c008834eff0b859f2841ee9f60b7661c64c390d7bc32525816f656d4
+EBUILD psmisc-23.4-r1.ebuild 1312 BLAKE2B 16ee0fd4d8e9359134efc632f888e1da7eaf32755d889e69440ea7b12de46949fb56f3016bba453ce8fd452104c6d238e7f7b7d5c48b879f6adbcc059846b5b2 SHA512 4774a5fbbaf16ac60c5b8ad5459883c50082200d04710424c52ae1203f2635bfd879ee689bf05aea09e14fbb02c80678075bbb3e4367b2d9cc9e2d30a6a3ed2e
 EBUILD psmisc-23.4.ebuild 1195 BLAKE2B 5924989ee1655fb9439e4718847c9171a8e011c0707db01519215f7c919d0c241a3e0e887d0fc6f5ecebfece77ae748430fd9379315ad02c6115ecd866fa33a1 SHA512 71f721429c81332cac93cd1ee5f3c7d0abc7bed54cd47c031056aff302f3eeee2ae937aa894bea76aa8da96409bf5d3a8cf79d9e9974598ff6bc8d668b087453
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
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
new file mode 100644
index 000000000000..59b2bfcef1de
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch
@@ -0,0 +1,45 @@
+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/psmisc-23.4-r1.ebuild b/sys-process/psmisc/psmisc-23.4-r1.ebuild
new file mode 100644
index 000000000000..7f5ad69fee46
--- /dev/null
+++ b/sys-process/psmisc/psmisc-23.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 nls selinux X"
+
+RDEPEND="!=app-i18n/man-pages-l10n-4.0.0-r0
+	>=sys-libs/ncurses-5.7-r7:0=
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=sys-devel/libtool-2.2.6b
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+	# https://gitlab.com/psmisc/psmisc/-/issues/35
+	"${FILESDIR}/${PN}-23.4-fuser_regression_revert.patch"
+)
+
+src_configure() {
+	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
+}