From owner-svn-ports-head@freebsd.org Fri Jan 10 00:02:33 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 70E7B1FD5BF; Fri, 10 Jan 2020 00:02:33 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47v3892SDzz3Q1t; Fri, 10 Jan 2020 00:02:33 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F7D29575; Fri, 10 Jan 2020 00:02:33 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00A02XYC092498; Fri, 10 Jan 2020 00:02:33 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00A02WgG092495; Fri, 10 Jan 2020 00:02:32 GMT (envelope-from ler@FreeBSD.org) Message-Id: <202001100002.00A02WgG092495@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Fri, 10 Jan 2020 00:02:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522545 - in head/sysutils/lsof: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ler X-SVN-Commit-Paths: in head/sysutils/lsof: . files X-SVN-Commit-Revision: 522545 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2020 00:02:33 -0000 Author: ler Date: Fri Jan 10 00:02:32 2020 New Revision: 522545 URL: https://svnweb.freebsd.org/changeset/ports/522545 Log: sysutils/lsof: fix after base r356432. PR: 243172 Submitted by: mjg Reported by: yasu@utahime.org Modified: head/sysutils/lsof/Makefile head/sysutils/lsof/files/patch-dialects_freebsd_dnode.c head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c Modified: head/sysutils/lsof/Makefile ============================================================================== --- head/sysutils/lsof/Makefile Thu Jan 9 22:42:51 2020 (r522544) +++ head/sysutils/lsof/Makefile Fri Jan 10 00:02:32 2020 (r522545) @@ -3,7 +3,7 @@ PORTNAME= lsof DISTVERSION= 4.93.2 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 8 CATEGORIES= sysutils Modified: head/sysutils/lsof/files/patch-dialects_freebsd_dnode.c ============================================================================== --- head/sysutils/lsof/files/patch-dialects_freebsd_dnode.c Thu Jan 9 22:42:51 2020 (r522544) +++ head/sysutils/lsof/files/patch-dialects_freebsd_dnode.c Fri Jan 10 00:02:32 2020 (r522545) @@ -1,4 +1,4 @@ ---- dialects/freebsd/dnode.c.orig 2019-12-19 21:29:42 UTC +--- dialects/freebsd/dnode.c.orig 2019-05-08 07:32:25 UTC +++ dialects/freebsd/dnode.c @@ -58,9 +58,7 @@ _PROTOTYPE(static int lkup_dev_tty,(dev_t *dr, INODETY @@ -10,3 +10,12 @@ #endif /* defined(HAS_TMPFS) */ _PROTOTYPE(static void get_lock_state,(KA_T f)); +@@ -562,7 +560,7 @@ process_overlaid_node: + * Get the pseudo vnode tag type for FreeBSD >= 5. + */ + vtag = VT_UNKNOWN; +- if (v->v_tag && !kread((KA_T)v->v_tag, (char *)&vtbuf, sizeof(vtbuf))) ++ if (!kread((KA_T)v->v_lock.lock_object.lo_name, (char *)&vtbuf, sizeof(vtbuf))) + { + vtbuf[sizeof(vtbuf) - 1] = '\0'; + vtbp = vtbuf; Modified: head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c ============================================================================== --- head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c Thu Jan 9 22:42:51 2020 (r522544) +++ head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c Fri Jan 10 00:02:32 2020 (r522545) @@ -1,6 +1,6 @@ ---- dialects/freebsd/dnode2.c.orig 2019-05-08 00:32:25.000000000 -0700 -+++ dialects/freebsd/dnode2.c 2020-01-05 20:22:25.621138000 -0800 -@@ -49,7 +49,13 @@ +--- dialects/freebsd/dnode2.c.orig 2019-05-08 07:32:25 UTC ++++ dialects/freebsd/dnode2.c +@@ -49,7 +49,13 @@ static char *rcsid = "$Id: dnode2.c,v 1.7 2018/02/14 1 * * Note: clang's complaint about VOP_FSYNC can't be avoided. */