[globus-rls-server/el4] Enable pthreads Fix broken links in README file
Mattias Ellert
ellert at fedoraproject.org
Wed Jan 18 18:48:37 UTC 2012
commit 4a539710eef45dc76bb313ae5547c34a01f4d8b1
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Wed Jan 18 19:47:29 2012 +0100
Enable pthreads
Fix broken links in README file
GLOBUS-RLS | 16 ++++++++--------
globus-rls-server-pthreads.patch | 11 +++++++++++
globus-rls-server.spec | 9 ++++++++-
3 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/GLOBUS-RLS b/GLOBUS-RLS
index 2ff1552..ff6e2d5 100644
--- a/GLOBUS-RLS
+++ b/GLOBUS-RLS
@@ -1,28 +1,28 @@
This package is part of the Replica Location Service (RLS) component
of the Globus Toolkit. For more information visit:
-http://www.globus.org/toolkit/docs/latest-stable/data/rls/
+http://www.globus.org/toolkit/docs/5.0/5.0.4/data/rls/
Admin Guide:
-http://www.globus.org/toolkit/docs/latest-stable/data/rls/admin/
+http://www.globus.org/toolkit/docs/5.0/5.0.4/data/rls/admin/
User's Guide:
-http://www.globus.org/toolkit/docs/latest-stable/data/rls/user/
+http://www.globus.org/toolkit/docs/5.0/5.0.4/data/rls/user/
Developer's Guide:
-http://www.globus.org/toolkit/docs/latest-stable/data/rls/developer/
+http://www.globus.org/toolkit/docs/5.0/5.0.4/data/rls/developer/
Release Notes:
-http://www.globus.org/toolkit/docs/latest-stable/data/rls/rn/
+http://www.globus.org/toolkit/docs/5.0/5.0.4/data/rls/rn/
Public Interface Guide:
-http://www.globus.org/toolkit/docs/latest-stable/data/rls/pi/
+http://www.globus.org/toolkit/docs/5.0/5.0.4/data/rls/pi/
Quality Profile:
-http://www.globus.org/toolkit/docs/latest-stable/data/rls/qp/
+http://www.globus.org/toolkit/docs/5.0/5.0.4/data/rls/qp/
Migrating Guide:
-http://www.globus.org/toolkit/docs/latest-stable/data/rls/mig/
+http://www.globus.org/toolkit/docs/5.0/5.0.4/data/rls/mig/
Globus RPM packaging is supported by the Initiative for Globus in Europe:
http://www.ige-project.eu/
diff --git a/globus-rls-server-pthreads.patch b/globus-rls-server-pthreads.patch
new file mode 100644
index 0000000..fd6597e
--- /dev/null
+++ b/globus-rls-server-pthreads.patch
@@ -0,0 +1,11 @@
+diff -ur globus_rls_server-4.9.orig/server.c globus_rls_server-4.9/server.c
+--- globus_rls_server-4.9.orig/server.c 2009-11-13 19:17:29.000000000 +0100
++++ globus_rls_server-4.9/server.c 2012-01-17 19:16:54.776646992 +0100
+@@ -461,6 +461,7 @@
+ * If we detach after activating globus modules we get mysterious hangs
+ * in globus_libc, so delay activation until after detaching.
+ */
++ globus_thread_set_model("pthread");
+ for (i = 0; i < NMODS; i++)
+ if ((n = globus_module_activate(modules[i])) != GLOBUS_SUCCESS) {
+ fprintf(stderr, "main: Unable to activate module %d error %d", i, n);
diff --git a/globus-rls-server.spec b/globus-rls-server.spec
index 073e17b..d097b2b 100644
--- a/globus-rls-server.spec
+++ b/globus-rls-server.spec
@@ -8,7 +8,7 @@ Name: globus-rls-server
%global _name %(tr - _ <<< %{name})
Version: 4.9
%global setupversion 4.5
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Globus Toolkit - Replica Location Service Server
Group: Applications/Internet
@@ -44,6 +44,8 @@ Patch1: %{name}-setup.patch
Patch2: %{name}-deps.patch
# Adapt to GT 5.2.0 mutex definition
Patch3: %{name}-mutex.patch
+# Enable pthreads
+Patch4: %{name}-pthreads.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-rls-client%{?_isa} >= 5.2-5
@@ -84,6 +86,7 @@ cd %{_name}_setup-%{setupversion}
cd -
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -256,6 +259,10 @@ fi
%doc %{_docdir}/%{name}-%{version}/README.Fedora
%changelog
+* Tue Jan 17 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.9-9
+- Enable pthreads
+- Fix broken links in README file
+
* Fri Dec 16 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.9-8
- Recompile for Globus Toolkit 5.2.0
More information about the scm-commits
mailing list