Merge lp:~mardy/libsignon-glib/packaging into lp:libsignon-glib

[Alberto Mardegan]

New upstream release.

New upstream release.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/libsignon-glib-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libsignon-glib-raring-amd64-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libsignon-glib-ci/3/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

review: Approve

[lp:~mardy/libsignon-glib/packaging]

138. By David King on 2013-04-26

New upstream release.

Approved by Ken VanDine, PS Jenkins bot.

=== modified file 'NEWS'
--- NEWS	2012-10-26 13:02:18 +0000
+++ NEWS	2013-04-26 14:25:59 +0000
@@ -1,5 +1,25 @@
 libsignon-glib NEWS
 
+Version 1.9
+-----------
+
+* Invoke the callback when errors occur
+* Add NOCONFIGURE logic to autogen.sh
+* Fix the check for pyoverridesdir for python3
+* Fix a memory leak
+
+Version 1.8
+-----------
+
+* Add signon_auth_session_process_async
+  http://code.google.com/p/accounts-sso/issues/detail?id=115
+* Fix all memory leaks detected by valgrind
+* Set ID before invoking the client callback
+  http://code.google.com/p/accounts-sso/issues/detail?id=132
+* Make tests optional at configure time
+  http://code.google.com/p/accounts-sso/issues/detail?id=124
+* Documentation and build system improvements
+
 Version 1.7
 -----------
 
 
=== modified file 'autogen.sh'
--- autogen.sh	2012-10-18 08:39:19 +0000
+++ autogen.sh	2013-04-26 14:25:59 +0000
@@ -9,6 +9,8 @@
 	exit 1
 }
 
+cd "$srcdir"
 gtkdocize --copy --flavour no-tmpl
-autoreconf --install --force
-. $srcdir/configure "$@"
+cd "$OLDPWD"
+autoreconf --install --force --verbose --warnings=all "$srcdir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
 
=== modified file 'configure.ac'
--- configure.ac	2013-01-23 06:25:21 +0000
+++ configure.ac	2013-04-26 14:25:59 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.64])
 AC_INIT([libsignon-glib],
-        [1.8],
+        [1.9],
         [http://code.google.com/p/accounts-sso/issues/entry],
         [libsignon-glib],
         [http://code.google.com/p/accounts-sso/])
@@ -11,7 +11,7 @@
 AC_CONFIG_SRCDIR([libsignon-glib.pc.in])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11 -Wall nostdinc silent-rules subdir-objects])
+AM_INIT_AUTOMAKE([1.11 -Wall check-news nostdinc silent-rules subdir-objects])
 
 AC_PROG_CC
 AC_PROG_CC_STDC
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-01-23 02:17:19 +0000
+++ debian/changelog	2013-04-26 14:25:59 +0000
@@ -1,8 +1,16 @@
-libsignon-glib (1.8.1-0ubuntu1) UNRELEASED; urgency=low
+libsignon-glib (1.9-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Robert Bruce Park ]
   * Inline packaging metadata.
 
- -- Robert Bruce Park <[e-mail]>  Tue, 22 Jan 2013 18:06:19 -0800
+  [ Alberto Mardegan ]
+  * New upstream release.
+    - Invoke the callback when errors occur
+    - Add NOCONFIGURE logic to autogen.sh
+    - Fix the check for pyoverridesdir for python3
+    - Fix a memory leak
+
+ -- Alberto Mardegan <[e-mail]>  Fri, 26 Apr 2013 17:20:58 +0300
 
 libsignon-glib (1.8-0ubuntu1) raring; urgency=low
 
 
=== modified file 'libsignon-glib/signon-auth-session.c'
--- libsignon-glib/signon-auth-session.c	2012-11-30 07:37:43 +0000
+++ libsignon-glib/signon-auth-session.c	2013-04-26 14:25:59 +0000
@@ -155,13 +155,17 @@
         g_simple_async_result_set_op_res_gpointer (res_process, reply,
                                                    (GDestroyNotify)
                                                    g_variant_unref);
-        g_simple_async_result_complete (res_process);
     }
     else
     {
         g_simple_async_result_take_error (res_process, error);
     }
 
