Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at 2013-08-27 20:47:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-keyring (Old) and /work/SRC/openSUSE:Factory/.gnome-keyring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-keyring" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-keyring/gnome-keyring.changes 2013-05-16 10:49:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-keyring.new/gnome-keyring.changes 2013-08-27 20:47:51.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Aug 26 17:05:24 UTC 2013 - [email protected] + +- Update to version 3.9.90: + + Fix running gnome-keyring-daemon under test harness. + + Test fixes (bgo#702367). + +------------------------------------------------------------------- +Mon Aug 19 20:04:38 UTC 2013 - [email protected] + +- Introduce %bcond_without gpgagent: allow to disable gpg agent + during build to easily test issues like bnc#829844. + +------------------------------------------------------------------- Old: ---- gnome-keyring-3.9.1.tar.xz New: ---- gnome-keyring-3.9.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.aeVbEF/_old 2013-08-27 20:47:52.000000000 +0200 +++ /var/tmp/diff_new_pack.aeVbEF/_new 2013-08-27 20:47:52.000000000 +0200 @@ -16,8 +16,10 @@ # +%bcond_without gpgagent + Name: gnome-keyring -Version: 3.9.1 +Version: 3.9.90 Release: 0 Url: http://www.gnome.org/ Summary: GNOME Keyring @@ -117,6 +119,9 @@ %build %configure\ --enable-pam \ +%if %{without gpgagent} + --disable-gpg-agent \ +%endif --with-pam-dir=/%{_lib}/security make %{?jobs:-j%jobs} V=1 @@ -128,7 +133,12 @@ desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart --add-only-show-in=XFCE $i done %find_lang %{name} +%if %{with gpgagent} %suse_update_desktop_file gnome-keyring-gpg +%else +# make install does not care for --disable-gpg-agent for the desktop file (it only changes the default loaders) +rm %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-keyring-gpg.desktop +%endif %suse_update_desktop_file gnome-keyring-pkcs11 %suse_update_desktop_file gnome-keyring-secrets %suse_update_desktop_file gnome-keyring-ssh ++++++ gnome-keyring-3.9.1.tar.xz -> gnome-keyring-3.9.90.tar.xz ++++++ ++++ 8811 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-keyring-3.9.1/ChangeLog new/gnome-keyring-3.9.90/ChangeLog --- old/gnome-keyring-3.9.1/ChangeLog 2013-04-30 19:08:28.000000000 +0200 +++ new/gnome-keyring-3.9.90/ChangeLog 2013-08-26 18:28:45.000000000 +0200 @@ -1,5 +1,60 @@ # Generate automatically. Do not edit. +commit d9d3b4922c5a210a9e82bc099505c1952c555826 +Author: Stef Walter <[email protected]> +Date: 2013-08-26 + + Release version 3.9.90 + + Makefile.am | 3 ++- + NEWS | 4 ++++ + configure.ac | 2 +- + 3 files changed, 7 insertions(+), 2 deletions(-) + +commit b8ad18fd3c49f744c4f744eae241c18f8fb8a953 +Author: Stef Walter <[email protected]> +Date: 2013-08-17 + + daemon: Fix running gnome-keyring-daemon under test harness + + daemon/dbus/tests/test-service.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit 1533e463d4263d3b4ec65750fb2f2ac7203edf73 +Author: Stef Walter <[email protected]> +Date: 2013-08-15 + + More reliable means of checking if object was finalized + + Don't try to use G_IS_OBJECT() to see if an object was finalized + as this segfaults in corner cases, even with our crafty check + for a pointer within our memory space. + + pkcs11/gnome2-store/tests/test-gnome2-storage.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 99b6f5aa5bf2d216fa4ad47a94cde21f87f1af38 +Author: Stef Walter <[email protected]> +Date: 2013-06-18 + + daemon: Fix running tests without installed gnome-keyring + + https://bugzilla.gnome.org/show_bug.cgi?id=702367 + + .gitignore | 2 ++ + daemon/dbus/tests/test-service.c | 9 ++++++++- + schema/Makefile.am | 8 ++++++++ + 3 files changed, 18 insertions(+), 1 deletion(-) + +commit 8b3f300761edbb1ef9fcf434ccc3150ca3a1eef9 +Author: Martin Olsson <[email protected]> +Date: 2013-06-13 + + Fixed typo in string. Fixes bug #697502 + + daemon/control/gkd-control-client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 769e917fc0b330d5d19f93c050870f7bc6d5555a Author: Stef Walter <[email protected]> Date: 2013-04-30 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-keyring-3.9.1/Makefile.am new/gnome-keyring-3.9.90/Makefile.am --- old/gnome-keyring-3.9.1/Makefile.am 2012-12-23 13:28:08.000000000 +0100 +++ new/gnome-keyring-3.9.90/Makefile.am 2013-08-26 18:26:47.000000000 +0200 @@ -76,4 +76,5 @@ endif upload-release: $(DIST_ARCHIVES) - scp $(DIST_ARCHIVES) master.gnome.org: + scp $(DIST_ARCHIVES) master.gnome.org: + ssh master.gnome.org ftpadmin install $(DIST_ARCHIVES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-keyring-3.9.1/NEWS new/gnome-keyring-3.9.90/NEWS --- old/gnome-keyring-3.9.1/NEWS 2013-04-30 19:02:18.000000000 +0200 +++ new/gnome-keyring-3.9.90/NEWS 2013-08-26 18:26:33.000000000 +0200 @@ -1,3 +1,7 @@ +Changes in version 3.9.90 are: + * Fix running gnome-keyring-daemon under test harness + * Test fixes [#702367] + Changes in version 3.9.1 are: * Fix implementation of LockService dbus method [#690466] * Updated translations [nl] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-keyring-3.9.1/configure.ac new/gnome-keyring-3.9.90/configure.ac --- old/gnome-keyring-3.9.1/configure.ac 2013-04-30 19:01:26.000000000 +0200 +++ new/gnome-keyring-3.9.90/configure.ac 2013-08-26 18:25:27.000000000 +0200 @@ -1,6 +1,6 @@ AC_INIT(daemon/gkd-main.c) -AM_INIT_AUTOMAKE(gnome-keyring, 3.9.1) +AM_INIT_AUTOMAKE(gnome-keyring, 3.9.90) AC_CONFIG_HEADERS(config.h) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-keyring-3.9.1/daemon/control/gkd-control-client.c new/gnome-keyring-3.9.90/daemon/control/gkd-control-client.c --- old/gnome-keyring-3.9.1/daemon/control/gkd-control-client.c 2012-12-23 13:28:08.000000000 +0100 +++ new/gnome-keyring-3.9.90/daemon/control/gkd-control-client.c 2013-08-15 10:13:44.000000000 +0200 @@ -49,7 +49,7 @@ /* First a bunch of checks to make sure nothing funny is going on */ if (lstat (path, &st) < 0) { if (!(flags & GKD_CONTROL_QUIET_IF_NO_PEER) || errno != ENOENT) - g_message ("couldn't access conrol socket: %s: %s", path, g_strerror (errno)); + g_message ("couldn't access control socket: %s: %s", path, g_strerror (errno)); return -1; } else if (st.st_uid != geteuid ()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-keyring-3.9.1/daemon/dbus/tests/test-service.c new/gnome-keyring-3.9.90/daemon/dbus/tests/test-service.c --- old/gnome-keyring-3.9.1/daemon/dbus/tests/test-service.c 2013-03-25 11:34:54.000000000 +0100 +++ new/gnome-keyring-3.9.90/daemon/dbus/tests/test-service.c 2013-08-17 10:27:19.000000000 +0200 @@ -63,14 +63,8 @@ static void on_service_spawned (gpointer user_data) { - TestService *test = user_data; int fd; - g_setenv ("GNOME_KEYRING_TEST_PATH", test->directory, TRUE); - g_setenv ("GNOME_KEYRING_TEST_SERVICE", test->bus_name, TRUE); - if (test->mock_prompter) - g_setenv ("GNOME_KEYRING_TEST_PROMPTER", test->mock_prompter, TRUE); - fd = g_open ("/dev/null", O_WRONLY, 0); if (fd != -1) dup2 (fd, 1); @@ -82,6 +76,7 @@ GError *error = NULL; GVariant *retval; GVariant *output; + gchar **env; gchar *args[] = { TOP_BUILDDIR "/daemon/gnome-keyring-daemon", @@ -105,13 +100,23 @@ SRCDIR "/files/test.keyring", NULL); - if (!g_spawn_async (NULL, args, NULL, + /* The schema directory */ + env = g_get_environ (); + env = g_environ_setenv (env, "GSETTINGS_SCHEMA_DIR", TOP_BUILDDIR "/schema", TRUE); + env = g_environ_setenv (env, "GNOME_KEYRING_TEST_PATH", test->directory, TRUE); + env = g_environ_setenv (env, "GNOME_KEYRING_TEST_SERVICE", test->bus_name, TRUE); + if (test->mock_prompter) + env = g_environ_setenv (env, "GNOME_KEYRING_TEST_PROMPTER", test->mock_prompter, TRUE); + + if (!g_spawn_async (NULL, args, env, G_SPAWN_LEAVE_DESCRIPTORS_OPEN | G_SPAWN_DO_NOT_REAP_CHILD, on_service_spawned, test, &test->pid, &error)) { g_error ("couldn't start gnome-keyring-daemon for testing: %s", error->message); g_assert_not_reached (); } + g_strfreev (env); + if (!test->available) { egg_test_wait (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-keyring-3.9.1/pkcs11/gnome2-store/tests/test-gnome2-storage.c new/gnome-keyring-3.9.90/pkcs11/gnome2-store/tests/test-gnome2-storage.c --- old/gnome-keyring-3.9.1/pkcs11/gnome2-store/tests/test-gnome2-storage.c 2013-03-25 11:34:55.000000000 +0100 +++ new/gnome-keyring-3.9.90/pkcs11/gnome2-store/tests/test-gnome2-storage.c 2013-08-15 10:38:19.000000000 +0200 @@ -89,6 +89,7 @@ test->storage = gkm_gnome2_storage_new (test->module, test->directory); rv = gkm_gnome2_storage_refresh (test->storage); gkm_assert_cmprv (rv, ==, CKR_OK); + g_object_add_weak_pointer (G_OBJECT (test->storage), (gpointer *)&test->storage); /* We already have the CKA_LABEL attribute */ gkm_store_register_schema (GKM_STORE (test->storage), &url, NULL, 0); @@ -151,7 +152,7 @@ g_object_unref (test->new_object); g_object_unref (test->old_object); g_object_unref (test->storage); - g_assert (!G_IS_OBJECT (test->storage)); + g_assert (test->storage == NULL); mock_gnome2_module_leave_and_finalize (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-keyring-3.9.1/schema/Makefile.am new/gnome-keyring-3.9.90/schema/Makefile.am --- old/gnome-keyring-3.9.1/schema/Makefile.am 2012-12-23 13:28:16.000000000 +0100 +++ new/gnome-keyring-3.9.90/schema/Makefile.am 2013-08-15 10:13:46.000000000 +0200 @@ -10,6 +10,14 @@ convertdir = \ $(datarootdir)/GConf/gsettings +all-local: gschemas.compiled + +gschemas.compiled: $(gsettings_SCHEMAS) + glib-compile-schemas --strict . + +DISTCLEAN = \ + gschemas.compiled + EXTRA_DIST = \ $(convert_DATA) \ $(gsettings_SCHEMAS) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
