diff --git a/corkscrew-2.0-from-debian.patch b/corkscrew-2.0-from-debian.patch index 0625f4c..fa13434 100644 --- a/corkscrew-2.0-from-debian.patch +++ b/corkscrew-2.0-from-debian.patch @@ -1,104 +1,3 @@ -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 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\fP and -+.\" \fI\fP escape sequences to invode bold face and italics, -+.\" respectively. -+.SH AUTHOR -+corkscrew was written by Pat Padgett . -+Thomas Seyrat is the debian maintainer for this -+package. This manual page was written by Laurent Fousse -+, 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 diff --git a/corkscrew.1 b/corkscrew.1 new file mode 100644 index 0000000..1c19c63 --- /dev/null +++ b/corkscrew.1 @@ -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 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\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +.SH AUTHOR +corkscrew was written by Pat Padgett . +Thomas Seyrat is the debian maintainer for this +package. This manual page was written by Laurent Fousse +, for the Debian GNU/Linux system (but may be used +by others). diff --git a/corkscrew.spec b/corkscrew.spec index a5d8193..9ffd62b 100644 --- a/corkscrew.spec +++ b/corkscrew.spec @@ -1,11 +1,12 @@ Summary: Tool for tunneling SSH through HTTP proxies Name: corkscrew Version: 2.0 -Release: 5%{dist} +Release: 6%{dist} License: GPLv2 Group: Applications/Internet URL: http://www.agroman.net/corkscrew/ Source0: http://www.agroman.net/corkscrew/%{name}-%{version}.tar.gz +Source1: %{name}.1 Patch0: %{name}-%{version}-from-debian.patch Patch1: %{name}-%{version}-typo.patch @@ -37,7 +38,7 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 make install DESTDIR=$RPM_BUILD_ROOT # man page -install -m644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.1.gz %changelog +* Fri Aug 03 2007 Debarshi Ray - 2.0-6 +- Moved the online manual page from Patch0 to Source1. + * Fri Aug 03 2007 Debarshi Ray - 2.0-5 - Changed value of License according to Fedora licensing guidelines.