Date: Sun, 12 Jun 2022 15:48:38 -0500 From: Larry Rosenman <ler@FreeBSD.org> To: Stefan Esser <se@freebsd.org> Cc: Damjan Jovanovic <damjan.jov@gmail.com>, Freebsd ports <freebsd-ports@freebsd.org>, Developers <developers@freebsd.org> Subject: Re: sysutils/lsof: help! Message-ID: <c91b88de3c3dd25e4859e9b7e5420f14@FreeBSD.org> In-Reply-To: <27cc744e-acbe-c550-880e-59bf00986842@FreeBSD.org> References: <2efeb912dbbba733826b79513b4f9f22@FreeBSD.org> <27cc744e-acbe-c550-880e-59bf00986842@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_554c42d451ea27150c00b511bcee79e1 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8; format=flowed On 06/12/2022 3:29 pm, Stefan Esser wrote: > Am 11.06.22 um 16:20 schrieb Larry Rosenman: >> greetings, >> I'm having trouble getting anyone to care about lsof anymore. If >> anyone >> can help fix these merge conflicts, I'd be most >> appreciative, and will merge and make a new FreeBSD release as soon as >> we get >> it fixed: >> https://github.com/lsof-org/lsof/pull/184 > > Hi Larry and Damjan, > > I have manually merged the pull request into the lsof-4.95.0. > > But I'm not sure how to best submit the result, since it seems > your forked repository is still at 4.94.0 and while I could > create a pull request at the official lsof repository, it would > make the full set of changes appear to have come from me. > > The patched sources can be fetched from my GitHub repository: > > https://github.com/stesser/lsof/ > > I have verified that lsof built from these sources leasd to a > working lsof binary. All current patches can be removed from > the port. > > One remark: there have been a lot of changes from Error() to > Exit(1) (or other parameters), these seem to be the main reason > that the patch did not apply anymore. I have changed a number > of Error() to Exit(1) in other parts of the affected source > files - these should be checked before commit. > > > On a kernel built with D34184 and D34323 applied I get output > like this: > > COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE > NAME > bash 3313 se txt VREG 3086741924,1296883289 937256 864387 > /usr/local/bin/bash (system/usr/local) > bash 3313 se ctty VCHR 1,229 0t0 485 > /dev/pts/0 (devfs) > bash 3313 se cwd VDIR 1269308102,3936804361 50 131584 > /usr/git/src (system/usr/git) > > Best regards, STefan > > PS: A patch that applies the ZFS fixes to sysutils/lsof can be > fetched from: > > https://people.freebsd.org/~se/ports/lsof-port-zfs-patch.diff Thanks, Stefan. What will it take to get those 2 differential reviews in to the system? Damjan, Can you update your repo and incorporate this in? I'd love to make a upstream release. -- Larry Rosenman http://people.freebsd.org/~ler Phone: +1 214-642-9640 E-Mail: ler@FreeBSD.org US Mail: 5708 Sabbia Dr, Round Rock, TX 78665-2106 --=_554c42d451ea27150c00b511bcee79e1 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=488 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEHjgknedhWzvJgwVzaXyZsatIp30FAmKmUSwACgkQaXyZsatI p32JjAgAiP/TyYTlJhDaQMbFGXW9Dc10E2i+LbJVlbOMbFHn/P5oiPHqDJ6p4ydN xT8VkwpNhOJgZarUceuh7HATeRnfihWHym4puNAgTRMsvlEJmiWpz7k5Ebz92pdi tTglc26Z0OM3+moPRkxA0DyuZWmqdtKj5c+aRAuK3oijts2m/Nh2B9YOxn1k/Qn2 6KK9mlksIKcttSfC0VzbmsvZ+aRPJOk9Hbfo1Ly2S6g3GN9WVCjR0yZxIyjcJk1L o1nXiUBg+eJ9mRrj/ROrP+VWIFTFsWWRtXO6ZUdkyclkeIXJOmWiVn8mX7aVAPYk QJgLsq5YoQQvCT6s3tIK/TkkCm60Mw== =ANph -----END PGP SIGNATURE----- --=_554c42d451ea27150c00b511bcee79e1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?c91b88de3c3dd25e4859e9b7e5420f14>