commit: 984c598ad12bf8109d4b062236326d32a716f11f Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Jun 21 09:41:01 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Jun 21 09:41:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984c598a
sys-process/lsof: drop 4.94.0-r1 Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-process/lsof/Manifest | 1 - .../lsof/files/lsof-4.94-arm-sigbus-fix.patch | 63 ----------- sys-process/lsof/lsof-4.94.0-r1.ebuild | 117 --------------------- 3 files changed, 181 deletions(-) diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest index e5fde09f82fe..b1aaf692109b 100644 --- a/sys-process/lsof/Manifest +++ b/sys-process/lsof/Manifest @@ -1,2 +1 @@ -DIST lsof-4.94.0.tar.gz 1340224 BLAKE2B b3d3c4707dac22c5431ac37c6a9f28ba5057b9a8dce65038934f1148209ef4615012ed887e263ec648679d0d95a06c78ed83a7d76cc8d97c05c013c563938793 SHA512 852b12e621e1dbf71e5f7fd848a200339ca278fbe8c39dcd33f745d1aea4e61552c0f30a3f6469ad9d4b86a9163e677f8c95298159ebd647357734225aa06c0c DIST lsof-4.95.0.tar.gz 1343380 BLAKE2B ffb0a656463f8f0e84ddcba36d78a94a8b4b883f0ff043c3821b3236274fb11e04b8c82f84f4e67ab922f021769c2711c1e97716aef3190d640fc321110521a3 SHA512 09c5c4b0ea0530e23b98b96df8485f37c2594028b604097a816aee216a8b1a7bc887071e8727cbaf3c765d0992314a5aa49723572cfe926f88806be18a6b8aef diff --git a/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch b/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch deleted file mode 100644 index 95bad206372e..000000000000 --- a/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch +++ /dev/null @@ -1,63 +0,0 @@ -https://bugs.gentoo.org/797358 - -From 21cb1dad1243f4c0a427d893babab12e48b60f0e Mon Sep 17 00:00:00 2001 -From: Masatake YAMATO <[email protected]> -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 <[email protected]> -[Adrian: Backported to 4.94] -Signed-off-by: Adrian Ratiu <[email protected]> ---- 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 - diff --git a/sys-process/lsof/lsof-4.94.0-r1.ebuild b/sys-process/lsof/lsof-4.94.0-r1.ebuild deleted file mode 100644 index f90987e76701..000000000000 --- a/sys-process/lsof/lsof-4.94.0-r1.ebuild +++ /dev/null @@ -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 -}
