gentoo Easter resync : 12.04.2020

5 files changed, 77 insertions, 87 deletions

diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index acb978baa446..62867bbab0a9 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,8 +1,8 @@
 AUX procps-3.3.11-sysctl-manpage.patch 941 BLAKE2B e10b6f85325d1ea23b327dffe4ba35662d5110492d0d5fcffad41edff21ddea4ea8c8bcb66582f63abd100a20d0d406e1c3fb176a8c290ba2cc6ecb02aa98248 SHA512 df8b233bde879fa675742baf8b38d43dd7c306fe52013ace715dff02c126d8c5ea12bd93087da10f5e722294eef59577b264309cbdc6f9f3727fa7111c5db313
 AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadbe5e7c54c4b0a65abad6ebe8a89f1b8f7f6bd29114b50678aa89cd0c89d26a95a10aa403d48bcc8371f16eaf34c823390 SHA512 ecc94717366a314ac4bba550b84472555f7b217be2174b68778d3364e16586ab9c21756d2041e2ac9d1449856fcd6aa691d8bd1a8558b4653d068dc1d59c2c71
+AUX procps-3.3.16-toprc_backwards_compatibility.patch 2926 BLAKE2B e7c84ba19c41db1284b5d8bf12201385b99c689117894c8bd7d4a6c6dae446bc20d71259a7ff3ca863d01522920394d29c5dbdecc3ff6cca0c3c511d4f6d2bea SHA512 0fd42746206ed25b8be3460a1c078ab7f7669ab15905e473c75bd07a2fa94ed3db8253882806ad9994eaa53c324b81204dc3d1c2a7d0ee6798d8ccd37302b725
 DIST procps-ng-3.3.15.tar.xz 904416 BLAKE2B 9fc1384df1d51a13bdf3aaad173160a11c5a7e016a8c397a076b5115e350d2c6fd8ff8d9ad5d83b959020bcd6a1ef9e1bca02e9a63d56881816c5c7d7c9a8bc3 SHA512 bc83ccc1941e7be8266588fdfbba17e2424b30163a215873ee6dee96215d66249f5d5e46fec2278d030b42bd7599861c4878360042dacec4c221ce411453747c
 DIST procps-ng-3.3.16.tar.xz 859736 BLAKE2B fbacc1edb0711cda0fecbf5f589c8cc18bd74f0430866e946f7c4612b78f383b9299840ab7fa5bbc65c581cc9484dbb37b111c493cf88f55ba247a343fd0c80d SHA512 d83da472df256b188c32082632202e7f8ebd1b161082387760876ae34d50221b3682299a2816a7d6a29afb40322743c31b87d92ca299c2944a6b55e50736d367
