[globus-gsi-sysconfig] Allow zero-size dirs

[Mattias Ellert]

commit 8a691883ee83d593a67f58cd73335da17ff507d5
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Mar 29 14:43:20 2011 +0200

    Allow zero-size dirs

 globus-gsi-sysconfig-zero-size-dir.patch |   21 +++++++++++++++++++++
 globus-gsi-sysconfig.spec                |    9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/globus-gsi-sysconfig-zero-size-dir.patch b/globus-gsi-sysconfig-zero-size-dir.patch
new file mode 100644
index 0000000..23a932f
--- /dev/null
+++ b/globus-gsi-sysconfig-zero-size-dir.patch
@@ -0,0 +1,21 @@
+diff -ur globus_gsi_sysconfig-3.1.orig/library/globus_gsi_system_config.c globus_gsi_sysconfig-3.1/library/globus_gsi_system_config.c
+--- globus_gsi_sysconfig-3.1.orig/library/globus_gsi_system_config.c	2010-02-15 02:21:00.000000000 +0100
++++ globus_gsi_sysconfig-3.1/library/globus_gsi_system_config.c	2011-03-29 12:46:04.252615646 +0200
+@@ -4724,17 +4724,6 @@
+      */
+     RAND_add((void*)&stx,sizeof(stx),2);
+ 
+-#ifndef TARGET_ARCH_CYGWIN
+-    if (stx.st_size == 0)
+-    {
+-        GLOBUS_GSI_SYSCONFIG_ERROR_RESULT(
+-            result,
+-            GLOBUS_GSI_SYSCONFIG_ERROR_FILE_ZERO_LENGTH,
+-            (_GSSL("File: %s"), filename));            
+-        goto exit;
+-    }
+-#endif
+-
+     if(!(stx.st_mode & S_IFDIR))
+     { 
+         GLOBUS_GSI_SYSCONFIG_ERROR_RESULT(
diff --git a/globus-gsi-sysconfig.spec b/globus-gsi-sysconfig.spec
index a86ea2f..9944c82 100644
--- a/globus-gsi-sysconfig.spec
+++ b/globus-gsi-sysconfig.spec
@@ -7,7 +7,7 @@
 Name:		globus-gsi-sysconfig
 %global _name %(tr - _ <<< %{name})
 Version:	3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus GSI System Config Library
 
 Group:		System Environment/Libraries
@@ -26,6 +26,9 @@ Source9:	epstopdf-2.9.5gw
 #		Fixes for mingw compilation:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
 Patch0:		%{name}-mingw.patch
+#		Allow zero-size dirs:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7157
+Patch1:		%{name}-zero-size-dir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl%{?_isa} >= 1
@@ -95,6 +98,7 @@ Globus GSI System Config Library Documentation Files
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -196,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Tue Mar 29 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.1-3
+- Allow zero-size dirs
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild