[globus-gridftp-server/el5: 4/4] Update to Globus Toolkit 6.0
Mattias Ellert
ellert at fedoraproject.org
Thu Sep 18 11:36:13 UTC 2014
commit 035597b2e318b2426e05f4d1ba3af4d947a948e5
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Sep 18 13:35:26 2014 +0200
Update to Globus Toolkit 6.0
- Drop GPT build system and GPT packaging metadata
- Activate hardening flags
globus-gridftp-server-deps.patch | 24 +++++++
globus-gridftp-server.spec | 125 +++++++++++++++++---------------------
sources | 2 +-
3 files changed, 80 insertions(+), 71 deletions(-)
---
diff --git a/globus-gridftp-server-deps.patch b/globus-gridftp-server-deps.patch
new file mode 100644
index 0000000..d2313f8
--- /dev/null
+++ b/globus-gridftp-server-deps.patch
@@ -0,0 +1,24 @@
+diff -ur globus_gridftp_server-7.11.orig/configure globus_gridftp_server-7.11/configure
+--- globus_gridftp_server-7.11.orig/configure 2014-08-23 05:04:33.823326410 +0200
++++ globus_gridftp_server-7.11/configure 2014-09-14 09:28:56.862883650 +0200
+@@ -2311,7 +2311,7 @@
+
+ AGE_VERSION=1
+
+-PACKAGE_DEPS="globus-common >= 15, globus-xio >= 3, globus-xio-gsi-driver >= 2, globus-gfork >= 3, globus-gridftp-server-control >= 2, globus-ftp-control >= 4, globus-authz >= 2, globus-usage >= 3, globus-gssapi-gsi >= 10, globus-gss-assist >= 9, globus-gsi-credential >= 6, openssl >= 0.9.8"
++PACKAGE_DEPS="globus-common >= 15, globus-xio >= 3, globus-xio-gsi-driver >= 2, globus-gfork >= 3, globus-gridftp-server-control >= 2, globus-ftp-control >= 4, globus-authz >= 2, globus-usage >= 3, globus-gssapi-gsi >= 10, globus-gss-assist >= 9, globus-gsi-credential >= 6, globus-gsi-sysconfig >= 5, globus-io >= 9, openssl >= 0.9.8"
+
+
+ ac_aux_dir=
+diff -ur globus_gridftp_server-7.11.orig/configure.ac globus_gridftp_server-7.11/configure.ac
+--- globus_gridftp_server-7.11.orig/configure.ac 2014-08-22 22:49:53.621326410 +0200
++++ globus_gridftp_server-7.11/configure.ac 2014-09-14 09:28:01.261537161 +0200
+@@ -4,7 +4,7 @@
+ AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}])
+ AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}])
+ AC_SUBST([AGE_VERSION], [1])
+-AC_SUBST([PACKAGE_DEPS], ["globus-common >= 15, globus-xio >= 3, globus-xio-gsi-driver >= 2, globus-gfork >= 3, globus-gridftp-server-control >= 2, globus-ftp-control >= 4, globus-authz >= 2, globus-usage >= 3, globus-gssapi-gsi >= 10, globus-gss-assist >= 9, globus-gsi-credential >= 6, openssl >= 0.9.8"])
++AC_SUBST([PACKAGE_DEPS], ["globus-common >= 15, globus-xio >= 3, globus-xio-gsi-driver >= 2, globus-gfork >= 3, globus-gridftp-server-control >= 2, globus-ftp-control >= 4, globus-authz >= 2, globus-usage >= 3, globus-gssapi-gsi >= 10, globus-gss-assist >= 9, globus-gsi-credential >= 6, globus-gsi-sysconfig >= 5, globus-io >= 9, openssl >= 0.9.8"])
+
+ AC_CONFIG_AUX_DIR([build-aux])
+ AM_INIT_AUTOMAKE([1.11 foreign parallel-tests tar-pax])
diff --git a/globus-gridftp-server.spec b/globus-gridftp-server.spec
index b6c5ab1..be758dc 100644
--- a/globus-gridftp-server.spec
+++ b/globus-gridftp-server.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,51 +6,44 @@
Name: globus-gridftp-server
%global _name %(tr - _ <<< %{name})
-Version: 6.38
-Release: 4%{?dist}
+Version: 7.11
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus GridFTP Server
Group: System Environment/Libraries
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: globus-gridftp-sshftp
Source3: globus-gridftp-password.8
Source4: globus-gridftp-server-setup-chroot.8
# README file
Source8: GLOBUS-GRIDFTP
+# Missing dependencis
+Patch0: %{name}-deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-gsi-credential%{?_isa} >= 6
-Requires: globus-gss-assist%{?_isa} >= 9
-Requires: globus-xio%{?_isa} >= 3
-Requires: globus-authz%{?_isa} >= 2
-Requires: globus-gfork%{?_isa} >= 3
-Requires: globus-ftp-control%{?_isa} >= 4
-Requires: globus-gridftp-server-control%{?_isa} >= 2
-Requires: globus-common%{?_isa} >= 14
-Requires: globus-usage%{?_isa} >= 3
Requires: globus-xio-gsi-driver%{?_isa} >= 2
-BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core >= 8
-BuildRequires: globus-gsi-credential-devel >= 6
-BuildRequires: globus-gss-assist-devel >= 9
+BuildRequires: globus-common-devel >= 15
BuildRequires: globus-xio-devel >= 3
-BuildRequires: globus-authz-devel >= 2
+BuildRequires: globus-xio-gsi-driver-devel >= 2
BuildRequires: globus-gfork-devel >= 3
-BuildRequires: globus-ftp-control-devel >= 4
BuildRequires: globus-gridftp-server-control-devel >= 2
-BuildRequires: globus-common-devel >= 14
+BuildRequires: globus-ftp-control-devel >= 4
+BuildRequires: globus-authz-devel >= 2
BuildRequires: globus-usage-devel >= 3
-BuildRequires: globus-xio-gsi-driver-devel >= 2
+BuildRequires: globus-gssapi-gsi-devel >= 10
+BuildRequires: globus-gss-assist-devel >= 9
+BuildRequires: globus-gsi-credential-devel >= 6
+BuildRequires: globus-gsi-sysconfig-devel >= 5
+BuildRequires: globus-io-devel >= 9
BuildRequires: openssl-devel
%package progs
Summary: Globus Toolkit - Globus GridFTP Server Programs
Group: Applications/Internet
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-xio-gsi-driver%{?_isa} >= 2
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
@@ -64,16 +53,19 @@ Requires(postun): initscripts
Summary: Globus Toolkit - Globus GridFTP Server Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-gsi-credential-devel%{?_isa} >= 6
-Requires: globus-gss-assist-devel%{?_isa} >= 9
+Requires: globus-common-devel%{?_isa} >= 15
Requires: globus-xio-devel%{?_isa} >= 3
-Requires: globus-authz-devel%{?_isa} >= 2
+Requires: globus-xio-gsi-driver-devel%{?_isa} >= 2
Requires: globus-gfork-devel%{?_isa} >= 3
-Requires: globus-ftp-control-devel%{?_isa} >= 4
Requires: globus-gridftp-server-control-devel%{?_isa} >= 2
-Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-ftp-control-devel%{?_isa} >= 4
+Requires: globus-authz-devel%{?_isa} >= 2
Requires: globus-usage-devel%{?_isa} >= 3
-Requires: globus-xio-gsi-driver-devel%{?_isa} >= 2
+Requires: globus-gssapi-gsi-devel%{?_isa} >= 10
+Requires: globus-gss-assist-devel%{?_isa} >= 9
+Requires: globus-gsi-credential-devel%{?_isa} >= 6
+Requires: globus-gsi-sysconfig-devel%{?_isa} >= 5
+Requires: globus-io-devel%{?_isa} >= 9
Requires: openssl-devel%{?_isa}
%description
@@ -105,22 +97,20 @@ Globus GridFTP Server Development Files
%prep
%setup -q -n %{_name}-%{version}
+touch -r configure.ac x
+%patch0 -p1
+touch -r x configure.ac
%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
+# Reduce overlinking
+export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}"
export GRIDMAP=/etc/grid-security/grid-mapfile
-%configure --disable-static --with-flavor=%{flavor} \
- --with-docdir=%{_pkgdocdir}
+export GLOBUS_VERSION=6.0
+%configure --disable-static \
+ --includedir='${prefix}/include/globus' \
+ --libexecdir='${datadir}/globus' \
+ --docdir=%{_pkgdocdir}
# Reduce overlinking
sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -131,11 +121,8 @@ make %{?_smp_mflags}
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
-
# Remove libtool archives (.la files)
-find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
+rm %{buildroot}%{_libdir}/*.la
mv %{buildroot}%{_sysconfdir}/gridftp.conf.default \
%{buildroot}%{_sysconfdir}/gridftp.conf
@@ -144,8 +131,6 @@ mv %{buildroot}%{_sysconfdir}/gridftp.xinetd.default \
%{buildroot}%{_sysconfdir}/xinetd.d/gridftp
mv %{buildroot}%{_sysconfdir}/gridftp.gfork.default \
%{buildroot}%{_sysconfdir}/gridftp.gfork
-rm $GLOBUSPACKAGEDIR/%{_name}/pkg_data_noflavor_data.gpt
-rm $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
# No need for environment in conf files
sed '/ env /d' -i %{buildroot}%{_sysconfdir}/gridftp.gfork
@@ -153,33 +138,17 @@ sed '/^env /d' -i %{buildroot}%{_sysconfdir}/xinetd.d/gridftp
# Remove start-up scripts
rm -rf %{buildroot}%{_sysconfdir}/init.d
-sed '/init\.d/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
# Install start-up scripts
mkdir -p %{buildroot}%{_initddir}
install -p %{SOURCE1} %{SOURCE2} %{buildroot}%{_initddir}
-# Move server man pages to progs package
-grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
-sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-
# Install additional man pages
install -m 644 -p %{SOURCE3} %{SOURCE4} %{buildroot}%{_mandir}/man8
# Install README file
install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
-# Generate package filelists
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
- | sed s!^!%{_prefix}! > package.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
- | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package-progs.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
- | sed s!^!%{_prefix}! > package-devel.filelist
-
%clean
rm -rf %{buildroot}
@@ -205,23 +174,39 @@ if [ $1 -ge 1 ]; then
/sbin/service globus-gridftp-sshftp condrestart > /dev/null 2>&1 || :
fi
-%files -f package.filelist
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_gridftp_server.so.*
%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
%doc %{_pkgdocdir}/README
-%files -f package-progs.filelist progs
+%files progs
+%{_sbindir}/gfs-dynbe-client
+%{_sbindir}/gfs-gfork-master
+%{_sbindir}/globus-gridftp-password
+%{_sbindir}/globus-gridftp-server
+%{_sbindir}/globus-gridftp-server-enable-sshftp
+%{_sbindir}/globus-gridftp-server-setup-chroot
%config(noreplace) %{_sysconfdir}/gridftp.conf
%config(noreplace) %{_sysconfdir}/gridftp.gfork
%config(noreplace) %{_sysconfdir}/xinetd.d/gridftp
%{_initddir}/%{name}
%{_initddir}/globus-gridftp-sshftp
%doc %{_mandir}/man8/globus-gridftp-password.8*
+%doc %{_mandir}/man8/globus-gridftp-server.8*
%doc %{_mandir}/man8/globus-gridftp-server-setup-chroot.8*
-%files -f package-devel.filelist devel
+%files devel
+%{_includedir}/globus/*
+%{_libdir}/libglobus_gridftp_server.so
+%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.11-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> - 6.38-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index da5f048..78a1b18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7b573940d6103c91822fd0255b116a9 globus_gridftp_server-6.38.tar.gz
+3eb38cbc6d515f1c0e4342f04ae4752a globus_gridftp_server-7.11.tar.gz
More information about the scm-commits
mailing list