diff options
Diffstat (limited to 'net-im/pidgin')
| -rw-r--r-- | net-im/pidgin/Manifest | 3 | ||||
| -rw-r--r-- | net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch | 33 | ||||
| -rw-r--r-- | net-im/pidgin/pidgin-2.13.0-r6.ebuild (renamed from net-im/pidgin/pidgin-2.13.0-r5.ebuild) | 1 |
3 files changed, 36 insertions, 1 deletions
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index b36360c10dea..3a28248c32f8 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -3,9 +3,10 @@ AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 BLAKE2B 5f83a3a9f36810c446bdc AUX pidgin-2.10.11-tinfo.patch 892 BLAKE2B 50e16a86ed29510c8632a8d6d2021236ba125a4f8fc4cd5c0408b2c0fcfe8187a4d72df512a2e224fbf801df88cb8f39c2d63487ba0f04934be09315d1306ac1 SHA512 019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db AUX pidgin-2.10.9-fix-gtkmedia.patch 267 BLAKE2B 71718c2d469c2418ee4abba9ca1ebdd672094e43773681fca25aeb940a442b56fca7b4342b4e983e4bd75835c80bdbba4171b0c4781c1f4425908e8a3a1f6fcd SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993 +AUX pidgin-2.13.0-gnutls_sni_support.patch 1298 BLAKE2B 1bf2be33e4328d5e52256ced4ee53a4ba7b4a294e7a8f47833950019dfae654c37f1b7dc63d6fe4b1d3f7b4e35fe3a1fc8d527a72660f43b9f16f2f218d491ee SHA512 ebdc088aeec3064e98e5f033f67eefa6c5a38cd074aa04d1bbd1db2738e932326a2abcddb27bd4b4a92bfde84811fec3517d4965cb215bd035762c4f1d006d8a AUX pidgin-2.13.0-python3_support.patch 1156 BLAKE2B be31ac0d0ab07588d2ae635f0662823888a7f844fc1f6f7b498755c447ee78cffc9bbafb7f7c531710d3045795517825257f2786f0c999829656d469bd835adb SHA512 3ae82355321c59b0c4afa916e5c27ff0d2df95951ba363c67fada5634bf5673c2ded01515a3b927f1c6020c5f56d19279e6a7e9715ce766013ad763c4e61652b DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 -EBUILD pidgin-2.13.0-r5.ebuild 7801 BLAKE2B b4734f51179dcfb60b5faf5d1305317f43efcbd4e7ef699ca41a6cd6f627cda9ae3e80f397194e3b76488c967723b1666dac0da699ee82edb0423bb043109115 SHA512 b4119884ad72dd99af7eab62a15f576630662888f98327ae67c8e0e99ee9a1125d3e63bc7a263d1070712a6a1edc6545ea2d309ad180d0d4a570141d8f738ca8 +EBUILD pidgin-2.13.0-r6.ebuild 7862 BLAKE2B 105e3f6c3cda1bf56e25b9eebedd47cbb765b1a73f17d94ce7751c0f1527d4ad62ad09d78328d378c66a3734a2c82c0f1877878e17e4070f38de4b88d3d32434 SHA512 b83b2ea8323a526afc623f16b3bd1a47c5533dd18111331b161d5bfe999c2ca9c19deabfc814acdb9f27f61bd7cd9e4d5e3c81ef0a743e4b3b832d889fbd9340 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7 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 000000000000..df6b8e5cd030 --- /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 <ionic@ionic.de> +# 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 index b6fa6ecd0772..aee1ccb0a4bf 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() { |