rpms/corkscrew/F-7 corkscrew-2.0-from-debian.patch, NONE, 1.1 corkscrew-2.0-typo.patch, NONE, 1.1 corkscrew.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Debarshi Ray (rishi) fedora-extras-commits at redhat.com
Tue Jun 12 15:26:28 UTC 2007

Author: rishi

Update of /cvs/extras/rpms/corkscrew/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25238/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	corkscrew-2.0-from-debian.patch corkscrew-2.0-typo.patch 
Log Message:
Initial import into F-7.
 Modified Files:
 	import.log F-7/.cvsignore F-7/sources 
 Added Files:
 	F-7/corkscrew-2.0-typo.patch F-7/corkscrew.spec 


--- NEW FILE corkscrew-2.0-from-debian.patch ---
diff -urNp corkscrew-2.0.orig/corkscrew.1 corkscrew-2.0/corkscrew.1
--- corkscrew-2.0.orig/corkscrew.1	1970-01-01 05:30:00.000000000 +0530
+++ corkscrew-2.0/corkscrew.1	2007-05-19 09:56:33.000000000 +0530
@@ -0,0 +1,97 @@
+.\"                                      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)
+corkscrew \- Tunnel TCP connections through HTTP proxies
+.B corkscrew
+[ authfile ]
+This manual page documents briefly the
+.BR corkscrew
+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.
+.B proxy
+This is the name of the host running the HTTP proxy.
+.B proxyport
+This is the port on which to connect on the proxy.
+.B target
+This is the host to reach through the proxy.
+.B targetport
+This is the port to connect to on the target host.
+The common usage of corkscrew is to put the following line in your
+ProxyCommand corkscrew proxy proxyport %h %p
+This will let your ssh connection go through the proxy with the help
+of corkscrew.
+The auth file is made of one single line containing your username and
+password in the form:
+You should add the path to your auth file in the proxy command
+described above:
+ProxyCommand corkscrew proxy proxyport %h %p auth-file
+.IX Header "SEE ALSO"
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+corkscrew was written by Pat Padgett <agroman at agroman.net>.
+Thomas Seyrat <tomasera at debian.org> is the debian maintainer for this
+package.  This manual page was written by Laurent Fousse
+<laurent at komite.net>, for the Debian GNU/Linux system (but may be used
+by others).
diff -urNp corkscrew-2.0.orig/corkscrew.c corkscrew-2.0/corkscrew.c
--- corkscrew-2.0.orig/corkscrew.c	2007-05-19 09:56:05.000000000 +0530
+++ corkscrew-2.0/corkscrew.c	2007-05-19 10:07:00.000000000 +0530
@@ -176,6 +176,7 @@ char *argv[];
 	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);
+					if (tmp = strstr(buffer,"\r\n\r\n"))
+					{
+					    tmp += 4;
+					    write(1, tmp, strlen(tmp));
+					}
 			if (FD_ISSET(csock, &sfd) && (sent == 0)) {
diff -urNp corkscrew-2.0.orig/README corkscrew-2.0/README
--- corkscrew-2.0.orig/README	2007-05-19 09:56:05.000000000 +0530
+++ corkscrew-2.0/README	2007-05-19 09:56:48.000000000 +0530
@@ -47,7 +47,7 @@ Setting up Corkscrew with SSH/OpenSSH is
 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


--- NEW FILE corkscrew-2.0-typo.patch ---
diff -urNp corkscrew-2.0.orig/README corkscrew-2.0/README
--- corkscrew-2.0.orig/README	2007-05-19 10:56:12.000000000 +0530
+++ corkscrew-2.0/README	2007-05-19 10:56:45.000000000 +0530
@@ -83,7 +83,7 @@ if you could include the following infor
 *NOTE: I have had problems using the auth features with Mircosoft Proxy
  server.  The problems are sporadic, and I believe that they are related
- to the round-robin setup that I was testing it again.  Your mileage may
+ to the round-robin setup that I was testing it against.  Your mileage may

--- NEW FILE corkscrew.spec ---
Summary: Tool for tunneling SSH through HTTP proxies
Name: corkscrew
Version: 2.0
Release: 4%{dist}
License: GPL
Group: Applications/Internet
URL: http://www.agroman.net/corkscrew/
Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz

Patch0: %{name}-%{version}-from-debian.patch
Patch1: %{name}-%{version}-typo.patch

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Corkscrew is a tool for tunneling SSH through HTTP proxies.

It has been tested with the following HTTP proxies :
 * Gauntlet
 * CacheFlow
 * JunkBuster
 * Apache mod_proxy

%setup -q
%patch0 -p1
%patch1 -p1

make %{?_smp_mflags}

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1


# man page
install -m644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1



* Sun Jun 10 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.0-4
- Removed 'export CC=gcc' from the build stanza.

* Wed Jun 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.0-3
- Removed '[ -d $RPM_BUILD_ROOT ]' from the install stanza.
- Changed value of BuildRoot as per recommendations in Fedora packaging

* Sat May 19 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.0-2
- Addressed warnings generated by rpmlint, and changed Source0 into a URL.
- Added AUTHORS, ChangeLog, COPYING and TODO in the list of documentation
- Added online manual page and patches to README and corkscrew.c from Debian.
- Fixed a typo in README.

* Sat May 12 2007 Debarshi Ray <rishi at fedoraproject.org> - 2.0-1
- Initial build.

Index: .cvsignore
RCS file: /cvs/extras/rpms/corkscrew/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jun 2007 23:15:25 -0000	1.1
+++ .cvsignore	12 Jun 2007 15:25:52 -0000	1.2
@@ -0,0 +1 @@

Index: sources
RCS file: /cvs/extras/rpms/corkscrew/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jun 2007 23:15:25 -0000	1.1
+++ sources	12 Jun 2007 15:25:52 -0000	1.2
@@ -0,0 +1 @@
+35df77e7f0e59c0ec4f80313be52c10a  corkscrew-2.0.tar.gz

More information about the scm-commits mailing list