gentoo resync : 12.05.2022

3 files changed, 143 insertions, 0 deletions

diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 8f50ab579a8e..c03ab2d0083d 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -1,5 +1,8 @@
 AUX lsof-4.85-cross.patch 1061 BLAKE2B 730a02dfcd433bb6d46d3fecd87aa0913800408d67302bd9a9580ab3fec6e4a88e453890dec348796258eccd4c5185cc8f06ab2029347d632037f24dd0aa066e SHA512 9326a2708910a39ba3b81253c21149f8e4fa44b207e4c2a88f86c9322d2b50e6360760fcb13e00f644aba57ad207106c280db00ebc2d1f3d49405b54681548e8
 AUX lsof-4.94-arm-sigbus-fix.patch 1925 BLAKE2B 30bf5726c04a2451db39778b5646c6624220822c834da5eb5807310ae3a4cd2762cc87c73a2b720f32629794f4b152934b8578f71f442e37161e7c5307ef3ef4 SHA512 29bcb993560635aac5dfa8df23f9797bc07a2b9f5418d65ac9be64a766387a64f6b977609a467c3c146ffef32cdb2742425e351d6e2acfd22462999a14e4d87d
+AUX lsof-4.95.0-test-typo.patch 935 BLAKE2B 508728789172985e16ba60a1a28cda07ae186499ed4db8c3085329b823f71861c4a4f402c3657a1730dbb14071c211c35659fbb065b0cea7527f53e36bcc5976 SHA512 c648e5ecee68e5fe9959df50509a43d19af24874604d361bf248ea6c42beb10ca9fcd60831638010a9a38e784cad56b8ff8c29557392e6888646abb358a4e5c6
 DIST lsof-4.94.0.tar.gz 1340224 BLAKE2B b3d3c4707dac22c5431ac37c6a9f28ba5057b9a8dce65038934f1148209ef4615012ed887e263ec648679d0d95a06c78ed83a7d76cc8d97c05c013c563938793 SHA512 852b12e621e1dbf71e5f7fd848a200339ca278fbe8c39dcd33f745d1aea4e61552c0f30a3f6469ad9d4b86a9163e677f8c95298159ebd647357734225aa06c0c
+DIST lsof-4.95.0.tar.gz 1343380 BLAKE2B ffb0a656463f8f0e84ddcba36d78a94a8b4b883f0ff043c3821b3236274fb11e04b8c82f84f4e67ab922f021769c2711c1e97716aef3190d640fc321110521a3 SHA512 09c5c4b0ea0530e23b98b96df8485f37c2594028b604097a816aee216a8b1a7bc887071e8727cbaf3c765d0992314a5aa49723572cfe926f88806be18a6b8aef
 EBUILD lsof-4.94.0-r1.ebuild 3482 BLAKE2B 2bd5766194598ed10580e4e869078ce64aee9f1a08226eb74b8e0fa5bdf794b8b3c740aad039e95be63b7d36d054499c0875e0190f767c97d8c0c315d168d33c SHA512 3ea260a7921b42356ef71de112115a9b198d9f6bd06c74d52f0c4c9bf3ed089498132fcd6d8ce4bd4a338539d691791ec4a0adaa1b6a3e3ec1e7610b250d5cae
+EBUILD lsof-4.95.0.ebuild 3482 BLAKE2B 58fac8f20c86bd82e8c9fb2d833edca74f7c0ee338357fd44a304cb0cb569b17c35cb8c0abad4194572e975770145311445116a5bca06a5994c51bf5040f74df SHA512 a64e9615f007888285b8b15b9eca2a2250cad86fbd529a038189955ed89eed2b1560f3b9fd771f610cc6ce18186acab2ec0fe4baba2af5d6c783aa8a7abb98df
 MISC metadata.xml 411 BLAKE2B 033bacd5f88ce993e772b5663906729e24a7b5ed0a21b05eab79cb5d0b513db0bce89e298c4ccfdf0bf8d56418424eafab1fcd653050b5c017db50fc5ac1115b SHA512 bd573321360b62368a1bff933851b2a8874bc59848990354f264c495f2748e3c8daa5e2844e7b908f6e2b880460091fd768f6cc5895f78edcfa3017ba39f419d
diff --git a/sys-process/lsof/files/lsof-4.95.0-test-typo.patch b/sys-process/lsof/files/lsof-4.95.0-test-typo.patch
new file mode 100644
index 000000000000..f35b71e749fa
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.95.0-test-typo.patch
@@ -0,0 +1,25 @@
+https://github.com/lsof-org/lsof/commit/60e292652879a45ecaa20987e755e218c1396311
+
+From 60e292652879a45ecaa20987e755e218c1396311 Mon Sep 17 00:00:00 2001
+From: Masatake YAMATO <yamato@redhat.com>
+Date: Thu, 28 Apr 2022 08:03:02 +0900
+Subject: [PATCH] [linux] test case: fix a typo
+
+Signed-off-by: Masatake YAMATO <yamato@redhat.com>
+---
+ dialects/linux/tests/case-10-ux-socket-state.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dialects/linux/tests/case-10-ux-socket-state.bash b/dialects/linux/tests/case-10-ux-socket-state.bash
+index 2c080d6..d58826e 100755
+--- a/dialects/linux/tests/case-10-ux-socket-state.bash
++++ b/dialects/linux/tests/case-10-ux-socket-state.bash
+@@ -4,7 +4,7 @@ name=$(basename $0 .bash)
+ lsof=$1
+ report=$2
+ 
+-if ! [ -r "/proc/$self/stack" ]; then
++if ! [ -r "/proc/self/stack" ]; then
+     echo "this platform doesn't allow to access /proc/\$PID/stack" >> $report
+     exit 2
+ fi
diff --git a/sys-process/lsof/lsof-4.95.0.ebuild b/sys-process/lsof/lsof-4.95.0.ebuild
new file mode 100644
index 000000000000..4d4956a7f95d
--- /dev/null
+++ b/sys-process/lsof/lsof-4.95.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="Lists open files for running Unix processes"
+HOMEPAGE="https://github.com/lsof-org/lsof"
+SRC_URI="https://github.com/lsof-org/lsof/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="lsof"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples ipv6 rpc selinux"
+
+RDEPEND="rpc? ( net-libs/libtirpc )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/groff
+	rpc? ( virtual/pkgconfig )"
+
+# Needs fixing first
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.85-cross.patch # bug #432120
+	"${FILESDIR}"/${P}-test-typo.patch
+)
+
+src_prepare() {
+	default
+	# fix POSIX compliance with `echo`
+	sed -i \
+		-e 's:echo -n:printf:' \
+		AFSConfig Configure Customize Inventory tests/CkTestDB || die
+	# Convert `test -r header.h` into a compile test.
+	# Make sure we convert `test ... -a ...` into two `test` commands
+	# so we can then convert both over into a compile test. #601432
+	sed -i -E \
+		-e '/if test .* -a /s: -a : \&\& test :g' \
+		-e '/test -r/s:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:g' \
+		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
+		Configure || die
+
+	# "create" man-page (bug #689462)
+	# inspired by shipped "makeman" ksh script
+	soelim < Lsof.8 > lsof.8 || die
+}
+
+target() {
+	case ${CHOST} in
+	*-darwin*)  echo darwin  ;;
+	*-freebsd*) echo freebsd ;;
+	*-solaris*) echo solaris ;;
+	*-aix*)     echo aixgcc  ;;
+	*)          echo linux   ;;
+	esac
+}
+
+src_configure() {
+	append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
+	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
+	[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# make sys/proc_info.h available in ${T} because of LSOF_INCLUDE
+		# dummy location -- Darwin needs this for a Configure check to
+		# succeed
+		if [[ -e /usr/include/sys/proc_info.h ]] ; then
+			mkdir -p "${T}"/sys || die
+			( cd "${T}"/sys && ln -s /usr/include/sys/proc_info.h ) || die
+		fi
+	fi
+
+	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
+		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
+
+	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
+	# around in it and mix /usr/include paths with cross-compile/etc.
+	touch .neverInv
+	LINUX_HASSELINUX=$(usex selinux y n) \
+	LSOF_INCLUDE=${T} \
+	LSOF_CC=$(tc-getCC) \
+	LSOF_AR="$(tc-getAR) rc" \
+	LSOF_RANLIB=$(tc-getRANLIB) \
+	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
+	./Configure -n $(target) || die
+}
+
+src_compile() {
+	emake DEBUG="" all
+}
+
+src_install() {
+	dobin lsof
+
+	if use examples ; then
+		insinto /usr/share/lsof/scripts
+		doins scripts/*
+	fi
+
+	doman lsof.8
+	dodoc 00*
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		einfo "Note: to use lsof on Solaris you need read permissions on"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
+	elif [[ ${CHOST} == *-aix* ]] ; then
+		einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group system"
+	fi
+}