[globus-gatekeeper/el5: 2/2] Update to Globus Toolkit 5.2.2

[Mattias Ellert]

commit 1e155cdffaa4a4dc398192ed4522a84424a000c3
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Wed Jul 25 09:52:23 2012 +0200

    Update to Globus Toolkit 5.2.2
    
    - Drop patch globus-gatekeeper-porting.patch (fixed upstream)

 globus-gatekeeper               |   18 +++++++++++++++---
 globus-gatekeeper-porting.patch |   15 ---------------
 globus-gatekeeper.spec          |   12 +++++++-----
 sources                         |    2 +-
 4 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/globus-gatekeeper b/globus-gatekeeper
index aefe06b..d7655c5 100644
--- a/globus-gatekeeper
+++ b/globus-gatekeeper
@@ -45,9 +45,6 @@ lockfile=/var/lock/subsys/${progname}
 GLOBUS_GATEKEEPER_PIDFILE="${GLOBUS_GATEKEEPER_PIDFILE:-/var/run/${progname}.pid}"
 GLOBUS_GATEKEEPER_PORT="${GLOBUS_GATEKEEPER_PORT:-2119}"
 
-test -f "${GLOBUS_GATEKEEPER_CERT_FILE:-/etc/grid-security/hostcert.pem}" || exit 0
-test -f "${GLOBUS_GATEKEEPER_KEY_FILE:-/etc/grid-security/hostkey.pem}" || exit 0
-
 start() {
     status > /dev/null
     rc=$?
@@ -57,6 +54,20 @@ start() {
         return 0
     fi
 
+    cert="${GLOBUS_GATEKEEPER_CERT_FILE:-/etc/grid-security/hostcert.pem}"
+    if [ ! -f $cert ]; then
+        echo "Error: Gatekeeper's certificate file ($cert) is missing."
+        echo "Failed to start globus-gatekeeper"
+        exit 6
+    fi
+
+    key="${GLOBUS_GATEKEEPER_KEY_FILE:-/etc/grid-security/hostkey.pem}"
+    if [ ! -f $key ]; then
+        echo "Error: Gatekeeper's private key file is ($key) is missing."
+        echo "Failed to start globus-gatekeeper"
+        exit 6
+    fi
+
     if [ "${GLOBUS_GATEKEEPER_KERBEROS_ENABLED:-false}" = "true" ]; then
         kflag="-k"
     else
@@ -66,6 +77,7 @@ start() {
     ${GLOBUS_GATEKEEPER_NICE_LEVEL:+nice -n "${GLOBUS_GATEKEEPER_NICE_LEVEL}"} \
     ${prog} \
         -pidfile "${GLOBUS_GATEKEEPER_PIDFILE}" \
+        ${GLOBUS_GATEKEEPER_LOG_FACILITY:+-lf "$GLOBUS_GATEKEEPER_LOG_FACILITY"} \
         ${GLOBUS_GATEKEEPER_PORT:+-p "${GLOBUS_GATEKEEPER_PORT}"} \
         ${GLOBUS_GATEKEEPER_LOG:+-l "${GLOBUS_GATEKEEPER_LOG}"} \
         ${GLOBUS_GATEKEEPER_GRID_SERVICES:+-grid_services "${GLOBUS_GATEKEEPER_GRID_SERVICES}"} \
diff --git a/globus-gatekeeper.spec b/globus-gatekeeper.spec
index c0f1409..8e99e03 100644
--- a/globus-gatekeeper.spec
+++ b/globus-gatekeeper.spec
@@ -8,19 +8,18 @@
 
 Name:		globus-gatekeeper
 %global _name %(tr - _ <<< %{name})
-Version:	9.11
-Release:	2%{?dist}
+Version:	9.14
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus Gatekeeper
 
 Group:		Applications/Internet
 License:	ASL 2.0
 URL:		http://www.globus.org/
-Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.1/packages/src/%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.2/packages/src/%{_name}-%{version}.tar.gz
 Source1:	%{name}
 Source2:	%{name}.README
 #		README file
 Source8:	GLOBUS-GRAM5
-Patch0:		%{name}-porting.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #		Keep providing globus-gatekeeper-setup until it is not needed
@@ -50,7 +49,6 @@ Globus Gatekeeper
 
 %prep
 %setup -q -n %{_name}-%{version}
-%patch0 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -138,6 +136,10 @@ fi
 %doc %{_docdir}/%{name}-%{version}/README.Fedora
 
 %changelog
+* Sun Jul 22 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.14-1
+- Update to Globus Toolkit 5.2.2
+- Drop patch globus-gatekeeper-porting.patch (fixed upstream)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 9106b1a..3515188 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bcc8ef1a430702ac39fb2b12c554c89e  globus_gatekeeper-9.11.tar.gz
+642cac7b7b47030d7a77fc4d4514d919  globus_gatekeeper-9.14.tar.gz