From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 81B4D138359 for ; Tue, 15 Sep 2020 21:24:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2BFCE0956; Tue, 15 Sep 2020 21:24:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7AEF5E0956 for ; Tue, 15 Sep 2020 21:24:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEB37340E1B for ; Tue, 15 Sep 2020 21:24:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AFCE339 for ; Tue, 15 Sep 2020 21:24:30 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1600205042.52dbb9774fa246374cd0f5a499e700e0c6a13aaf.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/corkscrew/, net-vpn/corkscrew/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/corkscrew/corkscrew-2.0-r1.ebuild net-vpn/corkscrew/files/corkscrew-2.0-crlf-with-authfile.patch net-vpn/corkscrew/metadata.xml X-VCS-Directories: net-vpn/corkscrew/ net-vpn/corkscrew/files/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 52dbb9774fa246374cd0f5a499e700e0c6a13aaf X-VCS-Branch: master Date: Tue, 15 Sep 2020 21:24:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2335b820-661a-4441-b350-14166c7e6574 X-Archives-Hash: b93af3adee5166e91f7baaeea7fdc938 commit: 52dbb9774fa246374cd0f5a499e700e0c6a13aaf Author: Robin H. Johnson gentoo org> AuthorDate: Tue Sep 15 21:21:52 2020 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Sep 15 21:24:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52dbb977 net-vpn/corkscrew: EAPI7 bump Closes: https://bugs.gentoo.org/652342 Closes: https://bugs.gentoo.org/742029 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Robin H. Johnson gentoo.org> net-vpn/corkscrew/corkscrew-2.0-r1.ebuild | 40 ++++++++++++++++++++++ .../files/corkscrew-2.0-crlf-with-authfile.patch | 12 +++++++ net-vpn/corkscrew/metadata.xml | 3 ++ 3 files changed, 55 insertions(+) diff --git a/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild b/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild new file mode 100644 index 00000000000..cd46ea513c7 --- /dev/null +++ b/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit eutils autotools + +DESCRIPTION="a tool for tunneling SSH through HTTP proxies" +HOMEPAGE="https://github.com/patpadgett/corkscrew/" +# This is the old distfile URL; the github site does not have exact matching +# checksum, but the content is otherwise identical. +SRC_URI="http://www.agroman.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" +IUSE="" + +DOCS="AUTHORS ChangeLog README TODO" + +src_prepare() { + # Fix \r\n per bug 652342 + eapply "${FILESDIR}/${P}-crlf-with-authfile.patch" + + # Christoph Mende (24 Jun 2012) + # AC_HEADER_STDC is called separately and #include is + # without #ifdef in corkscrew.c. Instead of using AC_C_PROTOTYPES, + # remove the call entirely as unused wrt bug #423193 + sed -i -e 's:AM_C_PROTOTYPES:dnl &:' configure.in || die + + mv configure.{in,ac} || die + + eautoreconf + default +} diff --git a/net-vpn/corkscrew/files/corkscrew-2.0-crlf-with-authfile.patch b/net-vpn/corkscrew/files/corkscrew-2.0-crlf-with-authfile.patch new file mode 100644 index 00000000000..1e750bc7411 --- /dev/null +++ b/net-vpn/corkscrew/files/corkscrew-2.0-crlf-with-authfile.patch @@ -0,0 +1,12 @@ +diff -ur corkscrew-2.0/corkscrew.c corkscrew-2.0.new/corkscrew.c +--- corkscrew-2.0/corkscrew.c 2001-08-23 14:27:32.000000000 -0400 ++++ corkscrew-2.0.new/corkscrew.c 2018-04-03 11:06:53.268025605 -0400 +@@ -219,7 +219,7 @@ + strncat(uri, destport, sizeof(uri) - strlen(uri) - 1); + strncat(uri, " HTTP/1.0", sizeof(uri) - strlen(uri) - 1); + if ((argc == 6) || (argc == 7)) { +- strncat(uri, "\nProxy-Authorization: Basic ", sizeof(uri) - strlen(uri) - 1); ++ strncat(uri, "\r\nProxy-Authorization: Basic ", sizeof(uri) - strlen(uri) - 1); + strncat(uri, base64_encode(up), sizeof(uri) - strlen(uri) - 1); + } + strncat(uri, linefeed, sizeof(uri) - strlen(uri) - 1); diff --git a/net-vpn/corkscrew/metadata.xml b/net-vpn/corkscrew/metadata.xml index a36bf94641e..d0dda636d40 100644 --- a/net-vpn/corkscrew/metadata.xml +++ b/net-vpn/corkscrew/metadata.xml @@ -5,4 +5,7 @@ sysadmin@gentoo.org Gentoo Sysadmin Project + +Corkscrew は HTTP プロクシ経由の SSH トンネルを構築するツールです。 +