main/util-linux: upgrade to 2.23.1

and normalize ./configure call

2 files changed, 14 insertions, 58 deletions

diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD
index c6cc23317..6b7b69f74 100644
--- a/main/util-linux/APKBUILD
+++ b/main/util-linux/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=util-linux
-pkgver=2.22.2
+pkgver=2.23.1
 
 case $pkgver in
 	*.*.*) _v=${pkgver%.*};;
@@ -20,7 +20,6 @@ install=
 source="http://www.kernel.org/pub/linux/utils/util-linux/v${_v}/util-linux-$pkgver.tar.xz
 	program-invocation.patch
 	gentoo-no-scanf.patch
-	rpmatch.patch
 	"
 subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk mcookie blkid"
 replaces="e2fsprogs util-linux-ng"
@@ -40,12 +39,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-#	sed -e 's/versionsort/alphasort/g'\
+#	sed -e 's/versionsort/alphasort/g' \
 #		-e 's/strverscmp.h/dirent.h/g' \
 #		-i mount/lomount.c
 
 	# login utils are provided by shadow (with PAM) or busybox (no PAM) --nenolod
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-raw \
 		--disable-uuidd \
 		--disable-nls \
@@ -116,7 +118,12 @@ mcookie() {
 	mv "$pkgdir"/usr/bin/mcookie "$subpkgdir"/usr/bin/
 }
 
-md5sums="eeacbfdd2556acd899a2d0ffdb446185  util-linux-2.22.2.tar.xz
+md5sums="33ba55ce82f8e3b8d7a38fac0f62779a  util-linux-2.23.1.tar.xz
 9682a6ddd5abe65434a145ebe512c123  program-invocation.patch
-85125e2cc7d54dc2733bedc603886f81  gentoo-no-scanf.patch
-2e6d6835adc6e962249d1c11792649fa  rpmatch.patch"
+85125e2cc7d54dc2733bedc603886f81  gentoo-no-scanf.patch"
+sha256sums="76fe4c11cf69f4293a676a61eb92710771f7514fd603d7192411b89bbf50d4e6  util-linux-2.23.1.tar.xz
+2bfa27969effc77631e981bbbcd1bf261e61f3e51875db950883ddb2a90ea4fd  program-invocation.patch
+2a2429b59151a63a75d2ff46f60732c6a3fbe9b52e472802edcf4eedbe3e22f2  gentoo-no-scanf.patch"
+sha512sums="bbe3cb82c35a78331067ce098396acabf83599d7061e3b8ddc063411327dca8ba0ba4e1b258a25d6a37a124342f381dd77c7e70c04adb508f6ddc18e437cd73f  util-linux-2.23.1.tar.xz
+5a07e86fa84961f73e53677d202e7a2101704eacb698426e62da897af07c7f1227e841f79ff59deed50cfb0e9ef1816f7c3fd03382ae4aa46909b6cd41a95d4e  program-invocation.patch
+5f199511d3c6919c1a23248f2fd1d15343ee330e169b8440ca48bbbbc1aae243d8bd652ab504520c5d12dd0875e5e94a704d727d4b71bcd940d4ff51115b3981  gentoo-no-scanf.patch"
diff --git a/main/util-linux/rpmatch.patch b/main/util-linux/rpmatch.patch
deleted file mode 100644
index 27dea20e5..000000000
--- a/main/util-linux/rpmatch.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d338f1a3125d1c069713a53967b65a9f18ad0bf7 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Thu, 25 Oct 2012 04:06:49 +0000
-Subject: [PATCH] Add missing rpmatch.h everywhere it needs to be.
-
-Signed-off-by: William Pitcock <nenolod@dereferenced.org>
----
- disk-utils/fsck.minix.c | 1 +
- login-utils/vipw.c      | 1 +
- term-utils/mesg.c       | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
-index f24a9f2..6b7a0b2 100644
---- a/disk-utils/fsck.minix.c
-+++ b/disk-utils/fsck.minix.c
-@@ -111,6 +111,7 @@
- #include "ismounted.h"
- #include "all-io.h"
- #include "closestream.h"
-+#include "rpmatch.h"
- 
- #define ROOT_INO 1
- #define YESNO_LENGTH 64
-diff --git a/login-utils/vipw.c b/login-utils/vipw.c
-index 1eeeb0d..4a1cf02 100644
---- a/login-utils/vipw.c
-+++ b/login-utils/vipw.c
-@@ -78,6 +78,7 @@
- #include "setpwnam.h"
- #include "strutils.h"
- #include "xalloc.h"
-+#include "rpmatch.h"
- 
- #ifdef HAVE_LIBSELINUX
- # include <selinux/selinux.h>
-diff --git a/term-utils/mesg.c b/term-utils/mesg.c
-index b24e783..78a4118 100644
---- a/term-utils/mesg.c
-+++ b/term-utils/mesg.c
-@@ -58,6 +58,7 @@
- #include "closestream.h"
- #include "nls.h"
- #include "c.h"
-+#include "rpmatch.h"
- 
- /* exit codes */
- 
--- 
-1.7.12.3
-