From 15ecf56e65efff56056787880a3dea72fbde40d1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 11 Feb 2014 03:33:43 +0100
Subject: [PATCH] util-linux: disable vipw (it's obsolete) and add compat
 patches for musl.

---
 .../libfdisk-sun.c-qsort-portability.patch    | 43 +++++++++++++++++++
 .../patches/sys-utils-dmesg-musl.patch        | 17 ++++++++
 srcpkgs/util-linux/template                   |  4 +-
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/util-linux/patches/libfdisk-sun.c-qsort-portability.patch
 create mode 100644 srcpkgs/util-linux/patches/sys-utils-dmesg-musl.patch

diff --git a/srcpkgs/util-linux/patches/libfdisk-sun.c-qsort-portability.patch b/srcpkgs/util-linux/patches/libfdisk-sun.c-qsort-portability.patch
new file mode 100644
index 00000000000..86eeff3606d
--- /dev/null
+++ b/srcpkgs/util-linux/patches/libfdisk-sun.c-qsort-portability.patch
@@ -0,0 +1,43 @@
+--- libfdisk/src/sun.c.orig	2014-01-20 13:25:31.183846196 +0100
++++ libfdisk/src/sun.c	2014-02-11 03:26:16.153979437 +0100
+@@ -48,6 +48,8 @@ static struct fdisk_parttype sun_parttyp
+ 	{ 0, NULL }
+ };
+ 
++static unsigned int *verify_sun_starts;
++
+ /* return poiter buffer with on-disk data */
+ static inline struct sun_disklabel *self_disklabel(struct fdisk_context *cxt)
+ {
+@@ -361,10 +363,8 @@ static void fetch_sun(struct fdisk_conte
+ 	}
+ }
+ 
+-static int verify_sun_cmp(int *a, int *b, void *data)
++static int verify_sun_cmp(int *a, int *b)
+ {
+-    unsigned int *verify_sun_starts = (unsigned int *) data;
+-
+     if (*a == -1)
+ 	    return 1;
+     if (*b == -1)
+@@ -379,7 +379,6 @@ static int sun_verify_disklabel(struct f
+     uint32_t starts[SUN_MAXPARTITIONS], lens[SUN_MAXPARTITIONS], start, stop;
+     uint32_t i,j,k,starto,endo;
+     int array[SUN_MAXPARTITIONS];
+-    unsigned int *verify_sun_starts;
+ 
+     assert(cxt);
+     assert(cxt->label);
+@@ -427,9 +426,8 @@ static int sun_verify_disklabel(struct f
+         else
+             array[i] = -1;
+     }
+-    qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
+-	  (int (*)(const void *,const void *,void *)) verify_sun_cmp,
+-	  verify_sun_starts);
++    qsort(array,ARRAY_SIZE(array),sizeof(array[0]),
++	  (int (*)(const void *,const void *)) verify_sun_cmp);
+ 
+     if (array[0] == -1) {
+ 	fdisk_info(cxt, _("No partitions defined."));
diff --git a/srcpkgs/util-linux/patches/sys-utils-dmesg-musl.patch b/srcpkgs/util-linux/patches/sys-utils-dmesg-musl.patch
new file mode 100644
index 00000000000..13c0330793a
--- /dev/null
+++ b/srcpkgs/util-linux/patches/sys-utils-dmesg-musl.patch
@@ -0,0 +1,17 @@
+TIMESPEC_TO_TIMEVAL is a macro defined by glibc... remove this for musl-0.9.16.
+
+--- sys-utils/dmesg.c.orig     2014-01-07 21:40:23.490421172 +0100
++++ sys-utils/dmesg.c  2014-01-07 21:41:22.419080539 +0100
+@@ -35,6 +35,12 @@
+ #include "mangle.h"
+ #include "pager.h"
+
++#ifndef TIMESPEC_TO_TIMEVAL
++#define TIMESPEC_TO_TIMEVAL(tv, ts) {         \
++      (tv)->tv_sec = (ts)->tv_sec;            \
++      (tv)->tv_usec = (ts)->tv_nsec / 1000;   \
++}
++#endif
+ /* Close the log.  Currently a NOP. */
+ #define SYSLOG_ACTION_CLOSE          0
+ /* Open the log. Currently a NOP. */
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 82be8299ebd..109b50f24da 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux'
 pkgname=util-linux
 version=2.24.1
-revision=1
+revision=2
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
@@ -40,7 +40,7 @@ do_configure() {
 		--enable-libuuid --disable-makeinstall-chown \
 		--enable-libblkid --enable-fsck --disable-rpath \
 		--enable-fs-paths-extra=/usr/sbin:/usr/bin \
-		--enable-vipw --enable-newgrp --enable-chfn-chsh \
+		--disable-vipw --enable-newgrp --enable-chfn-chsh \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system \
 		--without-udev --enable-write \
 		--enable-socket-activation \