Date: Sun, 12 Jun 2022 22:29:08 +0200 From: Stefan Esser <se@FreeBSD.org> To: Larry Rosenman <ler@FreeBSD.org>, Damjan Jovanovic <damjan.jov@gmail.com> Cc: Freebsd ports <freebsd-ports@freebsd.org>, Developers <developers@freebsd.org> Subject: Re: sysutils/lsof: help! Message-ID: <27cc744e-acbe-c550-880e-59bf00986842@FreeBSD.org> In-Reply-To: <2efeb912dbbba733826b79513b4f9f22@FreeBSD.org> References: <2efeb912dbbba733826b79513b4f9f22@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) --------------93axmqiD8aMHDJDQnub1Apjs Content-Type: multipart/mixed; boundary="------------85GeraMFVliAduOtNLb0a0GB"; protected-headers="v1" From: Stefan Esser <se@FreeBSD.org> To: Larry Rosenman <ler@FreeBSD.org>, Damjan Jovanovic <damjan.jov@gmail.com> Cc: Freebsd ports <freebsd-ports@freebsd.org>, Developers <developers@freebsd.org> Message-ID: <27cc744e-acbe-c550-880e-59bf00986842@FreeBSD.org> Subject: Re: sysutils/lsof: help! References: <2efeb912dbbba733826b79513b4f9f22@FreeBSD.org> In-Reply-To: <2efeb912dbbba733826b79513b4f9f22@FreeBSD.org> --------------85GeraMFVliAduOtNLb0a0GB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am 11.06.22 um 16:20 schrieb Larry Rosenman: > greetings, > =C2=A0=C2=A0=C2=A0 I'm having trouble getting anyone to care about lsof= anymore.=C2=A0 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 --------------85GeraMFVliAduOtNLb0a0GB-- --------------93axmqiD8aMHDJDQnub1Apjs Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAmKmTJQFAwAAAAAACgkQR+u171r99UTB zwf9G2JqrOLdAQKbHM82whjecvaRnbmt9btlm4OrStAhyq0t+BVd2aVQXVPRMzotq4/u7qYgWwyb wu/WoAWuheb46BAbseKPehURSqWcyCZtbbUtDSiBkAKv1+UFRGdGufAvQiMa08KPCVDoZp+bea7V I41XUaFS0IerFiKy36yKTZ2n4FYv4bwnqKxEiDIr03qsWWXW0kHlDXHGNE3GnUqmJc8lTjaRbKoD aKZVmdwMnC9tO7XoHmh4N+nxUUCCIBLnf3Nf/pYz30Mx8TDn/4JwkxpKogryuI7/cezhBiKpSirj dLjUqqM90dNi3T5X5Ts1zK4FBj/BqkWN8zax9opuRw== =2DkE -----END PGP SIGNATURE----- --------------93axmqiD8aMHDJDQnub1Apjs--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?27cc744e-acbe-c550-880e-59bf00986842>