Changes 2.24.2:

* __uuid_generate_time()  report if clock_seq is safe
* do not use invalid file descriptor
* fix test in get_clock()
* get_clock()  report if the clock_seq is safe
* introduce uuid_generate_time_safe()
* manpage spelling fixes
* move __uuid function to UUIDD_PRIVATE in uuid.sym
* rename uuid__generate_* to __uuid_generate_*
* update manpage, mention uuid_generate_time_safe

6 files changed, 47 insertions, 48 deletions

diff --git a/devel/libuuid/Makefile b/devel/libuuid/Makefile
index 9d8e5e52b01..55d1e9368b3 100644
--- a/devel/libuuid/Makefile
+++ b/devel/libuuid/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/03/13 11:08:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2014/05/05 20:14:55 adam Exp $
 
-DISTNAME=	util-linux-2.19.1
+DISTNAME=	util-linux-2.24.2
 PKGNAME=	${DISTNAME:S/util-linux/libuuid/}
-PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux/v2.19/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux/v${PKGVERSION_NOREV:R}/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://kernel.org/~kzak/util-linux-ng/
@@ -15,30 +14,28 @@ LICENSE=	modified-bsd
 USE_GCC_RUNTIME=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-agetty
-CONFIGURE_ARGS+=	--disable-cramfs
-CONFIGURE_ARGS+=	--disable-fallocate
-CONFIGURE_ARGS+=	--disable-fsck
-CONFIGURE_ARGS+=	--disable-mount
-CONFIGURE_ARGS+=	--disable-libblkid
-CONFIGURE_ARGS+=	--disable-libmount
-CONFIGURE_ARGS+=	--disable-pivot_root
-CONFIGURE_ARGS+=	--disable-rename
-CONFIGURE_ARGS+=	--disable-schedutils
-CONFIGURE_ARGS+=	--disable-switch_root
-CONFIGURE_ARGS+=	--disable-unshare
-CONFIGURE_ARGS+=	--disable-uuidd
-CONFIGURE_ARGS+=	--disable-wall
 CONFIGURE_ARGS+=	--without-ncurses
 
-PKGCONFIG_OVERRIDE+=	shlibs/uuid/uuid.pc.in
+PKGCONFIG_OVERRIDE+=	libuuid/uuid.pc.in
 
-BUILD_DIRS=		include shlibs/uuid
+BUILD_TARGET=		libuuid.la libuuid/uuid.pc
+INSTALLATION_DIRS+=	include/uuid lib/pkgconfig ${PKGMANDIR}/man3
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-Wl,--version-script=../../../shlibs/uuid/src/uuid.sym
+BUILDLINK_TRANSFORM+=	rm:-Wl,--version-script=./libuuid/src/uuid.sym
 .endif
 
