main/util-linux: renamed from util-linux-ng and upgrade to 2.20

3 files changed, 48 insertions, 13 deletions

diff --git a/main/util-linux/0001-script-fix-building-with-disable-nls.patch b/main/util-linux/0001-script-fix-building-with-disable-nls.patch
new file mode 100644
index 0000000000..d81efd3308
--- /dev/null
+++ b/main/util-linux/0001-script-fix-building-with-disable-nls.patch
@@ -0,0 +1,31 @@
+From c22a5aaf45d21487641080d185e175d7d78d65d1 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 30 Aug 2011 07:55:17 +0000
+Subject: [PATCH] script: fix building with --disable-nls
+
+We should only include the libintl.h when NLS is requested.
+
+This fixes issue when building util-linux with uClibc.
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ term-utils/script.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/term-utils/script.c b/term-utils/script.c
+index d96ca2f..99748a1 100644
+--- a/term-utils/script.c
++++ b/term-utils/script.c
+@@ -55,7 +55,9 @@
+ #include <getopt.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#ifdef ENABLE_NLS
+ #include <libintl.h>
++#endif
+ #include <limits.h>
+ #include <locale.h>
+ #include <stddef.h>
+-- 
+1.7.6.1
+
diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux/APKBUILD
index 7dcbc606c4..d4e0a8bde4 100644
--- a/main/util-linux-ng/APKBUILD
+++ b/main/util-linux/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=util-linux-ng
-pkgver=2.19.1
-pkgrel=2
+pkgname=util-linux
+pkgver=2.20
+pkgrel=0
 pkgdesc="Random collection of Linux utilities"
 url="http://kernel.org/~kzak/util-linux/"
 arch="all"
@@ -11,10 +11,13 @@ depends=
 # use GNU sed til bb sed is fixed
 makedepends="zlib-dev sed ncurses-dev"
 install=
-source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${pkgver%.*}/util-linux-$pkgver.tar.gz
-	program-invocation.patch"
+source="http://www.kernel.org/pub/linux/utils/util-linux/v${pkgver}/util-linux-$pkgver.tar.gz
+	program-invocation.patch
+	0001-script-fix-building-with-disable-nls.patch
+	"
+
 subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk mcookie blkid"
-replaces="e2fsprogs"
+replaces="e2fsprogs util-linux-ng"
 
 _builddir="$srcdir/util-linux-$pkgver"
 prepare() {
@@ -54,7 +57,7 @@ package() {
 
 dev() {
 	default_dev
-	replaces="e2fsprogs-dev"
+	replaces="e2fsprogs-dev util-linux-ng-dev"
 }
 
 blkid() {
@@ -73,14 +76,14 @@ libuuid() {
 }
 
 libblkid() {
-	pkgdesc="Block device identification library from util-linux-ng"
+	pkgdesc="Block device identification library from util-linux"
 	depends=
 	mkdir -p "$subpkgdir"/lib 
 	mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/
 }
 
 sfdisk() {
-	pkgdesc="Partition table manipulator from util-linux-ng"
+	pkgdesc="Partition table manipulator from util-linux"
 	depends=
 	mkdir -p "$subpkgdir"/sbin
 	mv "$pkgdir"/sbin/sfdisk "$subpkgdir"/sbin/
@@ -88,18 +91,19 @@ sfdisk() {
 
 
 cfdisk() {
-	pkgdesc="Curses based partition table manipulator from util-linux-ng"
+	pkgdesc="Curses based partition table manipulator from util-linux"
 	depends=
 	mkdir -p "$subpkgdir"/sbin
 	mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/
 }
 
 mcookie() {
-	pkgdesc="mcookie from util-linux-ng"
+	pkgdesc="mcookie from util-linux"
 	replaces="util-linux-ng"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/mcookie "$subpkgdir"/usr/bin/
 }
 
-md5sums="dd242eeb2ba76e4e55bf2237a50dd2b7  util-linux-2.19.1.tar.gz
-079dc713684e01ad48c7e0bb877dc51a  program-invocation.patch"
+md5sums="fbcd168147c87550804744b70c2feac5  util-linux-2.20.tar.gz
+079dc713684e01ad48c7e0bb877dc51a  program-invocation.patch
+b0b5ef3a9f785a5431675da696b60262  0001-script-fix-building-with-disable-nls.patch"
diff --git a/main/util-linux-ng/program-invocation.patch b/main/util-linux/program-invocation.patch
index c81f97e36a..c81f97e36a 100644
--- a/main/util-linux-ng/program-invocation.patch
+++ b/main/util-linux/program-invocation.patch