Fix pmap test when running under restrictive kernel/user settings #404389 by Markus Oehme.

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 90 insertions, 19 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 2cd282e29187..6dea75b4d880 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.137 2015/03/02 09:32:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.138 2015/05/18 04:19:01 vapier Exp $
+
+  18 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/procps-3.3.10-pmap-unreadable.patch, procps-3.3.10-r1.ebuild:
+  Fix pmap test when running under restrictive kernel/user settings #404389 by
+  Markus Oehme.
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> procps-3.3.9.ebuild:
   Stable for ppc, wrt bug #510316
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 8b741c0c1656..4b168b2fa950 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX procps-3.3.10-pmap-unreadable.patch 1775 SHA256 d4f34e6f33038f7599f403975bafd7f349013089fa2feda913b3ac9c56830c86 SHA512 d9ee6f9eb8d66b3777f0ec12066dd14d1849eb056b971b36f19612b2bcf60604fc361913b39b82766946f4a0e39907b68054bbc640b09b2e828c794824d79a57 WHIRLPOOL f4becc813b25d96fc778ce31f96494f8de13194a4ec5f7dbf184c99fd36a418f8fe5af0feb04c01b8f636660abe562131081031e868d9a739a1521fc7205e154
 AUX procps-3.3.8-kill-neg-pid.patch 1446 SHA256 847c21f6619c7aa0f2847726a17595f986ec2fe0f361d95e17812639abe32a79 SHA512 3ed4e83d81f7dd574ff68bbcae9ad9f8649a39d46a17de5fd4297f215d8f70cd28e415b1d3c7b5142e7719343af28f4b393061a60eb012caece81dfe5ff6c271 WHIRLPOOL cf452118312e60a0bab7a4ec87bed9a9d2f5fb8bb563769a0430f11c72348e5be79bdfc031f67f4e97e0bf9b32f6ccd1ac590f392c95ee935b77b857ce1b1739
 AUX procps-3.3.9-sysctl-load-config-files.patch 400 SHA256 f744a549f9205a47d892687d90096b25098ca91ae5f81879874e07e531d47131 SHA512 f528d5425ef55c3816403f3f0e61c0958726c561565e4702c5f3c09c695dcde4031d8d1aa4b30a621561ea020a66111291a5640ff51d53355d20168a319cf1d9 WHIRLPOOL fcf6b22c58ee21ba6aa49747903d06786a3283235821acf6277e5ed9301899ea389d54674d8ff614b6787a2b3d8c6c296f33017695b4061a6580980562029636
 DIST procps-3.3.8-respect_epipe_in_fileutils.patch 1412 SHA256 4a56c88697fa6099a62a4169838c9c04df2c2c2bbc08e9ad9953e5b00df16d68 SHA512 317fc8e7c3fbd280182f55b399a30b2cfbc72268590825ea323537361cd761776afe1486509cb04ae937287ccf11578def5aac2eaa0fe660d04f0357282d9c14 WHIRLPOOL f8fdac8a172037edf51e1e777374293848afaa2180adc35adce5bf8ebefceb37df30082b27f6d6f1f5a571ba0f84bdfff9fc6c2343f120ce5c80b2f52e1804ac
@@ -8,26 +9,26 @@ DIST procps-3.3.8-top_user_filter.patch 2355 SHA256 089d7d0a0a497d88d34f3d05da24
 DIST procps-ng-3.3.10.tar.xz 657232 SHA256 1759229cd0d97da3d200d5599c4ea82726d61fae9c4b7d3edd52c544962791b7 SHA512 cbfa49e79a88a8e7066a9c316ef089f15fa825c5bfbc22ab8a83f53c6f367a7c586cef9c403e360d373d824c471533a15ddb11cd30c561650e6879fe687e7e4f WHIRLPOOL 723dd1c00578a7fa7e3ff47bed60283c30850cc8ae8069c704ba648792809a67c5944dbfd9b7b0159e0be83215b61e6b71b2d76e65b3619aed54223900ffed9b
 DIST procps-ng-3.3.8.tar.xz 553056 SHA256 a4109cfb6fe3bcfb5a0efb37efe04d0c8ce858bff3820d48cc258bad41bed46b SHA512 63ba13f9ef0f4558748c6b2d1b0719a1173bd87e38279e3b052a10e207e1b808626d031f16dd65b05c55708366df7350cb0a64da8dc20e7f9f1fdc1cd2417c71 WHIRLPOOL 671860af1f028c9c8c7bb0c035db86e3e13d9d754801e7a3f19105710bb9720bbfa627e4e748b823192286319fe4e7e736c1af5a3fb34116cbe93386b0d2bed6
 DIST procps-ng-3.3.9.tar.xz 560812 SHA256 00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 SHA512 62c7270aa48b4346a3198f306d1cb8474f64650bfb67e8cc6c4d41923e50c31c95b3a0367a464823fb50a6137ec0c6352006292ac85b50caf730ec8ec35eb553 WHIRLPOOL dac97433a87badd40b46e3155bf0e30652ed2961a41bc8fca074357431301d250632215512ad752634c9c4f3273a1c75caba1ecf4f5a3c510bee155660dde166
-EBUILD procps-3.3.10-r1.ebuild 1979 SHA256 3197bfcdc067025c35bfa642730b4a007cc1a723c4c51b7cfb5d63f638f89ae2 SHA512 9be7486b1178cabf962aa6f2c115ed39a1f6f4f38a51ee9537c9e30b1f58f90cc7d785011a9f2065ff127ac9cdeae48d2e6c600c89eda2fc662600359e62094f WHIRLPOOL 2ce6d99e97b7a02bfed801285a7d6fd78003c1399ece596f4d3c68f8fda6a1cba83549d3e889b30b5f6ff2731fedab9aee04de5b6faa2cd8ec4234cc6718ac04
+EBUILD procps-3.3.10-r1.ebuild 2058 SHA256 1cf6dfa79b66e28c533bb0ce6f22d0b72084d2e50ed4515fbc6fa7411669dff6 SHA512 0e8cdc72f031b1306104d6c76a4adb7074d62bfc00727720fc416e1b787dcf26b89f3d0d37cc114f28b02b3dd9c9a0d7cb33630c7a4e521aeed38de0b7f061b1 WHIRLPOOL 4a623ba1e9296825391d6996a47754959ef109e4c55fc024127e5a4e25c980465777f532babfeb27b5fdc1330e43db432a67934674fc401c15e883b11b989772
 EBUILD procps-3.3.8-r2.ebuild 1885 SHA256 28ae59fc4b34f67d9f3b0c85d9abb56c5d5afd17ad0304649f1897eb7ba924b0 SHA512 99fe192331929060d5940c3a1f864e07f941d9c3a8b1a51cff7c96704bfed161375fcd0e49b35168bba0e4fc7926839decff0027e9144c2b43cfd852df8f4a7a WHIRLPOOL afb62ffc281d137a88b6c2369f9911f51f792a888484ddb588ca5cc0d979a62fa7f7c942f56664a44c035e8ef922085b858d514572b8fc5380cf59ffe50e3ea8
 EBUILD procps-3.3.9-r2.ebuild 1904 SHA256 3000c4f533a0ade9832b8d0e8d3f35d48a90efcaae93da2537d26bf5705e34a0 SHA512 4744bc00a7e4c316520c6f1a07a91848d7bb828b50f8bd4e59aadc35fbdd87daef6b08d55f618ad2db4ae40169d845c53d06938a5c591355c0d741fe6bbe761c WHIRLPOOL 8512f31b3c44791beb50202df78bbfd7186376f0965ccdde19377dfb72cdd105c019cadd7e1c3d9d141314768d33a666111110ce42fe26efc2170c8ccff152dc
 EBUILD procps-3.3.9.ebuild 1598 SHA256 60649c034fd165f9fb62ee9c4ef0a9acdab8c20d9f59617293df6b66bb857643 SHA512 c4347b5df6f473d554640dbb77344801944e975b9398e3727087c3f858bcb7317ee82ec19782c8208e7877f9a058dc595676c99b1e478de16bd8a0397259b756 WHIRLPOOL 38819a28c9a667ce20eefe4a28f44a35c0ab7533e2462cd70435f081c876448253a2e33909c4bf8bf5ac1645aa3f158110656787e16faf81348cbcb30d0a086f
