dante (1.2.2+dfsg-3) 02-rename-programs.patch

Summary

 INSTALL          |    4 ++--
 doc/sockd.8      |   12 ++++++------
 doc/sockd.conf.5 |   22 +++++++++++-----------
 doc/socks.conf.5 |    8 ++++----
 4 files changed, 23 insertions(+), 23 deletions(-)

    
download this patch

Patch contents

Description: Rename some files - this is Dante, not the original SOCKS.
 - /etc/socks.conf => /etc/dante.conf
 - /etc/sockd.conf => /etc/danted.conf
 - /usr/sbin/sockd => /usr/sbin/danted
 The changelog entry references bug #35187, but bugs.debian.org disclaims any
 knowledge of it.
Forwarded: not-needed
Author: Adrian Bridgett <bridgett@debian.org>
Last-Update: 2010-07-01

--- a/INSTALL
+++ b/INSTALL
@@ -346,8 +346,8 @@
 
 No configuration-files are installed, these must be installed
 manually.
-The Dante server expects it's configuration file to be in /etc/sockd.conf.
-The client library uses the file /etc/socks.conf.
+The Dante server expects it's configuration file to be in /etc/danted.conf.
+The client library uses the file /etc/dante.conf.
 
 The file bin/socksify.sh contains a shell script that allows one
 to dynamically socksify a dynamicly linked application at runtime.
--- a/doc/sockd.8
+++ b/doc/sockd.8
@@ -40,11 +40,11 @@
 .\" any improvements or extensions that they make and grant Inferno Nettverk A/S
 .\" the rights to redistribute these changes.
 .\"
-.TH SOCKD 8 "January, 2009"
+.TH DANTED 8 "January, 2009"
 .SH NAME
-sockd \- network proxyserver
+danted \- network proxyserver
 .SH SYNOPSIS
-.B sockd
+.B danted
 .RB [ \-DLVdhnv ]
 .RB [ \-N
 .IR number ]
@@ -96,7 +96,7 @@
 enables TCP keep-alive messages so that connections from machines that
 have crashed or for other reasons no longer can be reached time out.
 Note that this can take several hours.  See also the "timeout"
-option in sockd.conf(5).
+option in danted.conf(5).
 .TP
 .B \-v
 Displays
@@ -122,7 +122,7 @@
 be set to a (local) filesystem with low latency.
 .SH FILES
 .TP
-/etc/sockd.conf
+/etc/danted.conf
 .B Dante
 server configuration file.
 .SH AUTHORS
@@ -130,7 +130,7 @@
    Michael Shuldman
    Karl-Andre' Skevik
 .SH SEE ALSO
-socks.conf(5) sockd.conf(5)
+dante.conf(5) danted.conf(5)
 .PP
 Information about new releases and other related issues can be found
 on the
--- a/doc/sockd.conf.5
+++ b/doc/sockd.conf.5
@@ -41,9 +41,9 @@
 .\" any improvements or extensions that they make and grant Inferno Nettverk A/S
 .\" the rights to redistribute these changes.
 .\"
-.TH SOCKD.CONF 5 "January, 2009"
+.TH DANTED.CONF 5 "January, 2009"
 .SH NAME
-sockd.conf \- \fBDante\fP server configuration file syntax
+danted.conf \- \fBDante\fP server configuration file syntax
 .SH DESCRIPTION
 The configuration file for the \fBDante\fP server controls both access
 controls and logging.  It is divided into three parts; server settings,
@@ -116,7 +116,7 @@
 .IP \fBtimeout.io\fP
 The number of seconds an established connection can be idle.
 The default is 86400 (24 hours).  Set it to 0 for forever.
-See also the "-n" option in the sockd(8) manpage.
+See also the "-n" option in the danted(8) manpage.
 
 Individual timeouts can be set for tcp and udp by suffixing io with
 ".<protocolname>", i.e. \fBtimeout.io.tcp\fP or \fBtimeout.io.udp\fP
