Mon Sep 2 02:09:45 PDT 2013

4 files changed, 5 insertions, 125 deletions

diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
index 7b541c715..d91e396f5 100644
--- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD
+++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 193763 2013-08-30 13:15:23Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=gnome-online-accounts
 pkgname=gnome-online-accounts-nonprism
-pkgver=3.8.2
-pkgrel=2.1
+pkgver=3.8.3
+pkgrel=1
 pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
@@ -17,19 +17,8 @@ conflicts=$_pkgname
 replaces=($_pkgname $pkgname-coherence)
 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)
-sha256sums=('12611a002043c8acc29e9800ec009e3e19736bdb6237d246e848d7c7909fe826'
-            '2b413d1f401647bd143b7dc6dd4b6d6660ff47ef9a11ccbc691b7c13de5cba69'
-            'e7250be7c078053345699250433b7164751d3e457155bd35508c7d1660f459be')
-
-prepare() {
-  cd $_pkgname-$pkgver
-  # Upstream 3.8 branch
-  patch -Np1 -i ../imap-smtp.patch
-  patch -Np1 -i ../smtp-auth-plain.patch
-}
+source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b')
  
 build() {
   cd $_pkgname-$pkgver
diff --git a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
index ae4eb5fa7..525ecff63 100644
--- a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
+++ b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
@@ -9,4 +9,3 @@ post_upgrade() {
 post_remove() {
     post_install
 }
-
diff --git a/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch b/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch
deleted file mode 100644
index 7213c8d1e..000000000
--- a/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 034da0871ad78629f9d0df618be494dbb19157e4 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-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
diff --git a/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch b/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch
deleted file mode 100644
index c6782d0f6..000000000
--- a/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2210bf547dc35adacbc95c0dcf4abe75a73a8368 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-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