From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23355138350 for ; Tue, 11 Feb 2020 13:17:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67E11E084E; Tue, 11 Feb 2020 13:16:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 395EBE084E for ; Tue, 11 Feb 2020 13:16:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7053434EB5D for ; Tue, 11 Feb 2020 13:16:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6EAC535 for ; Tue, 11 Feb 2020 13:16:55 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1581427009.55f5d8938ea10bd15797d263d9dd132c74c5cc4d.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/files/, net-im/pidgin/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch net-im/pidgin/pidgin-2.13.0-r5.ebuild net-im/pidgin/pidgin-2.13.0-r6.ebuild X-VCS-Directories: net-im/pidgin/ net-im/pidgin/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 55f5d8938ea10bd15797d263d9dd132c74c5cc4d X-VCS-Branch: master Date: Tue, 11 Feb 2020 13:16:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f57259f-58be-466b-a8d9-f37ef718bf72 X-Archives-Hash: 0df58d7fc5b8ae1d2cddbf96083278e6 commit: 55f5d8938ea10bd15797d263d9dd132c74c5cc4d Author: Lars Wendler gentoo org> AuthorDate: Tue Feb 11 13:16:02 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Feb 11 13:16:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55f5d893 net-im/pidgin: Revbump to fix gnutls plugin Thanks-to: Phil Stracchino (Unix Ronin) caerllewys.net> Closes: https://bugs.gentoo.org/708226 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> .../files/pidgin-2.13.0-gnutls_sni_support.patch | 33 ++++++++++++++++++++++ ...in-2.13.0-r5.ebuild => pidgin-2.13.0-r6.ebuild} | 1 + 2 files changed, 34 insertions(+) diff --git a/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch b/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch new file mode 100644 index 00000000000..df6b8e5cd03 --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch @@ -0,0 +1,33 @@ +# HG changeset patch +# User Mihai Moldovan +# Date 1576498301 -3600 +# Branch release-2.x.y +# Node ID 6dba8046e1b120c506e1d911c6aa8757d7774c57 +# Parent 7a975763d3b64bdd8dd5371d711a4add647ed726 +Implement SNI support for the gnutls SSL plugin. + +Note that gnutls is picky in regard to what it accepts as the server name - it +MUST be a domain name. IP addresses are not supported according to the +documentation. + +Hence, filter out IP addresses and hope that whatever is not recognized as +such an address is actually a domain name. This will probably fail for more +exotic addresses (especially in IPv6 realm), but wiring up a full-blown parser +is too much effort and SSL plugins are not part of purple-3 anyway. + +Fixes #17300 + +diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c +--- a/libpurple/plugins/ssl/ssl-gnutls.c ++++ b/libpurple/plugins/ssl/ssl-gnutls.c +@@ -403,6 +403,10 @@ + + gnutls_transport_set_ptr(gnutls_data->session, GINT_TO_POINTER(gsc->fd)); + ++ /* SNI support. */ ++ if (gsc->host && !g_hostname_is_ip_address(gsc->host)) ++ gnutls_server_name_set(gnutls_data->session, GNUTLS_NAME_DNS, gsc->host, strlen(gsc->host)); ++ + gnutls_data->handshake_handler = purple_input_add(gsc->fd, + PURPLE_INPUT_READ, ssl_gnutls_handshake_cb, gsc); + diff --git a/net-im/pidgin/pidgin-2.13.0-r5.ebuild b/net-im/pidgin/pidgin-2.13.0-r6.ebuild similarity index 99% rename from net-im/pidgin/pidgin-2.13.0-r5.ebuild rename to net-im/pidgin/pidgin-2.13.0-r6.ebuild index b6fa6ecd077..aee1ccb0a4b 100644 --- a/net-im/pidgin/pidgin-2.13.0-r5.ebuild +++ b/net-im/pidgin/pidgin-2.13.0-r6.ebuild @@ -144,6 +144,7 @@ PATCHES=( "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286 "${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338 "${FILESDIR}/${PN}-2.13.0-python3_support.patch" #459996 + "${FILESDIR}/${PN}-2.13.0-gnutls_sni_support.patch" #708226 ) pkg_pretend() {