summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-04-21 22:23:32 +0000
committerMike Frysinger <vapier@gentoo.org>2006-04-21 22:23:32 +0000
commit21f92a11bf7fd8cf12fbfb1617f650548c2255f8 (patch)
tree98ab2d36e015068cb94c08eb0c13b1bd56d9467e /sys-process/procps/files
parentdocument (diff)
downloadgentoo-2-21f92a11bf7fd8cf12fbfb1617f650548c2255f8.tar.gz
gentoo-2-21f92a11bf7fd8cf12fbfb1617f650548c2255f8.tar.bz2
gentoo-2-21f92a11bf7fd8cf12fbfb1617f650548c2255f8.zip
Remove ABI cruft, use softlinks instead of hardlinks, and grab patch from Fedora for top bugs when /proc isnt mounted.
(Portage version: 2.1_pre9-r1)
Diffstat (limited to 'sys-process/procps/files')
-rw-r--r--sys-process/procps/files/digest-procps-3.2.5-r12
-rw-r--r--sys-process/procps/files/digest-procps-3.2.62
-rw-r--r--sys-process/procps/files/procps-3.2.3-noproc.patch22
-rw-r--r--sys-process/procps/files/procps-3.2.6-links.patch25
4 files changed, 51 insertions, 0 deletions
diff --git a/sys-process/procps/files/digest-procps-3.2.5-r1 b/sys-process/procps/files/digest-procps-3.2.5-r1
index 0f9fb90c8e34..21c634243df5 100644
--- a/sys-process/procps/files/digest-procps-3.2.5-r1
+++ b/sys-process/procps/files/digest-procps-3.2.5-r1
@@ -1 +1,3 @@
MD5 cde0e3612d1d7c68f404d46f01c44fb4 procps-3.2.5.tar.gz 277365
+RMD160 2deb6bc8f2af19f965aebe4aa87337a44a86e2e1 procps-3.2.5.tar.gz 277365
+SHA256 6d52c706401af197bd9d7e0187c35b4a3463ea720392ffa0c020d94899b361e5 procps-3.2.5.tar.gz 277365
diff --git a/sys-process/procps/files/digest-procps-3.2.6 b/sys-process/procps/files/digest-procps-3.2.6
index 02981df289b4..d1ceb677dde7 100644
--- a/sys-process/procps/files/digest-procps-3.2.6
+++ b/sys-process/procps/files/digest-procps-3.2.6
@@ -1 +1,3 @@
MD5 7ce39ea27d7b3da0e8ad74dd41d06783 procps-3.2.6.tar.gz 279084
+RMD160 f0b09701ce48d9f6db1cbb209b02ba026ee58d09 procps-3.2.6.tar.gz 279084
+SHA256 f98c7d065168a13f981e815f2472fe5eec7f4efdae6844b21a573ebada56727e procps-3.2.6.tar.gz 279084
diff --git a/sys-process/procps/files/procps-3.2.3-noproc.patch b/sys-process/procps/files/procps-3.2.3-noproc.patch
new file mode 100644
index 000000000000..f581cf459c82
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.3-noproc.patch
@@ -0,0 +1,22 @@
+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[])
+ {
++ struct stat isproc;
+ (void)dont_care_argc;
+ before(*argv);
+ // +-------------+
+ 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.6-links.patch b/sys-process/procps/files/procps-3.2.6-links.patch
new file mode 100644
index 000000000000..8f3f6b09800b
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.6-links.patch
@@ -0,0 +1,25 @@
+Generate soft links, not hard links
+
+--- procps-3.2.6/Makefile
++++ procps-3.2.6/Makefile
+@@ -227,8 +227,8 @@
+ $(install) --mode a=r $(notdir $@) $@
+
+ install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
+- cd $(usr/bin) && $(ln_f) skill snice
+- cd $(usr/proc/bin) && $(ln_f) pgrep pkill
++ cd $(usr/bin) && $(ln_sf) skill snice
++ cd $(usr/proc/bin) && $(ln_sf) pgrep pkill
+
+ ############ prog.c --> prog.o
+
+@@ -254,7 +254,7 @@
+ ############ progX --> progY
+
+ snice kill: skill
+- ln -f skill $@
++ $(ln_sf) skill $@
+
+ pkill: pgrep
+- ln -f pgrep pkill
++ $(ln_sf) pgrep pkill