diff options
| author |   Joshua Kinard <kumba@gentoo.org> | 2004-08-18 02:33:19 +0000 |
|---|---|---|
| committer | Joshua Kinard <kumba@gentoo.org> | 2004-08-18 02:33:19 +0000 |
| commit | 1858067b87ce2133d82b703fcb2479bae3318456 (patch) | |
| tree | 510abeede7edcd46ecacdec129fc70697a8c74cd /sys-apps | |
| parent | Update SELinux patch due to collision with PAM patch. (Manifest recommit) (diff) | |
| download | gentoo-2-1858067b87ce2133d82b703fcb2479bae3318456.tar.gz gentoo-2-1858067b87ce2133d82b703fcb2479bae3318456.tar.bz2 gentoo-2-1858067b87ce2133d82b703fcb2479bae3318456.zip | |
Tweak patch to add #ifndef lines.
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/procps/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/procps/Manifest | 30 | ||||
| -rw-r--r-- | sys-apps/procps/files/procps-mips-define-pagesize.patch | 11 |
3 files changed, 26 insertions, 21 deletions
diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog index ece8206ebe1f..bc984ae47d34 100644 --- a/sys-apps/procps/ChangeLog +++ b/sys-apps/procps/ChangeLog @@ -1,6 +1,10 @@ # 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.77 2004/08/13 15:28:25 lostlogic Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.78 2004/08/18 02:33:19 kumba Exp $ + + 17 Aug 2004; Joshua Kinard <kumba@gentoo.org> + files/procps-mips-define-pagesize.patch: + Tweak patch to add #ifndef lines. 13 Aug 2004; Brandon Low <lostlogic@gentoo.org> procps-3.2.3.ebuild: Make the sysctl.conf a doc not an /etc file diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest index c075ac1145e2..85535a0ab0cf 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 cf2018a073e0a1631e4c895d437050b1 ChangeLog 12361 +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 904c9f34deca36822bcda3dd0f54b0e7 procps-3.2.2-r1.ebuild 1293 +MD5 1a12a945ea2a7fdb7103644d22d4cb82 procps-3.1.15.ebuild 1236 MD5 d9a8450ad971e60a33b45788f89a0718 procps-3.2.0.ebuild 1149 -MD5 921a7f9ffcb05bc114e77dc715c6a53b ChangeLog 12233 -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 8a56bcff273fcacdcbb28e1284549002 files/procps-mips-define-pagesize.patch 420 -MD5 8f0e3a7050a05437d2872c94ea348a87 files/digest-procps-3.1.15 65 +MD5 8eae8fbe8949b39d3853f794f920e348 procps-3.2.1.ebuild 1149 +MD5 904c9f34deca36822bcda3dd0f54b0e7 procps-3.2.2-r1.ebuild 1293 +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 dfbcd3decf1c925da16cb88f60a2073c files/procps-mips-define-pagesize.patch 357 diff --git a/sys-apps/procps/files/procps-mips-define-pagesize.patch b/sys-apps/procps/files/procps-mips-define-pagesize.patch index ae3128876e63..d93bf32ffec3 100644 --- a/sys-apps/procps/files/procps-mips-define-pagesize.patch +++ b/sys-apps/procps/files/procps-mips-define-pagesize.patch @@ -1,11 +1,12 @@ -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-12 14:14:15.000000000 -0400 -@@ -16,6 +16,8 @@ +--- 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 @@ #include "../proc/readproc.h" #include <asm/page.h> /* looks safe for glibc, we need PAGE_SIZE */ -+#define PAGE_SIZE sysconf(_SC_PAGESIZE) ++#ifndef PAGE_SIZE ++#define PAGE_SIZE (sysconf(_SC_PAGESIZE)) ++#endif + #if 0 #define trace(args...) printf(## args) |