| 1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
| 2 | ## 02_hyphenfix.dpatch by Nico Golde <nion@debian.org> |
| 3 | ## |
| 4 | ## All lines beginning with `## DP:' are a description of the patch. |
| 5 | ## DP: No description. |
| 6 | |
| 7 | --- a/tsocks.8 |
| 8 | +++ b/tsocks.8 |
| 9 | @@ -13,11 +13,11 @@ Set LD_PRELOAD to load the library then |
| 10 | The syntax to force preload of the library for different shells is |
| 11 | specified below: |
| 12 | |
| 13 | -Bash, Ksh and Bourne shell - |
| 14 | +Bash, Ksh and Bourne shell \- |
| 15 | |
| 16 | export LD_PRELOAD=/lib/libtsocks.so |
| 17 | |
| 18 | -C Shell - |
| 19 | +C Shell \- |
| 20 | |
| 21 | setenv LD_PRELOAD=/lib/libtsocks.so |
| 22 | |
| 23 | @@ -52,7 +52,7 @@ the SOCKSified TCP/IP stacks seen on oth |
| 24 | Most arguments to |
| 25 | .BR tsocks |
| 26 | are provided in the configuration file (the location of which is defined |
| 27 | -at configure time by the --with-conf=<file> argument but defaults to |
| 28 | +at configure time by the \-\-with\-conf=<file> argument but defaults to |
| 29 | /etc/tsocks.conf). The structure of this file is documented in tsocks.conf(8) |
| 30 | |
| 31 | Some configuration options can be specified at run time using environment |
| 32 | @@ -63,7 +63,7 @@ variables as follows: |
| 33 | This environment variable overrides the default location of the tsocks |
| 34 | configuration file. This variable is not honored if the program tsocks |
| 35 | is embedded in is setuid. In addition this environment variable can |
| 36 | -be compiled out of tsocks with the --disable-envconf argument to |
| 37 | +be compiled out of tsocks with the \-\-disable\-envconf argument to |
| 38 | configure at build time |
| 39 | |
| 40 | .TP |
| 41 | @@ -73,10 +73,10 @@ generated by tsocks (debug output is gen |
| 42 | standard error). If this variable is not present by default the logging |
| 43 | level is set to 0 which indicates that only error messages should be output. |
| 44 | Setting it to higher values will cause tsocks to generate more messages |
| 45 | -describing what it is doing. If set to -1 tsocks will output absolutely no |
| 46 | +describing what it is doing. If set to \-1 tsocks will output absolutely no |
| 47 | error or debugging messages. This is only needed if tsocks output interferes |
| 48 | with a program it is embedded in. Message output can be permanently compiled |
| 49 | -out of tsocks by specifying the --disable-debug option to configure at |
| 50 | +out of tsocks by specifying the \-\-disable\-debug option to configure at |
| 51 | build time |
| 52 | |
| 53 | .TP |
| 54 | @@ -85,7 +85,7 @@ This option can be used to redirect the |
| 55 | be sent to standard error) to a file. This variable is not honored if the |
| 56 | program tsocks is embedded in is setuid. For programs where tsocks output |
| 57 | interferes with normal operation this option is generally better than |
| 58 | -disabling messages (with TSOCKS_DEBUG = -1) |
| 59 | +disabling messages (with TSOCKS_DEBUG = \-1) |
| 60 | |
| 61 | .TP |
| 62 | .I TSOCKS_USERNAME |
| 63 | @@ -115,8 +115,8 @@ consult the INSTALL file for more inform |
| 64 | .BR tsocks |
| 65 | will generate error messages and print them to stderr when there are |
| 66 | problems with the configuration file or the SOCKS negotiation with the |
| 67 | -server if the TSOCKS_DEBUG environment variable is not set to -1 or and |
| 68 | ---disable-debug was not specified at compile time. This output may cause |
| 69 | +server if the TSOCKS_DEBUG environment variable is not set to \-1 or and |
| 70 | +\-\-disable\-debug was not specified at compile time. This output may cause |
| 71 | some problems with programs that redirect standard error. |
| 72 | |
| 73 | .SS CAVEATS |
| 74 | @@ -157,12 +157,12 @@ not. This introduces overhead and should |
| 75 | .BR tsocks |
| 76 | uses ELF dynamic loader features to intercept dynamic function calls from |
| 77 | programs in which it is embedded. As a result, it cannot trace the |
| 78 | -actions of statically linked executables, non-ELF executables, or |
| 79 | +actions of statically linked executables, non\-ELF executables, or |
| 80 | executables that make system calls directly with the system call trap or |
| 81 | through the syscall() routine. |
| 82 | |
| 83 | .SH FILES |
| 84 | -/etc/tsocks.conf - default tsocks configuration file |
| 85 | +/etc/tsocks.conf \- default tsocks configuration file |
| 86 | |
| 87 | .SH SEE ALSO |
| 88 | tsocks.conf(5) |
| 89 | --- a/tsocks.conf.5 |
| 90 | +++ b/tsocks.conf.5 |
| 91 | @@ -66,7 +66,7 @@ The following directives are used in the |
| 92 | .I server |
| 93 | The IP address of the SOCKS server (e.g "server = 10.1.4.253"). Only one |
| 94 | server may be specified per path block, or one outside a path |
| 95 | -block (to define the default server). Unless --disable-hostnames was |
| 96 | +block (to define the default server). Unless \-\-disable\-hostnames was |
| 97 | specified to configure at compile time the server can be specified as |
| 98 | a hostname (e.g "server = socks.nec.com") |
| 99 | |
| 100 | @@ -118,13 +118,13 @@ local, otherwise tsocks would need a SOC |
| 101 | .TP |
| 102 | .I reaches |
| 103 | This directive is only valid inside a path block. Its parameter is formed |
| 104 | -as IP[:startport[-endport]]/Subnet and it specifies a network (and a range |
| 105 | +as IP[:startport[\-endport]]/Subnet and it specifies a network (and a range |
| 106 | of ports on that network) that can be accessed by the SOCKS server specified |
| 107 | in this path block. For example, in a path block "reaches = |
| 108 | -150.0.0.0:80-1024/255.0.0.0" indicates to tsocks that the SOCKS server |
| 109 | +150.0.0.0:80\-1024/255.0.0.0" indicates to tsocks that the SOCKS server |
| 110 | specified in the current path block should be used to access any IPs in the |
| 111 | range 150.0.0.0 to 150.255.255.255 when the connection request is for ports |
| 112 | -80-1024. |
| 113 | +80\-1024. |
| 114 | |
| 115 | .TP |
| 116 | .I fallback |
| 117 | @@ -155,12 +155,12 @@ the configuration to the screen in a for |
| 118 | extremely useful in debugging problems. |
| 119 | |
| 120 | validateconf can read a configuration file from a location other than the |
| 121 | -location specified at compile time with the -f <filename> command line |
| 122 | +location specified at compile time with the \-f <filename> command line |
| 123 | option. |
| 124 | |
| 125 | Normally validateconf simply dumps the configuration read to the screen (in |
| 126 | a nicely readable format), however it also has a useful 'test' mode. When |
| 127 | -passed a hostname/ip on the command line like -t <hostname/ip>, validateconf |
| 128 | +passed a hostname/ip on the command line like \-t <hostname/ip>, validateconf |
| 129 | determines which of the SOCKS servers specified in the configuration file |
| 130 | would be used by tsocks to access the specified host. |
| 131 | |