[nordugrid-arc/el5] Missing include unistd.h for gcc 4.7
Mattias Ellert
ellert at fedoraproject.org
Tue Mar 6 20:37:42 UTC 2012
commit f2cf4c20bca38221295a05685079b0af0623a044
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Tue Mar 6 21:37:09 2012 +0100
Missing include unistd.h for gcc 4.7
nordugrid-arc-missing-header.patch | 170 ++++++++++++++++++++++++++++++++++++
nordugrid-arc-threads.patch | 21 +++++
nordugrid-arc.spec | 4 +
3 files changed, 195 insertions(+), 0 deletions(-)
---
diff --git a/nordugrid-arc-missing-header.patch b/nordugrid-arc-missing-header.patch
new file mode 100644
index 0000000..c6c0336
--- /dev/null
+++ b/nordugrid-arc-missing-header.patch
@@ -0,0 +1,170 @@
+diff -ur nordugrid-arc-1.1.1.orig/src/hed/dmc/srm/srmclient/SRM1Client.cpp nordugrid-arc-1.1.1/src/hed/dmc/srm/srmclient/SRM1Client.cpp
+--- nordugrid-arc-1.1.1.orig/src/hed/dmc/srm/srmclient/SRM1Client.cpp 2012-03-01 19:44:36.707113071 +0100
++++ nordugrid-arc-1.1.1/src/hed/dmc/srm/srmclient/SRM1Client.cpp 2012-03-06 15:32:12.776926501 +0100
+@@ -8,6 +8,8 @@
+
+ #include <arc/StringConv.h>
+
++#include <unistd.h>
++
+ namespace Arc {
+
+ SRM1Client::SRM1Client(const UserConfig& usercfg, const SRMURL& url)
+diff -ur nordugrid-arc-1.1.1.orig/src/hed/dmc/srm/srmclient/SRM22Client.cpp nordugrid-arc-1.1.1/src/hed/dmc/srm/srmclient/SRM22Client.cpp
+--- nordugrid-arc-1.1.1.orig/src/hed/dmc/srm/srmclient/SRM22Client.cpp 2012-03-01 19:44:36.707113071 +0100
++++ nordugrid-arc-1.1.1/src/hed/dmc/srm/srmclient/SRM22Client.cpp 2012-03-06 15:20:57.945704679 +0100
+@@ -9,6 +9,8 @@
+ #include <arc/StringConv.h>
+ #include <arc/User.h>
+
++#include <unistd.h>
++
+ namespace Arc {
+
+ /**
+diff -ur nordugrid-arc-1.1.1.orig/src/hed/libs/common/test/FileLockTest.cpp nordugrid-arc-1.1.1/src/hed/libs/common/test/FileLockTest.cpp
+--- nordugrid-arc-1.1.1.orig/src/hed/libs/common/test/FileLockTest.cpp 2012-03-01 19:44:37.102107954 +0100
++++ nordugrid-arc-1.1.1/src/hed/libs/common/test/FileLockTest.cpp 2012-03-06 18:54:05.594560128 +0100
+@@ -3,6 +3,7 @@
+ #include <utime.h>
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
++#include <unistd.h>
+ #ifdef WIN32
+ #include <Winsock2.h> // for gethostname()
+ #endif
+diff -ur nordugrid-arc-1.1.1.orig/src/hed/libs/common/test/FileUtilsTest.cpp nordugrid-arc-1.1.1/src/hed/libs/common/test/FileUtilsTest.cpp
+--- nordugrid-arc-1.1.1.orig/src/hed/libs/common/test/FileUtilsTest.cpp 2012-03-01 19:44:37.099107993 +0100
++++ nordugrid-arc-1.1.1/src/hed/libs/common/test/FileUtilsTest.cpp 2012-03-06 17:36:20.994626829 +0100
+@@ -6,6 +6,7 @@
+
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include <cppunit/extensions/HelperMacros.h>
+
+ #include <arc/FileUtils.h>
+diff -ur nordugrid-arc-1.1.1.orig/src/hed/libs/common/test/ThreadTest.cpp nordugrid-arc-1.1.1/src/hed/libs/common/test/ThreadTest.cpp
+--- nordugrid-arc-1.1.1.orig/src/hed/libs/common/test/ThreadTest.cpp 2012-03-01 19:44:37.101107967 +0100
++++ nordugrid-arc-1.1.1/src/hed/libs/common/test/ThreadTest.cpp 2012-03-06 18:01:54.870636789 +0100
+@@ -1,6 +1,7 @@
+ // -*- indent-tabs-mode: nil -*-
+
+ #include <string>
++#include <unistd.h>
+
+ #include <cppunit/extensions/HelperMacros.h>
+
+diff -ur nordugrid-arc-1.1.1.orig/src/hed/libs/crypto/OpenSSL.cpp nordugrid-arc-1.1.1/src/hed/libs/crypto/OpenSSL.cpp
+--- nordugrid-arc-1.1.1.orig/src/hed/libs/crypto/OpenSSL.cpp 2012-03-01 19:44:36.891110689 +0100
++++ nordugrid-arc-1.1.1/src/hed/libs/crypto/OpenSSL.cpp 2012-03-06 15:22:03.944842990 +0100
+@@ -13,6 +13,8 @@
+
+ #include "OpenSSL.h"
+
++#include <unistd.h>
++
+ namespace Arc {
+
+ static Glib::Mutex lock;
+diff -ur nordugrid-arc-1.1.1.orig/src/services/a-rex/grid-manager/conf/conf_pre.cpp nordugrid-arc-1.1.1/src/services/a-rex/grid-manager/conf/conf_pre.cpp
+--- nordugrid-arc-1.1.1.orig/src/services/a-rex/grid-manager/conf/conf_pre.cpp 2012-03-01 19:44:38.554089148 +0100
++++ nordugrid-arc-1.1.1/src/services/a-rex/grid-manager/conf/conf_pre.cpp 2012-03-06 16:14:19.160085898 +0100
+@@ -6,6 +6,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <pwd.h>
++#include <unistd.h>
+
+ #include <arc/StringConv.h>
+ #include <arc/Logger.h>
+diff -ur nordugrid-arc-1.1.1.orig/src/services/a-rex/grid-manager/files/info_types.cpp nordugrid-arc-1.1.1/src/services/a-rex/grid-manager/files/info_types.cpp
+--- nordugrid-arc-1.1.1.orig/src/services/a-rex/grid-manager/files/info_types.cpp 2012-03-01 19:44:38.619088308 +0100
++++ nordugrid-arc-1.1.1/src/services/a-rex/grid-manager/files/info_types.cpp 2012-03-06 16:28:17.896184485 +0100
+@@ -5,6 +5,7 @@
+ #include <iostream>
+ #include <limits.h>
+ #include <errno.h>
++#include <unistd.h>
+
+ #include <arc/StringConv.h>
+ #include "../misc/canonical_dir.h"
+diff -ur nordugrid-arc-1.1.1.orig/src/services/a-rex/grid-manager/gm_jobs.cpp nordugrid-arc-1.1.1/src/services/a-rex/grid-manager/gm_jobs.cpp
+--- nordugrid-arc-1.1.1.orig/src/services/a-rex/grid-manager/gm_jobs.cpp 2012-03-01 19:44:38.637088074 +0100
++++ nordugrid-arc-1.1.1/src/services/a-rex/grid-manager/gm_jobs.cpp 2012-03-06 16:43:34.567268673 +0100
+@@ -5,6 +5,7 @@
+ #include <cstdio>
+ #include <fstream>
+ #include <pwd.h>
++#include <unistd.h>
+
+ #include <arc/XMLNode.h>
+ #include <arc/ArcConfig.h>
+diff -ur nordugrid-arc-1.1.1.orig/src/services/a-rex/grid-manager/inputcheck.cpp nordugrid-arc-1.1.1/src/services/a-rex/grid-manager/inputcheck.cpp
+--- nordugrid-arc-1.1.1.orig/src/services/a-rex/grid-manager/inputcheck.cpp 2012-03-01 19:44:38.637088074 +0100
++++ nordugrid-arc-1.1.1/src/services/a-rex/grid-manager/inputcheck.cpp 2012-03-06 16:44:07.958834659 +0100
+@@ -4,6 +4,7 @@
+
+ #include <string>
+ #include <list>
++#include <unistd.h>
+
+ #include <arc/Thread.h>
+ #include <arc/Logger.h>
+diff -ur nordugrid-arc-1.1.1.orig/src/services/a-rex/grid-manager/run/run_plugin.h nordugrid-arc-1.1.1/src/services/a-rex/grid-manager/run/run_plugin.h
+--- nordugrid-arc-1.1.1.orig/src/services/a-rex/grid-manager/run/run_plugin.h 2012-03-01 19:44:38.633088126 +0100
++++ nordugrid-arc-1.1.1/src/services/a-rex/grid-manager/run/run_plugin.h 2012-03-06 16:00:37.975755854 +0100
+@@ -8,9 +8,6 @@
+ #include <list>
+ #include <pthread.h>
+
+-extern char** environ;
+-
+-
+ class RunPlugin {
+ private:
+ std::list<std::string> args_;
+diff -ur nordugrid-arc-1.1.1.orig/src/services/cache_service/CacheService.cpp nordugrid-arc-1.1.1/src/services/cache_service/CacheService.cpp
+--- nordugrid-arc-1.1.1.orig/src/services/cache_service/CacheService.cpp 2012-03-01 19:44:37.859098151 +0100
++++ nordugrid-arc-1.1.1/src/services/cache_service/CacheService.cpp 2012-03-06 16:54:28.007549975 +0100
+@@ -1,5 +1,6 @@
+ #include <sys/stat.h>
+ #include <errno.h>
++#include <unistd.h>
+
+ #include <arc/credential/Credential.h>
+ #include <arc/data/FileCache.h>
+diff -ur nordugrid-arc-1.1.1.orig/src/services/gridftpd/conf/daemon.cpp nordugrid-arc-1.1.1/src/services/gridftpd/conf/daemon.cpp
+--- nordugrid-arc-1.1.1.orig/src/services/gridftpd/conf/daemon.cpp 2012-03-01 19:44:37.949096985 +0100
++++ nordugrid-arc-1.1.1/src/services/gridftpd/conf/daemon.cpp 2012-03-06 15:42:41.559746479 +0100
+@@ -9,6 +9,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <signal.h>
++#include <unistd.h>
+
+ #include <arc/Logger.h>
+ #include <arc/Utils.h>
+diff -ur nordugrid-arc-1.1.1.orig/src/services/gridftpd/run/run_plugin.h nordugrid-arc-1.1.1/src/services/gridftpd/run/run_plugin.h
+--- nordugrid-arc-1.1.1.orig/src/services/gridftpd/run/run_plugin.h 2012-03-01 19:44:37.996096376 +0100
++++ nordugrid-arc-1.1.1/src/services/gridftpd/run/run_plugin.h 2012-03-06 15:57:41.715047660 +0100
+@@ -7,8 +7,6 @@
+ #include <list>
+ #include <pthread.h>
+
+-extern char** environ;
+-
+ namespace gridftpd {
+
+ class RunPlugin {
+diff -ur nordugrid-arc-1.1.1.orig/src/utils/hed/arcplugin.cpp nordugrid-arc-1.1.1/src/utils/hed/arcplugin.cpp
+--- nordugrid-arc-1.1.1.orig/src/utils/hed/arcplugin.cpp 2012-03-01 19:44:37.641100974 +0100
++++ nordugrid-arc-1.1.1/src/utils/hed/arcplugin.cpp 2012-03-06 17:16:36.986114753 +0100
+@@ -3,6 +3,7 @@
+ #endif
+
+ #include <fstream>
++#include <unistd.h>
+
+ #include <glibmm/module.h>
+ #include <glibmm/fileutils.h>
diff --git a/nordugrid-arc-threads.patch b/nordugrid-arc-threads.patch
new file mode 100644
index 0000000..6c000bd
--- /dev/null
+++ b/nordugrid-arc-threads.patch
@@ -0,0 +1,21 @@
+--- nordugrid-arc-1.1.1/src/hed/libs/common/test/ThreadTest.cpp 2012-03-06 18:01:54.870636789 +0100
++++ trunk/src/hed/libs/common/test/ThreadTest.cpp 2012-03-06 19:55:46.315138350 +0100
+@@ -79,7 +79,7 @@
+ }
+ // Wait for all threads
+ // In worst case it should be no more than one thread simultaneously.
+- for(int n = 0; n<(500*2); ++n) {
++ for(int n = 0; n<(500*10); ++n) {
+ sleep(1);
+ if(counter >= 500) break;
+ }
+@@ -104,7 +104,9 @@
+ void ThreadTest::func_wait(void* arg) {
+ ThreadTest* test = (ThreadTest*)arg;
+ test->cond.wait();
++ lock->lock();
+ test->counter++;
++ lock->unlock();
+ }
+
+ void ThreadTest::func(void*) {
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index e779395..7a9c5c8 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -53,6 +53,8 @@ Group: System Environment/Daemons
License: ASL 2.0
URL: http://www.nordugrid.org/
Source: http://download.nordugrid.org/packages/%{name}/releases/%{version}/src/%{name}-%{version}.tar.gz
+Patch0: %{name}-missing-header.patch
+Patch1: %{name}-threads.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cppunit-devel
@@ -571,6 +573,8 @@ fetch-crl tool in the fetch-crl package.
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%if %{?fedora}%{!?fedora:0} <= 9 && %{?rhel}%{!?rhel:0} <= 5
# Older versions of SELinux does not have policy for open
More information about the scm-commits
mailing list