Hello community, here is the log from the commit of package vinagre for openSUSE:Factory checked in at 2017-02-19 00:40:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vinagre (Old) and /work/SRC/openSUSE:Factory/.vinagre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vinagre" Changes: -------- --- /work/SRC/openSUSE:Factory/vinagre/vinagre.changes 2016-09-21 18:40:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vinagre.new/vinagre.changes 2017-02-19 00:40:46.478595754 +0100 @@ -1,0 +2,8 @@ +Tue Nov 15 07:20:43 UTC 2016 - fezh...@suse.com + +- Add vinagre-cert-validation-api.patch: + Fix certificate validation callback incompatibilities with + freerdp 1.2 that causes rdp connections to abort (bgo#774473, + boo#1002350). + +------------------------------------------------------------------- New: ---- vinagre-cert-validation-api.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vinagre.spec ++++++ --- /var/tmp/diff_new_pack.dCMjxP/_old 2017-02-19 00:40:46.962527679 +0100 +++ /var/tmp/diff_new_pack.dCMjxP/_new 2017-02-19 00:40:46.962527679 +0100 @@ -1,7 +1,7 @@ # # spec file for package vinagre # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,8 +26,10 @@ Group: Productivity/Networking/Other Url: http://www.gnome.org/projects/vinagre/ Source0: http://download.gnome.org/sources/vinagre/3.22/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM vinagre-freerdp2.patch bgo#765444.patch mgo...@suse.com -- handle new "freerdp2" package name. +# PATCH-FIX-UPSTREAM vinagre-freerdp2.patch bgo#765444 mgo...@suse.com -- handle new "freerdp2" package name. Patch1: vinagre-freerdp2.patch +# PATCH-FIX-UPSTREAM vinagre-cert-validation-api.patch bgo#774473 boo#100235 fezh...@suse.com -- fix API incompatibilities with freerdp 1.2 that causes rdp connections abort +Patch2: vinagre-cert-validation-api.patch # The icon we rely on is from adwaita-icon-theme BuildRequires: adwaita-icon-theme BuildRequires: fdupes @@ -71,6 +73,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 translation-update-upstream %build ++++++ vinagre-cert-validation-api.patch ++++++ diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c index 5bbfca0..9149c0f 100644 --- a/plugins/rdp/vinagre-rdp-tab.c +++ b/plugins/rdp/vinagre-rdp-tab.c @@ -29,6 +29,7 @@ #include <freerdp/types.h> #include <freerdp/freerdp.h> #include <freerdp/gdi/gdi.h> +#include <freerdp/version.h> #if HAVE_FREERDP_1_1 #include <freerdp/locale/keyboard.h> #else @@ -926,11 +927,21 @@ frdp_authenticate (freerdp *instance, return TRUE; } +#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) || (FREERDP_VERSION_MAJOR == 2) +static DWORD +frdp_certificate_verify (freerdp *instance, + const char *common_name, + const char *subject, + const char *issuer, + const char *fingerprint, + BOOL host_mismatch) +#else static BOOL frdp_certificate_verify (freerdp *instance, char *subject, char *issuer, char *fingerprint) +#endif { VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); GtkBuilder *builder; @@ -960,17 +971,33 @@ frdp_certificate_verify (freerdp *instance, gtk_widget_hide (dialog); +#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) || (FREERDP_VERSION_MAJOR == 2) + return (response == GTK_RESPONSE_YES ? 1 : 0); +#else return response == GTK_RESPONSE_YES; +#endif } #if HAVE_FREERDP_1_1 +#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) || (FREERDP_VERSION_MAJOR == 2) +static DWORD +frdp_changed_certificate_verify (freerdp *instance, + const char* common_name, + const char* subject, + const char* issuer, + const char* new_fingerprint, + const char* old_subject, + const char* old_issuer, + const char* old_fingerprint) +#else static BOOL frdp_changed_certificate_verify (freerdp *instance, char *subject, char *issuer, char *new_fingerprint, char *old_fingerprint) +#endif { VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); GtkBuilder *builder; @@ -1015,7 +1042,11 @@ frdp_changed_certificate_verify (freerdp *instance, gtk_widget_hide (dialog); +#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) || (FREERDP_VERSION_MAJOR == 2) + return (response == GTK_RESPONSE_YES ? 1 : 0); +#else return response == GTK_RESPONSE_YES; +#endif } #endif
