From 0ee449f7a52a73c0636cd1117fcbbdb7a53eacad68520d370603fe8197b9bc2a Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Thu, 12 Apr 2018 10:01:12 +0000 Subject: [PATCH 1/2] Accepting request 595913 from home:zhangxiaofei:branches:network:pidgin - Add pidgin-enable-sni-gnutls.patch: Enable SNI for gnutls to avoid SSL handshake failure, patch written by Tiago Herrmann (therrmann@suse.com) (boo#1086349 pidgin.im#17300). OBS-URL: https://build.opensuse.org/request/show/595913 OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=25 --- pidgin-enable-sni-gnutls.patch | 15 +++++++++++++++ pidgin.changes | 7 +++++++ pidgin.spec | 3 +++ 3 files changed, 25 insertions(+) create mode 100644 pidgin-enable-sni-gnutls.patch diff --git a/pidgin-enable-sni-gnutls.patch b/pidgin-enable-sni-gnutls.patch new file mode 100644 index 0000000..490f291 --- /dev/null +++ b/pidgin-enable-sni-gnutls.patch @@ -0,0 +1,15 @@ +diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c +index 75e862d..d58d6e0 100644 +--- a/libpurple/plugins/ssl/ssl-gnutls.c ++++ b/libpurple/plugins/ssl/ssl-gnutls.c +@@ -403,6 +403,10 @@ ssl_gnutls_connect(PurpleSslConnection *gsc) + + gnutls_transport_set_ptr(gnutls_data->session, GINT_TO_POINTER(gsc->fd)); + ++ if (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/pidgin.changes b/pidgin.changes index d52f97c..15bbd5c 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 12 07:43:51 UTC 2018 - fezhang@suse.com + +- Add pidgin-enable-sni-gnutls.patch: Enable SNI for gnutls to + avoid SSL handshake failure, patch written by Tiago Herrmann + (therrmann@suse.com) (boo#1086349 pidgin.im#17300). + ------------------------------------------------------------------- Thu Mar 15 16:19:49 UTC 2018 - sor.alexei@meowr.ru diff --git a/pidgin.spec b/pidgin.spec index 2162884..2b5810b 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -38,6 +38,8 @@ Patch2: pidgin-fix-perl-build.patch Patch3: pidgin-ncurses-6.0-accessors.patch # PATCH-FIX-SLE pidgin-use-default-alsa.patch bsc#886670 tiwai@suse.de -- Use ALSA as a default for avoiding broken volume control. Patch4: pidgin-use-default-alsa.patch +# PATCH-FIX-UPSTREAM pidgin-enable-sni-gnutls.patch boo#1086349 pidgin.im#17300 fezhang@suse.com -- Enable SNI extension in GnuTLS connections. +Patch5: pidgin-enable-sni-gnutls.patch BuildRequires: ca-certificates-mozilla BuildRequires: doxygen BuildRequires: fdupes @@ -234,6 +236,7 @@ translation-update-upstream %if 0%{?sle_version} >= 120000 && !0%{?is_opensuse} %patch4 -p1 %endif +%patch5 -p1 cp -f %{SOURCE3} %{name}-prefs.xml From b13c8d544b81b421fcc4cae0b9182dec3fdba97b3b3ab6be4619f1170d2142bf Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Thu, 12 Apr 2018 10:02:53 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=26 --- pidgin-enable-sni-gnutls.patch | 2 -- pidgin.changes | 2 +- pidgin.spec | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pidgin-enable-sni-gnutls.patch b/pidgin-enable-sni-gnutls.patch index 490f291..36c53f2 100644 --- a/pidgin-enable-sni-gnutls.patch +++ b/pidgin-enable-sni-gnutls.patch @@ -1,5 +1,3 @@ -diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c -index 75e862d..d58d6e0 100644 --- a/libpurple/plugins/ssl/ssl-gnutls.c +++ b/libpurple/plugins/ssl/ssl-gnutls.c @@ -403,6 +403,10 @@ ssl_gnutls_connect(PurpleSslConnection *gsc) diff --git a/pidgin.changes b/pidgin.changes index 15bbd5c..968d981 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -3,7 +3,7 @@ Thu Apr 12 07:43:51 UTC 2018 - fezhang@suse.com - Add pidgin-enable-sni-gnutls.patch: Enable SNI for gnutls to avoid SSL handshake failure, patch written by Tiago Herrmann - (therrmann@suse.com) (boo#1086349 pidgin.im#17300). + (therrmann@suse.com) (bsc#1086349, pidgin.im#17300). ------------------------------------------------------------------- Thu Mar 15 16:19:49 UTC 2018 - sor.alexei@meowr.ru diff --git a/pidgin.spec b/pidgin.spec index 2b5810b..76399de 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -38,7 +38,7 @@ Patch2: pidgin-fix-perl-build.patch Patch3: pidgin-ncurses-6.0-accessors.patch # PATCH-FIX-SLE pidgin-use-default-alsa.patch bsc#886670 tiwai@suse.de -- Use ALSA as a default for avoiding broken volume control. Patch4: pidgin-use-default-alsa.patch -# PATCH-FIX-UPSTREAM pidgin-enable-sni-gnutls.patch boo#1086349 pidgin.im#17300 fezhang@suse.com -- Enable SNI extension in GnuTLS connections. +# PATCH-FIX-UPSTREAM pidgin-enable-sni-gnutls.patch bsc#1086349 pidgin.im#17300 fezhang@suse.com -- Enable SNI extension in GnuTLS connections. Patch5: pidgin-enable-sni-gnutls.patch BuildRequires: ca-certificates-mozilla BuildRequires: doxygen