svn commit: r523728 - in branches/2020Q1/sysutils/lsof: . files

[Larry Rosenman]

Author: ler
Date: Tue Jan 21 16:46:43 2020
New Revision: 523728
URL: https://svnweb.freebsd.org/changeset/ports/523728

Log:
  MFH: r522273 r522545 r522582 r523727
  
  sysutils/lsof: fix build following base r356337.
  
  I took the patch from 243122 as it was more correct.
  
  PR:		243122, 243083
  Submitted by:	cy, yasu at utahime.org
  
  sysutils/lsof: fix after  base r356432.
  
  PR:		243172
  Submitted by:	mjg
  Reported by:	yasu at utahime.org
  
  sysutils/lsof: add a PPC64 work around for needing -lzpool
  
  PR:		242833
  Submitted by:	luciano at vespaperitivo.it
  
  sysutils/lsof: fix build on powerpc, powerpc64, powerpcse
  
  PR:		242758
  Submitted by:	pkubaj
  
  Approved by:	ports-secteam (joneum)

Added:
  branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c
     - copied, changed from r522273, head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c
Modified:
  branches/2020Q1/sysutils/lsof/Makefile
  branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode.c
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/sysutils/lsof/Makefile
==============================================================================
--- branches/2020Q1/sysutils/lsof/Makefile	Tue Jan 21 15:41:15 2020	(r523727)
+++ branches/2020Q1/sysutils/lsof/Makefile	Tue Jan 21 16:46:43 2020	(r523728)
@@ -1,9 +1,12 @@
 # Created by: David O'Brien <obrien at FreeBSD.org>
 # $FreeBSD$
 
+# note: If someone has a fix for a particular ARCH please feel free
+#       to commit it.  I (ler) don't have access to all the ARCH's
+
 PORTNAME=	lsof
 DISTVERSION=	4.93.2
-PORTREVISION=	6
+PORTREVISION=	9
 PORTEPOCH=	8
 CATEGORIES=	sysutils
 
@@ -22,6 +25,17 @@ HAS_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	lsof-org
 
+OPTIONS_DEFINE_powerpc64=	AIM BOOKE
+OPTIONS_DEFAULT_powerpc64=	AIM
+
+AIM_DESC=	Set for AIM hardware
+AIM_CFLAGS=	-DAIM
+BOOKE_DESC=	Set for BOOKE hardware
+BOOKE_CFLAGS=	-DBOOKE
+
+CFLAGS_powerpc=	-DAIM
+CFLAGS_powerpcspe=	-DBOOKE
+
 SHEBANG_FILES=	scripts/sort_res.perl5
 
 .include <bsd.port.pre.mk>
@@ -29,6 +43,12 @@ SHEBANG_FILES=	scripts/sort_res.perl5
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-n freebsd
 CONFIGURE_ENV=	LSOF_CC="${CC}" FREEBSD_SYS="${SRC_BASE}/sys"
+
+# PPC64 needs -lzpool for reasons unknown.  If someone can
+# figure out why, I (ler) am all ears.
+.if ${ARCH} == powerpc64 || ${ARCH} == powerpc
+CONFIGURE_ENV+=	LSOF_CFGL="-lzpool"
+. endif
 
 .if !exists(${SRC_BASE}/sys/kern/kern_lockf.c)
 IGNORE+=		requires kernel sources

Modified: branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode.c
==============================================================================
--- branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode.c	Tue Jan 21 15:41:15 2020	(r523727)
+++ branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode.c	Tue Jan 21 16:46:43 2020	(r523728)
@@ -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;

Copied and modified: branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c (from r522273, head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c)
==============================================================================
--- head/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c	Mon Jan  6 20:42:08 2020	(r522273, copy source)
+++ branches/2020Q1/sysutils/lsof/files/patch-dialects_freebsd_dnode2.c	Tue Jan 21 16:46:43 2020	(r523728)
@@ -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.
   */