[arch-commits] Commit in procps/trunk (PKGBUILD procps-3.2.8-linux-ver-init.patch)

[Eric Bélanger]

    Date: Sunday, December 12, 2010 @ 18:53:18
  Author: eric
Revision: 102904

upgpkg: procps 3.2.8-3
Added patch to fix "Unknown HZ value!" on some machines

Added:
  procps/trunk/procps-3.2.8-linux-ver-init.patch
Modified:
  procps/trunk/PKGBUILD

-----------------------------------+
 PKGBUILD                          |    9 +++++----
 procps-3.2.8-linux-ver-init.patch |   23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-12 22:41:16 UTC (rev 102903)
+++ PKGBUILD	2010-12-12 23:53:18 UTC (rev 102904)
@@ -3,7 +3,7 @@
 
 pkgname=procps
 pkgver=3.2.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Utilities for monitoring your system and processes on your system"
 arch=('i686' 'x86_64')
 url="http://procps.sourceforge.net/"
@@ -20,7 +20,7 @@
         procps-3.2.7-top-remcpu.patch      procps-3.2.7-top-sorthigh.patch\
         procps-3.2.7-watch-unicode.patch   procps-3.2.7-w-best.patch\
         procps-3.2.8+gmake-3.82.patch      procps-3.2.8-setlocale.patch\
-        procps-3.2.8-threads.patch)
+        procps-3.2.8-threads.patch         procps-3.2.8-linux-ver-init.patch)
 md5sums=('9532714b6846013ca9898984ba4cd7e0' '9be3a131a7068aae11418e6dd99e2221'\
          '111f33c3fd8fab2fed36c279065fefff' '81ac7fb50fcdb03e57055c7b763bb275'\
          'cb020bfd46689908b56bf3fc5a55828a' '8d74603be1e426037a1e2c2743ef7345'\
@@ -30,7 +30,7 @@
          'f77626450619b4bebbd67b9e164f1857' 'c71b853144b4d22b861e435362845091'\
          '105fbbf179e63b7ca960a2dd2e5fab5b' '7f2540d2d4a2a1a6af70e9a980835753'\
          '8d1025ae906bf0320ad9bb5095f1b970' '2e6cce598f11d75becebbe58dbe9cbd4'\
-         'e2e5393d49034435c68469d008d56489')
+         'e2e5393d49034435c68469d008d56489' '6f46c8ea37c447a2d478883e89bf4d25')
 sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829' '9b9a314010d042b5aa487893c06f361531525e6a'\
          'bdd627f602ed2e38994d49309de0edbd90b41aff' 'da1b9e61f8df4a8e23a7032b245dd99e32e2c01c'\
          '1a656d8094be41e019b2a9598b07c8a3d47f9de3' 'ba9ad9f0bde3e84484b5a0238e53534438e924be'\
@@ -40,7 +40,7 @@
          'bce21809ee0cb917ddf5b0c0bf2a91ea50feb0c6' '1be00d71e8e16ff2d656e5dd1f9988f2f3c0d5a0'\
          '52068a433535ec3d5d974141be3d6d3b6a41725a' '3a8f1ba912112d7520becb28746e97b11d9b0c86'\
          '3a4908ed8dbc936e39cb9094af8098ef9e656581' '09b1f6a3f9691b9f1432549a7a74a90ee5cfbdde'\
-         '926b92913201f21c45d48436c0902cffc059ce27')
+         '926b92913201f21c45d48436c0902cffc059ce27' '171d5352940200c209e0c2d43c17f01c02173a66')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -61,6 +61,7 @@
   patch -p1 < ../procps-3.2.8+gmake-3.82.patch
   patch -p1 < ../procps-3.2.8-setlocale.patch
   patch -p1 < ../procps-3.2.8-threads.patch
+  patch -p0 < ../procps-3.2.8-linux-ver-init.patch
   sed -i "s:\$(lib64):lib:" Makefile
   make
 }

Added: procps-3.2.8-linux-ver-init.patch
===================================================================
--- procps-3.2.8-linux-ver-init.patch	                        (rev 0)
+++ procps-3.2.8-linux-ver-init.patch	2010-12-12 23:53:18 UTC (rev 102904)
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/303120
+
+make sure the linux version constructor runs before the libproc constructor
+since the latter uses variables setup by the former
+
+fix by Chris Coleman
+
+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 */