[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_1-7-gb519456

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=b519456b6bb9db1d3c3a9f25b64d79dfd81fe0b1

The branch, gnutls_3_0_x has been updated
       via  b519456b6bb9db1d3c3a9f25b64d79dfd81fe0b1 (commit)
       via  69bedfb1c9b464b63ece1f4d984bf3943edfa9f8 (commit)
      from  f5f51ab99256dde705784b29dd400a72e7c9fc21 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b519456b6bb9db1d3c3a9f25b64d79dfd81fe0b1
Merge: f5f51ab 69bedfb
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 21 14:51:14 2011 +0200

    Merge branch 'master' into gnutls_3_0_x

commit 69bedfb1c9b464b63ece1f4d984bf3943edfa9f8
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 21 14:51:05 2011 +0200

    The crywrap manpage was removed due to license reasons.

-----------------------------------------------------------------------

Summary of changes:
 doc/manpages/Makefile.am |    2 +-
 doc/manpages/crywrap.8   |  121 ----------------------------------------------
 2 files changed, 1 insertions(+), 122 deletions(-)
 delete mode 100644 doc/manpages/crywrap.8

diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 1c0bb65..1441501 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -21,7 +21,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 dist_man_MANS = gnutls-cli.1 gnutls-cli-debug.1 gnutls-serv.1  \
-       certtool.1 psktool.1 p11tool.1 crywrap.8
+       certtool.1 psktool.1 p11tool.1
 
 if ENABLE_SRP
 dist_man_MANS += srptool.1
diff --git a/doc/manpages/crywrap.8 b/doc/manpages/crywrap.8
deleted file mode 100644
index 76a6c92..0000000
--- a/doc/manpages/crywrap.8
+++ /dev/null
@@ -1,121 +0,0 @@
-.\" -*- nroff -*-
-.\" This manual is for CRYWrap
-.\" 
-.\" Copyright (C) 2003 Gergely Nagy <algernon@@bonehunter.rulez.org>
-.\"
-.\" Permission is granted to make and distribute verbatim copies of this
-.\" manual provided the copyright notice and this permission notice are
-.\" preserved on all copies.
-.\"
-.\" Permission is granted to copy and distribute modified versions of this
-.\" manual under the conditions for verbatim copying, provided that the
-.\" entire resulting derived work is distributed under the terms of a
-.\" permission notice identical to this one.
-.\"
-.\" Permission is granted to copy and distribute translations of this
-.\" manual into another language, under the above conditions for modified
-.\" versions, except that this permission notice may be stated in a
-.\" translation approved by the Author.
-.TH CRYWRAP 8 "03 May 2003" "CryWrap" "CryWrap"
-.SH "NAME"
-CryWrap \- Simple TCP/IP service encryption using TLS/SSL
-.SH "SYNOPSIS"
-.BI "crywrap \-\-listen " HOST / PORT " \-\-destination " HOST / PORT
-.BI [ options ]
-.SH "DESCRIPTION"
-.B CryWrap
-is a simple wrapper that waits for TLS/SSL connections, and proxies
-them to an unencrypted location.
-.SH "OPTIONS"
-.B CryWrap
-takes the following options:
-.SS "Required options"
-.TP
-.BI "\-\-destionation (\-d) " HOST / PORT
-The destionation host and address, where CryWrap should connect
-to. Both arguments are required.
-.SS "TLS options"
-.TP
-.B \-\-anon (\-a)
-Enables Anon-DH mode. If enabled, no certificate will be sent to the
-client, and only anonymous sessions will be enabled.
-.br
-Default is \fBoff\fR.
-.TP
-.BI "\-\-cert (\-c) " PATH
-.TP
-.BI "\-\-key (\-k) " PATH
-.br
-The public certificate to send to clients, and the private server key.
-.br
-Default is \fB/etc/crywrap/server.pem\fR, unless \fB--anon\fR is also
-specified, in which case no certificate will be used.
-.BI "\-\-ca (\-z) " PATH
-.br
-A Certificate Authority certificate to be used for verification of client 
certificates.
-.TP
-.BI "\-\-verify (\-v) [" LEVEL ]
-Set the level of client certificate verification. Level one simply
-logs the result, level two and above abort if the certificate could
-not be verified.
-.br
-Default is \fB0\fR.
-.SS "Miscellaneous options"
-.TP
-.B \-\-inetd (\-i)
-Enable inetd-mode. Use this if you want to run CryWrap from inetd. If
-this option is not enabled, then \fB\-\-listen\fR is a required
-option.
-.br
-Default is \fBoff\fR.
-.TP
-.BI "\-\-listen (\-l) " HOST / PORT
-The host and port CryWrap should listen on. \fIHOST\fR can be an IPv4
-or IPv6 address, or a hostname, and is optional \- if unspecified,
-CryWrap will listen on all available addresses. \fIPORT\fR is
-mandatory.
-.br
-This option is required, unless CryWrap was put into inetd mode.
-.TP
-.BI "\-\-pidfile (\-P) " PIDFILE
-Write the pid thy runs with to
-.IR PIDFILE .
-.br
-Default is
-.BR /var/run/crywrap.pid .
-.TP
-.BI "\-\-user (\-u) " UID
-.I UID
-is the numerical user id of the user thy should run as.
-.br
-Default is
-.BR 65534 .
-.TP
-.B \-\-version (\-V)
-Print the version number and exit.
-.TP
-.B \-\-help (\-?)
-Print a verbose help screen and exit.
-.TP
-.B \-\-usage
-Print a short summary of options.
-.SH "EXAMPLES"
-.SS "Setting up pop3s"
-.nf
-crywrap \-\-listen /995 \-\-destination localhost/110
-.fi
-.SS "Setting up imaps with a different certificate"
-.nf
-crywrap \-\-listen /993 \-\-destination localhost/143 \\
-       \-\-pem /etc/ssl/certs/imap.pem
-.fi
-.SH "FILES"
-.TP
-.I /etc/crywrap/
-.RS
-This directory contains the default server key and certificate.
-.RE
-.SH "BUGS"
-Probably many.
-.SH "AUTHOR"
-Gergely Nagy <address@hidden>


hooks/post-receive
-- 
GNU gnutls