-MISC ChangeLog 35249 SHA256 4463bf8b729503c6b53ba45ebee43db779fabfbc743f6976a4ad6a59941cd2a8 SHA512 034cc3ab4b6199dedb0560cd68582491daad597f7ae60147d5c76ae02d161a2245e5c9ffc0fbc779d586afd705fc90870a9416f48a52709371e3720b5167789d WHIRLPOOL 7e22de0f051dd220e03e9cc877ba45f22adc98484a85fcebb3d4836d7fd4e3858dd345fc106d8cf5953880b1eeb0c1a7b11d570f98ae53d1f0e45f68f083e7f8
+MISC ChangeLog 35469 SHA256 e909e58c53455ae9ea5adddd3add333d88684921acba7a10368dbfc1823ae456 SHA512 60bb60e028f7485c2602864ce95a46f708e2c6b516c9c69dbe753f4d41336ab935cfccd4b650b851f6c311c0d7bda4a5a4488f1629a964216e3241bd98cd7958 WHIRLPOOL fdb11dbb9ebfd9597b209c0272024c459da496e25e92109122a9826ae6c9e34a0bd581b30d66bcf613e08ad9e4a2d80acc6974be3ff16d7bc6ca2da11a2887bc
 MISC metadata.xml 377 SHA256 c0a45638c35d967d63370589161a647aff1e986589bbad5c1d0ed49566e6cdba SHA512 b554a36656163db9ad2d27719b2b2a5b5c9033ac83723c9387dcb68a895f83213bbed08f6a7cddb4777bfcb91981f958dab3ec6527c6bf9bd175c1d3c60cf973 WHIRLPOOL 58aad116a5100d29538791538d1accb86acb808267a431e95c8051f6a682ac94def16131e4ae86c4b29b71c9eb7748d7edf64284c9c86295680c45fe9fe02a84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9C44AAoJELp701BxlEWfXiEP/RN/ckaKMNtoDJnvXwnVnUuw
-i/IkqfuUxCxI/eILKb2z0y9kf+9blneWjWIMKVV6MSDwYqf8vo1HdrXKxf/D6EKk
-U5kcApnALrTt7HKfPzPSb/aZHenoaCyjm1rRsb2HKhxSn2eF9rMbx3hVHonkHUaj
-+9YOTpSDjlXRZrWlTWnqIRpSfx21EsrAn//9kvnxiPfeuInlvP4cSxURkOJG7LTk
-ZqFaV/cis2KKGJvGjtK+h0uqkDFJ3uOUfeJ0WccOYuZOLj08nM2OgcHT9xYBeS/y
-1ozRbSUxDTqKfEGLs2ulOyw8ByuJcxeo2DgjZGiY4I/HArHvdhJD4DCT0WTNalyV
-VxHhF+JKqzlK3nsgnV7LBG6X01tMRQBw4sQryNZCem5BNYyZ3Db7FfdlCnBlTdWi
-uJa+taRmafGS+JMY/0FDVPjOn0njp3rxQZnMQCBf88d8vfhr5LZmPyd/Y3XNG9sa
-nnloG+9SrSv7ZTpB02aA7XUk2PE7+HwTDQ/xrew7yTXB6zbJR5vJNZxEJQMndlX4
-f2EFpfb3KVKb2z7aRms0EIP8a5yWl8MzHKIwNhfTik4Y3MRgisd9SN66szFNgsXS
-s8+Y27nZLNZjfxeAVL8oC2ejW2wksmS5AzE7VEbsnEotH6rXA5CZycgbESGfoFwc
-QbfGkVJJFbSISxIJ2ier
-=Gavr
+iQIcBAEBCAAGBQJVWWg2AAoJEPGu1DbS6WIAPTIP/08y2IlMB+ty1y7YqFpJZugh
++WmROaO8g4gWpiG9FHkGDlWz/ZkF9rZbwnrHTq1mqrPsMezLVRJaYGuXhmcfCn2E
+OpipgI59ab3tjFC8Hj1kHA3DUq2gMaT185xfbm0Ct2oMdwa+y7ZAGnhgh8ENNZqR
+ymnd6dVYRJOXuOQUqbMEuWW7ck14zdVzqwn+WfOsFW8/bJnfg1rtzhVG7zNIlTEz
+MZhGDptI1nmppNHbSDW+/4KM5bTx5eLr5CiVDtPM92BGa7ED3KDwIs81ssWpWYY4
+3oW3ntJKTUew/sEikDE7L4oaqmpS+zaSIpxsQJwPy/XEtQjOKBGojnEGYd0DiVIK
++r0iBqu1PyeUr/rXQoxvma+B605GeFqVxoz/Ogh7c94zQA987Qbuk12NmRj3WQko
+fbX8nxf+abNOwZxadnBvpr7PRXk7C4Oi0RzxELf3Q/j/brHll7P+l5ZLJyJIhwMW
+15k9HXF/1xGrmXlnQB6KTNxgj0yVuUA1AyM2K9l9i+61wGyVlrm7KA8PKE0GJJKU
+qYmwTgOC1uhQih6v91Tmof766VZaecEt1tFHGeScMzI2cK9EA/nWTguITOH/JdKf
+j/4+AhpwoA+EHA3HLTzcPcPeZ4qhsOQSAGjl/SPwz3xMSB08o5ZoKE9TNq6r6+ah
+qtVoK8TR/E3nA6Vejsuv
+=uYq5
 -----END PGP SIGNATURE-----
diff --git a/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch b/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch
new file mode 100644
index 000000000000..697674861bff
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.10-pmap-unreadable.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/404389
+
+From 92071e963e6ff50f0e221dde286f3229267b2ff9 Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@enc.com.au>
+Date: Sat, 24 Jan 2015 18:53:29 +1100
+Subject: [PATCH] pmap: print process even if smaps unreadable
+
+pmap would previously print the process name if
+/proc/PID/smaps could be opened, even if subsequent
+reads failed.  This actually occurs with other users
+PIDs.
+
+Kernel 3.18rc1 introduced a change where the file could
+not been opened, meaning pmap -X 1 previously showed
+the process name and nothing else but NOW shows nothing
+make check failed because of this.
+
+This change prints the process name even before trying to open
+the file, returning it to previous behaviour.
+Thanks to Vincent Bernat for some analysis.
+
+References:
+  https://bugs.debian.org/775624
+  https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=29a40ace841cba9b661711f042d1821cdc4ad47c
+
+Signed-off-by: Craig Small <csmall@enc.com.au>
+---
+ NEWS   | 1 +
+ pmap.c | 8 ++++----
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/pmap.c b/pmap.c
+index c83617c..17e0e30 100644
+--- a/pmap.c
++++ b/pmap.c
+@@ -533,6 +533,10 @@ static int one_proc(proc_t * p)
+ 	 */
+ 	int maxcmd = 0xfffff;
+ 
++	escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd,
++		       ESC_ARGS | ESC_BRACKETS);
++	printf("%u:   %s\n", p->tgid, cmdbuf);
++
+ 	if (x_option || X_option || c_option) {
+ 		sprintf(buf, "/proc/%u/smaps", p->tgid);
+ 		if ((fp = fopen(buf, "r")) == NULL)
+@@ -543,10 +547,6 @@ static int one_proc(proc_t * p)
+ 			return 1;
+ 	}
+ 
+-	escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd,
+-		       ESC_ARGS | ESC_BRACKETS);
+-	printf("%u:   %s\n", p->tgid, cmdbuf);
+-
+ 	if (X_option || c_option) {
+ 		print_extended_maps(fp);
+ 		return 0;
+-- 
+2.4.0
+
diff --git a/sys-process/procps/procps-3.3.10-r1.ebuild b/sys-process/procps/procps-3.3.10-r1.ebuild
index 94548659b4b5..8201bebf296c 100644
--- a/sys-process/procps/procps-3.3.10-r1.ebuild
+++ b/sys-process/procps/procps-3.3.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.10-r1.ebuild,v 1.1 2014/09/24 06:14:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.10-r1.ebuild,v 1.2 2015/05/18 04:19:01 vapier Exp $
 
 EAPI="4"
 
@@ -32,7 +32,8 @@ S=${WORKDIR}/${PN}-ng-${PV}
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch
+		"${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch \
+		"${FILESDIR}"/${P}-pmap-unreadable.patch
 	sed -i -e 's:systemd-login:systemd:' configure || die #501306
 }
 
@@ -49,6 +50,10 @@ src_configure() {
 		$(use_enable unicode watch8bit)
 }
 
+src_test() {
+	emake check </dev/null
+}
+
 src_install() {
 	default
 	#dodoc sysctl.conf