Add patch to enable TLS. Fixes bug 551278. Drop old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key B0A72FD2)

4 files changed, 35 insertions, 39 deletions

diff --git a/net-misc/proxytunnel/ChangeLog b/net-misc/proxytunnel/ChangeLog
index 2385830e269c..6e6c79067a5c 100644
--- a/net-misc/proxytunnel/ChangeLog
+++ b/net-misc/proxytunnel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/proxytunnel
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/ChangeLog,v 1.26 2014/01/26 21:01:18 vikraman Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/ChangeLog,v 1.27 2015/07/08 04:18:22 vikraman Exp $
+
+*proxytunnel-1.9.1-r1 (08 Jul 2015)
+
+  08 Jul 2015; Vikraman Choudhury (vikraman) <vikraman@gentoo.org>
+  +files/proxytunnel-allowTLS.patch, +proxytunnel-1.9.1-r1.ebuild,
+  -proxytunnel-1.9.0.ebuild, -proxytunnel-1.9.1.ebuild:
+  Add patch to enable TLS. Fixes bug 551278. Drop old.
 
 *proxytunnel-1.9.1 (26 Jan 2014)
 
diff --git a/net-misc/proxytunnel/files/proxytunnel-allowTLS.patch b/net-misc/proxytunnel/files/proxytunnel-allowTLS.patch
new file mode 100644
index 000000000000..b6865a73fc5f
--- /dev/null
+++ b/net-misc/proxytunnel/files/proxytunnel-allowTLS.patch
@@ -0,0 +1,22 @@
+From 2a26224b5ff103d2b8e2ff7be56e616d1ecde1f4 Mon Sep 17 00:00:00 2001
+From: wicher <wicher@gavagai.eu>
+Date: Sun, 26 Apr 2015 13:07:13 +0200
+Subject: [PATCH] Allow TLS
+
+---
+ ptstream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ptstream.c b/ptstream.c
+index 4c87c80..6d55137 100644
+--- a/ptstream.c
++++ b/ptstream.c
+@@ -151,7 +151,7 @@ int stream_enable_ssl(PTSTREAM *pts) {
+ 	
+ 	/* Initialise the connection */
+ 	SSLeay_add_ssl_algorithms();
+-	meth = SSLv3_client_method();
++	meth = SSLv23_client_method();
+ 	SSL_load_error_strings();
+ 
+ 	ctx = SSL_CTX_new (meth);
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.0.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.0.ebuild
deleted file mode 100644
index c16367dee441..000000000000
--- a/net-misc/proxytunnel/proxytunnel-1.9.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/proxytunnel-1.9.0.ebuild,v 1.5 2014/01/26 21:01:17 vikraman Exp $
-
-EAPI="5"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Connect stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"
-HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ http://proxytunnel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/proxytunnel/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static"
-
-RDEPEND="dev-libs/openssl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	emake install PREFIX="${EPREFIX}"/usr DESTDIR="${D}" || die
-	dodoc CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO
-}
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
index 8c0a9cc13e0e..840d73e6a5b5 100644
--- a/net-misc/proxytunnel/proxytunnel-1.9.1.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/proxytunnel-1.9.1.ebuild,v 1.1 2014/01/26 21:01:17 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild,v 1.1 2015/07/08 04:18:22 vikraman Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="static"
 
-RDEPEND="dev-libs/openssl"
+RDEPEND="dev-libs/openssl:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	app-text/asciidoc
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
+	epatch "${FILESDIR}"/${PN}-allowTLS.patch
 }
 
 src_compile() {