+    /* We use the idle variant in order to avoid the following critical
+     * message:
+     * g_main_context_pop_thread_default: assertion `g_queue_peek_head (stack) == context' failed
+     */
+    g_simple_async_result_complete_in_idle (res_process);
     g_object_unref (self);
 }
 
@@ -180,6 +184,7 @@
     {
         DEBUG ("AuthSessionError: %s", error->message);
         g_simple_async_result_set_from_error (res, error);
+        g_simple_async_result_complete (res);
         return;
     }
 
@@ -191,6 +196,7 @@
                                          signon_error_quark (),
                                          SIGNON_ERROR_SESSION_CANCELED,
                                          "Authentication session was canceled");
+        g_simple_async_result_complete (res);
         return;
     }
 
 
=== modified file 'libsignon-glib/signon-identity.c'
--- libsignon-glib/signon-identity.c	2013-01-18 12:38:12 +0000
+++ libsignon-glib/signon-identity.c	2013-04-26 14:25:59 +0000
@@ -1359,7 +1359,8 @@
  * @user_data: user_data.
  *
  * Asks signond to close all authentication sessions for this
- * identity.
+ * identity, and to remove any stored secrets associated with it (password and
+ * authentication tokens).
  */
 void signon_identity_signout(SignonIdentity *self,
                              SignonIdentitySignedOutCb cb,
 
=== modified file 'tests/check_signon.c'
--- tests/check_signon.c	2012-11-30 07:38:19 +0000
+++ tests/check_signon.c	2013-04-26 14:25:59 +0000
@@ -527,6 +527,63 @@
 END_TEST
 
 static void
+test_auth_session_process_failure_cb (GObject *source_object,
+                                      GAsyncResult *res,
+                                      gpointer user_data)
+{
+    SignonAuthSession *auth_session = SIGNON_AUTH_SESSION (source_object);
+    GVariant *v_reply;
+    GError **error = user_data;
+
+    fail_unless (SIGNON_IS_AUTH_SESSION (source_object));
+
+    v_reply = signon_auth_session_process_finish (auth_session, res, error);
+    fail_unless (v_reply == NULL);
+
+    g_main_loop_quit (main_loop);
+}
+
+START_TEST(test_auth_session_process_failure)
+{
+    SignonAuthSession *auth_session;
+    GVariantBuilder builder;
+    GVariant *session_data;
+    GError *error = NULL;
+
+    g_debug("%s", G_STRFUNC);
+
+    g_type_init ();
+
+    auth_session = signon_auth_session_new (0, "nonexisting-method", &error);
+    fail_unless (auth_session != NULL, "Cannot create AuthSession object");
+    fail_unless (error == NULL);
+
+    g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+    g_variant_builder_add (&builder, "{sv}",
+                           "key", g_variant_new_string ("value"));
+
+    session_data = g_variant_builder_end (&builder);
+
+    signon_auth_session_process_async (auth_session,
+                                       session_data,
+                                       "mech1",
+                                       NULL,
+                                       test_auth_session_process_failure_cb,
+                                       &error);
+
+    main_loop = g_main_loop_new (NULL, FALSE);
+    g_main_loop_run (main_loop);
+    fail_unless (error != NULL);
+    fail_unless (error->domain == SIGNON_ERROR);
+    fail_unless (error->code == SIGNON_ERROR_METHOD_NOT_KNOWN);
+
+    g_object_unref (auth_session);
+
+    end_test ();
+}
+END_TEST
+
+static void
 test_auth_session_process_after_store_cb (SignonAuthSession *self,
                                           GHashTable *reply,
                                           const GError *error,
@@ -1403,6 +1460,7 @@
     tcase_add_test (tc_core, test_auth_session_query_mechanisms);
     tcase_add_test (tc_core, test_auth_session_query_mechanisms_nonexisting);
     tcase_add_test (tc_core, test_auth_session_process);
+    tcase_add_test (tc_core, test_auth_session_process_failure);
     tcase_add_test (tc_core, test_auth_session_process_after_store);
     tcase_add_test (tc_core, test_store_credentials_identity);
     tcase_add_test (tc_core, test_verify_secret_identity);