Wed Aug 17 23:14:29 UTC 2011

4 files changed, 58 insertions, 18 deletions

diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD
index e58f87add..1722fe189 100644
--- a/core/mkinitcpio-busybox/PKGBUILD
+++ b/core/mkinitcpio-busybox/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 123921 2011-05-14 11:29:02Z thomas $
+# $Id: PKGBUILD 135588 2011-08-16 07:52:57Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=mkinitcpio-busybox
-pkgver=1.18.4
+pkgver=1.18.5
 pkgrel=1
 pkgdesc="base initramfs tools"
 arch=('i686' 'x86_64')
@@ -10,8 +10,8 @@ license=('GPL')
 depends=('glibc')
 source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2
         config)
-sha256sums=('4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa'
-            'dd6dca08fbc335f1394e0f1b619df6895349c759d0c6e43456aed411e16d4194')
+sha256sums=('10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0'
+            '0961b4db5eb5eaa1b8d353a3fc792884f4f2733ec0f5715ba88a0e667f0f48ec')
 
 build() {
   cd "${srcdir}/busybox-${pkgver}"
diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config
index 1aa333faf..31a9d4330 100644
--- a/core/mkinitcpio-busybox/config
+++ b/core/mkinitcpio-busybox/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.18.2
-# Wed Jan 26 23:08:18 2011
+# Busybox version: 1.18.5
+# Sun Aug 14 01:22:25 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -90,7 +90,7 @@ CONFIG_PREFIX="./_install"
 # Busybox Library Tuning
 #
 CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=3
+CONFIG_MD5_SIZE_VS_SPEED=0
 CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 # CONFIG_FEATURE_USE_TERMIOS is not set
@@ -227,7 +227,7 @@ CONFIG_FEATURE_LS_TIMESTAMPS=y
 CONFIG_FEATURE_LS_USERNAME=y
 # CONFIG_FEATURE_LS_COLOR is not set
 # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-# CONFIG_MD5SUM is not set
+CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
 CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
 CONFIG_MKFIFO=y
@@ -247,9 +247,9 @@ CONFIG_RM=y
 CONFIG_RMDIR=y
 CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
 CONFIG_SEQ=y
-# CONFIG_SHA1SUM is not set
-# CONFIG_SHA256SUM is not set
-# CONFIG_SHA512SUM is not set
+CONFIG_SHA1SUM=y
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
 CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
 CONFIG_FEATURE_FLOAT_SLEEP=y
@@ -297,7 +297,11 @@ CONFIG_FEATURE_AUTOWIDTH=y
 # Common options for df, du, ls
 #
 CONFIG_FEATURE_HUMAN_READABLE=y
-# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 
 #
 # Console Utilities
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
+