[arch-commits] Commit in procps/trunk (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Mon Jul 25 18:18:23 UTC 2011
Date: Monday, July 25, 2011 @ 14:18:22
Author: foutrelis
Revision: 132740
upgpkg: procps 3.2.8-4
Fix warning on Linux 3.0.
Added:
procps/trunk/procps-3.2.8-gmake-3.82.patch
(from rev 132731, procps/trunk/procps-3.2.8+gmake-3.82.patch)
procps/trunk/procps-3.2.8-kernel3-uts.patch
Modified:
procps/trunk/PKGBUILD
Deleted:
procps/trunk/procps-3.2.8+gmake-3.82.patch
--------------------------------+
PKGBUILD | 76 ++++++++++++++++++++++-----------------
procps-3.2.8+gmake-3.82.patch | 14 -------
procps-3.2.8-gmake-3.82.patch | 14 +++++++
procps-3.2.8-kernel3-uts.patch | 20 ++++++++++
4 files changed, 78 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-07-25 17:59:25 UTC (rev 132739)
+++ PKGBUILD 2011-07-25 18:18:22 UTC (rev 132740)
@@ -3,7 +3,7 @@
pkgname=procps
pkgver=3.2.8
-pkgrel=3
+pkgrel=4
pkgdesc="Utilities for monitoring your system and processes on your system"
arch=('i686' 'x86_64')
url="http://procps.sourceforge.net/"
@@ -11,36 +11,47 @@
groups=('base')
depends=('ncurses')
backup=('etc/sysctl.conf')
-source=(http://procps.sourceforge.net/procps-${pkgver}.tar.gz sysctl.conf\
- groff-top-manpage.patch procps-3.2.7-free-hlmem.patch\
- procps-3.2.7-longcmd.patch procps-3.2.7-ps-man-fmt.patch\
- procps-3.2.7-psman.patch procps-3.2.7-slabtop-once.patch\
- procps-3.2.7-top-clrscr.patch procps-3.2.7-top-cpu0.patch\
- procps-3.2.7-top-env-cpuloop.patch procps-3.2.7-top-manpage.patch\
- 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-linux-ver-init.patch)
-md5sums=('9532714b6846013ca9898984ba4cd7e0' '9be3a131a7068aae11418e6dd99e2221'\
- '111f33c3fd8fab2fed36c279065fefff' '81ac7fb50fcdb03e57055c7b763bb275'\
- 'cb020bfd46689908b56bf3fc5a55828a' '8d74603be1e426037a1e2c2743ef7345'\
- 'bfb7530e248b86f1abf32bca09f28b68' '9a8c81aee89531b4a72f4e4e44fb055d'\
- '511023a3f39a90aa6efcf77120d32eb6' 'f29ef0b3a74767469651c9c335f09403'\
- 'd49673c19fa1a70f8e03fc1c24233458' '669955ca7fa7688e1c3ae7e723e0a567'\
- 'f77626450619b4bebbd67b9e164f1857' 'c71b853144b4d22b861e435362845091'\
- '105fbbf179e63b7ca960a2dd2e5fab5b' '7f2540d2d4a2a1a6af70e9a980835753'\
- '8d1025ae906bf0320ad9bb5095f1b970' '2e6cce598f11d75becebbe58dbe9cbd4'\
- 'e2e5393d49034435c68469d008d56489' '6f46c8ea37c447a2d478883e89bf4d25')
-sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829' '9b9a314010d042b5aa487893c06f361531525e6a'\
- 'bdd627f602ed2e38994d49309de0edbd90b41aff' 'da1b9e61f8df4a8e23a7032b245dd99e32e2c01c'\
- '1a656d8094be41e019b2a9598b07c8a3d47f9de3' 'ba9ad9f0bde3e84484b5a0238e53534438e924be'\
- '9944224ed2f5bd7d7fb505127bd71d6f01d88373' '954026785a9e6c90d796e93563fcea2a693691e8'\
- '8582cd15346fa939f3fd01081620de0ffc617335' '80e31310da53baf095e905d94485324932e433df'\
- '15fe886a2b4bed5885e6d457954e1145d1dcd2a2' '16737700b22eec8f4e8d16bce099f4b1662501e2'\
- 'bce21809ee0cb917ddf5b0c0bf2a91ea50feb0c6' '1be00d71e8e16ff2d656e5dd1f9988f2f3c0d5a0'\
- '52068a433535ec3d5d974141be3d6d3b6a41725a' '3a8f1ba912112d7520becb28746e97b11d9b0c86'\
- '3a4908ed8dbc936e39cb9094af8098ef9e656581' '09b1f6a3f9691b9f1432549a7a74a90ee5cfbdde'\
- '926b92913201f21c45d48436c0902cffc059ce27' '171d5352940200c209e0c2d43c17f01c02173a66')
+source=(http://procps.sourceforge.net/procps-${pkgver}.tar.gz sysctl.conf
+ groff-top-manpage.patch
+ procps-3.2.7-top-manpage.patch
+ procps-3.2.7-free-hlmem.patch
+ procps-3.2.7-ps-man-fmt.patch
+ procps-3.2.7-longcmd.patch
+ procps-3.2.7-psman.patch
+ procps-3.2.7-slabtop-once.patch
+ procps-3.2.7-top-clrscr.patch
+ procps-3.2.7-top-cpu0.patch
+ procps-3.2.7-top-env-cpuloop.patch
+ 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-linux-ver-init.patch
+ procps-3.2.8-kernel3-uts.patch)
+sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829'
+ '9b9a314010d042b5aa487893c06f361531525e6a'
+ 'bdd627f602ed2e38994d49309de0edbd90b41aff'
+ '16737700b22eec8f4e8d16bce099f4b1662501e2'
+ 'da1b9e61f8df4a8e23a7032b245dd99e32e2c01c'
+ 'ba9ad9f0bde3e84484b5a0238e53534438e924be'
+ '1a656d8094be41e019b2a9598b07c8a3d47f9de3'
+ '9944224ed2f5bd7d7fb505127bd71d6f01d88373'
+ '954026785a9e6c90d796e93563fcea2a693691e8'
+ '8582cd15346fa939f3fd01081620de0ffc617335'
+ '80e31310da53baf095e905d94485324932e433df'
+ '15fe886a2b4bed5885e6d457954e1145d1dcd2a2'
+ 'bce21809ee0cb917ddf5b0c0bf2a91ea50feb0c6'
+ '1be00d71e8e16ff2d656e5dd1f9988f2f3c0d5a0'
+ '52068a433535ec3d5d974141be3d6d3b6a41725a'
+ '3a8f1ba912112d7520becb28746e97b11d9b0c86'
+ '3a4908ed8dbc936e39cb9094af8098ef9e656581'
+ '09b1f6a3f9691b9f1432549a7a74a90ee5cfbdde'
+ '926b92913201f21c45d48436c0902cffc059ce27'
+ '171d5352940200c209e0c2d43c17f01c02173a66'
+ 'e2b2917e5462bd0aa3cb1b62942dbe8e8e81c16b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -58,10 +69,11 @@
patch -p1 < ../procps-3.2.7-top-sorthigh.patch
patch -p1 < ../procps-3.2.7-watch-unicode.patch
patch -p1 < ../procps-3.2.7-w-best.patch
- patch -p1 < ../procps-3.2.8+gmake-3.82.patch
+ 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
+ patch -p1 < ../procps-3.2.8-kernel3-uts.patch
sed -i "s:\$(lib64):lib:" Makefile
make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
}
Deleted: procps-3.2.8+gmake-3.82.patch
===================================================================
--- procps-3.2.8+gmake-3.82.patch 2011-07-25 17:59:25 UTC (rev 132739)
+++ procps-3.2.8+gmake-3.82.patch 2011-07-25 18:18:22 UTC (rev 132740)
@@ -1,14 +0,0 @@
-Index: procps-3.2.8/Makefile
-===================================================================
---- procps-3.2.8.orig/Makefile
-+++ procps-3.2.8/Makefile
-@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES)
- # 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)
-
Copied: procps/trunk/procps-3.2.8-gmake-3.82.patch (from rev 132731, procps/trunk/procps-3.2.8+gmake-3.82.patch)
===================================================================
--- procps-3.2.8-gmake-3.82.patch (rev 0)
+++ procps-3.2.8-gmake-3.82.patch 2011-07-25 18:18:22 UTC (rev 132740)
@@ -0,0 +1,14 @@
+Index: procps-3.2.8/Makefile
+===================================================================
+--- procps-3.2.8.orig/Makefile
++++ procps-3.2.8/Makefile
+@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES)
+ # 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)
+
Added: procps-3.2.8-kernel3-uts.patch
===================================================================
--- procps-3.2.8-kernel3-uts.patch (rev 0)
+++ procps-3.2.8-kernel3-uts.patch 2011-07-25 18:18:22 UTC (rev 132740)
@@ -0,0 +1,20 @@
+diff -Naur procps-3.2.8-20110302git.orig/proc/version.c procps-3.2.8-20110302git/proc/version.c
+--- procps-3.2.8-20110302git.orig/proc/version.c 2011-06-10 17:00:33.000000000 +0200
++++ procps-3.2.8-20110302git/proc/version.c 2011-06-10 17:20:17.000000000 +0200
+@@ -38,10 +38,15 @@
+ void init_Linux_version(void) {
+ static struct utsname uts;
+ int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */
++ int version_string_depth;
+
+ if (uname(&uts) == -1) /* failure implies impending death */
+ exit(1);
+- if (sscanf(uts.release, "%d.%d.%d", &x, &y, &z) < 3)
++
++ version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
++
++ if ((version_string_depth < 2) || /* Non-standard for all known kernels */
++ ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */
+ fprintf(stderr, /* *very* unlikely to happen by accident */
+ "Non-standard uts for running kernel:\n"
+ "release %s=%d.%d.%d gives version code %d\n",
More information about the arch-commits
mailing list