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

Proposed by Alberto Mardegan
Status: Merged
Approved by: Ken VanDine
Approved revision: no longer in the source branch.
Merged at revision: 138
Proposed branch: lp:~mardy/libsignon-glib/packaging
Merge into: lp:libsignon-glib
Diff against target: 218 lines (+103/-8)
7 files modified
NEWS (+20/-0)
autogen.sh (+4/-2)
configure.ac (+2/-2)
debian/changelog (+10/-2)
libsignon-glib/signon-auth-session.c (+7/-1)
libsignon-glib/signon-identity.c (+2/-1)
tests/check_signon.c (+58/-0)
To merge this branch: bzr merge lp:~mardy/libsignon-glib/packaging
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+161154@code.launchpad.net

Commit message

New upstream release.

Description of the change

New upstream release.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) :
review: Approve
lp:~mardy/libsignon-glib/packaging updated
138. By David King

New upstream release.

Approved by Ken VanDine, PS Jenkins bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2012-10-26 13:02:18 +0000
3+++ NEWS 2013-04-26 14:25:59 +0000
4@@ -1,5 +1,25 @@
5 libsignon-glib NEWS
6
7+Version 1.9
8+-----------
9+
10+* Invoke the callback when errors occur
11+* Add NOCONFIGURE logic to autogen.sh
12+* Fix the check for pyoverridesdir for python3
13+* Fix a memory leak
14+
15+Version 1.8
16+-----------
17+
18+* Add signon_auth_session_process_async
19+ http://code.google.com/p/accounts-sso/issues/detail?id=115
20+* Fix all memory leaks detected by valgrind
21+* Set ID before invoking the client callback
22+ http://code.google.com/p/accounts-sso/issues/detail?id=132
23+* Make tests optional at configure time
24+ http://code.google.com/p/accounts-sso/issues/detail?id=124
25+* Documentation and build system improvements
26+
27 Version 1.7
28 -----------
29
30
31=== modified file 'autogen.sh'
32--- autogen.sh 2012-10-18 08:39:19 +0000
33+++ autogen.sh 2013-04-26 14:25:59 +0000
34@@ -9,6 +9,8 @@
35 exit 1
36 }
37
38+cd "$srcdir"
39 gtkdocize --copy --flavour no-tmpl
40-autoreconf --install --force
41-. $srcdir/configure "$@"
42+cd "$OLDPWD"
43+autoreconf --install --force --verbose --warnings=all "$srcdir"
44+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
45
46=== modified file 'configure.ac'
47--- configure.ac 2013-01-23 06:25:21 +0000
48+++ configure.ac 2013-04-26 14:25:59 +0000
49@@ -1,7 +1,7 @@
50 dnl Process this file with autoconf to produce a configure script.
51 AC_PREREQ([2.64])
52 AC_INIT([libsignon-glib],
53- [1.8],
54+ [1.9],
55 [http://code.google.com/p/accounts-sso/issues/entry],
56 [libsignon-glib],
57 [http://code.google.com/p/accounts-sso/])
58@@ -11,7 +11,7 @@
59 AC_CONFIG_SRCDIR([libsignon-glib.pc.in])
60 AC_CONFIG_MACRO_DIR([m4])
61
62-AM_INIT_AUTOMAKE([1.11 -Wall nostdinc silent-rules subdir-objects])
63+AM_INIT_AUTOMAKE([1.11 -Wall check-news nostdinc silent-rules subdir-objects])
64
65 AC_PROG_CC
66 AC_PROG_CC_STDC
67
68=== modified file 'debian/changelog'
69--- debian/changelog 2013-01-23 02:17:19 +0000
70+++ debian/changelog 2013-04-26 14:25:59 +0000
71@@ -1,8 +1,16 @@
72-libsignon-glib (1.8.1-0ubuntu1) UNRELEASED; urgency=low
73+libsignon-glib (1.9-0ubuntu1) UNRELEASED; urgency=low
74
75+ [ Robert Bruce Park ]
76 * Inline packaging metadata.
77
78- -- Robert Bruce Park <robert.park@canonical.com> Tue, 22 Jan 2013 18:06:19 -0800
79+ [ Alberto Mardegan ]
80+ * New upstream release.
81+ - Invoke the callback when errors occur
82+ - Add NOCONFIGURE logic to autogen.sh
83+ - Fix the check for pyoverridesdir for python3
84+ - Fix a memory leak
85+
86+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Fri, 26 Apr 2013 17:20:58 +0300
87
88 libsignon-glib (1.8-0ubuntu1) raring; urgency=low
89
90
91=== modified file 'libsignon-glib/signon-auth-session.c'
92--- libsignon-glib/signon-auth-session.c 2012-11-30 07:37:43 +0000
93+++ libsignon-glib/signon-auth-session.c 2013-04-26 14:25:59 +0000
94@@ -155,13 +155,17 @@
95 g_simple_async_result_set_op_res_gpointer (res_process, reply,
96 (GDestroyNotify)
97 g_variant_unref);
98- g_simple_async_result_complete (res_process);
99 }
100 else
101 {
102 g_simple_async_result_take_error (res_process, error);
103 }
104
105+ /* We use the idle variant in order to avoid the following critical
106+ * message:
107+ * g_main_context_pop_thread_default: assertion `g_queue_peek_head (stack) == context' failed
108+ */
109+ g_simple_async_result_complete_in_idle (res_process);
110 g_object_unref (self);
111 }
112
113@@ -180,6 +184,7 @@
114 {
115 DEBUG ("AuthSessionError: %s", error->message);
116 g_simple_async_result_set_from_error (res, error);
117+ g_simple_async_result_complete (res);
118 return;
119 }
120
121@@ -191,6 +196,7 @@
122 signon_error_quark (),
123 SIGNON_ERROR_SESSION_CANCELED,
124 "Authentication session was canceled");
125+ g_simple_async_result_complete (res);
126 return;
127 }
128
129
130=== modified file 'libsignon-glib/signon-identity.c'
131--- libsignon-glib/signon-identity.c 2013-01-18 12:38:12 +0000
132+++ libsignon-glib/signon-identity.c 2013-04-26 14:25:59 +0000
133@@ -1359,7 +1359,8 @@
134 * @user_data: user_data.
135 *
136 * Asks signond to close all authentication sessions for this
137- * identity.
138+ * identity, and to remove any stored secrets associated with it (password and
139+ * authentication tokens).
140 */
141 void signon_identity_signout(SignonIdentity *self,
142 SignonIdentitySignedOutCb cb,
143
144=== modified file 'tests/check_signon.c'
145--- tests/check_signon.c 2012-11-30 07:38:19 +0000
146+++ tests/check_signon.c 2013-04-26 14:25:59 +0000
147@@ -527,6 +527,63 @@
148 END_TEST
149
150 static void
151+test_auth_session_process_failure_cb (GObject *source_object,
152+ GAsyncResult *res,
153+ gpointer user_data)
154+{
155+ SignonAuthSession *auth_session = SIGNON_AUTH_SESSION (source_object);
156+ GVariant *v_reply;
157+ GError **error = user_data;
158+
159+ fail_unless (SIGNON_IS_AUTH_SESSION (source_object));
160+
161+ v_reply = signon_auth_session_process_finish (auth_session, res, error);
162+ fail_unless (v_reply == NULL);
163+
164+ g_main_loop_quit (main_loop);
165+}
166+
167+START_TEST(test_auth_session_process_failure)
168+{
169+ SignonAuthSession *auth_session;
170+ GVariantBuilder builder;
171+ GVariant *session_data;
172+ GError *error = NULL;
173+
174+ g_debug("%s", G_STRFUNC);
175+
176+ g_type_init ();
177+
178+ auth_session = signon_auth_session_new (0, "nonexisting-method", &error);
179+ fail_unless (auth_session != NULL, "Cannot create AuthSession object");
180+ fail_unless (error == NULL);
181+
182+ g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
183+ g_variant_builder_add (&builder, "{sv}",
184+ "key", g_variant_new_string ("value"));
185+
186+ session_data = g_variant_builder_end (&builder);
187+
188+ signon_auth_session_process_async (auth_session,
189+ session_data,
190+ "mech1",
191+ NULL,
192+ test_auth_session_process_failure_cb,
193+ &error);
194+
195+ main_loop = g_main_loop_new (NULL, FALSE);
196+ g_main_loop_run (main_loop);
197+ fail_unless (error != NULL);
198+ fail_unless (error->domain == SIGNON_ERROR);
199+ fail_unless (error->code == SIGNON_ERROR_METHOD_NOT_KNOWN);
200+
201+ g_object_unref (auth_session);
202+
203+ end_test ();
204+}
205+END_TEST
206+
207+static void
208 test_auth_session_process_after_store_cb (SignonAuthSession *self,
209 GHashTable *reply,
210 const GError *error,
211@@ -1403,6 +1460,7 @@
212 tcase_add_test (tc_core, test_auth_session_query_mechanisms);
213 tcase_add_test (tc_core, test_auth_session_query_mechanisms_nonexisting);
214 tcase_add_test (tc_core, test_auth_session_process);
215+ tcase_add_test (tc_core, test_auth_session_process_failure);
216 tcase_add_test (tc_core, test_auth_session_process_after_store);
217 tcase_add_test (tc_core, test_store_credentials_identity);
218 tcase_add_test (tc_core, test_verify_secret_identity);

Subscribers

People subscribed via source and target branches

to all changes: