[csw-devel] SF.net SVN: gar:[20910] csw/mgar/pkg/libuuid/trunk

[dmichelsen at users.sourceforge.net]

Revision: 20910
          http://gar.svn.sourceforge.net/gar/?rev=20910&view=rev
Author:   dmichelsen
Date:     2013-04-30 12:01:37 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
libuuid/trunk: Add patch

Modified Paths:
--------------
    csw/mgar/pkg/libuuid/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libuuid/trunk/files/0001-Do-not-use-O_CLOEXEC-which-does-not-exist-on-Solaris.patch

Modified: csw/mgar/pkg/libuuid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libuuid/trunk/Makefile	2013-04-30 11:20:01 UTC (rev 20909)
+++ csw/mgar/pkg/libuuid/trunk/Makefile	2013-04-30 12:01:37 UTC (rev 20910)
@@ -6,17 +6,23 @@
 GARTYPE = v2
 
 DESCRIPTION = Portable uuid C library
-define BLURB
-  Portable uuid C library
-endef
 
-MASTER_SITES = $(SF_MIRROR)
-DISTFILES  = $(DISTNAME).tar.gz
+MASTER_SITES += $(SF_MIRROR)
+DISTFILES += $(DISTNAME).tar.gz
 
-GARCOMPILER = GNU
+# This is done via fcntl later on anyway
+PATCHFILES += 0001-Do-not-use-O_CLOEXEC-which-does-not-exist-on-Solaris.patch
 
+PACKAGES += CSWlibuuid1
+SPKG_DESC_CSWlibuuid1 = Portable uuid C library, libuuid.so.1
+PKGFILES_CSWlibuuid1 += $(call pkgfiles_lib,libuuid.so.1)
+
+PACKAGES += CSWlibuuid-dev
+SPKG_DESC_CSWlibuuid-dev = Development files for libuuid.so.1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibuuid-dev += CSWlibuuid1
+
 BUILD64 = 1
-CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk
 

Added: csw/mgar/pkg/libuuid/trunk/files/0001-Do-not-use-O_CLOEXEC-which-does-not-exist-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/libuuid/trunk/files/0001-Do-not-use-O_CLOEXEC-which-does-not-exist-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/libuuid/trunk/files/0001-Do-not-use-O_CLOEXEC-which-does-not-exist-on-Solaris.patch	2013-04-30 12:01:37 UTC (rev 20910)
@@ -0,0 +1,29 @@
+From 5efc02030b22bf11a087ee89fb64451becb1c9bd Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 30 Apr 2013 13:28:21 +0200
+Subject: [PATCH] Do not use O_CLOEXEC which does not exist on Solaris and
+ which is set later on anyway
+
+---
+ randutils.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/randutils.c b/randutils.c
+index ed79aad..80893d3 100644
+--- a/randutils.c
++++ b/randutils.c
+@@ -34,9 +34,9 @@ int random_get_fd(void)
+ 	struct timeval	tv;
+ 
+ 	gettimeofday(&tv, 0);
+-	fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC);
++	fd = open("/dev/urandom", O_RDONLY);
+ 	if (fd == -1)
+-		fd = open("/dev/random", O_RDONLY | O_NONBLOCK | O_CLOEXEC);
++		fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
+ 	if (fd >= 0) {
+ 		i = fcntl(fd, F_GETFD);
+ 		if (i >= 0)
+-- 
+1.8.1.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.