procps: fix for another bug uncovered by make 3.82

See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=603759
and https://bugs.gentoo.org/show_bug.cgi?id=303120
This commit is contained in:
Juergen Daubert 2010-11-22 17:56:59 +01:00
parent e2054ab27f
commit 612505d9e9
3 changed files with 27 additions and 4 deletions

View File

@ -1,3 +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

View File

@ -5,14 +5,17 @@
name=procps
version=3.2.8
release=2
source=(http://procps.sourceforge.net/$name-$version.tar.gz \
$name-$version.patch sysctl.conf)
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
}
}

View File

@ -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 */