gentoo resync : 16.09.2020

6 files changed, 5 insertions, 208 deletions

diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
index e5b14cf8d159..7cc8d4d21d7b 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,8 +1,4 @@
-AUX proxytunnel-1.9.1-gcc-10.patch 4076 BLAKE2B 13dcff92f5c440430b03b02abd2d3068fa1b95cd67d5830ab99ac077ca24b333dbfd7423d37c7e6cba8d92f820cc7c1ea5d407ac12f3ddd367fe48519113a310 SHA512 c031b884ee929cdae87fb03846a6f0a99b38fbea96c3fbbe94bd176d873e73a15f1a914795f85c9fb6cd107ec117e38dbce93a6aaa256ca516b41a0bd74f6929
-AUX proxytunnel-allowTLS.patch 592 BLAKE2B 2c48bb1a1c2e2374043d9bc73e653a5f87f5bbda6a64a5572cbe3bdafe533205f619b7248c8f7b6cecf7de8c72940a6ccf64e054c5419e9ba656f773e9d7d346 SHA512 67b0103054c56c69cd9c0d1aa144498151f105004b400bcdbbb3df519d37424630554e101e5617faf075fd978edddfc4d06cca7524c51e28cd33c1165b6a22f9
-DIST proxytunnel-1.10.20200507.tar.gz 52286 BLAKE2B fca86840c4240137e6cf92a289344c39a8ab4066fb3efe83007ea75c9e42ebd746ce3e326d2351af38ac580c18d139a8d4f956af828862ae4f4e89eb3bd19fa0 SHA512 8727a686dcca9e38e5327207f29824daeddf9ce9a4fccdef6c6bd41019eb3901d4b84e724cbf9ba615115151ea434a597e9290ce302ba6df41e99d2f0b484e01
-DIST proxytunnel-1.9.1.tar.gz 48025 BLAKE2B 5a844d8fdbb9a1eae9c40c7621086b873ae89813b7c596da4416efcb777a8110ad7d224a0efa2e193cfbbb82dbfe69d44d4dd36db080b8e902630a464a85b953 SHA512 819dd11bc13fc279d2d475b89909c0eea414ff71d772d4bfed742dd8d425669dc502f2c22d983bb8c58e426a2bc7209526cb21492ca5f8e92ea1b9ea961fcfdc
-EBUILD proxytunnel-1.10.20200507.ebuild 1093 BLAKE2B d62c614f964611b73c75cbd5db3752d1d837347de68f7aaa868aa943f386c4d4c77b0de6b620ddeaf47694d74ff96c1dfb812384fd18cd8ec74f691fb3c1af8a SHA512 054fe9d19722ee2081a89fbd6f372404f4f26ce5d27ce8110dc82452eb7fedf8c96a6b7c7b4e5a498ffb3c5c0569cb1a326ba2d64529f00ba2f26075d3ed047e
-EBUILD proxytunnel-1.9.1-r2.ebuild 1173 BLAKE2B 4402bd59cd3d1e967577fe65274347e6630553491850c87417d667eb7ec2a403782ddc3d31aa7dcbb302c490e3a73e19eadff9f418456741cd36be3ea9631125 SHA512 9e395e52a362684eae2c0ec6003e1e193cfb4d539173fc117352162601c85bc8d56214e320a5b7440394b20deded395fb5d50c43497bede6f8c144958dc37a2c
-EBUILD proxytunnel-9999.ebuild 1093 BLAKE2B d62c614f964611b73c75cbd5db3752d1d837347de68f7aaa868aa943f386c4d4c77b0de6b620ddeaf47694d74ff96c1dfb812384fd18cd8ec74f691fb3c1af8a SHA512 054fe9d19722ee2081a89fbd6f372404f4f26ce5d27ce8110dc82452eb7fedf8c96a6b7c7b4e5a498ffb3c5c0569cb1a326ba2d64529f00ba2f26075d3ed047e
+DIST proxytunnel-1.10.20200907.tar.gz 54711 BLAKE2B 79b5fc459ece793997b4407679498af29c53aa495802259f95ec600665fca815f9e43cafcbf1d0407c4f7184c21e7dae3f899413dbeeaf0924034e1bbd26cddb SHA512 f04570e87a0fda024661135b6598f87f1d7407c368fe3453300a655fefedb66ade96a742223de08b500ba9fc1fdc2e6519005ea38529ceaa3c1815f5012fca84
+EBUILD proxytunnel-1.10.20200907.ebuild 1099 BLAKE2B f0583623d03bd83e41af0154343767de36dcc426789cff6272422c19d703f045ca38608dd4123454517d4253f56c3116940f3a3fd52bcf254d3f28dfab6a2f5a SHA512 44d288b26633cde054f04560c0123e158acc23a76957e1b208e3333b828c15cf801f3a9108f29919c6250aab8a90968d2a23a1b1e5d0b5987d5906d4cceb4acd
+EBUILD proxytunnel-9999.ebuild 1099 BLAKE2B f0583623d03bd83e41af0154343767de36dcc426789cff6272422c19d703f045ca38608dd4123454517d4253f56c3116940f3a3fd52bcf254d3f28dfab6a2f5a SHA512 44d288b26633cde054f04560c0123e158acc23a76957e1b208e3333b828c15cf801f3a9108f29919c6250aab8a90968d2a23a1b1e5d0b5987d5906d4cceb4acd
 MISC metadata.xml 717 BLAKE2B da3b819d7e0caeee376359837cf0a6294eee0363ad857369816fbf595e6add90666feeea356a9864d71a3987f7393ac7483bd4fe800bae67364291da420a2c39 SHA512 ecf80d876bccd3c2c98cb6a46e543e6adbe5a52a1666b6678cd86def313593d5200189f67cec5d85150e7a308139089786c416ee0a2d6bfe58d800b0fc7a18da
