util-linux: update to 2.25.2

3 files changed, 36 insertions, 120 deletions

diff --git a/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch b/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch
deleted file mode 100644
index 8e4d7c6..0000000
--- a/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 71d842c01992b3678de4da4773ed54f08c0ab4f6 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 18 Nov 2013 11:27:35 +0100
-Subject: [PATCH] lsblk: fix -D segfault
-
-References: https://bugzilla.redhat.com/show_bug.cgi?id=1031262
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- misc-utils/lsblk.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
-index 9f7f1b6..9b53be3 100644
---- a/misc-utils/lsblk.c
-+++ b/misc-utils/lsblk.c
-@@ -903,7 +903,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
- 		if (cxt->discard && p)
- 			tt_line_set_data(ln, col, p);
- 		else
--			tt_line_set_data(ln, col, "0");
-+			tt_line_set_data(ln, col, xstrdup("0"));
- 		break;
- 	case COL_DGRAN:
- 		if (lsblk->bytes)
-@@ -936,7 +936,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
- 		if (cxt->discard && p)
- 			tt_line_set_data(ln, col, p);
- 		else
--			tt_line_set_data(ln, col, "0");
-+			tt_line_set_data(ln, col, xstrdup("0"));
- 		break;
- 	case COL_WSAME:
- 		if (lsblk->bytes)
-@@ -948,7 +948,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
- 					   "queue/write_same_max_bytes", &x) == 0)
- 				p = size_to_human_string(SIZE_SUFFIX_1LETTER, x);
- 		}
--		tt_line_set_data(ln, col, p ? p : "0");
-+		tt_line_set_data(ln, col, p ? p : xstrdup("0"));
- 		break;
- 	};
- }
--- 
-1.8.4.2
-
diff --git a/abs/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch b/abs/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch
deleted file mode 100644
index 34040b9..0000000
--- a/abs/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c8e5e6e7323642f7e6f12ee5f5231b0ec44c40ab Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Thu, 21 Nov 2013 12:25:27 -0500
-Subject: [PATCH] pylibmount: correctly import from pylibmount.so
-
-Without this, python is unable to find the module:
-
-$ python -c 'import libmount'
-Traceback (most recent call last):
-  File "<string>", line 1, in <module>
-  File "/usr/lib/python3.3/site-packages/libmount/__init__.py", line 1, in <module>
-    from pylibmount import *
-ImportError: No module named 'pylibmount'
-
-Signed-off-by: Dave Reisner <dreisner@archlinux.org>
----
- libmount/python/libmount/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmount/python/libmount/__init__.py b/libmount/python/libmount/__init__.py
-index 243c639..09104e2 100644
---- a/libmount/python/libmount/__init__.py
-+++ b/libmount/python/libmount/__init__.py
-@@ -1,2 +1,2 @@
--from pylibmount import *
-+from .pylibmount import *
- 
--- 
-1.8.4.2
-
diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD
index 53aa53e..0f8936d 100755
--- a/abs/core/util-linux/PKGBUILD
+++ b/abs/core/util-linux/PKGBUILD
@@ -1,43 +1,26 @@
-# $Id: PKGBUILD 201467 2013-12-12 15:33:24Z dreisner $
+# $Id$
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
-pkgname=util-linux
-pkgver=2.24
-pkgrel=2
+pkgbase=util-linux
+pkgname=(util-linux libutil-linux)
+pkgver=2.25.2
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
-groups=('base' 'base-devel')
-depends=('pam' 'shadow' 'coreutils' 'glibc')
-optdepends=('python: python bindings to libmount')
 makedepends=('systemd' 'python2')
-# checkdepends=('bc')
-conflicts=('util-linux-ng' 'eject')
-provides=("util-linux-ng=$pkgver" 'eject')
 license=('GPL2')
 options=('strip' 'debug')
-source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz"
-        0001-lsblk-fix-D-segfault.patch
-        0001-pylibmount-correctly-import-from-pylibmount.so.patch
+source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz"
         uuidd.tmpfiles
-        pam-login
-        pam-common
-        pam-su)
-backup=(etc/pam.d/chfn
-        etc/pam.d/chsh
-        etc/pam.d/login
-        etc/pam.d/su
-        etc/pam.d/su-l)
-install=util-linux.install
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir"/0001-lsblk-fix-D-segfault.patch
-  patch -Np1 <"$srcdir"/0001-pylibmount-correctly-import-from-pylibmount.so.patch
-}
+        pam-{login,common,su})
+md5sums=('cab3d7be354000f629bc601238b629b3'
+         'a39554bfd65cccfd8254bb46922f4a67'
+         '4368b3f98abd8a32662e094c54e7f9b1'
+         'a31374fef2cba0ca34dfc7078e2969e4'
+         'fa85e5cce5d723275b14365ba71a8aad')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -56,18 +39,22 @@ build() {
               --enable-socket-activation \
               --with-python=2
 
-#              --enable-reset \ # part of ncurses
-#              --enable-last \ # not compat
-
   make
 }
 
-#check() {
-# fails for some reason in chroot, works outside
-#  make -C "$pkgname-$pkgver" check
-#}
+package_util-linux() {
+  conflicts=('util-linux-ng' 'eject')
+  provides=("util-linux-ng=$pkgver" 'eject')
+  depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux')
+  optdepends=('python: python bindings to libmount')
+  install=util-linux.install
+  groups=('base' 'base-devel')
+  backup=(etc/pam.d/chfn
+          etc/pam.d/chsh
+          etc/pam.d/login
+          etc/pam.d/su
+          etc/pam.d/su-l)
 
-package() {
   cd "$pkgname-$pkgver"
 
   make DESTDIR="${pkgdir}" install
@@ -91,12 +78,16 @@ package() {
   mv {,usr/}sbin/* usr/bin
   rmdir sbin usr/sbin
 
-  
+  ### create libutil-linux split
+  rm -rf "$srcdir/_libutil-linux"
+  install -dm755 "$srcdir"/_libutil-linux/usr/lib
+  cd "$srcdir"/_libutil-linux
+  mv "$pkgdir"/usr/lib/lib*.{a,so}* usr/lib
+}
+
+package_libutil-linux() {
+  pkgdesc="util-linux runtime libraries"
+  provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+
+  mv "$srcdir/_libutil-linux"/* "$pkgdir"
 }
-md5sums=('4fac6443427f575fc5f3531a4ad2ca01'
-         '1899fe3b853a5835c76cca0501b6b518'
-         'a18a1e89ffdfa3bc96ae976646a723ec'
-         'a39554bfd65cccfd8254bb46922f4a67'
-         '4368b3f98abd8a32662e094c54e7f9b1'
-         'a31374fef2cba0ca34dfc7078e2969e4'
-         'fa85e5cce5d723275b14365ba71a8aad')