diff options
Diffstat (limited to 'sys-apps/procps')
| -rw-r--r-- | sys-apps/procps/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/procps/Manifest | 17 | ||||
| -rw-r--r-- | sys-apps/procps/files/procps-3.1.15-fix_attr.diff | 31 | ||||
| -rw-r--r-- | sys-apps/procps/procps-3.1.15.ebuild | 4 |
4 files changed, 48 insertions, 10 deletions
diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog index 0e9597be973e..0e0085b38f21 100644 --- a/sys-apps/procps/ChangeLog +++ b/sys-apps/procps/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/procps # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.49 2003/12/24 19:12:55 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.50 2003/12/24 20:50:36 pebenito Exp $ + + 24 Dec 2003; Chris PeBenito <pebenito@gentoo.org> procps-3.1.15.ebuild, + files/procps-3.1.15-fix_attr.diff: + Add patch to make SELinux contexts work on 2.4 kernels, not just 2.6. *procps-3.1.15 (24 Dec 2003) diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest index f9ce152fe1f9..d2461245a770 100644 --- a/sys-apps/procps/Manifest +++ b/sys-apps/procps/Manifest @@ -1,16 +1,17 @@ -MD5 2f1afef8f9f8f90ad9350b3efdf5e67f ChangeLog 8487 -MD5 983ab1a03d9994135baa5da4f431c08b procps-3.1.9-r1.ebuild 1292 -MD5 614fb5d8693070f220a47ca60b574b83 procps-3.1.12-r1.ebuild 1394 -MD5 d12bc7df9fd67c392566667979fa8ef8 procps-3.1.14-r1.ebuild 1245 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 d8b6b5a53183dbbd83371b10a852bcd9 procps-3.1.15.ebuild 1291 MD5 2e1ec951215c362e75568e65e08d9af3 procps-2.0.16-r1.ebuild 2024 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 cf157627db3576919002bf03c6bde6d0 ChangeLog 8672 +MD5 614fb5d8693070f220a47ca60b574b83 procps-3.1.12-r1.ebuild 1394 MD5 e3b8eddfe51ec626e323ebb4553652eb procps-3.1.13-r1.ebuild 1263 -MD5 e5d3f0ece2e6271928015294a4600571 procps-3.1.15.ebuild 1241 +MD5 d12bc7df9fd67c392566667979fa8ef8 procps-3.1.14-r1.ebuild 1245 +MD5 983ab1a03d9994135baa5da4f431c08b procps-3.1.9-r1.ebuild 1292 +MD5 8f0e3a7050a05437d2872c94ea348a87 files/digest-procps-3.1.15 65 MD5 7d8e6a0530e7ebd56a0445da8dcefb9b files/digest-procps-2.0.16-r1 65 MD5 9a240e887d0ca5948c23825937bcf53c files/digest-procps-3.1.9-r1 64 +MD5 01027f00be8fdd5ca08f0d15f1ed1512 files/procps-3.1.15-fix_attr.diff 1270 MD5 9dc38f56c976cdb1aa550458fe3e8bb7 files/digest-procps-3.1.12-r1 65 -MD5 291408557077f13b14c9223a9d2bc632 files/digest-procps-3.1.13-r1 65 MD5 e8320bb8f3dafed943fd15207648cf7f files/procps-3.1.11-multipids.patch 515 +MD5 291408557077f13b14c9223a9d2bc632 files/digest-procps-3.1.13-r1 65 MD5 74e03ab7d527f0d3a5ccde0b4502b132 files/digest-procps-3.1.14-r1 65 MD5 3dfa108ba0c53240d5bfe044fa8be931 files/procps-3.1.12-selinux.diff.bz2 8800 -MD5 8f0e3a7050a05437d2872c94ea348a87 files/digest-procps-3.1.15 65 diff --git a/sys-apps/procps/files/procps-3.1.15-fix_attr.diff b/sys-apps/procps/files/procps-3.1.15-fix_attr.diff new file mode 100644 index 000000000000..5ac08ed05a0a --- /dev/null +++ b/sys-apps/procps/files/procps-3.1.15-fix_attr.diff @@ -0,0 +1,31 @@ +diff -urN procps-3.1.15/ps/output.c procps-3.1.15.new/ps/output.c +--- procps-3.1.15/ps/output.c 2003-12-23 19:46:32.000000000 -0600 ++++ procps-3.1.15.new/ps/output.c 2003-12-24 13:31:16.000000000 -0600 +@@ -944,7 +944,7 @@ + + // wchan file is suitable for testing + //snprintf(filename, sizeof filename, "/proc/%d/task/%d/wchan", pp->tgid, pp->tid); +- snprintf(filename, sizeof filename, "/proc/%d/task/%d/attr/current", pp->tgid, pp->tid); ++ snprintf(filename, sizeof filename, "/proc/%d/attr/current", pp->tgid); + + fd = open(filename, O_RDONLY, 0); + if(likely(fd==-1)) goto fail; +diff -urN procps-3.1.15/ps/parser.c procps-3.1.15.new/ps/parser.c +--- procps-3.1.15/ps/parser.c 2003-12-23 17:58:06.000000000 -0600 ++++ procps-3.1.15.new/ps/parser.c 2003-12-24 13:45:08.000000000 -0600 +@@ -315,12 +315,10 @@ + exclusive("-V"); + display_version(); + exit(0); +-#if 0 +- case 'Z': /* full Mandatory Access Control level info */ +- trace("-Z shows full MAC info\n"); +- return "Don't understand MAC on Linux."; ++ case 'Z': ++ trace("-Z shows SELinux contexts\n"); ++ format_flags |= FF_Fc; + break; +-#endif + case 'a': + trace("-a select all with a tty, but omit session leaders.\n"); + simple_select |= SS_U_a; diff --git a/sys-apps/procps/procps-3.1.15.ebuild b/sys-apps/procps/procps-3.1.15.ebuild index 065b98a617e4..178c35b9786b 100644 --- a/sys-apps/procps/procps-3.1.15.ebuild +++ b/sys-apps/procps/procps-3.1.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.15.ebuild,v 1.1 2003/12/24 19:12:55 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.15.ebuild,v 1.2 2003/12/24 20:50:36 pebenito Exp $ inherit flag-o-matic @@ -20,6 +20,8 @@ src_unpack() { unpack ${A} cd ${S} + epatch ${FILESDIR}/procps-3.1.15-fix_attr.diff + # Use the CFLAGS from /etc/make.conf. replace-flags "-O3" "-O2" for file in `find . -iname "Makefile"`;do |