From 6d908a38e05b9d4135c65d23114a5874215b5bb8 Mon Sep 17 00:00:00 2001 From: Lukc Date: Sat, 11 Dec 2010 19:15:23 +0100 Subject: Engagement initial. --- procps/.footprint | 45 ++++++++++++++++ procps/.md5sum | 4 ++ procps/Pkgfile | 19 +++++++ procps/Pkgfile.old | 21 ++++++++ procps/procps-3.2.8-linux-ver-init.patch | 19 +++++++ procps/procps-3.2.8.patch | 91 ++++++++++++++++++++++++++++++++ procps/sysctl.conf | 5 ++ 7 files changed, 204 insertions(+) create mode 100644 procps/.footprint create mode 100644 procps/.md5sum create mode 100644 procps/Pkgfile create mode 100644 procps/Pkgfile.old create mode 100644 procps/procps-3.2.8-linux-ver-init.patch create mode 100644 procps/procps-3.2.8.patch create mode 100644 procps/sysctl.conf (limited to 'procps') diff --git a/procps/.footprint b/procps/.footprint new file mode 100644 index 0000000..8468836 --- /dev/null +++ b/procps/.footprint @@ -0,0 +1,45 @@ +drwxr-xr-x root/root bin/ +-rwxr-xr-x root/root bin/ps +drwxr-xr-x root/root etc/ +-rw-r--r-- root/root etc/sysctl.conf +drwxr-xr-x root/root lib/ +-rwxr-xr-x root/root lib/libproc-3.2.8.so +drwxr-xr-x root/root sbin/ +-rwxr-xr-x root/root sbin/sysctl +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/free +-rwxr-xr-x root/root usr/bin/pgrep +lrwxrwxrwx root/root usr/bin/pkill -> pgrep +-rwxr-xr-x root/root usr/bin/pmap +-rwxr-xr-x root/root usr/bin/pwdx +-rwxr-xr-x root/root usr/bin/skill +-rwxr-xr-x root/root usr/bin/slabtop +lrwxrwxrwx root/root usr/bin/snice -> skill +-rwxr-xr-x root/root usr/bin/tload +-rwxr-xr-x root/root usr/bin/top +-rwxr-xr-x root/root usr/bin/uptime +-rwxr-xr-x root/root usr/bin/vmstat +-rwxr-xr-x root/root usr/bin/w +-rwxr-xr-x root/root usr/bin/watch +drwxr-xr-x root/root usr/man/ +drwxr-xr-x root/root usr/man/man1/ +-rw-r--r-- root/root usr/man/man1/free.1.gz +-rw-r--r-- root/root usr/man/man1/pgrep.1.gz +-rw-r--r-- root/root usr/man/man1/pkill.1.gz +-rw-r--r-- root/root usr/man/man1/pmap.1.gz +-rw-r--r-- root/root usr/man/man1/ps.1.gz +-rw-r--r-- root/root usr/man/man1/pwdx.1.gz +-rw-r--r-- root/root usr/man/man1/skill.1.gz +-rw-r--r-- root/root usr/man/man1/slabtop.1.gz +-rw-r--r-- root/root usr/man/man1/snice.1.gz +-rw-r--r-- root/root usr/man/man1/tload.1.gz +-rw-r--r-- root/root usr/man/man1/top.1.gz +-rw-r--r-- root/root usr/man/man1/uptime.1.gz +-rw-r--r-- root/root usr/man/man1/w.1.gz +-rw-r--r-- root/root usr/man/man1/watch.1.gz +drwxr-xr-x root/root usr/man/man5/ +-rw-r--r-- root/root usr/man/man5/sysctl.conf.5.gz +drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/sysctl.8.gz +-rw-r--r-- root/root usr/man/man8/vmstat.8.gz diff --git a/procps/.md5sum b/procps/.md5sum new file mode 100644 index 0000000..a97fd77 --- /dev/null +++ b/procps/.md5sum @@ -0,0 +1,4 @@ +d47bdc30ef97d52659929acfed49c3cf procps-3.2.8-linux-ver-init.patch +46e344e5ebc243d185a6abd708430ac8 procps-3.2.8.patch +9532714b6846013ca9898984ba4cd7e0 procps-3.2.8.tar.gz +9875c218e1b14bee8f9f5800403a8a24 sysctl.conf diff --git a/procps/Pkgfile b/procps/Pkgfile new file mode 100644 index 0000000..a4e31db --- /dev/null +++ b/procps/Pkgfile @@ -0,0 +1,19 @@ +description="The /proc file system utilities" +packager="" +maintainer="CRUX System Team, core-ports at crux dot nu" +url="http://procps.sourceforge.net/" +depends=(ncurses) + +name=procps +version=3.2.8 +release=3 +source=(http://procps.sourceforge.net/procps-3.2.8.tar.gz procps-3.2.8.patch procps-3.2.8-linux-ver-init.patch sysctl.conf) +build () +{ + cd $name-$version; + patch -p1 -i $SRC/$name-$version.patch; + patch -p0 -i $SRC/$name-$version-linux-ver-init.patch; + make; + make DESTDIR=$PKG install; + install -D -m644 $SRC/sysctl.conf $PKG/etc/sysctl.conf +} diff --git a/procps/Pkgfile.old b/procps/Pkgfile.old new file mode 100644 index 0000000..6a70bda --- /dev/null +++ b/procps/Pkgfile.old @@ -0,0 +1,21 @@ +# Description: The /proc file system utilities +# URL: http://procps.sourceforge.net/ +# Maintainer: CRUX System Team, core-ports at crux dot nu +# Depends on: ncurses + +name=procps +version=3.2.8 +release=3 +source=(http://procps.sourceforge.net/$name-$version.tar.gz + $name-$version.patch + $name-$version-linux-ver-init.patch + sysctl.conf) + +build() { + cd $name-$version + patch -p1 -i $SRC/$name-$version.patch + patch -p0 -i $SRC/$name-$version-linux-ver-init.patch + make + make DESTDIR=$PKG install + install -D -m644 $SRC/sysctl.conf $PKG/etc/sysctl.conf +} diff --git a/procps/procps-3.2.8-linux-ver-init.patch b/procps/procps-3.2.8-linux-ver-init.patch new file mode 100644 index 0000000..3355554 --- /dev/null +++ b/procps/procps-3.2.8-linux-ver-init.patch @@ -0,0 +1,19 @@ +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=603759 +# https://bugs.gentoo.org/show_bug.cgi?id=303120 + +Index: proc/version.c +=================================================================== +RCS file: /cvsroot/procps/procps/proc/version.c,v +retrieving revision 1.7 +diff -u -p -r1.7 version.c +--- proc/version.c 9 Feb 2003 07:27:16 -0000 1.7 ++++ proc/version.c 14 Nov 2010 00:22:44 -0000 +@@ -33,7 +33,7 @@ void display_version(void) { + + int linux_version_code; + +-static void init_Linux_version(void) __attribute__((constructor)); ++static void init_Linux_version(void) __attribute__((constructor(100))); + static void init_Linux_version(void) { + static struct utsname uts; + int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ diff --git a/procps/procps-3.2.8.patch b/procps/procps-3.2.8.patch new file mode 100644 index 0000000..2a0614f --- /dev/null +++ b/procps/procps-3.2.8.patch @@ -0,0 +1,91 @@ +diff -Nru procps-3.2.8.orig/Makefile procps-3.2.8/Makefile +--- procps-3.2.8.orig/Makefile 2010-11-07 11:59:17.736493931 +0100 ++++ procps-3.2.8/Makefile 2010-11-07 12:24:02.973714246 +0100 +@@ -24,26 +24,26 @@ + ############ vars + + # so you can disable them or choose alternates +-ldconfig := ldconfig ++ldconfig := true + ln_f := ln -f + ln_sf := ln -sf + install := install -D --owner 0 --group 0 + + # Lame x86-64 /lib64 and /usr/lib64 abomination: +-lib64 := lib$(shell [ -d /lib64 ] && echo 64) ++lib64 := lib + + usr/bin := $(DESTDIR)/usr/bin/ + bin := $(DESTDIR)/bin/ + sbin := $(DESTDIR)/sbin/ + usr/proc/bin := $(DESTDIR)/usr/bin/ +-man1 := $(DESTDIR)/usr/share/man/man1/ +-man5 := $(DESTDIR)/usr/share/man/man5/ +-man8 := $(DESTDIR)/usr/share/man/man8/ ++man1 := $(DESTDIR)/usr/man/man1/ ++man5 := $(DESTDIR)/usr/man/man5/ ++man8 := $(DESTDIR)/usr/man/man8/ + lib := $(DESTDIR)/$(lib64)/ + usr/lib := $(DESTDIR)/usr/$(lib64)/ + usr/include := $(DESTDIR)/usr/include/ + +-#SKIP := $(bin)kill $(man1)kill.1 ++SKIP := $(bin)kill $(man1)kill.1 + + BINFILES := $(usr/bin)uptime $(usr/bin)tload $(usr/bin)free $(usr/bin)w \ + $(usr/bin)top $(usr/bin)vmstat $(usr/bin)watch $(usr/bin)skill \ +@@ -174,7 +174,8 @@ + # want this rule first, use := on ALL, and ALL not filled in yet + all: do_all + +--include */module.mk ++-include proc/module.mk ++-include ps/module.mk + + do_all: $(ALL) + +@@ -222,14 +223,14 @@ + ###### install + + $(BINFILES) : all +- $(install) --mode a=rx $(notdir $@) $@ ++ $(install) --mode=0755 $(notdir $@) $@ + + $(MANFILES) : all +- $(install) --mode a=r $(notdir $@) $@ ++ $(install) --mode=0644 $(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 + +diff -Nru procps-3.2.8.orig/proc/module.mk procps-3.2.8/proc/module.mk +--- procps-3.2.8.orig/proc/module.mk 2010-11-07 11:59:17.746493508 +0100 ++++ procps-3.2.8/proc/module.mk 2010-11-07 12:29:58.358664876 +0100 +@@ -96,7 +96,7 @@ + #################### install rules ########################### + + $(lib)$(SOFILE) : proc/$(SONAME) +- $(install) --mode a=rx $< $@ ++ $(install) --mode=0755 $< $@ + + ifneq ($(SOLINK),$(SOFILE)) + .PHONY: $(lib)$(SOLINK) +diff -Nru procps-3.2.8.orig/ps/module.mk procps-3.2.8/ps/module.mk +--- procps-3.2.8.orig/ps/module.mk 2010-11-07 11:59:17.746493508 +0100 ++++ procps-3.2.8/ps/module.mk 2010-11-07 12:26:19.287944149 +0100 +@@ -33,8 +33,8 @@ + + + $(bin)ps: ps/ps +- $(install) --mode a=rx $< $@ ++ $(install) --mode=0755 $< $@ + + $(man1)ps.1 : ps/ps.1 +- $(install) --mode a=r $< $@ ++ $(install) --mode=0644 $< $@ + -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz diff --git a/procps/sysctl.conf b/procps/sysctl.conf new file mode 100644 index 0000000..48c0484 --- /dev/null +++ b/procps/sysctl.conf @@ -0,0 +1,5 @@ +# +# /etc/sysctl.conf: configuration for system variables, see sysctl.conf(5) +# + +# End of file -- cgit v1.2.3-70-g09d2