Add patch from upstream to fix newer slab version #77301 by regala.

5 files changed, 37 insertions, 9 deletions

diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog
index efd193449237..118f69f606e1 100644
--- a/sys-apps/procps/ChangeLog
+++ b/sys-apps/procps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/procps
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.96 2005/01/10 17:02:42 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.97 2005/01/13 01:21:47 vapier Exp $
+
+*procps-3.2.4-r1 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/3.2.4-linux26-slab.patch, +procps-3.2.4-r1.ebuild,
+  -procps-3.2.4.ebuild:
+  Add patch from upstream to fix newer slab version #77301 by regala.
 
   10 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> procps-3.2.4.ebuild:
   Stable on sparc
diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest
index f268c7e3999c..4fef1d3eb04e 100644
--- a/sys-apps/procps/Manifest
+++ b/sys-apps/procps/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2d963dfa4d89721de95f35d2a08cb18d ChangeLog 15381
+MD5 a8d7e2b85b2fa57cd3a02b3f46d8af1c ChangeLog 15616
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 687bb08f11338030eabaca147372217f procps-3.2.3-r1.ebuild 1492
-MD5 6b856567149f55d37df90f85ef76ecf9 procps-3.2.4.ebuild 1747
+MD5 0cfaadaf5ad0999e57bcd1c8726fe0ea procps-3.2.4-r1.ebuild 1844
 MD5 7455bab26f4331ffc66d62113bc973db files/digest-procps-3.2.3-r1 64
-MD5 a26e86ab1efcb58809f0f46aa735ef07 files/digest-procps-3.2.4 64
 MD5 7ba1d9bd2f1c46766282250643ab9ebd files/procps-mips-define-pagesize.patch 1028
+MD5 7e94d86add2921b1262479b92f51da27 files/3.2.4-linux26-slab.patch 521
+MD5 a26e86ab1efcb58809f0f46aa735ef07 files/digest-procps-3.2.4-r1 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB4rVkKRy60XGEcJIRAkVOAJ0QgFUr6ujYWfH8w0rbf9WdAvNVGgCfYnt7
-MnE2lci9t7hIiW/WYjCWGiE=
-=b1o5
+iD8DBQFB5c1JroRuSHgZdywRAmisAJ90x/O3TCIxHmo7KXwU/s0QMXVLIwCeJvAR
+34qgFqrvjGplYko0Jm8CxYI=
+=bCQK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/procps/files/3.2.4-linux26-slab.patch b/sys-apps/procps/files/3.2.4-linux26-slab.patch
new file mode 100644
index 000000000000..d2d0ab0ceaae
--- /dev/null
+++ b/sys-apps/procps/files/3.2.4-linux26-slab.patch
@@ -0,0 +1,17 @@
+Index: proc/slab.c
+===================================================================
+RCS file: /cvsroot/procps/procps/proc/slab.c,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- proc/slab.c	5 Jan 2005 21:46:22 -0000	1.4
++++ proc/slab.c	10 Jan 2005 05:59:41 -0000	1.5
+@@ -293,7 +294,7 @@
+ 		return 1;
+ 	}
+ 
+-	if (major == 2 && minor == 0)
++	if (major == 2)
+ 		ret = parse_slabinfo20(list, stats, slabfile);
+ 	else if (major == 1 && minor == 1)
+ 		ret = parse_slabinfo11(list, stats, slabfile);
diff --git a/sys-apps/procps/files/digest-procps-3.2.4 b/sys-apps/procps/files/digest-procps-3.2.4-r1
index 2bf5f1226db4..2bf5f1226db4 100644
--- a/sys-apps/procps/files/digest-procps-3.2.4
+++ b/sys-apps/procps/files/digest-procps-3.2.4-r1
diff --git a/sys-apps/procps/procps-3.2.4.ebuild b/sys-apps/procps/procps-3.2.4-r1.ebuild
index 45b61129963f..6ddd1f682cd2 100644
--- a/sys-apps/procps/procps-3.2.4.ebuild
+++ b/sys-apps/procps/procps-3.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.4.ebuild,v 1.9 2005/01/10 17:02:42 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.4-r1.ebuild,v 1.1 2005/01/13 01:21:47 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -19,6 +19,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# Upstream patch to support newer linux #77301
+	epatch "${FILESDIR}"/${PV}-linux26-slab.patch
+
 	# Clean up the makefile
 	# firstly we want to control stripping
 	# and secondly these gcc flags have changed