[gentoo-commits] repo/gentoo:master commit in: app-shells/rrs/files/, app-shells/rrs/

[Sergey Popov]

commit:     7efd65718df37c2b2cb4aa8427075ae12b50f5ae
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 11:07:00 2019 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 11:07:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efd6571

app-shells/rrs: bump EAPI to 7, fix building with openssl 1.1

Reported-by: Toralf Förster <toralf <AT> gentoo.org>
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>
Closes: https://bugs.gentoo.org/674266
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../rrs/files/rrs-1.70-drop-old-ssl-algos.patch    | 64 ++++++++++++++++++++++
 app-shells/rrs/rrs-1.70-r2.ebuild                  | 10 +++-
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/app-shells/rrs/files/rrs-1.70-drop-old-ssl-algos.patch b/app-shells/rrs/files/rrs-1.70-drop-old-ssl-algos.patch
new file mode 100644
index 00000000000..ab7b43e6367
--- /dev/null
+++ b/app-shells/rrs/files/rrs-1.70-drop-old-ssl-algos.patch
@@ -0,0 +1,64 @@
+--- a/rrs.c	2019-01-17 12:36:21.134181933 +0300
++++ b/rrs.c	2019-01-17 12:37:56.133181353 +0300
+@@ -186,11 +186,9 @@
+ "                       can change it with, e.g., --ssl=tlsv1 for instance, or\n"
+ "                       the -S option.\n"
+ "   -S, --ssl=method    Choose OpenSSL protocol (case doesn't matter):\n"
+-"                           -S SSLv2\n"
+-"                           -S SSLv3\n"
+ "                           -S TLSv1\n"
+ "                       If you use --ssl instead of -S, please remember to use\n"
+-"                       the equal sign, e.g., --ssl=sslv3.\n"
++"                       the equal sign, e.g., --ssl=tlsv1.\n"
+ "   -P, --pem file      Specify private key and certificate (public key) file.\n"
+ "                       The file should begin with a PEM encoded private key\n"
+ "                       followed by a PEM encoded certificate. Both the\n"
+@@ -336,8 +334,8 @@
+ /****** various other global variables ******/
+ 
+ #if ! defined(WITHOUT_SSL)
+-    enum { none, TLSv1, SSLv3, SSLv2 } rrs_ssl = none;
+-    char *sslprotocols[] = { "none", "TLSv1", "SSLv3", "SSLv2" };
++    enum { none, TLSv1 } rrs_ssl = none;
++    char *sslprotocols[] = { "none", "TLSv1" };
+ #endif
+ 
+ unsigned int sourceport = 0,
+@@ -1826,11 +1824,7 @@
+                 }
+                 rrs_ssl = TLSv1;
+                 if (optarg) {
+-                    if (!strcasecmp(optarg, "SSLv2")) {
+-                        rrs_ssl = SSLv2;
+-                    } else if (!strcasecmp(optarg, "SSLv3")) {
+-                        rrs_ssl = SSLv3;
+-                    } else if (!strcasecmp(optarg, "TLSv1")) {
++                    if (!strcasecmp(optarg, "TLSv1")) {
+                         rrs_ssl = TLSv1;
+                     } else {
+                         fprintf(stderr, "[?] not supported ssl protocol: %s\n", optarg);
+@@ -1981,22 +1975,14 @@
+         SSL_load_error_strings();
+ 
+         if (rrs_listen) {
+-            if (rrs_ssl == SSLv2) {
+-                sslmethod = SSLv2_server_method();
+-            } else if (rrs_ssl == SSLv3) {
+-                sslmethod = SSLv3_server_method();
+-            } else if (rrs_ssl == TLSv1) {
++            if (rrs_ssl == TLSv1) {
+                 sslmethod = TLSv1_server_method();
+             } else {
+                 fprintf(stderr, "[?] huh? rrs_ssl = 0x%08x\n", (unsigned int)sslmethod);
+                 return err_generic;
+             }
+         } else {
+-            if (rrs_ssl == SSLv2) {
+-                sslmethod = SSLv2_client_method();
+-            } else if (rrs_ssl == SSLv3) {
+-                sslmethod = SSLv3_client_method();
+-            } else if (rrs_ssl == TLSv1) {
++            if (rrs_ssl == TLSv1) {
+                 sslmethod = TLSv1_client_method();
+             } else {
+                 fprintf(stderr, "[?] huh? rrs_ssl = 0x%08x\n", (unsigned int)sslmethod);

diff --git a/app-shells/rrs/rrs-1.70-r2.ebuild b/app-shells/rrs/rrs-1.70-r2.ebuild
index efc3d8c7394..0af183bb953 100644
--- a/app-shells/rrs/rrs-1.70-r2.ebuild
+++ b/app-shells/rrs/rrs-1.70-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,12 +12,16 @@ SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
+
 IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/"${P}"-asneeded.patch )
+PATCHES=(
+	"${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-drop-old-ssl-algos.patch"
+)
 
 src_prepare() {
 	default