From owner-svn-ports-branches@freebsd.org Sun Jan 27 15:25:34 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 950FB14B077B; Sun, 27 Jan 2019 15:25:34 +0000 (UTC) (envelope-from tdb@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 3BAE96E485; Sun, 27 Jan 2019 15:25:34 +0000 (UTC) (envelope-from tdb@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 3128F9DDC; Sun, 27 Jan 2019 15:25:34 +0000 (UTC) (envelope-from tdb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0RFPY4a069025; Sun, 27 Jan 2019 15:25:34 GMT (envelope-from tdb@FreeBSD.org) Received: (from tdb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0RFPYA2069024; Sun, 27 Jan 2019 15:25:34 GMT (envelope-from tdb@FreeBSD.org) Message-Id: <201901271525.x0RFPYA2069024@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tdb set sender to tdb@FreeBSD.org using -f From: Tim Bishop Date: Sun, 27 Jan 2019 15:25:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r491358 - in branches/2019Q1/devel/libstatgrab: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tdb X-SVN-Commit-Paths: in branches/2019Q1/devel/libstatgrab: . files X-SVN-Commit-Revision: 491358 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3BAE96E485 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2019 15:25:34 -0000 Author: tdb Date: Sun Jan 27 15:25:33 2019 New Revision: 491358 URL: https://svnweb.freebsd.org/changeset/ports/491358 Log: MFH: r490904 r490905 Fix libstatgrab on FreeBSD 12 On FreeBSD 12 (since r309017) v_cache_count no longer exists. A compatibility shim is in place if COMPAT_FREEBSD11 is defined in the kernel, but if not libstatgrab fails to return any memory statistics. This patch modifies libstatgrab to mimic this compatibility behaviour (ie. return 0), regardless of whether COMPAT_FREEBSD11 is defined, which ensures the remaining statistics are returned correctly. A more complete solution will be considered upstream and hopefully be included in the next release. Reported by: Alexey Milevsky Approved by: ports-secteam (miwi) Added: branches/2019Q1/devel/libstatgrab/files/ - copied from r490905, head/devel/libstatgrab/files/ Modified: branches/2019Q1/devel/libstatgrab/Makefile Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/devel/libstatgrab/Makefile ============================================================================== --- branches/2019Q1/devel/libstatgrab/Makefile Sun Jan 27 15:21:16 2019 (r491357) +++ branches/2019Q1/devel/libstatgrab/Makefile Sun Jan 27 15:25:33 2019 (r491358) @@ -3,6 +3,7 @@ PORTNAME= libstatgrab PORTVERSION= 0.91 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://ftp.mirrorservice.org/pub/i-scream/libstatgrab/ \ http://dl.ambiweb.de/mirrors/ftp.i-scream.org/libstatgrab/ \ @@ -13,10 +14,10 @@ COMMENT= Provides a useful interface to system statist LICENSE= LGPL21 -USE_LDCONFIG= yes -GNU_CONFIGURE= yes USES= pathfix pkgconfig libtool +USE_LDCONFIG= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --docdir=${DOCSDIR} OPTIONS_DEFINE= TOOLS DOCS @@ -30,5 +31,11 @@ TOOLS_VARS= SHEBANG_FILES+="src/statgrab/statgrab-make LICENSE+=GPLv2 LICENSE_COMB=multi OPTIONS_SUB= yes + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200016 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_libstatgrab_memory__stats.c +.endif .include