Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Mar 2019 22:10:21 +0000 (UTC)
From:      Dave Cottlehuber <dch@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r494460 - in head/sysutils/DTraceToolkit: . files
Message-ID:  <201903022210.x22MALY4054602@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dch
Date: Sat Mar  2 22:10:21 2019
New Revision: 494460
URL: https://svnweb.freebsd.org/changeset/ports/494460

Log:
  sysutils/DTraceToolkit: remove missing providers in FreeBSD 12.0
  
  dtruss fails as syscall::lstat*:return are no longer present
  
  Reviewed by:	jrm (mentor)
  Approved by:	dteske
  Differential Revision:	https://reviews.freebsd.org/D15879

Added:
  head/sysutils/DTraceToolkit/files/
  head/sysutils/DTraceToolkit/files/extra-patch-dtruss   (contents, props changed)
Modified:
  head/sysutils/DTraceToolkit/Makefile
  head/sysutils/DTraceToolkit/pkg-plist

Modified: head/sysutils/DTraceToolkit/Makefile
==============================================================================
--- head/sysutils/DTraceToolkit/Makefile	Sat Mar  2 22:10:02 2019	(r494459)
+++ head/sysutils/DTraceToolkit/Makefile	Sat Mar  2 22:10:21 2019	(r494460)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dtrace-toolkit
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	dteske@FreeBSD.org
@@ -77,16 +77,24 @@ SHEBANG_FILES=	Apps/shellsnoop \
 
 NO_BUILD=	yes
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200031
+# lstat calls are no longer available on 12.0+
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-dtruss
+.endif
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${TAR} --exclude '*.orig' -cf - . ) | \
 		(cd ${STAGEDIR}${DATADIR}/ && ${TAR} xvf -)
+	${RLN} ${STAGEDIR}${DATADIR}/dtruss ${STAGEDIR}${PREFIX}/bin/dtruss
 	${RLN} ${STAGEDIR}${DATADIR}/hotkernel ${STAGEDIR}${PREFIX}/bin/hotkernel
 	${RLN} ${STAGEDIR}${DATADIR}/procsystime ${STAGEDIR}${PREFIX}/bin/procsystime
 	${RLN} ${STAGEDIR}${DATADIR}/opensnoop ${STAGEDIR}${PREFIX}/bin/opensnoop
 	${RLN} ${STAGEDIR}${DATADIR}/Apps/shellsnoop ${STAGEDIR}${PREFIX}/bin/shellsnoop
 
-.for MANPAGE in hotkernel procsystime opensnoop shellsnoop
+.for MANPAGE in dtruss hotkernel procsystime opensnoop shellsnoop
 	${INSTALL_MAN} ${WRKSRC}/Man/man1m/${MANPAGE}.1m \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/${MANPAGE}.1
 .endfor

Added: head/sysutils/DTraceToolkit/files/extra-patch-dtruss
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/DTraceToolkit/files/extra-patch-dtruss	Sat Mar  2 22:10:21 2019	(r494460)
@@ -0,0 +1,11 @@
+--- dtruss.orig	2018-06-18 09:22:32 UTC
++++ dtruss
+@@ -270,7 +270,7 @@ syscall::sigprocmask:return
+ /* print 3 args, arg0 as a string */
+ syscall::access*:return,
+ syscall::stat*:return, 
+-syscall::lstat*:return, 
++syscall::*lstat*:return, 
+ syscall::readlink*:return,
+ syscall::open*:return
+ /self->start/

Modified: head/sysutils/DTraceToolkit/pkg-plist
==============================================================================
--- head/sysutils/DTraceToolkit/pkg-plist	Sat Mar  2 22:10:02 2019	(r494459)
+++ head/sysutils/DTraceToolkit/pkg-plist	Sat Mar  2 22:10:21 2019	(r494460)
@@ -1,7 +1,9 @@
+bin/dtruss
 bin/hotkernel
 bin/opensnoop
 bin/procsystime
 bin/shellsnoop
+man/man1/dtruss.1.gz
 man/man1/hotkernel.1.gz
 man/man1/opensnoop.1.gz
 man/man1/procsystime.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903022210.x22MALY4054602>