Commit 3ccccc39 authored by Thomas Seyrat's avatar Thomas Seyrat Committed by Jari Aalto

Imported Debian patch 2.0-5

parent c071f918
......@@ -47,7 +47,7 @@ Setting up Corkscrew with SSH/OpenSSH is very simple. Adding
the following line to your ~/.ssh/config file will usually do
the trick (replace proxy.example.com and 8080 with correct values):
ProxyCommand /usr/local/bin/corkscrew proxy.example.com 8080 %h %p
ProxyCommand /usr/bin/corkscrew proxy.example.com 8080 %h %p
NOTE: Command line syntax has changed since version 1.5. Please
notice that the proxy port is NOT optional anymore and is required
......@@ -70,7 +70,7 @@ chmod 600 myauth
Now you will have to change the ProxyCommand line in your ~/.ssh/config
file. Here's an example :
ProxyCommand /usr/local/bin/corkscrew proxy.work.com 80 %h %p ~/.ssh/myauth
ProxyCommand /usr/bin/corkscrew proxy.work.com 80 %h %p ~/.ssh/myauth
The proxy authentication feature is very new and has not been tested
extensively so your mileage may vary. If you encounter any problems
......
This diff is collapsed.
This diff is collapsed.
......@@ -176,6 +176,7 @@ char *argv[];
#endif
char *host = NULL, *desthost = NULL, *destport = NULL;
char *up = NULL;
char *tmp = NULL;
int port, sent, setup, code, csock;
fd_set rfd, sfd;
struct timeval tv;
......@@ -262,6 +263,11 @@ char *argv[];
fprintf(stderr, "Proxy could not open connnection to %s: %s\n", desthost, descr);
exit(-1);
}
if (tmp = strstr(buffer,"\r\n\r\n"))
{
tmp += 4;
write(1, tmp, strlen(tmp));
}
}
}
if (FD_ISSET(csock, &sfd) && (sent == 0)) {
......
corkscrew (2.0-5) unstable; urgency=low
* Updated config.sub/config.guess (thanks Aurelien Jarno)
(closes: #317321)
* Bumped Standards-Version to 3.6.2
-- Thomas Seyrat <tomasera@debian.org> Mon, 25 Jul 2005 11:40:14 +0200
corkscrew (2.0-4) unstable; urgency=low
* Applied patch by Frank Kirschner to fix issue when first packet
sent by proxy has both header and beginning of answer
* Included manpage provided by Laurent Fousse (closes: #222038)
* Fixed corkscrew path in README (closes: #219953)
* debian/rules minor changes
* Case adjustment in small description
* Bumped Standards-Version to 3.6.1
-- Thomas Seyrat <tomasera@debian.org> Sun, 29 Feb 2004 16:52:19 +0100
corkscrew (2.0-3) unstable; urgency=low
* Bumped Standards-Version to 3.5.7.
-- Thomas Seyrat <tomasera@debian.org> Sat, 21 Sep 2002 15:52:22 +0200
corkscrew (2.0-2) unstable; urgency=low
* Added README to documentation directory.
-- Thomas Seyrat <tomasera@debian.org> Fri, 17 May 2002 10:33:12 +0200
corkscrew (2.0-1) unstable; urgency=low
* Initial Release. (closes: #140343)
-- Thomas Seyrat <tomasera@debian.org> Thu, 28 Mar 2002 22:18:30 +0100
Source: corkscrew
Section: net
Priority: optional
Maintainer: Thomas Seyrat <tomasera@debian.org>
Build-Depends: debhelper (>> 3.0.0)
Standards-Version: 3.6.2
Package: corkscrew
Architecture: any
Depends: ${shlibs:Depends}
Description: tunnel TCP connections through HTTP proxies
corkscrew is a simple tool to tunnel TCP connections through an HTTP
proxy supporting the CONNECT method. It reads stdin and writes to
stdout during the connection, just like netcat.
.
It can be used for instance to connect to an SSH server running on
a remote 443 port through a strict HTTPS proxy.
This package was debianized by Thomas Seyrat <tomasera@debian.org> on
Thu, 28 Mar 2002 16:54:00 +0100.
It was downloaded from <URL:http://www.agroman.net/corkscrew/>
Upstream Author: Pat Padgett <agroman@agroman.net>
Copyright:
Copyright (C) 2001 Pat Padgett
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
see /usr/share/common-licenses/GPL for more details
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH CORKSCREW 1 "November 22, 2003"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
corkscrew \- Tunnel TCP connections through HTTP proxies
.SH SYNOPSIS
.B corkscrew
.BR
proxy
.BR
proxyport
.BR
targethost
.BR
targetport
.BR
[ authfile ]
.br
.SH DESCRIPTION
This manual page documents briefly the
.BR corkscrew
command.
This manual page was written for the Debian distribution
because the original program does not have a manual page.
corkscrew is a simple tool to tunnel TCP connections through an HTTP
proxy supporting the CONNECT method. It reads stdin and writes to
stdout during the connection, just like netcat.
It can be used for instance to connect to an SSH server running on
a remote 443 port through a strict HTTPS proxy.
.SH PARAMETERS
.TP
.B proxy
This is the name of the host running the HTTP proxy.
.TP
.B proxyport
This is the port on which to connect on the proxy.
.TP
.B target
This is the host to reach through the proxy.
.TP
.B targetport
This is the port to connect to on the target host.
.SH COMMON USAGE
The common usage of corkscrew is to put the following line in your
ssh_config:
ProxyCommand corkscrew proxy proxyport %h %p
This will let your ssh connection go through the proxy with the help
of corkscrew.
.SH AUTH FILE
The auth file is made of one single line containing your username and
password in the form:
username:password
You should add the path to your auth file in the proxy command
described above:
ProxyCommand corkscrew proxy proxyport %h %p auth-file
.SH "SEE ALSO"
.IX Header "SEE ALSO"
\&\fIssh_config\fR\|(5)
.PP
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.SH AUTHOR
corkscrew was written by Pat Padgett <agroman@agroman.net>.
Thomas Seyrat <tomasera@debian.org> is the debian maintainer for this
package. This manual page was written by Laurent Fousse
<laurent@komite.net>, for the Debian GNU/Linux system (but may be used
by others).
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
export DH_COMPAT=3
config.status:
dh_testdir
./configure --prefix=/usr --mandir=\$${prefix}/share/man
build: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp
-$(MAKE) distclean
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
$(MAKE) install prefix=$(CURDIR)/debian/corkscrew/usr
binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
dh_installdocs TODO AUTHORS README
dh_installman debian/corkscrew.1
dh_installchangelogs ChangeLog
dh_strip
dh_compress
dh_fixperms
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment