summaryrefslogtreecommitdiff
path: root/core/util-linux
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-08-17 23:14:29 +0000
committerroot <root@rshg054.dnsready.net>2011-08-17 23:14:29 +0000
commit3413e75c9cdb6c0daf6ddf92f469a2221c94a55b (patch)
treeebc8d673526a7bcca4a4fcd6ed7872baec735f90 /core/util-linux
parent68b7938bb87c6e91d54e4f35f0223c7237fa53e1 (diff)
Wed Aug 17 23:14:29 UTC 2011
Diffstat (limited to 'core/util-linux')
-rw-r--r--core/util-linux/PKGBUILD16
-rw-r--r--core/util-linux/two-component-linux.patch32
2 files changed, 42 insertions, 6 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 877e0135a..487b8eb6d 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123897 2011-05-14 09:14:06Z tpowa $
-# Maintainer:
+# $Id: PKGBUILD 135595 2011-08-16 14:10:53Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
pkgver=2.19.1
-pkgrel=2
+pkgrel=3
pkgdesc="Miscellaneous system utilities for Linux"
url="http://userweb.kernel.org/~kzak/util-linux-ng/"
arch=('i686' 'x86_64')
@@ -16,13 +16,14 @@ provides=('linux32' "util-linux-ng=${pkgver}")
license=('GPL2')
options=('!libtool')
source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2
- mount-segfault-2.19.1.patch)
+ mount-segfault-2.19.1.patch
+ two-component-linux.patch)
optdepends=('perl: for chkdupexe support')
-md5sums=('3eab06f05163dfa65479c44e5231932c'
- '3247b52f0e4b8044f23f2f7218e2fdea')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ # add support for linux 3.0, which is needed mkswap
+ patch -Np1 -i ../two-component-linux.patch
# fix https://bugs.archlinux.org/task/24261
patch -Np1 -i ../mount-segfault-2.19.1.patch
# hardware clock
@@ -36,3 +37,6 @@ package() {
install -dm755 "${pkgdir}/var/lib/hwclock"
make DESTDIR="${pkgdir}" install
}
+md5sums=('3eab06f05163dfa65479c44e5231932c'
+ '3247b52f0e4b8044f23f2f7218e2fdea'
+ '6eb23edb484adf7192e107d1c6d94bd3')
diff --git a/core/util-linux/two-component-linux.patch b/core/util-linux/two-component-linux.patch
new file mode 100644
index 000000000..1b65ca295
--- /dev/null
+++ b/core/util-linux/two-component-linux.patch
@@ -0,0 +1,32 @@
+From fa7e0d6d442de9f5940f99fd93f4522602439131 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 6 Jun 2011 12:35:26 +0200
+Subject: [PATCH] lib: [linux_version.c] accommodate two-component linux
+ version (e.g. 3.0)
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ lib/linux_version.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/linux_version.c b/lib/linux_version.c
+index f9fbd8d..ada566a 100644
+--- a/lib/linux_version.c
++++ b/lib/linux_version.c
+@@ -16,10 +16,10 @@ get_linux_version (void)
+ return kver;
+ if (uname (&uts))
+ kver = 0;
+- else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) != 3)
+- kver = 0;
+- else
++ else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) == 3)
+ kver = KERNEL_VERSION (major, minor, teeny);
++ else if (sscanf (uts.release, "%d.%d", &major, &minor) == 2)
++ kver = KERNEL_VERSION (major, minor, 0);
+
+ return kver;
+ }
+--
+1.7.6
+