diff --git a/net-misc/proxytunnel/files/proxytunnel-1.9.1-gcc-10.patch b/net-misc/proxytunnel/files/proxytunnel-1.9.1-gcc-10.patch
deleted file mode 100644
index a42b8424cca5..000000000000
--- a/net-misc/proxytunnel/files/proxytunnel-1.9.1-gcc-10.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-https://github.com/proxytunnel/proxytunnel/pull/43
-
-From 517650724dc478dd35ac7c7953b4eb700ccb7273 Mon Sep 17 00:00:00 2001
-From: Paul Howarth <paul@city-fan.org>
-Date: Wed, 22 Jan 2020 21:44:01 +0000
-Subject: [PATCH] Fix global variable declarations/definitions for GCC 10
- compatibility
-
-This boils down to declaring global variables as "extern" in header files
-and defining them in just one place.
-
-See https://www.gnu.org/software/gcc/gcc-10/porting_to.html
----
- Makefile      |  1 +
- globals.c     | 41 +++++++++++++++++++++++++++++++++++++++++
- ntlm.h        |  4 ++--
- proxytunnel.h | 16 ++++++++--------
- 4 files changed, 52 insertions(+), 10 deletions(-)
- create mode 100644 globals.c
-
-diff --git a/Makefile b/Makefile
-index 57328e8..ecdaa5f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -63,6 +63,7 @@ OBJ = proxytunnel.o	\
- 	readpassphrase.o	\
- 	messages.o	\
- 	cmdline.o	\
-+	globals.o	\
- 	ntlm.o		\
- 	ptstream.o
- 
-diff --git a/globals.c b/globals.c
-new file mode 100644
-index 0000000..fe19db4
---- /dev/null
-+++ b/globals.c
-@@ -0,0 +1,41 @@
-+/* Proxytunnel - (C) 2001-2008 Jos Visser / Mark Janssen    */
-+/* Contact:                  josv@osp.nl / maniac@maniac.nl */
-+
-+/*
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ */
-+
-+/* globals.c */
-+
-+#include "proxytunnel.h"
-+
-+/* Globals */
-+char *program_name;             /* Guess what? */
-+int i_am_daemon;                /* Also... */
-+
-+PTSTREAM *stunnel;	/* stream representing the socket from us to proxy */
-+PTSTREAM *std;		/* stream representing stdin/stdout */
-+
-+/*
-+ * All the command line options
-+ */
-+struct gengetopt_args_info args_info;
-+
-+char buf[SIZE];         /* Data transfer buffer */
-+
-+char ntlm_type1_buf[160];
-+char ntlm_type3_buf[4096];
-+
-+// vim:noexpandtab:ts=4
-diff --git a/ntlm.h b/ntlm.h
-index f919368..01a6434 100644
---- a/ntlm.h
-+++ b/ntlm.h
-@@ -26,8 +26,8 @@ void build_ntlm2_response();
- 
- extern int ntlm_challenge;
- 
--char ntlm_type1_buf[160];
--char ntlm_type3_buf[4096];
-+extern char ntlm_type1_buf[160];
-+extern char ntlm_type3_buf[4096];
- 
- 
- // Below are the flag definitions.
-diff --git a/proxytunnel.h b/proxytunnel.h
-index 593cd7e..aa09a4b 100644
---- a/proxytunnel.h
-+++ b/proxytunnel.h
-@@ -46,21 +46,21 @@ char * readpassphrase(const char *, char *, size_t, int);
- char * getpass_x(const char *format, ...);
- 
- /* Globals */
--int read_fd;                    /* The file descriptor to read from */
--int write_fd;                   /* The file destriptor to write to */
--char *program_name;             /* Guess what? */
--int i_am_daemon;                /* Also... */
-+extern int read_fd;                    /* The file descriptor to read from */
-+extern int write_fd;                   /* The file descriptor to write to */
-+extern char *program_name;             /* Guess what? */
-+extern int i_am_daemon;                /* Also... */
- 
--PTSTREAM *stunnel;	/* stream representing the socket from us to proxy */
--PTSTREAM *std;		/* stream representing stdin/stdout */
-+extern PTSTREAM *stunnel;	/* stream representing the socket from us to proxy */
-+extern PTSTREAM *std;		/* stream representing stdin/stdout */
- 
- /*
-  * All the command line options
-  */
--struct gengetopt_args_info args_info;
-+extern struct gengetopt_args_info args_info;
- 
- #define SIZE 65536
--char buf[SIZE];         /* Data transfer buffer */
-+extern char buf[SIZE];         /* Data transfer buffer */
- 
- /*
-  * Small MAX macro
diff --git a/net-misc/proxytunnel/files/proxytunnel-allowTLS.patch b/net-misc/proxytunnel/files/proxytunnel-allowTLS.patch
deleted file mode 100644
index b6865a73fc5f..000000000000
--- a/net-misc/proxytunnel/files/proxytunnel-allowTLS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.10.20200507.ebuild b/net-misc/proxytunnel/proxytunnel-1.10.20200907.ebuild
index cbc33dfb1f68..c4cce456a92d 100644
--- a/net-misc/proxytunnel/proxytunnel-1.10.20200507.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.10.20200907.ebuild
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}
 	"
 BDEPEND="virtual/pkgconfig"
 
-DOCS=( CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO )
+DOCS=( CHANGES CREDITS INSTALL.md KNOWN_ISSUES LICENSE.txt README.md RELNOTES TODO )
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
deleted file mode 100644
index 0e62845f44f2..000000000000
--- a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Connect stdin and stdout to a server via an HTTPS proxy"
-HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ https://proxytunnel.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static"
-
-RDEPEND="dev-libs/openssl:="
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-allowTLS.patch
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-src_prepare() {
-	default
-	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
-	einstalldocs
-}
diff --git a/net-misc/proxytunnel/proxytunnel-9999.ebuild b/net-misc/proxytunnel/proxytunnel-9999.ebuild
index cbc33dfb1f68..c4cce456a92d 100644
--- a/net-misc/proxytunnel/proxytunnel-9999.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-9999.ebuild
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}
 	"
 BDEPEND="virtual/pkgconfig"
 
-DOCS=( CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO )
+DOCS=( CHANGES CREDITS INSTALL.md KNOWN_ISSUES LICENSE.txt README.md RELNOTES TODO )
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"