[globus-gridftp-server/el5] Update to Globus Toolkit 5.2.1
Mattias Ellert
ellert at fedoraproject.org
Tue May 1 20:10:52 UTC 2012
commit 7aad248dd8bb2c018a6ff9d1bcc6d97f99dd7e3f
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Tue May 1 22:10:28 2012 +0200
Update to Globus Toolkit 5.2.1
- Drop patches globus-gridftp-server-deps.patch,
globus-gridftp-server-funcgrp.patch, globus-gridftp-server-pathmax.patch
and globus-gridftp-server-compat.patch (fixed upstream)
- Drop globus-gridftp-server man page from packaging since it is now included
in upstream sources
- Add additional contributed man pages
globus-gridftp-password.8 | 33 ++
globus-gridftp-server-compat.patch | 254 --------------
globus-gridftp-server-deps.patch | 51 ---
globus-gridftp-server-format.patch | 12 +
globus-gridftp-server-funcgrp.patch | 11 -
globus-gridftp-server-pathmax.patch | 28 --
globus-gridftp-server-setup-chroot.8 | 39 +++
globus-gridftp-server.8 | 609 ----------------------------------
globus-gridftp-server.spec | 41 ++-
sources | 2 +-
10 files changed, 110 insertions(+), 970 deletions(-)
---
diff --git a/globus-gridftp-password.8 b/globus-gridftp-password.8
new file mode 100644
index 0000000..379f33a
--- /dev/null
+++ b/globus-gridftp-password.8
@@ -0,0 +1,33 @@
+.TH GLOBUS-GRIDFTP-PASSWORD 8 "February 16th, 2012" "" "Globus Toolkit"
+
+.SH "NAME"
+globus-gridftp-password - creates an encrypted password to be used for an user of the Globus GridFTP server
+
+.SH "SYNOPSYS"
+
+.B "globus-gridftp-password"
+
+.SH "DESCRIPTION"
+
+Create encrypted user passwords to be used with the GridFTP server in case it is configured to use clear text password. However, this type of functionality is not recommended, unless the network is trusted.
+
+The \fBglobus-gridftp-password\fR command asks for a password and generates a line in the same format as the standard password file (see file \fB/etc/passwd\fR). Such a line can be appended to the password file used by the GridFTP server.
+
+.SH "EXAMPLE"
+.nf
+.B % gridftp-password.pl >> pwfile
+.B " Password:"
+.fi
+
+Generates a password line for the current user and append it to file "pwfile".
+
+.SH AUTHOR
+
+Initiative for Globus in Europe (IGE), http://www.ige-project.eu
+
+.SH COPYRIGHT
+
+Copyright \(co 2012 Initiative for Globus in Europe (IGE)
+
+.SH "SEE ALSO"
+globus-gridftp-server(8)
diff --git a/globus-gridftp-server-format.patch b/globus-gridftp-server-format.patch
new file mode 100644
index 0000000..3290af4
--- /dev/null
+++ b/globus-gridftp-server-format.patch
@@ -0,0 +1,12 @@
+diff -ur globus_gridftp_server-6.10.orig/globus_i_gfs_log.c globus_gridftp_server-6.10/globus_i_gfs_log.c
+--- globus_gridftp_server-6.10.orig/globus_i_gfs_log.c 2012-03-06 05:01:40.000000000 +0100
++++ globus_gridftp_server-6.10/globus_i_gfs_log.c 2012-04-29 18:00:02.869038692 +0200
+@@ -639,7 +639,7 @@
+ "Server configuration error.\n\n%s\nPlease notify administrator.",
+ msg);
+ out_msg = globus_gsc_string_to_959(500, tmp, " ");
+- globus_libc_fprintf(stderr, out_msg);
++ globus_libc_fprintf(stderr, "%s", out_msg);
+ globus_free(tmp);
+ globus_free(out_msg);
+ }
diff --git a/globus-gridftp-server-setup-chroot.8 b/globus-gridftp-server-setup-chroot.8
new file mode 100644
index 0000000..af83e3d
--- /dev/null
+++ b/globus-gridftp-server-setup-chroot.8
@@ -0,0 +1,39 @@
+.TH GLOBUS-GRIDFTP-SERVER-SETUP-CHROOT 8 "February 16th, 2012" "" "Globus Toolkit"
+
+.SH "NAME"
+globus-gridftp-server-setup-chroot - creates the specific contents of a directory that can specified as a root of the file system tree exposed by the Globus GridFTP server
+
+.SH "SYNOPSYS"
+
+.B "globus-gridftp-server-setup-chroot"
+[-c certificate_dir] -r chroot_path_to_create
+
+.SH "DESCRIPTION"
+
+GridFTP server can be configured to restrict access to specific path using the command line option \fB-chroot-path\fR of the \fBglobus-gridftp-server\fR command. The specified path will become the new root after authentication.
+
+That path must contain a valid certificate structure, and the files /etc/passwd and /etc/groups.
+
+The command \fBglobus-gridftp-server-setup-chroot\fR helps creating such a suitable directory structure.
+
+
+.SH "OPTIONS"
+
+.TP
+\fB\-r chroot_path_to_create\fR
+Creates in \fBchroot_path_to_create\fR the directory structure expected by the \fBglobus-gridftp-server\fR command, when started with \fB-chroot-path\fR command line option.
+
+.TP
+.B "-c certificate_dir"
+Specifies explicitly the directory from which the certificates will be copied into the directory \fBchroot_path_to_create\fR. The default path is \fB/etc/grid-security/certificates\fR.
+
+.SH AUTHOR
+
+Initiative for Globus in Europe (IGE), http://www.ige-project.eu
+
+.SH COPYRIGHT
+
+Copyright \(co 2012 Initiative for Globus in Europe (IGE)
+
+.SH "SEE ALSO"
+globus-gridftp-server(8)
diff --git a/globus-gridftp-server.spec b/globus-gridftp-server.spec
index a6305a8..3ce7246 100644
--- a/globus-gridftp-server.spec
+++ b/globus-gridftp-server.spec
@@ -8,23 +8,21 @@
Name: globus-gridftp-server
%global _name %(tr - _ <<< %{name})
-Version: 6.5
-Release: 4%{?dist}
+Version: 6.10
+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.0/packages/src/%{_name}-%{version}.tar.gz
+Source: http://www.globus.org/ftppub/gt5/5.2/5.2.1/packages/src/%{_name}-%{version}.tar.gz
Source1: %{name}
Source2: globus-gridftp-sshftp
-Source3: %{name}.8
+Source3: globus-gridftp-password.8
+Source4: globus-gridftp-server-setup-chroot.8
# README file
Source8: GLOBUS-GRIDFTP
-Patch0: %{name}-deps.patch
-Patch1: %{name}-funcgrp.patch
-Patch2: %{name}-pathmax.patch
-Patch3: %{name}-compat.patch
+Patch0: %{name}-format.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-xio%{?_isa} >= 3
@@ -101,9 +99,6 @@ Globus GridFTP Server Development Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
# Remove files that should be replaced during bootstrap
@@ -158,9 +153,13 @@ sed '/init\.d/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
mkdir -p $RPM_BUILD_ROOT%{_initddir}
install -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_initddir}
-# Install man page
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
-install -m 644 -p %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man8
+# 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} $RPM_BUILD_ROOT%{_mandir}/man8
# Install README file
install -m 644 -p %{SOURCE8} \
@@ -172,7 +171,7 @@ cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
| sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' >> package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
- | sed s!^!%{_prefix}! > package-progs.filelist
+ | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package-progs.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
| sed s!^!%{_prefix}! > package-devel.filelist
@@ -214,12 +213,22 @@ fi
%config(noreplace) %{_sysconfdir}/xinetd.d/gridftp
%{_initddir}/%{name}
%{_initddir}/globus-gridftp-sshftp
-%{_mandir}/man8/%{name}.8*
+%doc %{_mandir}/man8/globus-gridftp-password.8*
+%doc %{_mandir}/man8/globus-gridftp-server-setup-chroot.8*
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%changelog
+* Fri Apr 27 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.10-1
+- Update to Globus Toolkit 5.2.1
+- Drop patches globus-gridftp-server-deps.patch,
+ globus-gridftp-server-funcgrp.patch, globus-gridftp-server-pathmax.patch
+ and globus-gridftp-server-compat.patch (fixed upstream)
+- Drop globus-gridftp-server man page from packaging since it is now included
+ in upstream sources
+- Add additional contributed man pages
+
* Sat Mar 10 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.5-4
- Restore enum and struct member order for improved backward compatibility
diff --git a/sources b/sources
index 2359e38..25d97f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-efbba3f12e464ec0d42f6ef8b906a1c3 globus_gridftp_server-6.5.tar.gz
+31734dfcfcf7aee7f0b915fa73ca7257 globus_gridftp_server-6.10.tar.gz
More information about the scm-commits
mailing list