diff options
Diffstat (limited to 'net-proxy/sshproxy/files/sshproxy-0.6.0_beta2-rename-wrappers.patch')
| -rw-r--r-- | net-proxy/sshproxy/files/sshproxy-0.6.0_beta2-rename-wrappers.patch | 159 |
1 files changed, 159 insertions, 0 deletions
diff --git a/net-proxy/sshproxy/files/sshproxy-0.6.0_beta2-rename-wrappers.patch b/net-proxy/sshproxy/files/sshproxy-0.6.0_beta2-rename-wrappers.patch new file mode 100644 index 000000000000..765bd9d5bdf9 --- /dev/null +++ b/net-proxy/sshproxy/files/sshproxy-0.6.0_beta2-rename-wrappers.patch @@ -0,0 +1,159 @@ +diff -Nru sshproxy-0.6.0_beta2.orig/lib/get_client_scripts/getscript.py sshproxy-0.6.0_beta2/lib/get_client_scripts/getscript.py +--- sshproxy-0.6.0_beta2.orig/lib/get_client_scripts/getscript.py 2008-01-28 01:44:29.000000000 +0200 ++++ sshproxy-0.6.0_beta2/lib/get_client_scripts/getscript.py 2009-07-23 10:34:01.000000000 +0300 +@@ -22,7 +22,7 @@ + from sshproxy import get_class + from sshproxy.util import chanfmt + +-pssh = """#!/bin/bash ++spssh = """#!/bin/bash + + PROXY_PORT=${SSHPROXY_PORT:-%(port)d} + PROXY_HOST=${SSHPROXY_HOST:-%(ip_addr)s} +@@ -32,7 +32,7 @@ + exec ssh -tp $PROXY_PORT $PROXY_USER@$PROXY_HOST -- "$@" + """ + +-pscp = """#!/bin/bash ++spscp = """#!/bin/bash + + PROXY_PORT=${SSHPROXY_PORT:-%(port)s} + PROXY_HOST=${SSHPROXY_HOST:-%(ip_addr)s} +@@ -79,26 +79,26 @@ + class Server(base_class): + def add_cmdline_options(self, parser): + base_class.add_cmdline_options(self, parser) +- parser.add_option("", "--get-pssh", dest="action", +- help="display pssh client script.", ++ parser.add_option("", "--get-spssh", dest="action", ++ help="display spssh client script.", + action="store_const", +- const="get_pssh", ++ const="get_spssh", + ) +- parser.add_option("", "--get-pscp", dest="action", +- help="display pscp client script.", ++ parser.add_option("", "--get-spscp", dest="action", ++ help="display spscp client script.", + action="store_const", +- const="get_pscp", ++ const="get_spscp", + ) + +- def opt_get_pssh(self, options, *args): ++ def opt_get_spssh(self, options, *args): + user = self.pwdb.get_client().username + ip_addr, port = self.ip_addr, self.port +- self.chan.send(pssh % locals()) ++ self.chan.send(spssh % locals()) + +- def opt_get_pscp(self, options, *args): ++ def opt_get_spscp(self, options, *args): + user = self.pwdb.get_client().username + ip_addr, port = self.ip_addr, self.port +- self.chan.send(pscp % locals()) ++ self.chan.send(spscp % locals()) + + + +diff -Nru sshproxy-0.6.0_beta2.orig/lib/get_client_scripts/__init__.py sshproxy-0.6.0_beta2/lib/get_client_scripts/__init__.py +--- sshproxy-0.6.0_beta2.orig/lib/get_client_scripts/__init__.py 2008-01-28 01:44:29.000000000 +0200 ++++ sshproxy-0.6.0_beta2/lib/get_client_scripts/__init__.py 2009-07-23 10:32:34.000000000 +0300 +@@ -21,11 +21,11 @@ + + __plugin_name__ = "Get Client Scripts" + __description__ = """ +- This plugin allows clients to download the pssh and +- pscp wrapper scripts with special options on the ssh ++ This plugin allows clients to download the spssh and ++ spscp wrapper scripts with special options on the ssh + command line: +- ssh -tp 2242 user@sshproxy -- --get-pssh +- ssh -tp 2242 user@sshproxy -- --get-pscp ++ ssh -tp 2242 user@sshproxy -- --get-spssh ++ ssh -tp 2242 user@sshproxy -- --get-spscp + """ + + def __init_plugin__(): +diff -Nru sshproxy-0.6.0_beta2.orig/misc/acl.db sshproxy-0.6.0_beta2/misc/acl.db +--- sshproxy-0.6.0_beta2.orig/misc/acl.db 2008-01-28 01:44:29.000000000 +0200 ++++ sshproxy-0.6.0_beta2/misc/acl.db 2009-07-23 10:30:30.000000000 +0300 +@@ -78,13 +78,13 @@ + # options ###################################################### + + # opt_list_sites is to allow or deny the use of the --list-sites option: +-# $ pssh --list-sites ++# $ spssh --list-sites + opt_list_sites: + # guests group members can't see the list of allowed sites (they're blind) + client.group != "guests" + +-# opt_get_pkey controls the option --get-pkey of pssh: +-# $ pssh --get-pkey root@host ++# opt_get_pkey controls the option --get-pkey of spssh: ++# $ spssh --get-pkey root@host + opt_get_pkey: + # only admins can get the public key of a site login + "admin" in split(client.groups) +diff -Nru sshproxy-0.6.0_beta2.orig/README sshproxy-0.6.0_beta2/README +--- sshproxy-0.6.0_beta2.orig/README 2008-01-28 01:44:29.000000000 +0200 ++++ sshproxy-0.6.0_beta2/README 2009-07-23 10:23:21.000000000 +0300 +@@ -95,9 +95,9 @@ + root@remote-site # exit + me@myhost $ + +-Here is the same with the pssh shell wrapper:: ++Here is the same with the spssh shell wrapper:: + +- me@myhost $ pssh remote-site ++ me@myhost $ spssh remote-site + root@remote-site # + ... doing some administration commands ... + root@remote-site # exit +@@ -105,7 +105,7 @@ + + You can also execute remote commands:: + +- me@myhost $ pssh remote-site uname -a ++ me@myhost $ spssh remote-site uname -a + nova.wallix.com + me@myhost $ + +@@ -114,9 +114,9 @@ + me@myhost $ scp /etc/issue me@proxy:root@remote-site:/etc/issue.new + me@myhost $ + +-And the same with the pscp shell wrapper:: ++And the same with the spscp shell wrapper:: + +- me@myhost $ pscp /etc/issue remote-site:/etc/issue.new ++ me@myhost $ spscp /etc/issue remote-site:/etc/issue.new + me@myhost $ + + +diff -Nru sshproxy-0.6.0_beta2.orig/setup.py sshproxy-0.6.0_beta2/setup.py +--- sshproxy-0.6.0_beta2.orig/setup.py 2008-01-28 01:44:29.000000000 +0200 ++++ sshproxy-0.6.0_beta2/setup.py 2009-07-23 10:22:31.000000000 +0300 +@@ -74,7 +74,7 @@ + url=url, + download_url='%sdownload/sshproxy-%s.tar.gz' % (url, version), + packages=['sshproxy'], +- scripts=['bin/sshproxyd', 'bin/sshproxy-setup', 'bin/pssh', 'bin/pscp'], ++ scripts=['bin/sshproxyd', 'bin/sshproxy-setup', 'bin/spssh', 'bin/spscp'], + long_description=long_description, + data_files=data_files, + classifiers=classifiers, +diff -Nru sshproxy-0.6.0_beta2.orig/sshproxy/server.py sshproxy-0.6.0_beta2/sshproxy/server.py +--- sshproxy-0.6.0_beta2.orig/sshproxy/server.py 2008-01-28 01:44:29.000000000 +0200 ++++ sshproxy-0.6.0_beta2/sshproxy/server.py 2009-07-23 10:30:44.000000000 +0300 +@@ -308,8 +308,8 @@ + + def parse_cmdline(self, args): + usage = u""" +- pssh [options] +- pssh [user@site [cmd]] ++ spssh [options] ++ spssh [user@site [cmd]] + """ + parser = OptionParser(self.chan, usage=usage) + # add options from a mapping or a Registry callback |