From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Jan 2018 15:48:02 +0000 Subject: gentoo resync : 25.01.2018 --- ...-fix-segfault-due-to-derefencing-null-ptr.patch | 66 ------------------ .../wget/files/wget-1.92.2-openssl-1.1.0-r1.patch | 80 ---------------------- 2 files changed, 146 deletions(-) delete mode 100644 net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch delete mode 100644 net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch (limited to 'net-misc/wget/files') diff --git a/net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch b/net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch deleted file mode 100644 index 8a66e08c3e3b..000000000000 --- a/net-misc/wget/files/wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 973c26ed7d51052a7b6e120ed1b84e47266667e1 Mon Sep 17 00:00:00 2001 -From: Darshit Shah -Date: Mon, 6 Nov 2017 10:09:03 +0100 -Subject: Fix Segfault due to derefencing null ptr -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* src/http.c(gethttp): When Encoding is gzip, ensure that the -Content-Type Header was actually seen. Without this, the "type" variable -is null causing a Segfault. - -Reported-By: Noël Köthe ---- - src/http.c | 30 +++++++++++++++++++----------- - 1 file changed, 19 insertions(+), 11 deletions(-) - -diff --git a/src/http.c b/src/http.c -index 9954848..2a5454f 100644 ---- a/src/http.c -+++ b/src/http.c -@@ -3714,22 +3714,30 @@ gethttp (const struct url *u, struct url *original_url, struct http_stat *hs, - && opt.compression != compression_none) - { - /* Make sure the Content-Type is not gzip before decompressing */ -- const char * p = strchr (type, '/'); -- if (p == NULL) -- { -- hs->remote_encoding = ENC_GZIP; -- hs->local_encoding = ENC_NONE; -- } -- else -+ if (type) - { -- p++; -- if (c_tolower(p[0]) == 'x' && p[1] == '-') -- p += 2; -- if (0 != c_strcasecmp (p, "gzip")) -+ const char * p = strchr (type, '/'); -+ if (p == NULL) - { - hs->remote_encoding = ENC_GZIP; - hs->local_encoding = ENC_NONE; - } -+ else -+ { -+ p++; -+ if (c_tolower(p[0]) == 'x' && p[1] == '-') -+ p += 2; -+ if (0 != c_strcasecmp (p, "gzip")) -+ { -+ hs->remote_encoding = ENC_GZIP; -+ hs->local_encoding = ENC_NONE; -+ } -+ } -+ } -+ else -+ { -+ hs->remote_encoding = ENC_GZIP; -+ hs->local_encoding = ENC_NONE; - } - } - #endif --- -cgit v1.0-41-gc330 - diff --git a/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch b/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch deleted file mode 100644 index 79f33b157599..000000000000 --- a/net-misc/wget/files/wget-1.92.2-openssl-1.1.0-r1.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -174,11 +174,16 @@ ssl_init (void) - { - SSL_METHOD const *meth; - long ssl_options = 0; -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ int ssl_proto_version = 0; -+#endif - - #if OPENSSL_VERSION_NUMBER >= 0x00907000 - if (ssl_true_initialized == 0) - { -+#if OPENSSL_API_COMPAT < 0x10100000L - OPENSSL_config (NULL); -+#endif - ssl_true_initialized = 1; - } - #endif -@@ -202,8 +207,12 @@ ssl_init (void) - CONF_modules_load_file(NULL, NULL, - CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE); - #endif -+#if OPENSSL_API_COMPAT >= 0x10100000L -+ OPENSSL_init_ssl(0, NULL); -+#else - SSL_library_init (); - SSL_load_error_strings (); -+#endif - #if OPENSSL_VERSION_NUMBER < 0x10100000L - SSLeay_add_all_algorithms (); - SSLeay_add_ssl_algorithms (); -@@ -229,16 +238,31 @@ ssl_init (void) - ssl_options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; - break; - case secure_protocol_tlsv1: -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ meth = TLS_client_method(); -+ ssl_proto_version = TLS1_VERSION; -+#else - meth = TLSv1_client_method (); -+#endif - break; - - #if OPENSSL_VERSION_NUMBER >= 0x10001000 - case secure_protocol_tlsv1_1: -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ meth = TLS_client_method(); -+ ssl_proto_version = TLS1_1_VERSION; -+#else - meth = TLSv1_1_client_method (); -+#endif - break; - - case secure_protocol_tlsv1_2: -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ meth = TLS_client_method(); -+ ssl_proto_version = TLS1_2_VERSION; -+#else - meth = TLSv1_2_client_method (); -+#endif - break; - #else - case secure_protocol_tlsv1_1: -@@ -262,8 +286,15 @@ ssl_init (void) - if (!ssl_ctx) - goto error; - -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) - if (ssl_options) - SSL_CTX_set_options (ssl_ctx, ssl_options); -+#endif -+ -+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >=0x10100000L) -+ if (ssl_proto_version) -+ SSL_CTX_set_min_proto_version(ssl_ctx, ssl_proto_version); -+#endif - - /* OpenSSL ciphers: https://www.openssl.org/docs/apps/ciphers.html - * Since we want a good protection, we also use HIGH (that excludes MD4 ciphers and some more) -- cgit v1.2.3