Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3cfecec1ce125d80546282a8e93d416e2aafb924
commit 3cfecec1ce125d80546282a8e93d416e2aafb924 Author: Miklos Vajna <[email protected]> Date: Sat Aug 27 08:04:14 2011 +0200 procps-3.2.8-5-i686 - add procps-3.2.8-kernel3-uts.patch - closes #4557 diff --git a/source/base/procps/FrugalBuild b/source/base/procps/FrugalBuild index ec8ea75..7e7d9ec 100644 --- a/source/base/procps/FrugalBuild +++ b/source/base/procps/FrugalBuild @@ -3,7 +3,7 @@ pkgname=procps pkgver=3.2.8 -pkgrel=4 +pkgrel=5 pkgdesc="utilities for displaying process information" url="http://procps.sf.net"; depends=('ncurses>=5.6-4') @@ -13,7 +13,15 @@ backup=('etc/sysctl.conf') up2date="lynx -dump http://procps.sourceforge.net/ |grep 'latest release'|cut -d - -f 2|sed 's/.tar.gz.//'|cut -d ' ' -f 1" source=(http://procps.sourceforge.net/procps-$pkgver.tar.gz \ procps-3.2.5-top-sort.patch procps-3.2.8-make.patch procps-3.2.8-constructor-order.patch \ - procps-3.2.7-ps-cgroup.patch procps-3.2.8-ps-cgroup-suppress-root-group.patch) + procps-3.2.7-ps-cgroup.patch procps-3.2.8-ps-cgroup-suppress-root-group.patch \ + procps-3.2.8-kernel3-uts.patch) +sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829' \ + 'ad7782f3f4d118fa67c667d611a1eb2f4c736808' \ + '4a67774ef9b37a8d2e2571ac4fc90aa3aa212852' \ + '39b2fdc7cfe60f35f8c9570413e5e955318de5cd' \ + 'f4321158ff2e7c0c3ab99d71bc54e148c6b85afb' \ + 'e9970d940f99b10a721422d5f166a0afe8ff797f' \ + 'e2b2917e5462bd0aa3cb1b62942dbe8e8e81c16b') build() { @@ -29,10 +37,3 @@ build() } # optimization ok - -sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829' \ - 'ad7782f3f4d118fa67c667d611a1eb2f4c736808' \ - '4a67774ef9b37a8d2e2571ac4fc90aa3aa212852' \ - '39b2fdc7cfe60f35f8c9570413e5e955318de5cd' \ - 'f4321158ff2e7c0c3ab99d71bc54e148c6b85afb' \ - 'e9970d940f99b10a721422d5f166a0afe8ff797f') diff --git a/source/base/procps/procps-3.2.8-kernel3-uts.patch b/source/base/procps/procps-3.2.8-kernel3-uts.patch new file mode 100644 index 0000000..a72ae59 --- /dev/null +++ b/source/base/procps/procps-3.2.8-kernel3-uts.patch @@ -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", _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
