From owner-svn-ports-all@freebsd.org Wed Nov 11 22:11:46 2020 Return-Path: Delivered-To: svn-ports-all@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 A2C1246793B; Wed, 11 Nov 2020 22:11:46 +0000 (UTC) (envelope-from leres@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4CWf8f4GnRz3sQ8; Wed, 11 Nov 2020 22:11:46 +0000 (UTC) (envelope-from leres@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 857891BD90; Wed, 11 Nov 2020 22:11:46 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ABMBkQV052174; Wed, 11 Nov 2020 22:11:46 GMT (envelope-from leres@FreeBSD.org) Received: (from leres@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ABMBkHt051839; Wed, 11 Nov 2020 22:11:46 GMT (envelope-from leres@FreeBSD.org) Message-Id: <202011112211.0ABMBkHt051839@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: leres set sender to leres@FreeBSD.org using -f From: Craig Leres Date: Wed, 11 Nov 2020 22:11:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554915 - in head/sysutils/lsof: . files X-SVN-Group: ports-head X-SVN-Commit-Author: leres X-SVN-Commit-Paths: in head/sysutils/lsof: . files X-SVN-Commit-Revision: 554915 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2020 22:11:46 -0000 Author: leres Date: Wed Nov 11 22:11:45 2020 New Revision: 554915 URL: https://svnweb.freebsd.org/changeset/ports/554915 Log: sysutils/lsof: Unbreak for 12.2-RELEASE and newer 13.0-CURRENT The the order of fields in the namecache struct changed in stable/12 (r363891) and head (r367338); this definition is not public so lsof has it's own copy that needs to be conditionally adjusted accordingly. PR: 250916 Approved by: ler (maintainer) Modified: head/sysutils/lsof/Makefile head/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h Modified: head/sysutils/lsof/Makefile ============================================================================== --- head/sysutils/lsof/Makefile Wed Nov 11 21:19:48 2020 (r554914) +++ head/sysutils/lsof/Makefile Wed Nov 11 22:11:45 2020 (r554915) @@ -6,7 +6,7 @@ PORTNAME= lsof DISTVERSION= 4.93.2 -PORTREVISION= 13 +PORTREVISION= 14 PORTEPOCH= 8 CATEGORIES= sysutils Modified: head/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h ============================================================================== --- head/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h Wed Nov 11 21:19:48 2020 (r554914) +++ head/sysutils/lsof/files/patch-dialects-freebsd-dlsof.h Wed Nov 11 22:11:45 2020 (r554915) @@ -21,16 +21,32 @@ # if FREEBSDV>=4000 # if FREEBSDV>=5000 # if FREEBSDV<6020 -@@ -104,6 +111,12 @@ typedef struct device *device_t; +@@ -105,6 +112,12 @@ typedef struct device *device_t; - #include -+ + +/* + * include for refcount(9) + */ +#include + - ++ # if defined(HAS_VM_MEMATTR_T) #undef vm_memattr_t + # endif /* defined(HAS_VM_MEMATTR_T) */ +@@ -652,9 +665,15 @@ struct sfile { + */ + + struct namecache { ++# if __FreeBSD_version < 1202000 || (__FreeBSD_version >= 1300000 && __FreeBSD_version < 1300105) + LIST_ENTRY(namecache) nc_hash; /* hash chain */ + LIST_ENTRY(namecache) nc_src; /* source vnode list */ + TAILQ_ENTRY(namecache) nc_dst; /* destination vnode list */ ++# else ++ LIST_ENTRY(namecache) nc_src; /* source vnode list */ ++ TAILQ_ENTRY(namecache) nc_dst; /* destination vnode list */ ++ LIST_ENTRY(namecache) nc_hash; /* hash chain */ ++# endif + struct vnode *nc_dvp; /* vnode of parent of name */ + struct vnode *nc_vp; /* vnode the name refers to */ + u_char nc_flag; /* flag bits */