-EBUILD procps-3.3.15-r1.ebuild 1988 BLAKE2B df4346e657c3707afa375775e06f86a4e31cfd99b79033961aacd72c02d6505c1e86a907d25a4d6b877b09fa8de88cc21f9ab44eaff80f78c61842a88254ac0b SHA512 73bf01d07bf989b5f36221f01a9434c636320af146254cf611e2f21105e995846698b17c353deecb8b4ea449aa7ea8203eab6f02164cde3add392de2f5900b78
-EBUILD procps-3.3.16-r1.ebuild 2313 BLAKE2B 4b458809f2d79690989075210c44374cbdcacc9cd2f25bf325c9ddd80c2f7117cab5c9399bb89daa805aa491177b3f694e2bf8d9e932f16f3c9eaf2836dba44d SHA512 c235ef1a6206038d63c1d2988e92d2e7070af2345ab2ad77ad1540f571759f4f0b12d5ddf6fd65865b22d556c6209674c4dc483b8d1e5301ef41b41acacf7b84
-EBUILD procps-3.3.16.ebuild 2068 BLAKE2B eb68f0961489fdbf6d92f01e0fb2400dab5c3034b357d5e1df035af39a908cc90e04675350fe1847110a5562afdbe3aa9aaa26dbab7ad1640b79cc9900aa2638 SHA512 a5156f8371bf4c84c2a6e9efc2f3733b7f0547f984c66b30bec91c229299cd927dd9de7f35a128b229777b2e0481e2f5bb0b91dc14ea9f42342955d2e5aaa4fe
+EBUILD procps-3.3.15-r1.ebuild 1986 BLAKE2B d581d05d3d7aac553da6245f62bff90440ea5050e0be6ac48aa94bf9abacbebad78bd016e498f30ff627295de9d209f35752672df637e4bcb77e7ad26bfdceb2 SHA512 3a6deef67e4977acc826ac5487d2d159c260045d90d1196d6b06ed1b8219647424fc65c1d569240e541c0d671b4416354e27e35c2fe63518162e81f31d78ddfd
+EBUILD procps-3.3.16-r2.ebuild 2373 BLAKE2B 503a77ecdcb66c72ae9d8fb5ed1371fbbc542bff3a1e0b90e35d58c27d7151c3da6ddd98f851c036991843680bffc0b77aa4409fa82ac8d2e16bd458baca5ed4 SHA512 4eee6d3fdf5e4f48f9b2667712ee745dc3116c8838a67362eefeb777fb78529bc2f0a117bd518133ae4649858b0ff017004e8bfab4617545d6f8e65cc5ee62b6
 MISC metadata.xml 653 BLAKE2B de137950217a24b13838a10e3dddacd94898c4d4be18c9080e31d666fe74d6f8e5fe3edfb4f3caf369fde1c82858e4c8828883c21f3ed32867a5f35d0771dc89 SHA512 d98bc7ed5e5437134c30db0a2ecbe4f430143aad2b91775e128fe735ddc39801e8d8fe62905cabbd8a41c4d07698110605b74056296282a74ac7622a09272703
