[gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/

["Robin H. Johnson" <robbat2@gentoo.org>]

commit:     d67d725f6bbb13cf73ff577df38e36bd08544d78
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 12 18:01:43 2021 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jun 12 18:04:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d67d725f

sys-block/blktrace: bump using snapshot

Reference: CVE-2018-10689
Bug: https://bugs.gentoo.org/655146
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sys-block/blktrace/Manifest                        |  1 +
 .../blktrace/blktrace-1.2.0_p20210419122502.ebuild | 61 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 5f5984d3f9b..a468e89de08 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1 +1,2 @@
 DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86
+DIST blktrace-git-20210419122502.tar.gz 2207917 BLAKE2B 27851953e857af6362604b91740f9df2e59ec79b6c192a3bf85e1ab8f9a4307f3220ec73283b73d121d0846fdf3d00a6fa5761959590ea2daa0c27192637a9f5 SHA512 a459273579480288a354e214795a2c09831b23216f407b30d21ad950d7bb88138aad4e2d5612566f359ae7111a200ca28d19d3a1a6ffcdf446cb07c59feec6fc

diff --git a/sys-block/blktrace/blktrace-1.2.0_p20210419122502.ebuild b/sys-block/blktrace/blktrace-1.2.0_p20210419122502.ebuild
new file mode 100644
index 00000000000..4cf61b2d4ce
--- /dev/null
+++ b/sys-block/blktrace/blktrace-1.2.0_p20210419122502.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic linux-info
+
+MY_PN="blktrace"
+if [[ ${PV} =~ _p20 ]]; then
+	#https://brick.kernel.dk/snaps/blktrace-git-20210419122502.tar.gz
+	MY_P="${MY_PN}-git-${PV/*_p}"
+	EXT='tar.gz'
+	S="${WORKDIR}/${PN}"
+else
+	MY_P="${MY_PN}-${PV}"
+	EXT='tar.bz2'
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="show detailed info about what is happening on a block device io queue"
+HOMEPAGE="https://git.kernel.dk/cgit/blktrace/"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.${EXT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/libaio"
+# This is a Linux specific app!
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	doc? (
+		virtual/latex-base
+		>=app-text/texlive-core-2014
+	)
+"
+
+CONFIG_CHECK="~BLK_DEV_IO_TRACE"
+WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine"
+
+PATCHES=(
+	#"${FILESDIR}"/${P}-overlapping-io-stats.patch
+	#"${FILESDIR}"/${PN}-1.2.0-ldflags.patch #335741
+	#"${FILESDIR}"/${PN}-1.2.0-parallel-build.patch #335741
+)
+
+src_compile() {
+	append-cppflags -DLVM_REMAP_WORKAROUND -W -I"${S}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}"
+	if use doc; then
+		export VARTEXFONTS="${T}/fonts"
+		emake docs
+	fi
+}
+
+src_install() {
+	emake install CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}" DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man"
+	einstalldocs
+	use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
+}