Update to 2.27:

libuuid:
   - return correct value for uuid_generate_time_safe  [Romain Bouvier]

5 files changed, 35 insertions, 26 deletions

diff --git a/devel/libuuid/Makefile b/devel/libuuid/Makefile
index cc254d8e91a..129d6ba2018 100644
--- a/devel/libuuid/Makefile
+++ b/devel/libuuid/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2015/06/17 11:48:15 fhajny Exp $
+# $NetBSD: Makefile,v 1.15 2015/09/30 20:38:16 wiz Exp $
 
-DISTNAME=	util-linux-2.26.2
+DISTNAME=	util-linux-2.27
 PKGNAME=	${DISTNAME:S/util-linux/libuuid/}
 CATEGORIES=	devel
-MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux/v${PKGVERSION_NOREV:R}/
+MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux/v${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 EXTRACT_USING=	gtar
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://kernel.org/~kzak/util-linux-ng/
+HOMEPAGE=	https://github.com/karelzak/util-linux
 COMMENT=	Generate unique identifiers for objects
 LICENSE=	modified-bsd
 
diff --git a/devel/libuuid/distinfo b/devel/libuuid/distinfo
index a07495ce584..957c18f55ce 100644
--- a/devel/libuuid/distinfo
+++ b/devel/libuuid/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2015/06/14 16:23:03 wiz Exp $
+$NetBSD: distinfo,v 1.9 2015/09/30 20:38:16 wiz Exp $
 
-SHA1 (util-linux-2.26.2.tar.xz) = ac0b880a12392b2cbbe12239ab7613c25349093d
-RMD160 (util-linux-2.26.2.tar.xz) = 2bdbd937843dbf6bc5a5a997f1dc3253d2166a25
-Size (util-linux-2.26.2.tar.xz) = 3863868 bytes
-SHA1 (patch-ab) = 160c13ca5ff36c4ed78aaa9bd3b4d270a5a8b847
-SHA1 (patch-configure) = e025f3ebe8ccf5bdc0fa46746f038ab2bbb4b481
-SHA1 (patch-lib_randutils.c) = 5cab5d27a4936478c55c8d11dc002df9a0a41962
+SHA1 (util-linux-2.27.tar.xz) = 0549760ba1d2eb0e48b41b926d54ac55533369af
+RMD160 (util-linux-2.27.tar.xz) = fa0ff85e9701461e8f259bd72d3715c2d14c4ff1
+Size (util-linux-2.27.tar.xz) = 3968872 bytes
+SHA1 (patch-ab) = 14203e9a470f620c442ddacf14dba219027aef84
+SHA1 (patch-configure) = 000f32a8ac3418e60a28a0e324307b1f7604b192
+SHA1 (patch-lib_randutils.c) = d1f57352c5c19bfe20ee79ebc93fb2949db2ea47
diff --git a/devel/libuuid/patches/patch-ab b/devel/libuuid/patches/patch-ab
index f34b80f170f..9a41293792f 100644
--- a/devel/libuuid/patches/patch-ab
+++ b/devel/libuuid/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.5 2014/05/05 20:14:55 adam Exp $
+$NetBSD: patch-ab,v 1.6 2015/09/30 20:38:16 wiz Exp $
 
 fcntl is portable, flock is not.
 
 Solaris does not have ifr.ifr_hwaddr.
 
---- libuuid/src/gen_uuid.c.orig	2013-09-18 13:50:12.000000000 +0000
+--- libuuid/src/gen_uuid.c.orig	2015-06-29 11:39:37.000000000 +0000
 +++ libuuid/src/gen_uuid.c
-@@ -172,7 +172,7 @@ static int get_node_id(unsigned char *no
+@@ -166,7 +166,7 @@ static int get_node_id(unsigned char *no
  	for (i = 0; i < n; i+= ifreq_size(*ifrp) ) {
  		ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
  		strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
@@ -15,7 +15,7 @@ Solaris does not have ifr.ifr_hwaddr.
  		if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
  			continue;
  		a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
-@@ -227,12 +227,17 @@ static int get_clock(uint32_t *clock_hig
+@@ -221,12 +221,17 @@ static int get_clock(uint32_t *clock_hig
  	THREAD_LOCAL int		state_fd = -2;
  	THREAD_LOCAL FILE		*state_f;
  	THREAD_LOCAL uint16_t		clock_seq;
@@ -30,10 +30,10 @@ Solaris does not have ifr.ifr_hwaddr.
 +	lock.l_start = 0;
 +	lock.l_len = 0;
 +
- 	if (state_fd == -2) {
- 		save_umask = umask(0);
- 		state_fd = open(LIBUUID_CLOCK_FILE, O_RDWR|O_CREAT|O_CLOEXEC, 0660);
-@@ -250,7 +255,8 @@ static int get_clock(uint32_t *clock_hig
+ 	if (state_fd == -1)
+ 		ret = -1;
+ 
+@@ -247,7 +252,8 @@ static int get_clock(uint32_t *clock_hig
  	}
  	if (state_fd >= 0) {
  		rewind(state_f);
@@ -43,7 +43,7 @@ Solaris does not have ifr.ifr_hwaddr.
  			if ((errno == EAGAIN) || (errno == EINTR))
  				continue;
  			fclose(state_f);
-@@ -322,7 +328,8 @@ try_again:
+@@ -319,7 +325,8 @@ try_again:
  			fflush(state_f);
  		}
  		rewind(state_f);
diff --git a/devel/libuuid/patches/patch-configure b/devel/libuuid/patches/patch-configure
index f9db1163c41..8addaa58c42 100644
--- a/devel/libuuid/patches/patch-configure
+++ b/devel/libuuid/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2015/06/14 16:23:03 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2015/09/30 20:38:16 wiz Exp $
 
---- configure.orig	2015-04-30 10:13:13.000000000 +0000
+--- configure.orig	2015-09-07 07:59:52.000000000 +0000
 +++ configure
-@@ -20035,7 +20035,7 @@ else
+@@ -20352,7 +20352,7 @@ else
  fi
  
  
@@ -11,3 +11,12 @@ $NetBSD: patch-configure,v 1.1 2015/06/14 16:23:03 wiz Exp $
  
  
  $as_echo "#define USE_LIBMOUNT_FORCE_MOUNTINFO 1" >>confdefs.h
+@@ -27616,7 +27616,7 @@ else
+ fi
+ 
+ 
+-if test "x$enable_usrdir_path" == xyes; then :
++if test "x$enable_usrdir_path" = xyes; then :
+ 
+ 
+ $as_echo "#define USE_USRDIR_PATHS_ONLY 1" >>confdefs.h
diff --git a/devel/libuuid/patches/patch-lib_randutils.c b/devel/libuuid/patches/patch-lib_randutils.c
index dce45a7403e..8bc3122a69c 100644
--- a/devel/libuuid/patches/patch-lib_randutils.c
+++ b/devel/libuuid/patches/patch-lib_randutils.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_randutils.c,v 1.1 2014/05/11 04:59:07 pho Exp $
+$NetBSD: patch-lib_randutils.c,v 1.2 2015/09/30 20:38:16 wiz Exp $
 
 O_CLOEXEC is not available on every platform (e.g. MacOS X < 10.7). It
 was introduced in POSIX 2008.
 
---- lib/randutils.c.orig	2014-04-23 13:28:29.000000000 +0000
+--- lib/randutils.c.orig	2015-04-29 07:52:21.000000000 +0000
 +++ lib/randutils.c
-@@ -28,6 +28,10 @@
+@@ -30,6 +30,10 @@
  THREAD_LOCAL unsigned short ul_jrand_seed[3];
  #endif