From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Jan 2019 10:09:44 +0000 Subject: gentoo resync : 22.01.2019 --- app-shells/rrs/Manifest | 3 +- .../rrs/files/rrs-1.70-drop-old-ssl-algos.patch | 64 ++++++++++++++++++++++ app-shells/rrs/rrs-1.70-r2.ebuild | 10 +++- 3 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 app-shells/rrs/files/rrs-1.70-drop-old-ssl-algos.patch (limited to 'app-shells/rrs') diff --git a/app-shells/rrs/Manifest b/app-shells/rrs/Manifest index 4f1ac797b4a5..8567d3b4a827 100644 --- a/app-shells/rrs/Manifest +++ b/app-shells/rrs/Manifest @@ -1,4 +1,5 @@ AUX rrs-1.70-asneeded.patch 1436 BLAKE2B ab35e22a351024935c13433d49e9c7e1ae452b597e179810a58a9e181895d6731a81d472abd2147865ff76bd4ad338429d41eadcead229a5ce243a66b66e8c17 SHA512 05972478d2e27290a430b0d80343f25c494a9f0f82ad87df2bc400dc652775dff447d8914e367d3092db2fcb5c4700e5d5873452767943e3d0b27410bef51188 +AUX rrs-1.70-drop-old-ssl-algos.patch 2855 BLAKE2B 86194d554b477bd1efb0e2b6950cde48202224efb0e87675f4b571efd95e509a9262236a6852a2e821b20f0e25c68d4d748a2cac3c6019b972a30366076b17e7 SHA512 9b5516a32a0c824dfb52d3cee07747b1931432ed3f7db96ca5121ecef914065b024ea4bb920e9b560f344dfad5d0eb6429ed7fcaff7cf0acc05b62a9b5135b45 DIST rrs-1.70.tar.gz 49579 BLAKE2B 0345f559239f64d51891100c11f3b80d2b41277eaa0e283c86dbd990496f083e1da60aa6937c870c133bfe8e7f905848d0da1a17b827a2bb07bd8ee1be4b36de SHA512 58a3d34bd80f2ddaa62112819d83ab2175daf1b9e66605d0b629a15d1fc6b43b482e1a4a763b99a07d85bbb0fa6df339d0dfcc203e3a3da3d5cfdabbd14a4bfa -EBUILD rrs-1.70-r2.ebuild 721 BLAKE2B f3adb0826e4243789287286c4258aafa8da95030148cce06b2a9a56f9cc748ac924b67212cd5a611c4b6ea1b0ff28cf1a3616671b2bf0df4a7acb50164fadbd1 SHA512 466f0c10175cd675bf54af6cc727ba9bd2101a24cff53d9fc41da3a0adf7a8a7bcc20e4876b41179f05788762325e0451ce0581ac3734caa8c81e2c24e60c9d3 +EBUILD rrs-1.70-r2.ebuild 766 BLAKE2B 92fc2721518f0783bd64fb58b5a5506f2e3e0a95656d1bffd08df7c12e9f6d18c0bf8f3b479f121b71e571d100dded39ba6e4de7b7dc7b1f427e232f43b48654 SHA512 b16df4e5b98b34ae90c0ac86d9137592122f72c02dfb67488e72a263ecbe8413916e52a163ec117a440ac38bfeb194a1266d58b9cb1f7acd36cc96ca9841bac5 MISC metadata.xml 317 BLAKE2B 79bf68384cb06bb254c6bd8757a368e929ae41d5dcd793c7123ea0e336c9187c9062013fc4feeb032c18515fa865d05f1f61272555f2e137e419c23b289246e7 SHA512 b80e5e730f8ee1225f73e1c1651c9cec243f117f3b983ef0814699ba367f373ada228e1fe2b6b8f1928eeb5cd854c1a7bf07d59075607a992a4a0e0dd3482ee4 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 000000000000..ab7b43e63672 --- /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 efc3d8c7394f..0af183bb953f 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 -- cgit v1.2.3