Found an instance of PAGE_SIZE being defined in minimal.c to a set value if it wasn't previously defined in asm/page.h; changed to use sysconf() to fetch the size if not defined instead.

3 files changed, 41 insertions, 19 deletions

diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog
index e3de876acedf..2983959da57f 100644
--- a/sys-apps/procps/ChangeLog
+++ b/sys-apps/procps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/procps
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.79 2004/08/19 02:46:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.80 2004/08/20 06:09:16 kumba Exp $
+
+  20 Aug 2004; Joshua Kinard <kumba@gentoo.org>
+  files/procps-mips-define-pagesize.patch:
+  Found an instance of PAGE_SIZE being defined in minimal.c to a set value if it
+  wasn't previously defined in asm/page.h; changed to use sysconf() to fetch the
+  size if not defined instead.
 
   18 Aug 2004; Aron Griffis <agriffis@gentoo.org> procps-3.2.2-r1.ebuild:
   stable on alpha and ia64
diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest
index 7882dbde9afe..637fb83ab3ea 100644
--- a/sys-apps/procps/Manifest
+++ b/sys-apps/procps/Manifest
@@ -1,23 +1,23 @@
-MD5 1a12a945ea2a7fdb7103644d22d4cb82 procps-3.1.15.ebuild 1236
-MD5 8eae8fbe8949b39d3853f794f920e348 procps-3.2.1.ebuild 1149
+MD5 d1a187f5afc400784b40e3f5221f2db9 ChangeLog 12744
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 e3b3f57a3f6f7e586cd3a23a5689cc30 procps-2.0.16-r1.ebuild 2002
-MD5 8c51a9fca2d728dd06124b739c216f86 procps-3.2.3.ebuild 1208
+MD5 5dbeadf75302e75297ff2fd9605cd50e procps-3.1.12-r1.ebuild 1342
 MD5 416c9134bb5282ee2d9e86b81826f55d procps-3.1.13-r1.ebuild 1185
-MD5 1b9801e23a3e88cee2ccddd784445f56 procps-3.2.2-r1.ebuild 1294
+MD5 1a12a945ea2a7fdb7103644d22d4cb82 procps-3.1.15.ebuild 1236
 MD5 d9a8450ad971e60a33b45788f89a0718 procps-3.2.0.ebuild 1149
-MD5 211b38624ded0619a5e78abfff462e04 ChangeLog 12462
-MD5 5dbeadf75302e75297ff2fd9605cd50e procps-3.1.12-r1.ebuild 1342
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e8320bb8f3dafed943fd15207648cf7f files/procps-3.1.11-multipids.patch 515
-MD5 dfbcd3decf1c925da16cb88f60a2073c files/procps-mips-define-pagesize.patch 357
-MD5 8f0e3a7050a05437d2872c94ea348a87 files/digest-procps-3.1.15 65
+MD5 8eae8fbe8949b39d3853f794f920e348 procps-3.2.1.ebuild 1149
+MD5 1b9801e23a3e88cee2ccddd784445f56 procps-3.2.2-r1.ebuild 1294
+MD5 8c51a9fca2d728dd06124b739c216f86 procps-3.2.3.ebuild 1208
 MD5 7d8e6a0530e7ebd56a0445da8dcefb9b files/digest-procps-2.0.16-r1 65
+MD5 9dc38f56c976cdb1aa550458fe3e8bb7 files/digest-procps-3.1.12-r1 65
+MD5 291408557077f13b14c9223a9d2bc632 files/digest-procps-3.1.13-r1 65
+MD5 8f0e3a7050a05437d2872c94ea348a87 files/digest-procps-3.1.15 65
 MD5 e442fb89cb9b1f265f5198dfb3859434 files/digest-procps-3.2.0 64
 MD5 c1bbc74ed021ce8b4f496b391f20ab76 files/digest-procps-3.2.1 64
-MD5 7455bab26f4331ffc66d62113bc973db files/digest-procps-3.2.3 64
-MD5 5a46a0ddb09b5c217ae8d97f16da74a7 files/digest-procps-3.2.2-r1 64
-MD5 81ead3c972547f9348f2aebd43af32e4 files/procps-3.2.0-selinux-Z.diff 683
+MD5 e8320bb8f3dafed943fd15207648cf7f files/procps-3.1.11-multipids.patch 515
 MD5 3dfa108ba0c53240d5bfe044fa8be931 files/procps-3.1.12-selinux.diff.bz2 8800
-MD5 9dc38f56c976cdb1aa550458fe3e8bb7 files/digest-procps-3.1.12-r1 65
-MD5 291408557077f13b14c9223a9d2bc632 files/digest-procps-3.1.13-r1 65
 MD5 01027f00be8fdd5ca08f0d15f1ed1512 files/procps-3.1.15-fix_attr.diff 1270
+MD5 81ead3c972547f9348f2aebd43af32e4 files/procps-3.2.0-selinux-Z.diff 683
+MD5 5a46a0ddb09b5c217ae8d97f16da74a7 files/digest-procps-3.2.2-r1 64
+MD5 7455bab26f4331ffc66d62113bc973db files/digest-procps-3.2.3 64
+MD5 7ba1d9bd2f1c46766282250643ab9ebd files/procps-mips-define-pagesize.patch 1028
diff --git a/sys-apps/procps/files/procps-mips-define-pagesize.patch b/sys-apps/procps/files/procps-mips-define-pagesize.patch
index d93bf32ffec3..3802f4ccecfb 100644
--- a/sys-apps/procps/files/procps-mips-define-pagesize.patch
+++ b/sys-apps/procps/files/procps-mips-define-pagesize.patch
@@ -1,10 +1,26 @@
---- ps/common.h.orig	2004-08-17 22:28:05.459171904 -0400
-+++ ps/common.h	2004-08-17 22:28:34.370776672 -0400
-@@ -16,6 +16,10 @@
+diff -Naurp procps-3.2.3.orig/minimal.c procps-3.2.3/minimal.c
+--- procps-3.2.3.orig/minimal.c	2004-05-04 20:26:14.000000000 -0400
++++ procps-3.2.3/minimal.c	2004-08-20 02:01:35.868100752 -0400
+@@ -68,8 +68,8 @@
+ ///////////////////////////////////////////////////////////
+ 
+ #ifndef PAGE_SIZE
+-#warning PAGE_SIZE not defined, assuming it is 4096
+-#define PAGE_SIZE 4096
++#warning PAGE_SIZE not defined, using sysconf() to determine correct value
++#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
+ #endif
+ 
+ 
+diff -Naurp procps-3.2.3.orig/ps/common.h procps-3.2.3/ps/common.h
+--- procps-3.2.3.orig/ps/common.h	2004-04-25 17:03:18.000000000 -0400
++++ procps-3.2.3/ps/common.h	2004-08-20 02:00:59.228670792 -0400
+@@ -16,6 +16,11 @@
  #include "../proc/readproc.h"
  #include <asm/page.h>  /* looks safe for glibc, we need PAGE_SIZE */
  
 +#ifndef PAGE_SIZE
++#warning PAGE_SIZE not defined, using sysconf() to determine correct value
 +#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
 +#endif
 +