[Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo stamp-vti ... [signed-commits3]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         signed-commits3
Changes by:     Derek Robert Price <address@hidden>     06/01/11 20:41:04

Modified files:
        doc            : ChangeLog cvs.1 cvs.texinfo stamp-vti 
                         version.texi 

Log message:
        * cvs.texinfo (The connection method, Global options): Note new
        --verify and --verify-template configuration options.  Note
        --textmode.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?only_with_tag=signed-commits3&tr1=1.944.2.1&tr2=1.944.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.1.diff?only_with_tag=signed-commits3&tr1=1.38.2.1&tr2=1.38.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.texinfo.diff?only_with_tag=signed-commits3&tr1=1.673.2.1&tr2=1.673.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-vti.diff?only_with_tag=signed-commits3&tr1=1.170.2.1&tr2=1.170.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version.texi.diff?only_with_tag=signed-commits3&tr1=1.171.2.1&tr2=1.171.2.2&r1=text&r2=text

Patches:
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.944.2.1 ccvs/doc/ChangeLog:1.944.2.2
--- ccvs/doc/ChangeLog:1.944.2.1        Wed Dec 21 13:25:08 2005
+++ ccvs/doc/ChangeLog  Wed Jan 11 20:41:04 2006
@@ -1,3 +1,9 @@
+2006-01-11  Derek Price  <address@hidden>
+
+       * cvs.texinfo (The connection method, Global options): Note new
+       --verify and --verify-template configuration options.  Note
+       --textmode.
+
 2005-12-12  Derek Price  <address@hidden>
 
        * cvsclient.texi (Responses): Add new Base-* & Temp-checkout responses.
Index: ccvs/doc/cvs.1
diff -u ccvs/doc/cvs.1:1.38.2.1 ccvs/doc/cvs.1:1.38.2.2
--- ccvs/doc/cvs.1:1.38.2.1     Wed Dec 21 13:25:08 2005
+++ ccvs/doc/cvs.1      Wed Jan 11 20:41:04 2006
@@ -491,9 +491,57 @@
 Substitute the name of the file to generate a signature for.
 .SP
 This template should send the generated signature to its standard output.
-Overrides the \fBsign-template\fR method optoin and defaults to something like
+Overrides the \fBsign-template\fR method option and defaults to something like
 \fB/usr/bin/gpg --detach-sign --output - %t %a %s\fR.
 .SP
+.IP "" 0
+\fB--verify\fR
+.IP "" 2
+.IP "" 0
+\fB--no-verify\fR
+.IP "" 2
+Force OpenPGP signature verification on checkout off, or set the failure mode.
+With a failure mode of \fBwarn\fR, the user will be warned of invalid
+signatures but the checkout will be allowed.  With a failure mode of
+\fBfatal\fR, the checkout will be aborted when the first corrupt file is
+received.  If the server does not support OpenPGP signatures, a failure mode
+of \fBfatal\fR will disallow the entire checkout.  Overrides the \fBverify\fR
+and \fBno-verify\fR method options (see node `The connection method\(aq in the 
CVS manual).
+.SP
+.IP "" 0
+\fB--verify-template=\fItemplate\fB\fR
+.IP "" 2
+Use \fItemplate\fR as the command line template to verify OpenPGP signatures.
+Format strings in this template are substituted before the command is run:
+.SP
+.IP "" 2
+\fB%t\fR
+.IP "" 4
+Substitute in the textmode flag (defaults to \fB--textmode\fR) when a
+signature is being verified for a text file.
+.SP
+.IP "" 2
+\fB%a\fR
+.IP "" 4
+Substitute in any \fIarg\fRs set via the \fB--verify-arg\fR option or the
+CVSROOT \fBverify-arg\fR method option.
+.SP
+.IP "" 2
+\fB%S\fR
+.IP "" 4
+Substitute the name of the file containing the signature.
+.SP
+.IP "" 2
+\fB%s\fR
+.IP "" 4
+Substitute the name of the signed file.
+.SP
+This template should exit with an exit code of zero if the signature is valid
+for the signed file and a non-zero exit code otherwise.  Overrides the
+\fBverify-template\fR method option see node `The connection method\(aq in the 
CVS manual and
+defaults to something like
+\fB/usr/bin/gpg --detach-sign --output - %t %a %S %s\fR.
+.SP
 .SH "Common options"
 .SS "Common command options"
 .IX "Common options"
Index: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.673.2.1 ccvs/doc/cvs.texinfo:1.673.2.2
--- ccvs/doc/cvs.texinfo:1.673.2.1      Wed Dec 21 13:25:08 2005
+++ ccvs/doc/cvs.texinfo        Wed Jan 11 20:41:04 2006
@@ -2324,11 +2324,11 @@
 if the server does not support OpenPGP signatures.  Without one of these
 options, CVS will autonegotiate signing, attempting to sign commits when the
 server supports it.  May be overridden by the @samp{--sign} and 
@samp{--no-sign}
-commit options (@pxref{commit options}).
+global options (@pxref{Global options}).
 
 @item address@hidden
 Use @var{template} as the command line template to generate OpenPGP signatures.
-Format strings in this template are substituted before the commit is run:
+Format strings in this template are substituted before the command is run:
 
 @table @code
 @item %t
@@ -2344,8 +2344,50 @@
 @end table
 
 This template should send the generated signature to its standard output.
-Overrides the @samp{sign-template} method optoin and defaults to something like
+IS overridden by the @samp{--sign-template} global command line option
address@hidden options} and defaults to
 @samp{/usr/bin/gpg --detach-sign --output - %t %a %s}.
+
address@hidden textmode
+The value passed to both in place of %t in both the OpenPGP signature
+and the OpenPGP verification command line templates.  Defaults to
address@hidden
+
address@hidden verify
address@hidden no-verify
+Force OpenPGP signature verification on checkout off, or set the failure mode.
+With a failure mode of @samp{warn}, the user will be warned of invalid
+signatures but the checkout will be allowed.  With a failure mode of
address@hidden, the checkout will be aborted when the first corrupt file is
+received.  If the server does not support OpenPGP signatures, a failure mode
+of @samp{fatal} will disallow the entire checkout.  May be overridden by the
address@hidden and @samp{--no-verify} global options (@pxref{Global options}).
+
address@hidden address@hidden
+Use @var{template} as the command line template to verify OpenPGP signatures.
+Format strings in this template are substituted before the command is run:
+
address@hidden @code
address@hidden %t
+Substitute in the textmode flag (defaults to @samp{--textmode}) when a
+signature is being verified for a text file.
+
address@hidden %a
+Substitute in any @var{arg}s set via the @samp{--verify-arg} option or the
+CVSROOT verify-arg method option.
+
address@hidden %S
+Substitute the name of the file containing the signature.
+
address@hidden %s
+Substitute the name of the signed file.
address@hidden table
+
+This template should exit with an exit code of zero if the signature is valid
+for the signed file and a non-zero exit code otherwise.  This method option is
+overridden by the @samp{--verify-template} global command line option
address@hidden options} and defaults to something like
address@hidden/usr/bin/gpg --detach-sign --output - %t %a %S %s}.
 @end table
 
 As a further example, to combine both the @code{CVS_RSH} and @code{CVS_SERVER}
