Commit aca71b7c authored by Mattias Ellert's avatar Mattias Ellert

Switch upstream to Grid Community Toolkit

First Grid Community Toolkit release (15.0)
- Disable usage statistics reporting by default
- Workaround non-implemented features on GNU/Hurd (socket buffer size)
- Move grid-proxy-destroy call to before starting personal gatekeeper in
  the test wrapper
Use 2048 bit RSA key for tests (15.1)
Drop patches globus-gram-job-manager-socket-buffer-size.patch and
globus-gram-job-manager-proxy.patch (accepted upstream)
parent 9c6f3216
This package is part of the GRAM5 component
of the Globus Toolkit. For more information visit:
This package is part of the Grid Resource Allocation and Management component
of the Grid Community Toolkit. For more information visit:
http://toolkit.globus.org/toolkit/docs/latest-stable/gram5/
https://gridcf.org/gct-docs/gram5/
Key Concepts:
http://toolkit.globus.org/toolkit/docs/latest-stable/gram5/key/
https://gridcf.org/gct-docs/gram5/key/
Admin Guide:
http://toolkit.globus.org/toolkit/docs/latest-stable/gram5/admin/
https://gridcf.org/gct-docs/gram5/admin/
User's Guide:
http://toolkit.globus.org/toolkit/docs/latest-stable/gram5/user/
https://gridcf.org/gct-docs/gram5/user/
Developer's Guide:
http://toolkit.globus.org/toolkit/docs/latest-stable/gram5/developer/
https://gridcf.org/gct-docs/gram5/developer/
Release Notes:
http://toolkit.globus.org/toolkit/docs/latest-stable/gram5/rn/
https://gridcf.org/gct-docs/gram5/rn/
Public Interface Guide:
http://toolkit.globus.org/toolkit/docs/latest-stable/gram5/pi/
https://gridcf.org/gct-docs/gram5/pi/
Quality Profile:
http://toolkit.globus.org/toolkit/docs/latest-stable/gram5/qp/
https://gridcf.org/gct-docs/gram5/qp/
Migrating Guide:
http://toolkit.globus.org/toolkit/docs/latest-stable/gram5/mig/
https://gridcf.org/gct-docs/gram5/mig/
globus-gram-job-manager (15.1-1) unstable; urgency=medium
* Switch upstream to Grid Community Toolkit
* First Grid Community Toolkit release (15.0)
- Disable usage statistics reporting by default
- Workaround non-implemented features on GNU/Hurd (socket buffer size)
- Move grid-proxy-destroy call to before starting personal gatekeeper in
the test wrapper
* Use 2048 bit RSA key for tests (15.1)
* Drop patches globus-gram-job-manager-socket-buffer-size.patch and
globus-gram-job-manager-proxy.patch (accepted upstream)
-- Mattias Ellert <mattias.ellert@physics.uu.se> Sun, 16 Sep 2018 03:16:31 +0200
globus-gram-job-manager (14.37-1) unstable; urgency=medium
* GT6 update: Use 2048 bit keys to support openssl 1.1.1
......
......@@ -6,7 +6,7 @@ Standards-Version: 4.2.1
Section: net
Vcs-Browser: https://salsa.debian.org/ellert/globus-gram-job-manager
Vcs-Git: https://salsa.debian.org/ellert/globus-gram-job-manager.git
Homepage: http://toolkit.globus.org/
Homepage: https://github.com/gridcf/gct/
Package: globus-gram-job-manager
Section: net
......@@ -15,12 +15,12 @@ Multi-Arch: foreign
Replaces: globus-gram-job-manager-doc (<< 14)
Conflicts: globus-gram-job-manager-doc (<< 14)
Depends: ${shlibs:Depends}, ${misc:Depends}, libglobus-xio-popen-driver (>= 2), globus-common-progs (>= 15), globus-gatekeeper (>= 9), globus-gram-client-tools (>= 10), globus-gass-copy-progs (>= 8), globus-gass-cache-program (>= 5), globus-gram-job-manager-scripts (>= 6), globus-proxy-utils (>= 5), globus-gsi-cert-utils-progs, globus-seg-job-manager (= ${binary:Version})
Description: Globus Toolkit - GRAM Jobmanager
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.
Description: Grid Community Toolkit - GRAM Jobmanager
The Grid Community Toolkit (GCT) is an open source software toolkit used for
building grid systems and applications. It is a fork of the Globus Toolkit
originally created by the Globus Alliance. It is supported by the Grid
Community Forum (GridCF) that provides community-based support for core
software packages in grid computing.
.
The globus-gram-job-manager package contains:
GRAM Jobmanager
......@@ -33,12 +33,12 @@ Replaces: globus-gram-job-manager (<< 13.53)
Breaks: globus-gram-job-manager (<< 13.53)
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Globus Toolkit - Scheduler Event Generator Job Manager
The Globus Toolkit is an open source software toolkit used for
building Grid systems and applications. It is being developed by the
Globus Alliance and many others all over the world. A growing number
of projects and companies are using the Globus Toolkit to unlock the
potential of grids for their cause.
Description: Grid Community Toolkit - Scheduler Event Generator Job Manager
The Grid Community Toolkit (GCT) is an open source software toolkit used for
building grid systems and applications. It is a fork of the Globus Toolkit
originally created by the Globus Alliance. It is supported by the Grid
Community Forum (GridCF) that provides community-based support for core
software packages in grid computing.
.
The globus-seg-job-manager package contains:
Scheduler Event Generator Job Manager
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: globus_gram_job_manager
Upstream-Contact: http://toolkit.globus.org/
Source: https://downloads.globus.org/toolkit/gt6/packages/globus_gram_job_manager-14.37.tar.gz
Upstream-Contact: https://github.com/gridcf/gct/
Source: https://repo.gridcf.org/gct6/sources/globus_gram_job_manager-15.1.tar.gz
Files: *
Copyright:
1999-2018 University of Chicago
2018 Grid Community Forum
License: Apache-2.0
Files: debian/*
......
diff -ur globus_gram_job_manager-14.27.orig/test/gram-test-wrapper.in globus_gram_job_manager-14.27/test/gram-test-wrapper.in
--- globus_gram_job_manager-14.27.orig/test/gram-test-wrapper.in 2015-07-28 16:31:05.265343564 +0200
+++ globus_gram_job_manager-14.27/test/gram-test-wrapper.in 2016-05-05 21:57:06.108000000 +0200
@@ -48,6 +48,8 @@
export PERL5LIB
fi
+grid-proxy-destroy 2>/dev/null || true
+
if [ -n "$CONTACT_STRING" ]; then
echo "# Using existing GRAM service at $CONTACT_STRING"
else
@@ -70,8 +72,6 @@
export CONTACT_STRING="$contact"
fi
-grid-proxy-destroy 2>/dev/null || true
-
# Perl scripts pass through, otherwise run the program under valgrind
# conditionally
if [ "${1##*.}" = "pl" ]; then
diff --git a/startup_socket.c b/startup_socket.c
index e36a6fc..e6c0ec4 100644
--- a/startup_socket.c
+++ b/startup_socket.c
@@ -448,7 +448,7 @@ globus_gram_job_manager_startup_socket_init(
rcvbuf = 10 * GLOBUS_GRAM_PROTOCOL_MAX_MSG_SIZE;
rc = setsockopt(sock, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(rcvbuf));
- if (rc < 0)
+ if (rc < 0 && errno != ENOPROTOOPT)
{
rc = GLOBUS_GRAM_PROTOCOL_ERROR_NO_RESOURCES;
@@ -2136,7 +2136,7 @@ globus_l_create_starter_connect_socket(
}
sndbuf = GLOBUS_GRAM_PROTOCOL_MAX_MSG_SIZE;
rc = setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf));
- if (rc < 0)
+ if (rc < 0 && errno != ENOPROTOOPT)
{
rc = GLOBUS_GRAM_PROTOCOL_ERROR_NO_RESOURCES;
save_errno = errno;
diff --git a/test/jobmanager/rsl_size_test/globus-gram-job-manager-rsl-size-test.pl.in b/test/jobmanager/rsl_size_test/globus-gram-job-manager-rsl-size-test.pl.in
index 5456427..b53f79b 100755
--- a/test/jobmanager/rsl_size_test/globus-gram-job-manager-rsl-size-test.pl.in
+++ b/test/jobmanager/rsl_size_test/globus-gram-job-manager-rsl-size-test.pl.in
@@ -22,12 +22,20 @@ my $verbose = 0;
die if $contact eq '';
-my @test_cases=qw(
- tiny small medium large huge
-);
-
-my @todo_cases=qw(
-);
+my @test_cases;
+my @todo_cases;
+if ($^O eq 'gnu')
+{
+ # SO_RCVBUF/SO_SNDBUF not implemented on GNU/Hurd
+ # http://savannah.gnu.org/task/?12729
+ @test_cases=qw(tiny small medium);
+ @todo_cases=qw(large huge);
+}
+else
+{
+ @test_cases=qw(tiny small medium large huge);
+ @todo_cases=qw();
+}
sub test_rsl
{
# Workaround for SO_RCVBUF/SO_SNDBUF not implemented on GNU/Hurd
# https://github.com/globus/globus-toolkit/pull/29
globus-gram-job-manager-socket-buffer-size.patch
# Move grid-proxy-destroy call to before starting personal gatekeeper
# https://github.com/globus/globus-toolkit/pull/42
globus-gram-job-manager-proxy.patch
......@@ -11,6 +11,7 @@ INSTALLDIR = $(CURDIR)/debian/tmp
_prefix = /usr
_bindir = $(_prefix)/bin
_sbindir = $(_prefix)/sbin
_includedir = $(_prefix)/include
_libdir = $(_prefix)/lib
_datadir = $(_prefix)/share
_mandir = $(_datadir)/man
......@@ -28,9 +29,8 @@ configure-stamp:
LDFLAGS="$(LDFLAGS) -Wl,--as-needed -Wl,-z,defs" \
dh_auto_configure -- \
--disable-static \
--sharedstatedir=/var/lib \
--includedir='$${prefix}/include/globus' \
--libexecdir='$${datadir}/globus' \
--includedir=$(_includedir)/globus \
--libexecdir=$(_datadir)/globus \
--docdir=$(_docdir)
# Reduce overlinking
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment