Start using Debian patchset #375275 by Dieter Ries.

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

5 files changed, 153 insertions, 15 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 2b18c8356814..19febf263def 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.48 2011/06/14 20:35:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.49 2011/07/20 05:47:41 vapier Exp $
+
+*procps-3.2.8_p10 (20 Jul 2011)
+
+  20 Jul 2011; Mike Frysinger <vapier@gentoo.org>
+  files/procps-3.2.3-noproc.patch, +procps-3.2.8_p10.ebuild,
+  +files/procps-3.2.8-r1-forest-prefix.patch:
+  Start using Debian patchset #375275 by Dieter Ries.
 
   14 Jun 2011; Matt Turner <mattst88@gentoo.org>
   -files/procps-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch,
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index eca22df00138..32693d7a647e 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,14 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 3.2.5-top-sort.patch 1384 RMD160 7ab964b4dd310d5032826abe64a46b8b6e968a80 SHA1 ad7782f3f4d118fa67c667d611a1eb2f4c736808 SHA256 bd52bdde8f43e9f1428d18efa13691abd83a25ea2f99d8c44fabccd7f2ba902b
-AUX procps-3.2.3-noproc.patch 911 RMD160 0c6714c16424a31cde28f8e667f05a46e71402d1 SHA1 6cc1c4fc8f7e39347619f4c9f1432dfc6d0164a1 SHA256 e3897fe3e8df43750f514e8fc84a82f5e00c0bc2245bbd21ad2d8ff9789087f1
+AUX procps-3.2.3-noproc.patch 514 RMD160 0d27f02b6e1e8a9a717f293d2cde4013a531cc06 SHA1 6106530a402f772426ee80d05dab9a24deec49a4 SHA256 44dd3145a8be03cdb0ab3b691de5a98c89398d9990b3094af2e879ef54f98c51
 AUX procps-3.2.7-proc-mount.patch 657 RMD160 90d0dae26d4a514ef0dbcb3c90ba167d0890d14e SHA1 07bdfb5484189daad7beb18fd5e2f280e3de3cad SHA256 17194621e6f5307c1712fab15a13a7da0e10315cf8b45b34403b54c70013b2ba
 AUX procps-3.2.8+gmake-3.82.patch 366 RMD160 8de2f12ffcf2dee2b1074ab16f37c8b664e8d268 SHA1 c1f5e83507dbcbfaf3328accdb9cf9b2d3fe4c1b SHA256 8b74a3ee39ab8535a414931f86b85320a38ef3dc39d65c75ed51fa6d7c041cdb
 AUX procps-3.2.8-forest-prefix.patch 1129 RMD160 b3f7d39cfab5fcf7bc4740a392d9471be1a54c7a SHA1 7974f857634698650953d40a38ed9cdbcaad613b SHA256 4773f42d2c9bd2dafe14431b2b1e41d79bfbf9b567b4003b2a383ed6c65cd930
 AUX procps-3.2.8-linux-ver-init.patch 823 RMD160 e029ee04df0be7ca11878c3bb4e3c544602dc329 SHA1 171d5352940200c209e0c2d43c17f01c02173a66 SHA256 48da9b481af5cbf1beb11f1828c8142b3b77d62c387d8af79e8b0de2c36e6aa8
+AUX procps-3.2.8-r1-forest-prefix.patch 1178 RMD160 a1290cdca6b058a0b7a6f648f9c4f030ad037dd9 SHA1 5476d86cce4d201b3b684c99ddd53bb09962ef5c SHA256 7f1f56c34014243b140f4e71bfd396b5e3e86fba600e7826bb031236ae95d5dc
 AUX procps-3.2.8-toprc-fixup.patch 647 RMD160 68ced4f43bcf86f61f4e66baecd60832fbcd8693 SHA1 e81c7dd3f836078bcb9b1d25ef2a161a48c5dce4 SHA256 da07ed67e5d1405ca673075459070f2fee985692ff930124ed484dacfe4db588
 AUX procps-mips-define-pagesize.patch 1028 RMD160 aa0cb4fdf76d50bae983683e0de0a06daba52361 SHA1 7658c35e40c4c565bd4f4124b09c43ec474da0bd SHA256 9000966beaa7ae9e8261dfc691b7b7bec08857e8404de60f30b10bbe6e702d8e
 DIST procps-3.2.8.tar.gz 285758 RMD160 ad63601fb6bf4692108484d9ed362f510cbcf505 SHA1 a0c86790569dec26b5d9037e8868ca907acc9829 SHA256 11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535
+DIST procps_3.2.8-10.debian.tar.gz 97024 RMD160 140630444577b7349ce6feea84cecf926a2fd98d SHA1 898449da0ac41194b8743f965862ce9be3760075 SHA256 07d2295014920e5ff4182257f5b7781019dc0e70a12755cefa93e19022f45aad
 EBUILD procps-3.2.8-r1.ebuild 2297 RMD160 33568cf3dbc91f41dbc77a91e68a629359e438ab SHA1 f8d3285f5bd5e48b7e3012002056499f8524820e SHA256 8792660ca782802a70bebd9209d418d399daa19b86c5f88f3810cb4708d6e843
 EBUILD procps-3.2.8-r2.ebuild 2404 RMD160 6c7555d8704fc852ad796cf964829a4d9a1456b0 SHA1 8b2bcc0c9be52cdd3f76a1220a9c06d9cbc85cf2 SHA256 288127656d1c50ed1a4da866a41179bedc29fa37836e3aefae33bba40edd2107
 EBUILD procps-3.2.8.ebuild 2178 RMD160 137ac755f53942f610174836337d95189278b2c1 SHA1 a2078c1e328c8dcf27323076faf133e590221611 SHA256 aa8bf0982fb584e8bc27cd6fba80871a85db1f818464bb9e7b08f586e10af1be
-MISC ChangeLog 22709 RMD160 8ae073b5a706c08d3730cc4b3e619fca5df71fd6 SHA1 6f2a8dd15cb8489cca8d70da21fbd0c8fc8bedb0 SHA256 e3a7133b28d4c570d97bd5e17d6dead727bcf6cfe405e5fb6ff175e69ae3d5e4
+EBUILD procps-3.2.8_p10.ebuild 2386 RMD160 dea7fd04d868c3dc34ed39474dc9bb9a7a80d2a5 SHA1 3b1f1d09a22f23dc7320501fe02d940dc937c5ea SHA256 f5b1ae4999e5cff80121a43c5ffd7c00481033aa3753c3ad532cb0971978e20c
+MISC ChangeLog 22952 RMD160 656725cdf99ad4695c2332fe7db88cf6ef08c28e SHA1 67c1c96e12db435739d5f734c1721cf5a9aaf2a7 SHA256 1cd42ff2b16e6811b2687099571846157c1da7893f82c96135a4b30c478c8f39
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4mbAMACgkQaC/OocHi7JbSLgD/dXR6MIguyQopBWdQBLuZkY6g
+R/28cAgvm9VSGUXFtToA/3hOw3XDEC6Wy5UxEo5IBQ5dsOthnxbKdFjSa7UTLvdc
+=8PBE
+-----END PGP SIGNATURE-----
diff --git a/sys-process/procps/files/procps-3.2.3-noproc.patch b/sys-process/procps/files/procps-3.2.3-noproc.patch
index f581cf459c82..6da48eb44f42 100644
--- a/sys-process/procps/files/procps-3.2.3-noproc.patch
+++ b/sys-process/procps/files/procps-3.2.3-noproc.patch
@@ -1,22 +1,15 @@
-Ripped from Fedora
-
 If /proc isnt mounted, `top` will cause screen corruption ...
 
 --- procps-3.2.3/top.c
 +++ procps-3.2.3/top.c