+do-install:
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libuuid.la \
+		${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libuuid/src/uuid.h \
+		${DESTDIR}${PREFIX}/include/uuid/uuid.h
+	${INSTALL_DATA} ${WRKSRC}/libuuid/uuid.pc \
+		${DESTDIR}${PREFIX}/lib/pkgconfig/uuid.pc
+	set -e; for f in ${WRKSRC}/libuuid/man/*.3; do \
+		${INSTALL_MAN} $${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/; \
+	done
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libuuid/PLIST b/devel/libuuid/PLIST
index 59fc304274a..e40985d0726 100644
--- a/devel/libuuid/PLIST
+++ b/devel/libuuid/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/08 20:40:33 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/05/05 20:14:55 adam Exp $
 include/uuid/uuid.h
 lib/libuuid.la
 lib/pkgconfig/uuid.pc
@@ -9,6 +9,7 @@ man/man3/uuid_copy.3
 man/man3/uuid_generate.3
 man/man3/uuid_generate_random.3
 man/man3/uuid_generate_time.3
+man/man3/uuid_generate_time_safe.3
 man/man3/uuid_is_null.3
 man/man3/uuid_parse.3
 man/man3/uuid_time.3
diff --git a/devel/libuuid/builtin.mk b/devel/libuuid/builtin.mk
index 27a85a1ab79..3ed9759505a 100644
--- a/devel/libuuid/builtin.mk
+++ b/devel/libuuid/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2013/11/23 11:29:35 obache Exp $
+# $NetBSD: builtin.mk,v 1.6 2014/05/05 20:14:55 adam Exp $
 
 BUILTIN_PKG:=	libuuid
 
@@ -43,12 +43,12 @@ BUILTIN_PKG.libuuid=	libuuid-2.18	# whatever, as long as it is big enough
 ###
 .if !defined(USE_BUILTIN.libuuid)
 .  if ${PREFER.libuuid} == "pkgsrc"
-USE_BUILTIN.libuuid=       no
+USE_BUILTIN.libuuid=	no
 .  else
-USE_BUILTIN.libuuid=       ${IS_BUILTIN.libuuid}
+USE_BUILTIN.libuuid=	${IS_BUILTIN.libuuid}
 .    if defined(BUILTIN_PKG.libuuid) && \
         !empty(IS_BUILTIN.libuuid:M[yY][eE][sS])
-USE_BUILTIN.libuuid=       yes
+USE_BUILTIN.libuuid=	yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.libuuid}
 .        if !empty(USE_BUILTIN.libuuid:M[yY][eE][sS])
 USE_BUILTIN.libuuid!=      \
diff --git a/devel/libuuid/distinfo b/devel/libuuid/distinfo
index d515546e21b..a929457fbe6 100644
--- a/devel/libuuid/distinfo
+++ b/devel/libuuid/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2012/09/05 13:03:04 jperkin Exp $
+$NetBSD: distinfo,v 1.5 2014/05/05 20:14:55 adam Exp $
 
-SHA1 (util-linux-2.19.1.tar.bz2) = 96af5d4a37c42296dae5365ba533316216a6b347
-RMD160 (util-linux-2.19.1.tar.bz2) = e4763d21a3a32029ccc525a0222e271f0946a4fd
-Size (util-linux-2.19.1.tar.bz2) = 4396543 bytes
-SHA1 (patch-aa) = 07d66ef414f5781d75159b446d6c822b1e543477
-SHA1 (patch-ab) = e0dee6d6de8460638ce3ca1ce2212bb3dfce5e9a
+SHA1 (util-linux-2.24.2.tar.xz) = 4d2159b2420b8090b31f7198ff9d392a5b3cf0ff
+RMD160 (util-linux-2.24.2.tar.xz) = 7db147ba5545aadef19920815b6461001afb1f4e
+Size (util-linux-2.24.2.tar.xz) = 3586580 bytes
+SHA1 (patch-aa) = 7e59f46e346e2b6e09dc4853215b95546f9c792c
+SHA1 (patch-ab) = 160c13ca5ff36c4ed78aaa9bd3b4d270a5a8b847
diff --git a/devel/libuuid/patches/patch-aa b/devel/libuuid/patches/patch-aa
index 66d42e56eed..28220bfb711 100644
--- a/devel/libuuid/patches/patch-aa
+++ b/devel/libuuid/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2011/05/12 12:26:15 adam Exp $
+$NetBSD: patch-aa,v 1.3 2014/05/05 20:14:55 adam Exp $
 
 sh doesn't like the empty case
 
---- configure.orig	2011-05-02 09:49:20.000000000 +0000
+--- configure.orig	2014-04-24 09:25:29.000000000 +0000
 +++ configure
-@@ -15993,11 +15993,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
+@@ -19345,11 +19345,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
  else
  
  	  syscall=no
@@ -16,7 +16,7 @@ sh doesn't like the empty case
  
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -16073,11 +16068,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
+@@ -19552,11 +19547,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
  else
  
  	  syscall=no
@@ -28,7 +28,7 @@ sh doesn't like the empty case
  
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -16330,11 +16320,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
+@@ -19718,11 +19708,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
  else
  
  	  syscall=no
@@ -40,7 +40,7 @@ sh doesn't like the empty case
  
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -16461,11 +16446,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
+@@ -20780,11 +20765,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
  else
  
  	  syscall=no
diff --git a/devel/libuuid/patches/patch-ab b/devel/libuuid/patches/patch-ab
index 421399ea0b6..f34b80f170f 100644
--- a/devel/libuuid/patches/patch-ab
+++ b/devel/libuuid/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2012/09/05 13:03:04 jperkin Exp $
+$NetBSD: patch-ab,v 1.5 2014/05/05 20:14:55 adam Exp $
 
 fcntl is portable, flock is not.
 
 Solaris does not have ifr.ifr_hwaddr.
 
---- shlibs/uuid/src/gen_uuid.c.orig	Mon May  2 09:10:08 2011
-+++ shlibs/uuid/src/gen_uuid.c	Wed Sep  5 12:23:54 2012
-@@ -265,7 +265,7 @@
+--- libuuid/src/gen_uuid.c.orig	2013-09-18 13:50:12.000000000 +0000
++++ libuuid/src/gen_uuid.c
+@@ -172,7 +172,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;
-@@ -314,11 +314,16 @@
+@@ -227,12 +227,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;
@@ -24,6 +24,7 @@ Solaris does not have ifr.ifr_hwaddr.
  	uint64_t			clock_reg;
  	mode_t				save_umask;
  	int				len;
+ 	int				ret = 0;
  
 +	lock.l_whence = SEEK_SET;
 +	lock.l_start = 0;
@@ -31,18 +32,18 @@ Solaris does not have ifr.ifr_hwaddr.
 +
  	if (state_fd == -2) {
  		save_umask = umask(0);
- 		state_fd = open("/var/lib/libuuid/clock.txt",
-@@ -334,7 +339,8 @@
+ 		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 >= 0) {
  		rewind(state_f);
 -		while (flock(state_fd, LOCK_EX) < 0) {
 +		lock.l_type = F_WRLCK;
 +		while (fcntl(state_fd, F_SETLKW, &lock) < 0) {
- 			if (errno == EINTR)
+ 			if ((errno == EAGAIN) || (errno == EINTR))
  				continue;
  			fclose(state_f);
-@@ -405,7 +411,8 @@
+@@ -322,7 +328,8 @@ try_again:
  			fflush(state_f);
  		}
  		rewind(state_f);