Date: Friday, August 30, 2013 @ 15:15:23 Author: heftig Revision: 193763
3.8.3 Modified: gnome-online-accounts/trunk/PKGBUILD Deleted: gnome-online-accounts/trunk/imap-smtp.patch gnome-online-accounts/trunk/smtp-auth-plain.patch -----------------------+ PKGBUILD | 14 +------ imap-smtp.patch | 20 ---------- smtp-auth-plain.patch | 88 ------------------------------------------------ 3 files changed, 3 insertions(+), 119 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-08-30 11:12:15 UTC (rev 193762) +++ PKGBUILD 2013-08-30 13:15:23 UTC (rev 193763) @@ -2,8 +2,8 @@ # Maintainer: Ionut Biru <[email protected]> pkgname=gnome-online-accounts -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64) url="http://www.gnome.org"; @@ -13,14 +13,10 @@ options=(!libtool) install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz - imap-smtp.patch - smtp-auth-plain.patch drop-google-password-interface-1.patch drop-google-password-interface-2.patch drop-google-password-interface-3.patch) -sha256sums=('12611a002043c8acc29e9800ec009e3e19736bdb6237d246e848d7c7909fe826' - '2b413d1f401647bd143b7dc6dd4b6d6660ff47ef9a11ccbc691b7c13de5cba69' - 'e7250be7c078053345699250433b7164751d3e457155bd35508c7d1660f459be' +sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b' '33435c10aa1ba3fbb6fd633dc098cd1da50629f1d602521ca83be5379f2ebe48' 'c837f9be4e5e072a06ea44076e6b9a1519c66c95b16d7a55b1dba105fded317f' '18dfad8ed978af1068fd057bbe323006c349ac4ea77c742aa06f1011dc92326e') @@ -27,10 +23,6 @@ prepare() { cd $pkgname-$pkgver - # Upstream 3.8 branch - patch -Np1 -i ../imap-smtp.patch - patch -Np1 -i ../smtp-auth-plain.patch - # Backport from Ubuntu patch -Np1 -i ../drop-google-password-interface-1.patch patch -Np1 -i ../drop-google-password-interface-2.patch Deleted: imap-smtp.patch =================================================================== --- imap-smtp.patch 2013-08-30 11:12:15 UTC (rev 193762) +++ imap-smtp.patch 2013-08-30 13:15:23 UTC (rev 193763) @@ -1,20 +0,0 @@ -From 034da0871ad78629f9d0df618be494dbb19157e4 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <[email protected]> -Date: Tue, 18 Jun 2013 10:35:42 +0000 -Subject: imap-smtp: Prevent error messages from expanding the dialog - ---- -diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c -index d10a9d8..841327d 100644 ---- a/src/goabackend/goaimapsmtpprovider.c -+++ b/src/goabackend/goaimapsmtpprovider.c -@@ -669,6 +669,7 @@ create_account_details_ui (GoaProvider *provider, - - data->cluebar_label = gtk_label_new (""); - gtk_label_set_line_wrap (GTK_LABEL (data->cluebar_label), TRUE); -+ gtk_label_set_max_width_chars (GTK_LABEL (data->cluebar_label), 36); - gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (data->cluebar))), - data->cluebar_label); - --- -cgit v0.9.2 Deleted: smtp-auth-plain.patch =================================================================== --- smtp-auth-plain.patch 2013-08-30 11:12:15 UTC (rev 193762) +++ smtp-auth-plain.patch 2013-08-30 13:15:23 UTC (rev 193763) @@ -1,88 +0,0 @@ -From 2210bf547dc35adacbc95c0dcf4abe75a73a8368 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <[email protected]> -Date: Tue, 18 Jun 2013 15:27:55 +0000 -Subject: smtp-auth-plain: Handle multiline SMTP greetings - -Fixes: https://bugzilla.gnome.org/702263 ---- -diff --git a/src/goabackend/goasmtpauthplain.c b/src/goabackend/goasmtpauthplain.c -index bb783bd..77324cf 100644 ---- a/src/goabackend/goasmtpauthplain.c -+++ b/src/goabackend/goasmtpauthplain.c -@@ -167,6 +167,40 @@ smtp_auth_plain_check_454 (const gchar *response, GError **error) - - /* ---------------------------------------------------------------------------------------------------- */ - -+static gboolean -+smtp_auth_plain_check_greeting (GDataInputStream *input, GCancellable *cancellable, GError **error) -+{ -+ gboolean ret; -+ gchar *response; -+ -+ response = NULL; -+ ret = FALSE; -+ -+ greeting_again: -+ response = g_data_input_stream_read_line (input, NULL, cancellable, error); -+ if (response == NULL) -+ goto out; -+ g_debug ("< %s", response); -+ if (smtp_auth_plain_check_421 (response, error)) -+ goto out; -+ if (smtp_auth_plain_check_not_220 (response, error)) -+ goto out; -+ -+ if (response[3] == '-') -+ { -+ g_clear_pointer (&response, g_free); -+ goto greeting_again; -+ } -+ -+ ret = TRUE; -+ -+ out: -+ g_free (response); -+ return ret; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ - static gchar * - smtp_auth_plain_get_domain (GoaSmtpAuthPlain *auth, - GError **error) -@@ -563,15 +597,8 @@ goa_smtp_auth_plain_run_sync (GoaMailAuth *_auth, - - if (!auth->greeting_absent) - { -- response = g_data_input_stream_read_line (input, NULL, cancellable, error); -- if (response == NULL) -- goto out; -- g_debug ("< %s", response); -- if (smtp_auth_plain_check_421 (response, error)) -+ if (!smtp_auth_plain_check_greeting (input, cancellable, error)) - goto out; -- if (smtp_auth_plain_check_not_220 (response, error)) -- goto out; -- g_clear_pointer (&response, g_free); - } - - /* Send EHLO */ -@@ -685,15 +712,8 @@ goa_smtp_auth_plain_starttls_sync (GoaMailAuth *_auth, - - /* Check the greeting */ - -- response = g_data_input_stream_read_line (input, NULL, cancellable, error); -- if (response == NULL) -- goto out; -- g_debug ("< %s", response); -- if (smtp_auth_plain_check_421 (response, error)) -+ if (!smtp_auth_plain_check_greeting (input, cancellable, error)) - goto out; -- if (smtp_auth_plain_check_not_220 (response, error)) -- goto out; -- g_clear_pointer (&response, g_free); - - /* Send EHLO */ - --- -cgit v0.9.2
