From nobody Sun Jun 12 20:29:08 2022 X-Original-To: freebsd-ports@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9BEB0853676 for ; Sun, 12 Jun 2022 20:29:13 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LLmWY3vVpz3QbM; Sun, 12 Jun 2022 20:29:13 +0000 (UTC) (envelope-from se@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655065753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=S3KrbGy7izYRNlpBusO1D/uUt69KWuFFvlAbxnnwvYU=; b=QjNxF3LmI5GBd+DrtZucnT3kSwdLvUNGByhu49Ttx7MpOIjCLseh4+3tr9/ayYaqQkI7SP qE00hHtC+tMoHBxAIuYznhsN0ggGtSXPA/SEKVwluEQLiXUoo8JiZFZWTIK+TX/KrP9JKd 83Q3IycRRfHisitTzaxTKBkN0AKJxMl0J6P+TuD6UV8+ECaFiDAWMABuUodB/VMopVjK2I pXSIFL+px0zmCQTYauRBl0lFbB7fUfQECU7vukJuQCJlrwiB77TU+PFDZtYFfS11eEEAhS Cscl/G6asyar+21hAyO4L/bM5mvxjGtt3iUGbviqZ3c010bklkISfD6lcG630A== Received: from [IPV6:2003:cd:5f17:8800:e435:36f4:febb:2519] (p200300cd5f178800e43536f4febb2519.dip0.t-ipconnect.de [IPv6:2003:cd:5f17:8800:e435:36f4:febb:2519]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id AC00422A96; Sun, 12 Jun 2022 20:29:12 +0000 (UTC) (envelope-from se@FreeBSD.org) Message-ID: <27cc744e-acbe-c550-880e-59bf00986842@FreeBSD.org> Date: Sun, 12 Jun 2022 22:29:08 +0200 List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 From: Stefan Esser Subject: Re: sysutils/lsof: help! To: Larry Rosenman , Damjan Jovanovic References: <2efeb912dbbba733826b79513b4f9f22@FreeBSD.org> Content-Language: en-US Cc: Freebsd ports , Developers In-Reply-To: <2efeb912dbbba733826b79513b4f9f22@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------93axmqiD8aMHDJDQnub1Apjs" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655065753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=S3KrbGy7izYRNlpBusO1D/uUt69KWuFFvlAbxnnwvYU=; b=MWq7yEU5pO3LBEyJO2ibPxqbJmjb3CpOGb3mmrkDQKcppto1JoFzRw5ORTbuQ9SzR/vR1b roPnCzktO5KDBEnFrsUXeSjlB8EEqu6g9CbbdDHUw7M4BGVqksPPLqikZAiII1MQ2QUkGj o0MtnB1+kiqwlikUugxJyKFXYRIQz18tN3LF0qurQD5JquWJ+NYJQCkG9sgNvl9IGGYFtx BdkQ5jZryMSq1HXD3glqIMxbb0ru+KZjLswqmBMKMvt+mS7jjuYyz0RyR2Dx0wdNQR2hWg Wu2OnMEPk6XZ4RCLae/IgsgGARULaqm8LVo4fhAqL+NXIGShvSqB0UZudfq8nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655065753; a=rsa-sha256; cv=none; b=kDx68cKqylhApyBIGAvADW/LCTQ2pt31s87ZEeg9dxQ09H/kF8/vhpwf48tUK2OM6R2osR fXzJukEWYSWyivztX0EQB87dpNP0mFSvoSMZH6DETdFNZS3eU4SV0VSg+btNN38DSkpCfK wRpKLxWRB1ksFKP9O6pt7UahXc348M67WuQY6UzsfEnTwluguXYR5rHUHCYUPbKgtDjLQ+ V4bSQo3YuoVXs0zxs+0Gf4zVZt2FVKT2oI0gwunqSQT8kFQXIPwQsYCQUQ8f6PPuPNX42v eqO0DVdeyds9+XMT0V5Siot81GWov6UqPeYtfXw/ZISU3uGtdzJwqVfPEEcvkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------93axmqiD8aMHDJDQnub1Apjs Content-Type: multipart/mixed; boundary="------------85GeraMFVliAduOtNLb0a0GB"; protected-headers="v1" From: Stefan Esser To: Larry Rosenman , Damjan Jovanovic Cc: Freebsd ports , Developers 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--