mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 20:36:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/corkscrew: upgrade to github.com version

Browse Source 
rework README patches
remove not needed  autoconf patch
remove corkscrew.c patch
This commit is contained in:
Milan P. Stanić 2019-01-10 18:38:54 +01:00 committed by Natanael Copa
parent f324af6812
commit 82bbdbee40
5 changed files with 37 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
testing/corkscrew/APKBUILD
View File

@ -2,23 +2,23 @@
# Maintainer:
pkgname=corkscrew
pkgver=2.0
pkgrel=0
pkgrel=1
_commit=a94f745b40077172b8fe7d77e2d583b9cf900281
pkgdesc="Tool for tunneling SSH through HTTP proxies"
url="http://agroman.net/corkscrew/"
url="https://github.com/bryanpkc/corkscrew/"
arch="all"
license="GPL"
depends=""
makedepends="autoconf automake"
install=""
subpackages="$pkgname-doc"
source="http://agroman.net/$pkgname/$pkgname-$pkgver.tar.gz
corkscrew-2.0-from-debian.patch
source="$pkgname-$pkgver.tar.gz::https://github.com/bryanpkc/corkscrew/archive/$_commit.tar.gz
corkscrew-2.0-from-debian-readme.patch
corkscrew-2.0-typo.patch
corkscrew-2.0-autoconf.patch
corkscrew.1
"
_builddir="$srcdir"/$pkgname-$pkgver
_builddir="$srcdir"/$pkgname-$_commit
prepare() {
local i
cd "$_builddir"
@ -48,18 +48,7 @@ package() {
"$pkgdir"/usr/share/man/man1/corkscrew.1 || return 1
}
md5sums="35df77e7f0e59c0ec4f80313be52c10a corkscrew-2.0.tar.gz
877c4d390dde4af6669f26ead2d4f3d9 corkscrew-2.0-from-debian.patch
2c8c799949903a166bb08a6747a3563c corkscrew-2.0-typo.patch
bd80d0cc791e83734d7521ccc59badb6 corkscrew-2.0-autoconf.patch
bf041e99c7395e32460c34b3a01c9db1 corkscrew.1"
sha256sums="0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be corkscrew-2.0.tar.gz
6dd9455f3063cab53fd95c416d5706d921d19a050794cf53df7f2f51e5a97511 corkscrew-2.0-from-debian.patch
94a2137fbfe09b2c417dab251ce98e75ca4bc219c0002eaaeb84236f26361fe5 corkscrew-2.0-typo.patch
b4fb8a9c40e1902f718a9e2bd03bf43976fe57903f977d20d6e81812f97ac777 corkscrew-2.0-autoconf.patch
67f442ffccda98b05a1b4b42c9e4064f538467361d36fcca1401398efd3a44b2 corkscrew.1"
sha512sums="bfea81064601cdf67ba1730b49e3a5f7aa377423edbfb052ff0f6b2776b49e104852b7f126f4668d37541a706313ef37d9b4535126e94bb202db4ac38f693e6f corkscrew-2.0.tar.gz
58b8360155aefc636dfed3c1be89ebbcf39b623dacea12d1fdf3c5831f3b6d06c4f8510a3ccc125f24644a0ca27606c10af99e22266fdd7eca5a3677504f88fb corkscrew-2.0-from-debian.patch
6a685588231485b3808909d12885ed4265f9dd471bf89774ee7f4603577a866c16b296642f223c5ca91eb75c71c552d3aac249bed451dcdffbdacc19abda309d corkscrew-2.0-typo.patch
3ad3ac14717e2f8120bd7415426232e081cdc3a1c46437a54a4e27f7cc3777ecf266cd52a9917a48317dedc5c529363a404d4ff556f20c52bf0c00ee4003e799 corkscrew-2.0-autoconf.patch
sha512sums="3023df4a366d08d131fe3c73c4841c4aed3b257c6deb64c4db2f0f6e210483d7c563937468f8c9e5da8441305951ffccb5bc05da6da24bc0463f1806ad7e6abe corkscrew-2.0.tar.gz
2514663f2f120c49b7c0d40246ca5fae49f9c27097c17c38992085bc9f4ae3e2f1a749ceaf400b10b4b68c809365a420865fab90fead585949ad440a19f02aeb corkscrew-2.0-from-debian-readme.patch
197dd0d3de4a026603af8ea4bf8cdf1d25b7555166b817697474961020491b4f181c67e431f340791f22768c28b40262819780c77055ec3d066c60c19f57ac2e corkscrew-2.0-typo.patch
a59c99056ef4c12dec854ab0b571b9778b78c3d429193c1365ef2c1a37edb478e8d7e7948e830b22dfe3fb724e6be0b6176ac541da1fa5a2678a608f2b025e90 corkscrew.1"

10
testing/corkscrew/corkscrew-2.0-autoconf.patch
View File

@ -1,10 +0,0 @@
--- corkscrew-2.0/configure.in.orig
+++ corkscrew-2.0/configure.in
@@ -1,7 +1,6 @@
AC_INIT(corkscrew.c)
AM_INIT_AUTOMAKE(corkscrew, 2.0)
AM_CONFIG_HEADER(config.h:config.in)
-AM_C_PROTOTYPES
AC_PROG_CC
AC_PROG_AWK

20
testing/corkscrew/corkscrew-2.0-from-debian-readme.patch Normal file
View File

@ -0,0 +1,20 @@
--- a/README
+++ b/README
@@ -66,7 +66,7 @@
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 in the
@@ -91,7 +91,7 @@
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 when

44
testing/corkscrew/corkscrew-2.0-from-debian.patch
View File

@ -1,44 +0,0 @@
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[];
#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)) {
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

17
testing/corkscrew/corkscrew-2.0-typo.patch
View File

@ -1,12 +1,11 @@
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
--- a/README
+++ b/README
@@ -105,7 +105,7 @@
*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
vary.
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
vary.