From 995a0fc29734e06ddf63b76c327629199fa4919c Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Mar 2011 08:10:31 +0000 Subject: [PATCH] procps: update to 3.2.8 --- procps/.md5sum | 3 +- procps/Pkgfile | 13 ++-- procps/procps-3.2.8-linux-ver-init.patch | 19 +++++ procps/procps-3.2.8-priorities.patch | 36 ---------- procps/procps-3.2.8.patch | 91 ++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 44 deletions(-) create mode 100644 procps/procps-3.2.8-linux-ver-init.patch delete mode 100644 procps/procps-3.2.8-priorities.patch create mode 100644 procps/procps-3.2.8.patch diff --git a/procps/.md5sum b/procps/.md5sum index a1ebaf6..a97fd77 100644 --- a/procps/.md5sum +++ b/procps/.md5sum @@ -1,3 +1,4 @@ -710451091fad30aa12d0d6fe40b327ae procps-3.2.8-priorities.patch +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 index 05d5ec5..a1216e2 100644 --- a/procps/Pkgfile +++ b/procps/Pkgfile @@ -9,11 +9,14 @@ version=3.2.8 release=2 source=(http://procps.sourceforge.net/$name-$version.tar.gz \ sysctl.conf \ - procps-3.2.8-priorities.patch) + $name-$version.patch \ + $name-$version-linux-ver-init.patch) build() { cd $name-$version - patch -p1 -i $SRC/procps-3.2.8-priorities.patch + patch -p1 -i $SRC/$name-$version.patch + patch -p0 -i $SRC/$name-$version-linux-ver-init.patch + make make DESTDIR=$PKG \ ldconfig=true \ @@ -21,10 +24,6 @@ build() { man5=$PKG/usr/man/man5/ \ man8=$PKG/usr/man/man8/ \ install - install -D -m644 ../sysctl.conf $PKG/etc/sysctl.conf - rm -f $PKG/bin/kill $PKG/usr/man/man1/kill.1 - ln -sf pgrep $PKG/usr/bin/pkill - ln -sf skill $PKG/usr/bin/snice - chmod +w -R $PKG + install -D -m644 ../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-priorities.patch b/procps/procps-3.2.8-priorities.patch deleted file mode 100644 index 07d27ef..0000000 --- a/procps/procps-3.2.8-priorities.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -aur procps-3.2.8.orig/proc/sig.c procps-3.2.8/proc/sig.c ---- procps-3.2.8.orig/proc/sig.c 2003-03-19 01:52:39.000000000 +0100 -+++ procps-3.2.8/proc/sig.c 2010-06-25 20:39:06.081194787 +0200 -@@ -231,7 +231,7 @@ - } - - /* sanity check */ --static int init_signal_list(void) __attribute__((constructor)); -+static int init_signal_list(void) __attribute__((constructor(0))); - static int init_signal_list(void){ - if(number_of_signals != 31){ - fprintf(stderr, "WARNING: %d signals -- adjust and recompile.\n", number_of_signals); -diff -aur procps-3.2.8.orig/proc/sysinfo.c procps-3.2.8/proc/sysinfo.c ---- procps-3.2.8.orig/proc/sysinfo.c 2008-03-24 05:33:43.000000000 +0100 -+++ procps-3.2.8/proc/sysinfo.c 2010-06-25 20:41:33.254192147 +0200 -@@ -209,7 +209,7 @@ - return !!rc; - } - --static void init_libproc(void) __attribute__((constructor)); -+static void init_libproc(void) __attribute__((constructor(2))); - static void init_libproc(void){ - have_privs = check_for_privs(); - // ought to count CPUs in /proc/stat instead of relying -diff -aur procps-3.2.8.orig/proc/version.c procps-3.2.8/proc/version.c ---- procps-3.2.8.orig/proc/version.c 2003-01-29 02:11:43.000000000 +0100 -+++ procps-3.2.8/proc/version.c 2010-06-25 20:39:12.126192267 +0200 -@@ -33,7 +33,7 @@ - - int linux_version_code; - --static void init_Linux_version(void) __attribute__((constructor)); -+static void init_Linux_version(void) __attribute__((constructor(1))); - 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 -- 2.26.2