[globus-gridftp-server/el4] Update contributed manpage
Mattias Ellert
ellert at fedoraproject.org
Wed Oct 5 23:25:12 UTC 2011
commit a054f3687722af3bf8fb32b80163c2c4e205c9a9
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Oct 6 01:22:33 2011 +0200
Update contributed manpage
globus-gridftp-server | 5 ++++
globus-gridftp-server-deps.patch | 2 +-
globus-gridftp-server.8 | 43 ++++++++++++++++++++++---------------
globus-gridftp-server.spec | 5 +++-
4 files changed, 35 insertions(+), 20 deletions(-)
---
diff --git a/globus-gridftp-server b/globus-gridftp-server
index 912263e..fbdba43 100644
--- a/globus-gridftp-server
+++ b/globus-gridftp-server
@@ -26,6 +26,11 @@ conf=${sysconfdir}/gridftp.conf
pidfile=${localstatedir}/run/globus-gridftp-server.pid
gridftpd=${sbindir}/globus-gridftp-server
+# Include defaults if available
+if [ -r /etc/sysconfig/globus-gridftp-server ] ; then
+ . /etc/sysconfig/globus-gridftp-server
+fi
+
start() {
echo -n "Starting globus-gridftp-server: "
if [ ! -f $conf ]; then
diff --git a/globus-gridftp-server-deps.patch b/globus-gridftp-server-deps.patch
index 52bd7bb..5a45db3 100644
--- a/globus-gridftp-server-deps.patch
+++ b/globus-gridftp-server-deps.patch
@@ -134,7 +134,7 @@ diff -ur globus_gridftp_server-3.28.orig/pkgdata/pkg_data_src.gpt.in globus_grid
<cflags>@GPT_PKG_CFLAGS@</cflags>
<external_includes>@GPT_EXTERNAL_INCLUDES@</external_includes>
<external_libs>@GPT_EXTERNAL_LIBS@</external_libs>
-+ <pkg_libs>-lglobus_server</pkg_libs>
++ <pkg_libs>-lglobus_gridftp_server</pkg_libs>
</Build_Environment>
</src_pkg>
</gpt_package_metadata>
diff --git a/globus-gridftp-server.8 b/globus-gridftp-server.8
index 8fad44f..846fca8 100644
--- a/globus-gridftp-server.8
+++ b/globus-gridftp-server.8
@@ -2,12 +2,12 @@
.\" Title: globus-gridftp-server
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 04/18/2011
+.\" Date: 08/11/2011
.\" Manual: Globus Tookit
.\" Source: The Globus Alliance
.\" Language: English
.\"
-.TH "GLOBUS\-GRIDFTP\-SER" "8" "04/18/2011" "The Globus Alliance" "Globus Tookit"
+.TH "GLOBUS\-GRIDFTP\-SER" "8" "08/11/2011" "The Globus Alliance" "Globus Tookit"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -63,6 +63,13 @@ Show version information for all loaded globus libraries and exit\&.
.sp
Default value: FALSE
.RE
+.PP
+\fBversions <0|1> \-V \-versions\fR
+.RS 4
+Show version information for all loaded globus libraries and exit\&.
+.sp
+Default value: FALSE
+.RE
.SH "MODES OF OPERATION"
.PP
\fBinetd <0|1> \-i \-inetd\fR
@@ -95,7 +102,7 @@ Default value: FALSE
.PP
\fBexec <string> \-exec <string>\fR
.RS 4
-For staticly compiled or non\-GLOBUS_LOCATION standard binary locations, specify the full path of the server binary here\&. Only needed when run in daemon mode\&.
+For staticaly compiled or non\-GLOBUS_LOCATION standard binary locations, specify the full path of the server binary here\&. Only needed when run in daemon mode\&.
.sp
Default value: not set
.RE
@@ -145,28 +152,28 @@ Default value: not set
.PP
\fBipc_allow_from <string> \-ipc\-allow\-from <string>\fR
.RS 4
-Only allow connections from these source ip addresses\&. Specify a comma seperated list of ip address fragmen ts\&. A match is any ip address that starts with the specified fragment\&. Example: \*(Aq192\&.168\&.1\&.\*(Aq will match and allow a connect ion from 192\&.168\&.1\&.45\&. Note that if this option is used any address not specifically allowed will be denied\&.
+Only allow connections from these source ip addresses\&. Specify a comma separated list of ip address fragmen ts\&. A match is any ip address that starts with the specified fragment\&. Example: \*(Aq192\&.168\&.1\&.\*(Aq will match and allow a connect ion from 192\&.168\&.1\&.45\&. Note that if this option is used any address not specifically allowed will be denied\&.
.sp
Default value: not set
.RE
.PP
\fBipc_deny_from <string> \-ipc\-deny\-from <string>\fR
.RS 4
-Deny connections from these source ip addresses\&. Specify a comma seperated list of ip address fragments\&. A match is any ip address that starts with the specified fragment\&. Example: \*(Aq192\&.168\&.2\&.\*(Aq will match and deny a connection from 192\&.168\&.2\&.45\&.
+Deny connections from these source ip addresses\&. Specify a comma separated list of ip address fragments\&. A match is any ip address that starts with the specified fragment\&. Example: \*(Aq192\&.168\&.2\&.\*(Aq will match and deny a connection from 192\&.168\&.2\&.45\&.
.sp
Default value: not set
.RE
.PP
\fBallow_from <string> \-allow\-from <string>\fR
.RS 4
-Only allow connections from these source ip addresses\&. Specify a comma seperated list of ip address fragmen ts\&. A match is any ip address that starts with the specified fragment\&. Example: \*(Aq192\&.168\&.1\&.\*(Aq will match and allow a connection from 192\&.168\&.1\&.45\&. Note that if this option is used any address not specifically allowed will be denied\&.
+Only allow connections from these source ip addresses\&. Specify a comma separated list of ip address fragmen ts\&. A match is any ip address that starts with the specified fragment\&. Example: \*(Aq192\&.168\&.1\&.\*(Aq will match and allow a connection from 192\&.168\&.1\&.45\&. Note that if this option is used any address not specifically allowed will be denied\&.
.sp
Default value: not set
.RE
.PP
\fBdeny_from <string> \-deny\-from <string>\fR
.RS 4
-Deny connections from these source ip addresses\&. Specify a comma seperated list of ip address fragments\&. A match is any ip address that starts with the specified fragment\&. Example: \*(Aq192\&.168\&.2\&.\*(Aq will match and deny a connection from 192\&.168\&.2\&.45\&.
+Deny connections from these source ip addresses\&. Specify a comma separated list of ip address fragments\&. A match is any ip address that starts with the specified fragment\&. Example: \*(Aq192\&.168\&.2\&.\*(Aq will match and deny a connection from 192\&.168\&.2\&.45\&.
.sp
Default value: not set
.RE
@@ -194,7 +201,7 @@ Default value: FALSE
.PP
\fBanonymous_names_allowed <string> \-anonymous\-names\-allowed <string>\fR
.RS 4
-Comma seperated list of names to treat as anonymous users when allowing anonymous access\&. If not set, the d efault names of \*(Aqanonymous\*(Aq and \*(Aqftp\*(Aq will be allowed\&. Use \*(Aq*\*(Aq to allow any username\&.
+Comma separated list of names to treat as anonymous users when allowing anonymous access\&. If not set, the d efault names of \*(Aqanonymous\*(Aq and \*(Aqftp\*(Aq will be allowed\&. Use \*(Aq*\*(Aq to allow any username\&.
.sp
Default value: not set
.RE
@@ -243,7 +250,7 @@ Default value: not set
.PP
\fBdisable_command_list <string> \-disable\-command\-list <string>\fR
.RS 4
-A comma seperated list of client commands that will be disabled\&.
+A comma separated list of client commands that will be disabled\&.
.sp
Default value: not set
.RE
@@ -257,7 +264,7 @@ Default value: TRUE
.PP
\fBacl <string> \-em <string> \-acl <string>\fR
.RS 4
-A comma seperated list of ACL or event modules to load\&.
+A comma separated list of ACL or event modules to load\&.
.sp
Default value: not set
.RE
@@ -265,7 +272,7 @@ Default value: not set
.PP
\fBlog_level <string> \-d <string> \-log\-level <string>\fR
.RS 4
-Log level\&. A comma seperated list of levels from: \*(AqERROR, WARN, INFO, TRANSFER, DUMP, ALL\*(Aq\&. TRANSFER include s the same statistics that are sent to the seperate transfer log when \-log\-transfer is used\&. Example: error,warn,info\&. You m ay also specify a numeric level of 1\-255\&. The default level is ERROR\&.
+Log level\&. A comma separated list of levels from: \*(AqERROR, WARN, INFO, TRANSFER, DUMP, ALL\*(Aq\&. TRANSFER include s the same statistics that are sent to the separate transfer log when \-log\-transfer is used\&. Example: error,warn,info\&. You m ay also specify a numeric level of 1\-255\&. The default level is ERROR\&.
.sp
Default value: ERROR
.RE
@@ -286,7 +293,7 @@ Default value: not set
.PP
\fBlog_unique <string> \-L <string> \-logdir <string>\fR
.RS 4
-Partial path to which \*(Aqgridftp\&.(pid)\&.log\*(Aq will be appended to construct the log filename\&. Example: \-L /var/l og/gridftp/ will create a seperate log ( /var/log/gridftp/gridftp\&.xxxx\&.log ) for each process (which is normally each new cli ent session)\&. If neither this option or log_single is set, logs will be written to stderr unless the execution mode is detac hed or inetd, in which case logging will be disabled\&.
+Partial path to which \*(Aqgridftp\&.(pid)\&.log\*(Aq will be appended to construct the log filename\&. Example: \-L /var/l og/gridftp/ will create a separate log ( /var/log/gridftp/gridftp\&.xxxx\&.log ) for each process (which is normally each new cli ent session)\&. If neither this option or log_single is set, logs will be written to stderr unless the execution mode is detac hed or inetd, in which case logging will be disabled\&.
.sp
Default value: not set
.RE
@@ -314,7 +321,7 @@ Default value: FALSE
.PP
\fBusage_stats_target <string> \-usage\-stats\-target <string>\fR
.RS 4
-Comma seperated list of contact strings (host:port) for usage statistics receivers\&. The usage stats sent to a particular receiver may be customized by configuring it with a taglist (host:port!taglist) The taglist is a list of chara cters that each correspond to a usage stats tag\&. When this option is unset, stats are reported to usage\-stats\&.globus\&.org:4810\&. If you set your own receiver, and wish to continue reporting to the Globus receiver, you will need to add it manually\&. The list of available tags follow\&. Tags marked * are reported by default\&. *(e) START \- start time of transfer *(E) END \- end time of transfer *(v) VER \- version string of gridftp server *(b) BUFFER \- tcp buffer size used for transfer *(B) BLOCK \- disk blocksize used for transfer *(N) NBYTES \- number of bytes transferred *(s) STREAMS \- number of parallel streams used *(S) STRIPES \- number of stripes used *(t) TYPE \- transfer command: RETR, STOR, LIST, etc *(c) CODE \- ftp result co
de (226 = success, 5xx = fail) *(D) DSI \- DSI module in use *(A) EM \- event modules in use *(T) SCHEME \- ftp, gsiftp, sshftp, etc\&. (client supplied) *(a) APP \- guc, rft, generic library app, etc\&. (client supplied) *(V) APPVER \- version string of above\&. (client supplied) (f) FILE \- name of file/data transferred (i) CLIENTIP \- ip address of host running client (control channel) (I) DATAIP \- ip address of source/dest host of data (data channel) (u) USER \- local user name the transfer was performed as (d) USERDN \- DN that was mapped to user id (C) CONFID \- ID defined by \-usage\-stats\-id config option (U) SESSID \- unique id that can be used to match transfers in a session and transfers across source/dest of a third party transfer\&. (client supplied)
+Comma separated list of contact strings (host:port) for usage statistics receivers\&. The usage stats sent to a particular receiver may be customized by configuring it with a taglist (host:port!taglist) The taglist is a list of chara cters that each correspond to a usage stats tag\&. When this option is unset, stats are reported to usage\-stats\&.globus\&.org:481 0\&. If you set your own receiver, and wish to continue reporting to the Globus receiver, you will need to add it manually\&. T he list of available tags follow\&. Tags marked * are reported by default\&. *(e) START \- start time of transfer *(E) END \- end time of transfer *(v) VER \- version string of gridftp server *(b) BUFFER \- tcp buffer size used for transfer *(B) BLOCK \- disk blocksize used for transfer *(N) NBYTES \- number of bytes transferred *(s) STREAMS \- number of parallel streams used *(S) STRIPES \- number of stripes used *(t) TYPE \- transfer command: RETR, STOR, LIST, etc *(c) CODE \- ftp result
code (226 = success, 5xx = fail) *(D) DSI \- DSI module in use *(A) EM \- event modules in use *(T) SCHEME \- ftp, gsiftp, sshftp, etc\&. (client supplied) *(a) APP \- guc, rft, generic library app, etc\&. (client supplied) *(V) APPVER \- version string of above\&. (client supplied) (f) FILE \- name of file/data transferred (i) CLIENTIP \- ip address of host running client (control channel) (I) DATAIP \- ip address of source/dest host of data (data channel) (u) USER \- local user name the transfer was performed as (d) USERDN \- DN that was mapped to user id (C) CONFID \- ID defined by \-usage\-stats\-id config option (U) SESSID \- unique id that can be used to match transfers in a session and transfers across source/dest of a third party transfer\&. (client supplied)
.sp
Default value: not set
.RE
@@ -329,7 +336,7 @@ Default value: not set
.PP
\fBremote_nodes <string> \-r <string> \-remote\-nodes <string>\fR
.RS 4
-Comma seperated list of remote node contact strings\&.
+Comma separated list of remote node contact strings\&.
.sp
Default value: not set
.RE
@@ -543,28 +550,28 @@ Default value: not set
.PP
\fBallowed_modules <string> \-allowed\-modules <string>\fR
.RS 4
-Comma seperated list of ERET/ESTO modules to allow, and optionally specify an alias for\&. Example: module1,al ias2:module2,module3 (module2 will be loaded when a client asks for alias2)\&.
+Comma separated list of ERET/ESTO modules to allow, and optionally specify an alias for\&. Example: module1,al ias2:module2,module3 (module2 will be loaded when a client asks for alias2)\&.
.sp
Default value: not set
.RE
.PP
\fBdc_whitelist <string> \-dc\-whitelist <string>\fR
.RS 4
-A comma seperated list of drivers allowed on the network stack\&.
+A comma separated list of drivers allowed on the network stack\&.
.sp
Default value: not set
.RE
.PP
\fBfs_whitelist <string> \-fs\-whitelist <string>\fR
.RS 4
-A comma seperated list of drivers allowed on the disk stack\&.
+A comma separated list of drivers allowed on the disk stack\&.
.sp
Default value: not set
.RE
.PP
\fBpopen_whitelist <string> \-popen\-whitelist <string>\fR
.RS 4
-A comma seperated list of programs that the popen driver is allowed to execute, when used on the network or disk stack\&. An alias may also be specified, so that a client does not need to specify the full path\&. Format is [alias:]prog, [alias:]prog\&. example: /bin/gzip,tar:/bin/tar
+A comma separated list of programs that the popen driver is allowed to execute, when used on the network or disk stack\&. An alias may also be specified, so that a client does not need to specify the full path\&. Format is [alias:]prog, [alias:]prog\&. example: /bin/gzip,tar:/bin/tar
.sp
Default value: not set
.RE
diff --git a/globus-gridftp-server.spec b/globus-gridftp-server.spec
index c00db93..b3907d5 100644
--- a/globus-gridftp-server.spec
+++ b/globus-gridftp-server.spec
@@ -7,7 +7,7 @@
Name: globus-gridftp-server
%global _name %(tr - _ <<< %{name})
Version: 3.33
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Toolkit - Globus GridFTP Server
Group: System Environment/Libraries
@@ -237,6 +237,9 @@ fi
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Sun Oct 02 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.33-2
+- Update contributed manpage
+
* Sun Jun 05 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.33-1
- Update to Globus Toolkit 5.0.4
More information about the scm-commits
mailing list