-@@ -3201,12 +3201,15 @@
- 
- int main (int dont_care_argc, char *argv[])
+@@ -3201,6 +3201,10 @@
  {
-+   struct stat isproc;
     (void)dont_care_argc;
     before(*argv);
++
++   if (access("/proc/stat", F_OK))
++      std_err("/proc is not mounted, required for output data");
++
                                          //                 +-------------+
     windows_stage1();                    //                 top (sic) slice
     configs_read();                      //                 > spread etc, <
-    parse_args(&argv[1]);                //                 > lean stuff, <
-+   if (stat("/proc/self", &isproc)==-1)
-+      std_err("/proc is not mounted, required for output data");
-    whack_terminal();                    //                 > onions etc. <
-    windows_stage2();                    //                 as bottom slice
-                                         //                 +-------------+
diff --git a/sys-process/procps/files/procps-3.2.8-r1-forest-prefix.patch b/sys-process/procps/files/procps-3.2.8-r1-forest-prefix.patch
new file mode 100644
index 000000000000..cee331e53ca2
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.8-r1-forest-prefix.patch
@@ -0,0 +1,42 @@
+avoid gcc warnings like:
+
+ps/output.c:341:6: warning: the address of ‘forest_prefix’ will always evaluate as ‘true’
+
+--- a/ps/output.c
++++ b/ps/output.c
+@@ -338,7 +338,7 @@ static int pr_args(char *restrict const 
+   unsigned flags;
+   int rightward=max_rightward;
+ 
+-  if(forest_prefix){
++  if(/*forest_prefix*/1){
+     int fh = forest_helper(outbuf);
+     endp += fh;
+     rightward -= fh;
+@@ -405,7 +405,7 @@ static int pr_cgroup(char *restrict cons
+  if(pp->cgroup && *pp->cgroup) {
+    char *endp = outbuf;
+    int rightward=max_rightward;
+-   if(forest_prefix){
++   if(/*forest_prefix*/1){
+        int fh = forest_helper(outbuf);
+        endp += fh;
+        rightward -= fh;
+@@ -365,7 +365,7 @@ static int pr_comm(char *restrict const 
+   unsigned flags;
+   int rightward=max_rightward;
+   
+-  if(forest_prefix){
++  if(/*forest_prefix*/1){
+     int fh = forest_helper(outbuf);
+     endp += fh;
+     rightward -= fh;
+@@ -390,7 +390,7 @@ static int pr_fname(char *restrict const
+   char *endp = outbuf;
+   int rightward = max_rightward;
+   
+-  if(forest_prefix){
++  if(/*forest_prefix*/1){
+     int fh = forest_helper(outbuf);
+     endp += fh;
+     rightward -= fh;
diff --git a/sys-process/procps/procps-3.2.8_p10.ebuild b/sys-process/procps/procps-3.2.8_p10.ebuild
new file mode 100644
index 000000000000..92209f588512
--- /dev/null
+++ b/sys-process/procps/procps-3.2.8_p10.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8_p10.ebuild,v 1.1 2011/07/20 05:47:41 vapier Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DEB_VER=${PV#*_p}
+MY_PV=${PV%_p*}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps.sourceforge.net/"
+SRC_URI="http://procps.sourceforge.net/${MY_P}.tar.gz
+	mirror://debian/pool/main/p/procps/${PN}_${MY_PV}-${DEB_VER}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local d="${WORKDIR}"/debian/patches
+	EPATCH_SOURCE="${d}" \
+	epatch $(<"${d}"/series)
+	# fixup debian watch_exec_beep.patch
+	sed -i '1i#include <sys/wait.h>' watch.c || die
+
+	epatch "${FILESDIR}"/${PN}-3.2.7-proc-mount.patch
+	epatch "${FILESDIR}"/${PN}-3.2.3-noproc.patch
+	epatch "${FILESDIR}"/${PN}-3.2.8-toprc-fixup.patch
+	epatch "${FILESDIR}"/${PN}-3.2.8-r1-forest-prefix.patch
+
+	# Clean up the makefile
+	#  - we do stripping ourselves
+	#  - punt fugly gcc flags
+	sed -i \
+		-e '/install/s: --strip : :' \
+		-e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \
+		-e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,' \
+		-e "/^lib64/s:=.*:=$(get_libdir):" \
+		-e 's:-m64::g' \
+		Makefile || die "sed Makefile"
+
+	# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
+	# userspace anymore, so this patch instructs procps to get the
+	# value from sysconf().
+	epatch "${FILESDIR}"/${PN}-mips-define-pagesize.patch
+
+	# lame unicode stuff checks glibc defines
+	sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die
+}
+
+src_compile() {
+	replace-flags -O3 -O2
+	emake \
+		CC="$(tc-getCC)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		|| die "make failed"
+}
+
+src_install() {
+	emake \
+		ln_f="ln -sf" \
+		ldconfig="true" \
+		DESTDIR="${D}" \
+		install \
+		|| die "install failed"
+
+	insinto /usr/include/proc
+	doins proc/*.h || die
+
+	dodoc sysctl.conf BUGS NEWS TODO ps/HACKING
+
+	# compat symlink so people who shouldnt be using libproc can #170077
+	dosym libproc-${PV}.so /$(get_libdir)/libproc.so || die
+}