From e80777b54c5b430ca044e16878f59a2020423d48 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 10 Nov 2022 09:27:33 +0000
Subject: gentoo auto-resync : 10:11:2022 - 09:27:33

---
 app-admin/procinfo-ng/Manifest                     |  3 +-
 .../procinfo-ng-2.0.304-wformat-security.patch     | 11 +++++++
 .../procinfo-ng/procinfo-ng-2.0.304-r1.ebuild      | 29 -----------------
 .../procinfo-ng/procinfo-ng-2.0.304-r2.ebuild      | 38 ++++++++++++++++++++++
 4 files changed, 51 insertions(+), 30 deletions(-)
 create mode 100644 app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch
 delete mode 100644 app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
 create mode 100644 app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild

(limited to 'app-admin/procinfo-ng')

diff --git a/app-admin/procinfo-ng/Manifest b/app-admin/procinfo-ng/Manifest
index d89b542dd4b3..db361ae0c0be 100644
--- a/app-admin/procinfo-ng/Manifest
+++ b/app-admin/procinfo-ng/Manifest
@@ -1,5 +1,6 @@
 AUX procinfo-ng-2.0.304-autotools.patch 1521 BLAKE2B 900b0605e17dfe22512399aac73f79109c12524f53e9924d5f240e10422a1b53d3e171c89b292748bbf5515c4ea99610c39cc8d94bfe1c968a225c5a36f41955 SHA512 3b13f4eb5ebad4d9d9dc6a31f7a46b49b76aeee19042029d7c37c5fe21555c7c98c990cdf57ce9583469058fed315903efe919f7f25cc5354a6800086f56cd28
 AUX procinfo-ng-2.0.304-man.patch 130 BLAKE2B d06416e6302ca0b8952b2f01c2e6d64dbf913c5009248d187bfbf91af938d1f253ff5ff12c467041bcced2f460c3116cfd2192177d3bc7004168ee024c3aedb6 SHA512 acc1ce2abda6099b31faf4d1d6e940e8cbb8a3accfd6ca2af550d226b7f12aebc84cd68b118f7c1362895f63a800416e538ebc43e7ae98a1b348656b09373056
+AUX procinfo-ng-2.0.304-wformat-security.patch 386 BLAKE2B 46754dbf8bb6da0d9af0378abb89f7887595ca107ae68ed96f2320a89d20607ce464d231a93ced73ef2cc8d0fb1392d57b788a247138c5598d3afab3e27b7343 SHA512 32c422e389aac770fa7fc444f865da09e2b6c8bfdd3a55339afb117d5e459ea505f598b5cb0b0d1382f8afbbfec0a65717f2acb1b3fa184e67551919748f4886
 DIST procinfo-ng-2.0.304.tar.bz2 62469 BLAKE2B fc08cc69ebb4f21c52a314c19eea820bc69408d609e59f122c939c14c9159e4348c4ccc07f39f63e96ec046d8af79abd6456a56397eb952d2fff1dd31f89a3e5 SHA512 db336d2ff3bb3b31ac83a51a9d273fae8d16d36bd805f548eda06cb501699473fd8e4b4f9b722165fbf685d76c3fc09bfea9e516eabc37a888e2fae7679c08cf
-EBUILD procinfo-ng-2.0.304-r1.ebuild 611 BLAKE2B 0cfd601139aeeddc77c745210ea71ad640477f4ba503433c96bcaadefa96200a1eaecba54ee7f9350d4d0331d452c35cef24a811b5eb41a1e34014fb5522367e SHA512 7338ddfca8710b2341c40c508636d2619ac967f4d0aceac4fe04b6c76d3d7b9ddaf352723f4b724c6d8c852301150958e075f4cd3ac0d10967a95057c192c94d
+EBUILD procinfo-ng-2.0.304-r2.ebuild 741 BLAKE2B f200e30c42d4d7b3afc221c24cb71b37f1063de57052b598e94615f20b227ab6a0fd1b4ea8e70cf3e68896eb3ca0884ef5c01e2a989daa59cc5f1e4bf9e0b3ec SHA512 0a9b1fd5d462557e00c65069b5f699a4560d3f1102bd225a527d50b26d8f6548e9763f06d64453ed5b2d7551410ccdd43c5a4a457460e304676aac8e93cdb515
 MISC metadata.xml 357 BLAKE2B 02b0a928b12ab935675a1ee29a1ba7a9dd897da2f619e43dc1a84ffcf90ed8912706dc0baa8199220336c8e37d2c5cbf60c1c25eca22cb68cf881937bb1cc33c SHA512 5e806da0da0a037e8923a94a5325f3e5edd531d4da5545e9d97520a5cb3754798d716b3a383a85471057501bccf4e06b547bd7f27e5f1a68ff9a65864e766cde
diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch
new file mode 100644
index 000000000000..315983c9af30
--- /dev/null
+++ b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch
@@ -0,0 +1,11 @@
+--- a/procinfo.cpp
++++ b/procinfo.cpp
+@@ -211,7 +211,7 @@ int mainLoop(bool perSecond, bool showTotals, bool showTotalsMem, bool fullScree
+ 	try {
+ 		rows = getNetStats(perSecond, showTotals, skipIfaces, elapsed);
+ 	} catch (string exceptionMessage) {
+-		print(exceptionMessage.c_str());
++		print("%s", exceptionMessage.c_str());
+ 	}
+ 	print("\n");
+ 	prettyPrint(rows, rowWidth, true);
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
deleted file mode 100644
index c1fe7c224965..000000000000
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Completely rewrite of the old system monitoring app procinfo"
-HOMEPAGE="https://sourceforge.net/projects/procinfo-ng/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-autotools.patch
-	"${FILESDIR}"/${P}-man.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild
new file mode 100644
index 000000000000..d9384bee0dd8
--- /dev/null
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Completely rewrite of the old system monitoring app procinfo"
+HOMEPAGE="https://sourceforge.net/projects/procinfo-ng/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-wformat-security.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	# bug #719790
+	append-cxxflags -std=c++03
+
+	default
+}
-- 
cgit v1.2.3