[globus-gatekeeper/el5: 4/4] Update to Globus Toolkit 6.0

[Mattias Ellert]

commit e1cd38a7b04736d39e37b7fffe5ed3de7151536b
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Sep 18 18:05:44 2014 +0200

    Update to Globus Toolkit 6.0
    
    - Drop GPT build system and GPT packaging metadata
    - Activate hardening flags

 globus-gatekeeper.spec |   78 ++++++++++++++++++-----------------------------
 sources                |    2 +-
 2 files changed, 31 insertions(+), 49 deletions(-)
---
diff --git a/globus-gatekeeper.spec b/globus-gatekeeper.spec
index c2462f6..a5b7d6b 100644
--- a/globus-gatekeeper.spec
+++ b/globus-gatekeeper.spec
@@ -1,8 +1,4 @@
-%ifarch aarch64 alpha ia64 %{power64} s390x sparc64 x86_64
-%global flavor gcc64
-%else
-%global flavor gcc32
-%endif
+%global _hardened_build 1
 
 %{!?_initddir: %global _initddir %{_initrddir}}
 
@@ -10,32 +6,27 @@
 
 Name:		globus-gatekeeper
 %global _name %(tr - _ <<< %{name})
-Version:	9.15
-Release:	4%{?dist}
+Version:	10.7
+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.5/packages/src/%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
 Source1:	%{name}
 Source2:	%{name}.README
 #		README file
 Source8:	GLOBUS-GRAM5
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#		Keep providing globus-gatekeeper-setup until it is not needed
-Provides:	%{name}-setup = 2.2
-Requires:	globus-common%{?_isa} >= 14
-Requires:	globus-gss-assist%{?_isa} >= 8
-Requires:	globus-gssapi-gsi%{?_isa} >= 9
+#		For using killall in the logrotate scripts
+Requires:	psmisc
 Requires(post):		chkconfig
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
 Requires(postun):	initscripts
-BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core >= 8
-BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-common-devel >= 15
 BuildRequires:	globus-gss-assist-devel >= 8
 BuildRequires:	globus-gssapi-gsi-devel >= 9
 BuildRequires:	openssl-devel
@@ -53,21 +44,15 @@ Globus Gatekeeper
 %setup -q -n %{_name}-%{version}
 
 %build
-# Remove files that should be replaced during bootstrap
-rm -f doxygen/Doxyfile*
-rm -f doxygen/Makefile.am
-rm -f pkgdata/Makefile.am
-rm -f globus_automake*
-rm -rf autom4te.cache
-
-unset GLOBUS_LOCATION
-unset GPT_LOCATION
-%{_datadir}/globus/globus-bootstrap.sh
-
-%configure --disable-static --with-flavor=%{flavor} \
-	   --with-docdir=%{_pkgdocdir} \
-	   --with-initscript-config-path=/etc/sysconfig/globus-gatekeeper \
-	   --with-lockfile-path='${localstatedir}/lock/subsys/globus-gatekeeper'
+# Reduce overlinking
+export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}"
+
+%configure --disable-static \
+	   --includedir='${prefix}/include/globus' \
+	   --libexecdir='${datadir}/globus' \
+	   --docdir=%{_pkgdocdir} \
+	   --with-initscript-config-path=/etc/sysconfig/%{name} \
+	   --with-lockfile-path='${localstatedir}/lock/subsys/%{name}'
 
 # Reduce overlinking
 sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -78,32 +63,19 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
-
 # Remove start-up script
 rm -rf %{buildroot}%{_sysconfdir}/init.d
-sed '/init\.d/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
 
 # Install start-up script
 mkdir -p %{buildroot}%{_initrddir}
 install -p %{SOURCE1} %{buildroot}%{_initrddir}
 
 # Install post installation instructions
-install -m 644 -p %{SOURCE2} \
-  %{buildroot}%{_pkgdocdir}/README.Fedora
+install -m 644 -p %{SOURCE2} %{buildroot}%{_pkgdocdir}/README.Fedora
 
 # Install README file
 install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
 
-# Generate package filelists
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
-    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
-  | sed -e s!^!%{_prefix}! \
-	-e 's!%{_prefix}%{_sysconfdir}!%config(noreplace) %{_sysconfdir}!' \
-  > package.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
-  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
-
 mkdir -p %{buildroot}/etc/grid-services
 mkdir -p %{buildroot}/etc/grid-services/available
 
@@ -125,17 +97,27 @@ if [ $1 -ge 1 ]; then
     /sbin/service %{name} condrestart > /dev/null 2>&1 || :
 fi
 
-%files -f package.filelist
+%files
+%{_sbindir}/globus-gatekeeper
+%{_sbindir}/globus-k5
 %{_initddir}/%{name}
-%{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %dir %{_sysconfdir}/grid-services
 %dir %{_sysconfdir}/grid-services/available
-%dir %{_datadir}/globus/packages/%{_name}
+%doc %{_mandir}/man8/globus-gatekeeper.8*
+%doc %{_mandir}/man8/globus-k5.8*
 %dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
 %doc %{_pkgdocdir}/README.Fedora
 
 %changelog
+* Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.7-1
+- Update to Globus Toolkit 6.0
+- Drop GPT build system and GPT packaging metadata
+- Activate hardening flags
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 749e7cb..9fe9102 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5214547b1a332c988aaa2efe0f93a1a7  globus_gatekeeper-9.15.tar.gz
+4aae0f5e2962f36b3cc0154e90accb34  globus_gatekeeper-10.7.tar.gz