sys-process/lsof: Sync with Gentoo

It's from Gentoo commit 1e505057e5ec18ae8b98d22d9cf1955ce0a46fad.

sdk_container/src/third_party/portage-stable/sys-process/lsof/Manifest

@@ -1 +1 @@
-DIST lsof-4.94.0.tar.gz 1340224 BLAKE2B b3d3c4707dac22c5431ac37c6a9f28ba5057b9a8dce65038934f1148209ef4615012ed887e263ec648679d0d95a06c78ed83a7d76cc8d97c05c013c563938793 SHA512 852b12e621e1dbf71e5f7fd848a200339ca278fbe8c39dcd33f745d1aea4e61552c0f30a3f6469ad9d4b86a9163e677f8c95298159ebd647357734225aa06c0c
+DIST lsof-4.98.0.tar.gz 734232 BLAKE2B 2f4ba4d179e8061e5bcff7dda4a0981616530bd5577fc73904e2699e6e982efee9e4270d3f2d3c68751d73cb98bfed0fd49d4c6bd967d15b4e06dcb72494d024 SHA512 6fde12497ce9cbba698be624b45e8392d551626c3e46b50ec23e661b322438ef7162dbac0d06829d56f074c7d934fa1ca98aa50ee1487125c93bebfe8eb2a2e8

sdk_container/src/third_party/portage-stable/sys-process/lsof/files/lsof-4.85-cross.patch

@@ -1,37 +0,0 @@
-let the preprocessor work its magic rather than executing the code
-
-https://bugs.gentoo.org/432120
-
-make sure to use -P here
-
-https://bugs.gentoo.org/546636
-
---- a/Configure
-+++ b/Configure
-@@ -2730,20 +2730,17 @@ LOCKF_OWNER4
-       rm -f ${LSOF_TMPC}.*
-       cat > $LSOF_TMPC.c << .LSOF_END_HERE_DOC1
- #include <features.h>
--main() {
-+#undef XXX
- #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
--printf("-DGLIBCV=%d\n",__GLIBC__*100+__GLIBC_MINOR__);
-+XXX: __GLIBC__ * 100 + __GLIBC_MINOR__
- #elif defined(__GLIBC__)
--printf("-DGLIBCV=%d00\n",__GLIBC__);
--#else
--printf("\n");
-+XXX: __GLIBC__ * 100
- #endif
--return(0); }
- .LSOF_END_HERE_DOC1
--      $LINUX_CONF_CC ${LSOF_TMPC}.c -I$LSOF_INCLUDE -o ${LSOF_TMPC}.x > /dev/null 2>&1
-+      $LINUX_CONF_CC ${LSOF_TMPC}.c -E -P -I$LSOF_INCLUDE 2>/dev/null | sed -n '/^XXX:/s|.*:||p' > ${LSOF_TMPC}.x
--      if test -x ${LSOF_TMPC}.x	# {
-+      if test -s ${LSOF_TMPC}.x	# {
-       then
--	LINUX_CLIB=`${LSOF_TMPC}.x`
-+	LINUX_CLIB="-DGLIBCV=$(( `cat ${LSOF_TMPC}.x` ))"
- 	LSOF_TMP=$?
-       else
- 	LINUX_CLIB=""

sdk_container/src/third_party/portage-stable/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch

@@ -1,63 +0,0 @@
-https://bugs.gentoo.org/797358
-
-From 21cb1dad1243f4c0a427d893babab12e48b60f0e Mon Sep 17 00:00:00 2001
-From: Masatake YAMATO <yamato@redhat.com>
-Date: Sun, 20 Jun 2021 21:40:55 +0900
-Subject: [PATCH] Adjust alignment of buffer passed to stat()
-
-Close #160.
-
-The original code passes char[] buffer to stat().
-This can be cause a SIGBUS.
-
-#160 reported an actual crash on armv7a + glibc-2.33 platform.
-See also https://sourceware.org/bugzilla/show_bug.cgi?id=27993.
-
-The issue is reported by @10ne1.
-
-Signed-off-by: Masatake YAMATO <yamato@redhat.com>
-[Adrian: Backported to 4.94]
-Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
---- a/misc.c
-+++ b/misc.c
-@@ -293,7 +293,15 @@ doinchild(fn, fp, rbuf, rbln)
- 		 */
- 
- 		    int r_al, r_rbln;
--		    char r_arg[MAXPATHLEN+1], r_rbuf[MAXPATHLEN+1];
-+		    char r_arg[MAXPATHLEN+1];
-+		    union {
-+			    char r_rbuf[MAXPATHLEN+1];
-+			    /*
-+			     * This field is only for adjusting the alignment of r_rbuf that
-+			     * can be used as an argument for stat().
-+			     */
-+			    struct stat _;
-+		    } r;
- 		    int (*r_fn)();
- 		/*
- 		 * Close sufficient open file descriptors except Pipes[0] and
-@@ -358,16 +366,16 @@ doinchild(fn, fp, rbuf, rbln)
- 			||  read(Pipes[0], r_arg, r_al) != r_al
- 			||  read(Pipes[0], (char *)&r_rbln, sizeof(r_rbln))
- 			    != (int)sizeof(r_rbln)
--			||  r_rbln < 1 || r_rbln > (int)sizeof(r_rbuf))
-+			||  r_rbln < 1 || r_rbln > (int)sizeof(r.r_rbuf))
- 			    break;
--			zeromem (r_rbuf, r_rbln);
--			rv = r_fn(r_arg, r_rbuf, r_rbln);
-+			zeromem (r.r_rbuf, r_rbln);
-+			rv = r_fn(r_arg, r.r_rbuf, r_rbln);
- 			en = errno;
- 			if (write(Pipes[3], (char *)&rv, sizeof(rv))
- 			    != sizeof(rv)
- 			||  write(Pipes[3], (char *)&en, sizeof(en))
- 			    != sizeof(en)
--			||  write(Pipes[3], r_rbuf, r_rbln) != r_rbln)
-+			||  write(Pipes[3], r.r_rbuf, r_rbln) != r_rbln)
- 			    break;
- 		    }
- 		    (void) _exit(0);
--- 
-2.32.0
-

sdk_container/src/third_party/portage-stable/sys-process/lsof/files/lsof-4.98.0-fix-common-include-strftime.patch

@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/910547
+https://github.com/lsof-org/lsof/commit/437824cf35daf5a505bed5b619bef95af090ecc4
+
+From 437824cf35daf5a505bed5b619bef95af090ecc4 Mon Sep 17 00:00:00 2001
+From: Kalin KOZHUHAROV <me.kalin@gmail.com>
+Date: Wed, 19 Jul 2023 15:23:13 +0200
+Subject: [PATCH] src/util.c	add proper includes (#294)
+
+* src/util.c	add proper includes
+
+Fixes #293 for lsof-org/lsof
+
+Signed-off-by: Kalin KOZHUHAROV <kalin@thinrope.net>
+
+---------
+
+Signed-off-by: Kalin KOZHUHAROV <kalin@thinrope.net>
+Co-authored-by: Jiajie Chen <c@jia.je>
+--- a/util.c
++++ b/util.c
+@@ -35,6 +35,7 @@
+  * 4. This notice may not be removed or altered.
+  */
+ 
++#include "lsof.h"
+ 
+ #if	defined(HAS_STRFTIME)
+ #include <time.h>

sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.94.0-r1.ebuild

@@ -1,117 +0,0 @@
-# Copyright 1999-2021 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 #432120
-	"${FILESDIR}"/${PN}-4.94-arm-sigbus-fix.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
-}

sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.98.0-r1.ebuild

@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+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/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="lsof"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="rpc selinux"
+
+RDEPEND="
+	rpc? ( net-libs/libtirpc )
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/groff
+	rpc? ( virtual/pkgconfig )
+"
+
+# Needs fixing first for sandbox
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-common-include-strftime.patch
+)
+
+src_configure() {
+	# TODO: drop after 4.98.0: https://github.com/lsof-org/lsof/commit/4fbe0b78f63ce115f25cf7a49756745e3bf47fea
+	export ac_cv_header_selinux_selinux_h=$(usex selinux)
+
+	# TODO: drop after 4.98.0: https://github.com/lsof-org/lsof/commit/22d9cedfca4672601f35f7683907373cd5124121
+	[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
+
+	local myeconfargs=(
+		$(use_with rpc libtirpc)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake DEBUG="" all
+}
+
+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"
+	fi
+}

sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.98.0.ebuild

@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+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/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="lsof"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="rpc selinux"
+
+RDEPEND="
+	rpc? ( net-libs/libtirpc )
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/groff
+	rpc? ( virtual/pkgconfig )
+"
+
+# Needs fixing first for sandbox
+RESTRICT="test"
+
+src_configure() {
+	export ac_cv_header_selinux_selinux_h=$(usex selinux)
+
+	[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
+
+	local myeconfargs=(
+		$(use_with rpc libtirpc)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake DEBUG="" all
+}
+
+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"
+	fi
+}

sdk_container/src/third_party/portage-stable/sys-process/lsof/metadata.xml

@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:lsof_project:lsof</remote-id>
+		<remote-id type="github">lsof-org/lsof</remote-id>
 	</upstream>
 </pkgmetadata>