gentoo auto-resync : 10:11:2022 - 09:27:33

6 files changed, 28 insertions, 7 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0020b9ee6db3..cae6b31e7bff 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
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-r2.ebuild
index c1fe7c224965..d9384bee0dd8 100644
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Completely rewrite of the old system monitoring app procinfo"
 HOMEPAGE="https://sourceforge.net/projects/procinfo-ng/"
@@ -13,17 +13,26 @@ LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="amd64 ~hppa x86"
 
-RDEPEND="sys-libs/ncurses:0="
+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
+}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 350ffffb3f21..321d1d9e6f06 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -2,5 +2,5 @@ AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927
 DIST sysstat-12.6.0.tar.gz 1454167 BLAKE2B 84213e1d63e6d44e889e9763c9f47c769805baf65715199b1ddb3472ce68c37b3b46229af43ecf0cd85d6c09be85273e90b96a975304cf2f6695298b3e552630 SHA512 f4d0e0dead0cce84782e985c8074871c45e77949c2bcfefd5642280e961f39e9eaa9f9fc93c013d79deba6e3703626894dd665ff64db72550d1c24f404780a5f
 DIST sysstat-12.7.1.tar.gz 1464847 BLAKE2B dd4cb510d45879665945d7c3efcb9e1011f6b77d152c7f989ef6a3e8f203c05c1ca708959030cb864c31810ec27a5e880a9cfcd805f26c4f3537d55bdd9fd763 SHA512 5c1da0f5a1bf26091f029c5ea138f836616becb1e531843aa2c150a66ddc1f07b43cffeac98445855bf70319942fe22838a682c2f7685893bead7d8de7e9e2a8
 EBUILD sysstat-12.6.0.ebuild 1709 BLAKE2B 28cfcc23664f257132f8c45e9eaa5abdeda9f70b4421b11965aa0055508e552e3f9275451e424aaed593a67a3dfeb3665b03a10baa49d28185601508f6c777ac SHA512 bacd5e5c3f6886e7a215ac9e64db6bcc19b89b1e0abfc6e3e66df7dff403725e9855a0344680e3f9c79d190eb121ca33f41ff8ea4b983c1dbb5f2d14206bc5de
-EBUILD sysstat-12.7.1.ebuild 1717 BLAKE2B 3462dd189fb0c48f9e47e2a75e70fd13400f7cdf6da3ad48aa98e3642168bdf4547cc4c7f56e0e8213d34be237eb269479899d4358827d3e712482dd9a797411 SHA512 0e5c83c6391d5fc9ca0dad48ac5cb8f3c5f8027ad897d5291a3489939bb9899576042236b7203939c6ec6a0ddac76202ffd97451435974d08da319118e69ee84
+EBUILD sysstat-12.7.1.ebuild 1713 BLAKE2B aca8ddba7c7d93d3e5a2d1550a2f297f18470d62e32ff9c0818b89dc731a12c5238172ecd2c9b7a467f2a60c23f60251cf6d7ebf906fb4543e32909107fdf899 SHA512 e4b0ba283874ecc76c128cc38cb9299f5a110ae0434f96cc439e81da29b4b087f8b4bbc258946c6c6c36752af27ef8b52a08303e632b3245189d82fe9326d663
 MISC metadata.xml 537 BLAKE2B 96a62a60f2e483414fdbe7c2d2e11c25528e5c3301b50079a32fa91deaeae37f63f7e78c73a4b749c3cbca6d438aaf0387edc655fe0575fd15ee641619529d02 SHA512 57724ab12c814c17c3c44c234409fcca149058ae678d4dd26fac4fdc11eb4234885948862880db038e82190d665a664d6449a22da49f2fe08b42106aac2058e6
diff --git a/app-admin/sysstat/sysstat-12.7.1.ebuild b/app-admin/sysstat/sysstat-12.7.1.ebuild
index 37ab5d829827..df4308ea1361 100644
--- a/app-admin/sysstat/sysstat-12.7.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="dcron debug nls lm-sensors lto selinux systemd"
 
 BDEPEND="