diff --git a/sys-process/procps/files/procps-3.3.16-toprc_backwards_compatibility.patch b/sys-process/procps/files/procps-3.3.16-toprc_backwards_compatibility.patch
new file mode 100644
index 000000000000..19721205dfe7
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.16-toprc_backwards_compatibility.patch
@@ -0,0 +1,71 @@
+From 5cd29e5093efa3c6ee9c5310b64347f1d54b707d Mon Sep 17 00:00:00 2001
+From: Jim Warner <james.warner@comcast.net>
+Date: Sat, 15 Feb 2020 00:00:00 -0600
+Subject: [PATCH] top: restore configuration file backward compatibility
+
+The Debian bug referenced below has nothing to do with
+locales. In fact, top was made locale independent back
+in release 3.3.13 (April, 2018). However, that bug did
+reveal some misplaced logic which this patch corrects.
+
+Prompted by the Qualys audit, all rcfile field strings
+were checked for potential duplicates which could only
+have resulted from some user's manual/malicious edits.
+
+Unfortunately, that code was executed before top had a
+chance to enforce the proper/maximum string length (in
+the event an extremely old rcfile had just been read).
+This created some potential string overrun references.
+
+In top's original 3.3.15 implementation, the potential
+overrun extended for 15 characters. That is the number
+of field characters added with 3.3.9 (December, 2013).
+But, since strchr() was used, no error exit was taken.
+
+In the revised 3.3.16 implementation, the strchr() was
+replaced with '&w->rc.fieldscur[n]'. This held overrun
+to a single position while producing an error message.
+
+So, this commit just moves that logic to a point where
+fieldscur is guaranteed to be longer than EU_MAXPFLGS.
+
+Reference(s):
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=951335
+. revised 3.3.16 validation logic
+commit 291d98ee5036567f93d21bc11142b0a7e2ee70ae
+. original 3.3.15 validation logic
+commit fdb58974e24c025a1f866f324c62f1d8f96234f8
+
+Signed-off-by: Jim Warner <james.warner@comcast.net>
+---
+diff --git a/top/top.c b/top/top.c
+index 63ec5fe..b4fe21e 100644
+--- a/top/top.c
++++ b/top/top.c
+@@ -3939,11 +3939,6 @@ static const char *configs_file (FILE *fp, const char *name, float *delay) {
+  // too bad fscanf is not as flexible with his format string as snprintf
+  #error Hey, fix the above fscanf 'PFLAGSSIZ' dependency !
+ #endif
+-      // ensure there's been no manual alteration of fieldscur
+-      for (n = 0 ; n < EU_MAXPFLGS; n++) {
+-         if (&w->rc.fieldscur[n] != strrchr(w->rc.fieldscur, w->rc.fieldscur[n]))
+-            return p;
+-      }
+       // be tolerant of missing release 3.3.10 graph modes additions
+       if (3 > fscanf(fp, "\twinflags=%d, sortindx=%d, maxtasks=%d, graph_cpus=%d, graph_mems=%d\n"
+          , &w->rc.winflags, &w->rc.sortindx, &w->rc.maxtasks, &w->rc.graph_cpus, &w->rc.graph_mems))
+@@ -3989,6 +3984,11 @@ static const char *configs_file (FILE *fp, const char *name, float *delay) {
+                   return p;
+             break;
+       }
++      // ensure there's been no manual alteration of fieldscur
++      for (n = 0 ; n < EU_MAXPFLGS; n++) {
++         if (&w->rc.fieldscur[n] != strrchr(w->rc.fieldscur, w->rc.fieldscur[n]))
++            return p;
++      }
+ #ifndef USE_X_COLHDR
+       OFFw(w, NOHIFND_xxx | NOHISEL_xxx);
+ #endif
+-- 
+2.24.1
+
diff --git a/sys-process/procps/procps-3.3.15-r1.ebuild b/sys-process/procps/procps-3.3.15-r1.ebuild
index d1b833ff9f17..29d5c5e6eec0 100644
--- a/sys-process/procps/procps-3.3.15-r1.ebuild
+++ b/sys-process/procps/procps-3.3.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/6" # libprocps.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-process/procps/procps-3.3.16-r1.ebuild b/sys-process/procps/procps-3.3.16-r2.ebuild
index b7c8b18e2320..09f6a12956a8 100644
--- a/sys-process/procps/procps-3.3.16-r1.ebuild
+++ b/sys-process/procps/procps-3.3.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/8" # libprocps.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
 RESTRICT="!test? ( test )"
 
@@ -43,6 +43,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
 
 	# Upstream fixes
+	"${FILESDIR}"/${P}-toprc_backwards_compatibility.patch #711676
 )
 
 multilib_src_configure() {
diff --git a/sys-process/procps/procps-3.3.16.ebuild b/sys-process/procps/procps-3.3.16.ebuild
deleted file mode 100644
index 520b8f0d9507..000000000000
--- a/sys-process/procps/procps-3.3.16.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic usr-ldscript
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/8" # libprocps.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	elogind? ( sys-auth/elogind )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${COMMON_DEPEND}
-	elogind? ( virtual/pkgconfig )
-	ncurses? ( virtual/pkgconfig )
-	systemd? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )"
-RDEPEND="
-	${COMMON_DEPEND}
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-apps/util-linux[kill]
-	)
-	!<app-i18n/man-pages-de-2.12-r1
-	!<app-i18n/man-pages-pl-0.7-r1
-	!<sys-apps/sysvinit-2.88-r6
-"
-
-S="${WORKDIR}/${PN}-ng-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
-	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
-
-	# Upstream fixes
-)
-
-src_configure() {
-	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
-	append-lfs-flags #471102
-	local myeconfargs=(
-		$(use_with elogind)
-		$(use_enable kill)
-		$(use_enable modern-top)
-		$(use_with ncurses)
-		$(use_enable nls)
-		$(use_enable selinux libselinux)
-		$(use_enable static-libs static)
-		$(use_with systemd)
-		$(use_enable unicode watch8bit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check </dev/null #461302
-}
-
-src_install() {
-	default
-	#dodoc sysctl.conf
-
-	dodir /bin
-	mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
-	if use kill; then
-		mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
-	fi
-
-	gen_usr_ldscript -a procps
-	find "${ED}" -type f -name '*.la' -delete || die
-}