@@ -195,8 +195,8 @@
 
 .IP \fBuser.privileged\fP
 Username which will be used for doing privileged operations.
-If you need special privileges to read the sockd.conf file or to write
-the sockd.pid file (you can create it manually before starting sockd),
+If you need special privileges to read the danted.conf file or to write
+the danted.pid file (you can create it manually before starting danted),
 have anything in your configuration that requires binding privileged
 tcp/udp ports (ports below 1024), or use some sort of password-based
 authentication, this probably needs to be set to root.
@@ -330,7 +330,7 @@
 Possible values are \fBclear\fP, \fBintegrity\fP, or \fBconfidentiality\fP.
 The default is to accept whatever the client offers.
 .IP \fBgssapi.keytab\fP
-Value for keytab to use.  The default is "FILE:/etc/sockd.keytab".
+Value for keytab to use.  The default is "FILE:/etc/danted.keytab".
 .IP \fBgssapi.servicename\fP
 Which servicename to use when involving GSSAPI.  Default is "rcmd".
 
@@ -355,7 +355,7 @@
 The default is all ports.
 
 .IP \fBpam.servicename\fP
-Which servicename to use when involving pam.  Default is "sockd".
+Which servicename to use when involving pam.  Default is "danted".
 .IP \fBto\fP
 The rule applies to requests going to the address given as value.
 .IP \fBuser\fP
@@ -396,7 +396,7 @@
 the rule.
 Valid values are the same as in the global \fBmethod\fP line.
 .IP \fBpam.servicename\fP
-What servicename to use when involving pam.  Default is "sockd".
+What servicename to use when involving pam.  Default is "danted".
 .IP \fBport\fP
 Parameter to \fBfrom\fP, \fBto\fP and \fBvia\fP.  Accepts the keywords
 \fBeq/=, neq/!=, ge/>=, le/<=, gt/>, lt/<\fP followed by a number.
@@ -445,7 +445,7 @@
 .SH ROUTES
 The routes are specified with a \fBroute\fP keyword.
 Inside a pair of parenthesis ({}) a set of keywords control the behavior of
-the route.  See socks.conf(5) for a description.  This is used to
+the route.  See dante.conf(5) for a description.  This is used to
 perform so-called "server-chaining", where one socks-server connects
 to another socks-server further upstream.
 
@@ -457,7 +457,7 @@
 .SH FILES
 .nf
 .ta \w 1
-/etc/sockd.conf   \fBDante\fP server configuration file.
+/etc/danted.conf   \fBDante\fP server configuration file.
 /etc/passwd   file used when checking username/passwords.
 .fi
 .SH AUTHORS
@@ -465,7 +465,7 @@
    Michael Shuldman
    Karl-Andre' Skevik
 .SH SEE ALSO
-sockd(8), socks.conf(5), hosts_access(5)
+danted(8), dante.conf(5), hosts_access(5)
 .Pp
 Information about new releases and other related issues can be found
 on the
--- a/doc/socks.conf.5
+++ b/doc/socks.conf.5
@@ -40,9 +40,9 @@
 .\" any improvements or extensions that they make and grant Inferno Nettverk A/S
 .\" the rights to redistribute these changes.
 .\"
-.TH SOCKS.CONF 5 "January, 2009"
+.TH DANTE.CONF 5 "January, 2009"
 .SH NAME
-socks.conf \- socks client configuration file syntax
+dante.conf \- socks client configuration file syntax
 .SH DESCRIPTION
 The configuration file for the socks client library allow control over
 logging and server selection.  It is divided into two parts,
@@ -163,13 +163,13 @@
 Some additional environment variables are documented in socksify(1).
 .TP
 .SH FILES
-.I /etc/socks.conf
+.I /etc/dante.conf
 .SH AUTHORS
 For inferno Nettverk A/S:
    Michael Shuldman
    Karl-Andre' Skevik
 .SH SEE ALSO
-socksify(1) sockd(8) sockd.conf(5)
+socksify(1) danted(8) danted.conf(5)
 .TP
 Information about new releases and other related issues can be found
 on the