@@ -8539,8 +8581,49 @@
 @end table
 
 This template should send the generated signature to its standard output.
-Overrides the @samp{sign-template} method optoin and defaults to something like
+Overrides the @samp{sign-template} method option and defaults to something like
 @samp{/usr/bin/gpg --detach-sign --output - %t %a %s}.
+
address@hidden --textmode
+The value passed to both in place of %t in both the OpenPGP signature
+and the OpenPGP verification command line templates.  Defaults to
address@hidden
+
address@hidden --verify
address@hidden --no-verify
+Force OpenPGP signature verification on checkout off, or set the failure mode.
+With a failure mode of @samp{warn}, the user will be warned of invalid
+signatures but the checkout will be allowed.  With a failure mode of
address@hidden, the checkout will be aborted when the first corrupt file is
+received.  If the server does not support OpenPGP signatures, a failure mode
+of @samp{fatal} will disallow the entire checkout.  Overrides the @samp{verify}
+and @samp{no-verify} method options (@pxref{The connection method}).
+
address@hidden address@hidden
+Use @var{template} as the command line template to verify OpenPGP signatures.
+Format strings in this template are substituted before the command is run:
+
address@hidden @code
address@hidden %t
+Substitute in the textmode flag (defaults to @samp{--textmode}) when a
+signature is being verified for a text file.
+
address@hidden %a
+Substitute in any @var{arg}s set via the @samp{--verify-arg} option or the
+CVSROOT @samp{verify-arg} method option.
+
address@hidden %S
+Substitute the name of the file containing the signature.
+
address@hidden %s
+Substitute the name of the signed file.
address@hidden table
+
+This template should exit with an exit code of zero if the signature is valid
+for the signed file and a non-zero exit code otherwise.  Overrides the
address@hidden method option @pxref{The connection method} and
+defaults to something like
address@hidden/usr/bin/gpg --detach-sign --output - %t %a %S %s}.
 @end table
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Index: ccvs/doc/stamp-vti
diff -u ccvs/doc/stamp-vti:1.170.2.1 ccvs/doc/stamp-vti:1.170.2.2
--- ccvs/doc/stamp-vti:1.170.2.1        Wed Dec 21 13:25:08 2005
+++ ccvs/doc/stamp-vti  Wed Jan 11 20:41:04 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 13 December 2005
address@hidden UPDATED-MONTH December 2005
address@hidden UPDATED 11 January 2006
address@hidden UPDATED-MONTH January 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1
Index: ccvs/doc/version.texi
diff -u ccvs/doc/version.texi:1.171.2.1 ccvs/doc/version.texi:1.171.2.2
--- ccvs/doc/version.texi:1.171.2.1     Wed Dec 21 13:25:08 2005
+++ ccvs/doc/version.texi       Wed Jan 11 20:41:04 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 13 December 2005
address@hidden UPDATED-MONTH December 2005
address@hidden UPDATED 11 January 2006
address@hidden UPDATED-MONTH January 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1