Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at 2015-10-25 19:10:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-10-06 16:37:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-keyring.new/gnome-keyring.changes 2015-10-25 19:10:31.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Oct 17 06:05:33 UTC 2015 - zai...@opensuse.org + +- Update to version 3.18.1: + + Fix regression initializing gnome-keyring-daemon (bgo#756059). + + Fix regression racing for DBus name during startup + (bgo#756006). + + Build and testing fixes (bgo#755873). + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-keyring-3.18.0.tar.xz New: ---- gnome-keyring-3.18.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.CSnOac/_old 2015-10-25 19:10:32.000000000 +0100 +++ /var/tmp/diff_new_pack.CSnOac/_new 2015-10-25 19:10:32.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-keyring -Version: 3.18.0 +Version: 3.18.1 Release: 0 Url: http://www.gnome.org/ Summary: GNOME Keyring ++++++ gnome-keyring-3.18.0.tar.xz -> gnome-keyring-3.18.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/ChangeLog new/gnome-keyring-3.18.1/ChangeLog --- old/gnome-keyring-3.18.0/ChangeLog 2015-09-28 17:58:30.000000000 +0200 +++ new/gnome-keyring-3.18.1/ChangeLog 2015-10-16 22:56:31.000000000 +0200 @@ -1,5 +1,175 @@ # Generate automatically. Do not edit. +commit 91dfc6a365f3d12e87769680c2dedc2bc1e57b23 +Author: Stef Walter <st...@gnome.org> +Date: 2015-10-16 + + Bump version number + + NEWS | 6 ++++++ + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit bf560bd195919d79a59a8642923ccac80c437bb1 +Author: Ray Strode <rstr...@redhat.com> +Date: 2015-10-15 + + daemon: Kill off foreground proceses when session dies + + Right now gnome-keyring will keep processes around forever + in some cases. They need to die when the session goes away, + at least. + + Signed-off-by: Cosimo Cecchi <cosi...@gnome.org> + * Don't leak a DBus connection + + Signed-off-by: Stef Walter <st...@gnome.org> + * Print error message if we cannot connect to bus + * Wait for gnome-keyring-daemon when --foreground + + https://bugzilla.gnome.org/show_bug.cgi?id=756059 + + daemon/gkd-main.c | 27 +++++++++++++++++++++++++-- + 1 file changed, 25 insertions(+), 2 deletions(-) + +commit ac9492a929d364685da8c8cb4152bf2534ddfb6f +Author: Cosimo Cecchi <cosi...@gnome.org> +Date: 2015-10-16 + + daemon: adjust CFLAGS for daemon + + https://bugzilla.gnome.org/show_bug.cgi?id=756059 + + daemon/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6040bdb2a0ee9ee1f8e308b8cdede6d3fe5c94bf +Author: Ray Strode <rstr...@redhat.com> +Date: 2015-10-15 + + daemon: fork before threads are spawned + + It's not really a good idea to fork after glib has initialized, + since it has helper threads that may have taken locks etc. + + This commit forks really early to prevent locks from leaking + and causing deadlock. + + Signed-off-by: Cosimo Cecchi <cosi...@gnome.org> + * Split out separate function + * Check return value of g_unix_open_pipe() + * Don't fork when running foreground + * Read login password before fork() + + Signed-off-by: Stef Walter <st...@gnome.org> + * Since stdout is open, just print evironment directly + + https://bugzilla.gnome.org/show_bug.cgi?id=756059 + + daemon/gkd-main.c | 72 ++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 50 insertions(+), 22 deletions(-) + +commit 74fc065e3c3e04a5cd5dfa0e725f7664825a5b1e +Author: Stef Walter <st...@gnome.org> +Date: 2015-10-13 + + pam: Stop using deprecated <selinux/flask.h> header + + And use the more complex function call instead. + + Fixes this warning: + + /usr/include/selinux/flask.h:5:2: error: #warning "Please remove any #include's of this header in your source code." [-Werror=cpp] + #warning "Please remove any #include's of this header in your source code." + ^ + + pam/gkr-pam-module.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit b84b9205f9f3ccf7c05f16cac561e8e16eebbefa +Author: Tom Tryfonidis <tomt...@gmail.com> +Date: 2015-10-08 + + Updated Greek translation + + po/el.po | 135 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 61 insertions(+), 74 deletions(-) + +commit 3cf744f67939dc23c2cc8715cda999a7ec13f1b6 +Author: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +Date: 2015-10-06 + + dbus: Initialize secret service before claiming name + + Otherwise incoming calls can race with our initialization. Activating + calls are even guaranteed to arrive before we have set up the service. + + https://bugzilla.gnome.org/show_bug.cgi?id=756006 + + daemon/dbus/gkd-dbus-secrets.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 918ab836fd23f9b2c0bf655c7f4f575bffff3189 +Author: Dmitry Shachnev <mity...@ubuntu.com> +Date: 2015-09-30 + + build: Make tap-gtester handle skipped tests correctly + + In pam/test-pam.c, the skip_test function either prints the status + itself, or relies on g_test_skip (depending on GLib version). + + The tap-gtester script should handle both cases, not only the first + one. + + https://bugzilla.gnome.org/show_bug.cgi?id=755873 + + build/tap-gtester | 2 ++ + 1 file changed, 2 insertions(+) + +commit cc0d05adb11f1bcbc9a8be33a29a34cd20a9a57f +Author: Dmitry Shachnev <mity...@ubuntu.com> +Date: 2015-09-30 + + egg: Make sure names for encode-decode tests are different + + https://bugzilla.gnome.org/show_bug.cgi?id=755873 + + egg/test-asn1x.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3c424be597a2e4164348bc087882a7ed376df163 +Author: Dmitry Shachnev <mity...@ubuntu.com> +Date: 2015-09-30 + + tests: Make sure names for write_large_file tests are different + + https://bugzilla.gnome.org/show_bug.cgi?id=755873 + + pkcs11/gkm/test-transaction.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 2425dab6765cb67b3c08e4143d70421a98f997d1 +Author: Dmitry Shachnev <mity...@ubuntu.com> +Date: 2015-09-30 + + tests: Fix name of note-xdg-schema-without-schema-locked test + + https://bugzilla.gnome.org/show_bug.cgi?id=755873 + + pkcs11/secret-store/test-secret-schema.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8b24acb220cf5355596c562532ac494a9f1a6388 +Author: Trần Ngọc Quân <vnwild...@gmail.com> +Date: 2015-10-01 + + Updated Vietnamese translation + + Signed-off-by: Trần Ngọc Quân <vnwild...@gmail.com> + + po/vi.po | 136 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 62 insertions(+), 74 deletions(-) + commit b1aee9c01f647f084e6c0ae2b4810c9ec7d0fd0d Author: Stef Walter <st...@gnome.org> Date: 2015-09-28 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/Makefile.in new/gnome-keyring-3.18.1/Makefile.in --- old/gnome-keyring-3.18.0/Makefile.in 2015-09-28 16:00:04.000000000 +0200 +++ new/gnome-keyring-3.18.1/Makefile.in 2015-10-16 22:52:13.000000000 +0200 @@ -660,9 +660,12 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(gnome_keyring_@GKR_MAJOR@_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -am_gnome_keyring_daemon_OBJECTS = daemon/gkd-glue.$(OBJEXT) \ - daemon/gkd-main.$(OBJEXT) daemon/gkd-capability.$(OBJEXT) \ - daemon/gkd-pkcs11.$(OBJEXT) daemon/gkd-util.$(OBJEXT) \ +am_gnome_keyring_daemon_OBJECTS = \ + daemon/gnome_keyring_daemon-gkd-glue.$(OBJEXT) \ + daemon/gnome_keyring_daemon-gkd-main.$(OBJEXT) \ + daemon/gnome_keyring_daemon-gkd-capability.$(OBJEXT) \ + daemon/gnome_keyring_daemon-gkd-pkcs11.$(OBJEXT) \ + daemon/gnome_keyring_daemon-gkd-util.$(OBJEXT) \ $(am__objects_1) gnome_keyring_daemon_OBJECTS = $(am_gnome_keyring_daemon_OBJECTS) gnome_keyring_daemon_DEPENDENCIES = libgkd-dbus.la libgkd-login.la \ @@ -670,6 +673,10 @@ libgkm-rpc-layer.la libgkm-secret-store.la libgkm-ssh-store.la \ libgkm-gnome2-store.la libgkm-xdg-store.la libgkm.la \ $(am__DEPENDENCIES_1) +gnome_keyring_daemon_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ am_test_armor_OBJECTS = egg/test-armor.$(OBJEXT) test_armor_OBJECTS = $(am_test_armor_OBJECTS) am__DEPENDENCIES_6 = libegg.la $(am__DEPENDENCIES_1) \ @@ -1893,6 +1900,9 @@ libgkm.la \ $(DAEMON_LIBS) +gnome_keyring_daemon_CFLAGS = \ + $(DAEMON_CFLAGS) + service_in_files = \ daemon/org.gnome.keyring.service.in \ daemon/org.freedesktop.secrets.service.in @@ -1913,7 +1923,7 @@ daemon/gkd-test.h daemon_CFLAGS = \ - $(DBUS_CFLAGS) \ + $(GIO_CFLAGS) \ $(GCR_CFLAGS) daemon_LIBS = \ @@ -3697,20 +3707,20 @@ gnome-keyring-@GKR_MAJOR@$(EXEEXT): $(gnome_keyring_@GKR_MAJOR@_OBJECTS) $(gnome_keyring_@GKR_MAJOR@_DEPENDENCIES) $(EXTRA_gnome_keyring_@GKR_MAJOR@_DEPENDENCIES) @rm -f gnome-keyring-@GKR_MAJOR@$(EXEEXT) $(AM_V_CCLD)$(gnome_keyring_@GKR_MAJOR@_LINK) $(gnome_keyring_@GKR_MAJOR@_OBJECTS) $(gnome_keyring_@GKR_MAJOR@_LDADD) $(LIBS) -daemon/gkd-glue.$(OBJEXT): daemon/$(am__dirstamp) \ - daemon/$(DEPDIR)/$(am__dirstamp) -daemon/gkd-main.$(OBJEXT): daemon/$(am__dirstamp) \ - daemon/$(DEPDIR)/$(am__dirstamp) -daemon/gkd-capability.$(OBJEXT): daemon/$(am__dirstamp) \ - daemon/$(DEPDIR)/$(am__dirstamp) -daemon/gkd-pkcs11.$(OBJEXT): daemon/$(am__dirstamp) \ - daemon/$(DEPDIR)/$(am__dirstamp) -daemon/gkd-util.$(OBJEXT): daemon/$(am__dirstamp) \ - daemon/$(DEPDIR)/$(am__dirstamp) +daemon/gnome_keyring_daemon-gkd-glue.$(OBJEXT): \ + daemon/$(am__dirstamp) daemon/$(DEPDIR)/$(am__dirstamp) +daemon/gnome_keyring_daemon-gkd-main.$(OBJEXT): \ + daemon/$(am__dirstamp) daemon/$(DEPDIR)/$(am__dirstamp) +daemon/gnome_keyring_daemon-gkd-capability.$(OBJEXT): \ + daemon/$(am__dirstamp) daemon/$(DEPDIR)/$(am__dirstamp) +daemon/gnome_keyring_daemon-gkd-pkcs11.$(OBJEXT): \ + daemon/$(am__dirstamp) daemon/$(DEPDIR)/$(am__dirstamp) +daemon/gnome_keyring_daemon-gkd-util.$(OBJEXT): \ + daemon/$(am__dirstamp) daemon/$(DEPDIR)/$(am__dirstamp) gnome-keyring-daemon$(EXEEXT): $(gnome_keyring_daemon_OBJECTS) $(gnome_keyring_daemon_DEPENDENCIES) $(EXTRA_gnome_keyring_daemon_DEPENDENCIES) @rm -f gnome-keyring-daemon$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gnome_keyring_daemon_OBJECTS) $(gnome_keyring_daemon_LDADD) $(LIBS) + $(AM_V_CCLD)$(gnome_keyring_daemon_LINK) $(gnome_keyring_daemon_OBJECTS) $(gnome_keyring_daemon_LDADD) $(LIBS) egg/test-armor.$(OBJEXT): egg/$(am__dirstamp) \ egg/$(DEPDIR)/$(am__dirstamp) @@ -4153,12 +4163,12 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkd_dbus_la-gkm-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgkm_la-gkm-marshal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gkd-capability.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gkd-glue.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gkd-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gkd-pkcs11.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gkd-test.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gkd-util.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-capability.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-glue.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-pkcs11.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/test-startup.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@daemon/$(DEPDIR)/test_shutdown-test-shutdown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@daemon/control/$(DEPDIR)/frob-control-change.Po@am__quote@ @@ -5336,6 +5346,76 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_@GKR_MAJOR@_CFLAGS) $(CFLAGS) -c -o tool/gnome_keyring_@gkr_ma...@-gkr-tool-version.obj `if test -f 'tool/gkr-tool-version.c'; then $(CYGPATH_W) 'tool/gkr-tool-version.c'; else $(CYGPATH_W) '$(srcdir)/tool/gkr-tool-version.c'; fi` +daemon/gnome_keyring_daemon-gkd-glue.o: daemon/gkd-glue.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -MT daemon/gnome_keyring_daemon-gkd-glue.o -MD -MP -MF daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-glue.Tpo -c -o daemon/gnome_keyring_daemon-gkd-glue.o `test -f 'daemon/gkd-glue.c' || echo '$(srcdir)/'`daemon/gkd-glue.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-glue.Tpo daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-glue.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon/gkd-glue.c' object='daemon/gnome_keyring_daemon-gkd-glue.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -c -o daemon/gnome_keyring_daemon-gkd-glue.o `test -f 'daemon/gkd-glue.c' || echo '$(srcdir)/'`daemon/gkd-glue.c + +daemon/gnome_keyring_daemon-gkd-glue.obj: daemon/gkd-glue.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -MT daemon/gnome_keyring_daemon-gkd-glue.obj -MD -MP -MF daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-glue.Tpo -c -o daemon/gnome_keyring_daemon-gkd-glue.obj `if test -f 'daemon/gkd-glue.c'; then $(CYGPATH_W) 'daemon/gkd-glue.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gkd-glue.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-glue.Tpo daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-glue.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon/gkd-glue.c' object='daemon/gnome_keyring_daemon-gkd-glue.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -c -o daemon/gnome_keyring_daemon-gkd-glue.obj `if test -f 'daemon/gkd-glue.c'; then $(CYGPATH_W) 'daemon/gkd-glue.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gkd-glue.c'; fi` + +daemon/gnome_keyring_daemon-gkd-main.o: daemon/gkd-main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -MT daemon/gnome_keyring_daemon-gkd-main.o -MD -MP -MF daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-main.Tpo -c -o daemon/gnome_keyring_daemon-gkd-main.o `test -f 'daemon/gkd-main.c' || echo '$(srcdir)/'`daemon/gkd-main.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-main.Tpo daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon/gkd-main.c' object='daemon/gnome_keyring_daemon-gkd-main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -c -o daemon/gnome_keyring_daemon-gkd-main.o `test -f 'daemon/gkd-main.c' || echo '$(srcdir)/'`daemon/gkd-main.c + +daemon/gnome_keyring_daemon-gkd-main.obj: daemon/gkd-main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -MT daemon/gnome_keyring_daemon-gkd-main.obj -MD -MP -MF daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-main.Tpo -c -o daemon/gnome_keyring_daemon-gkd-main.obj `if test -f 'daemon/gkd-main.c'; then $(CYGPATH_W) 'daemon/gkd-main.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gkd-main.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-main.Tpo daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon/gkd-main.c' object='daemon/gnome_keyring_daemon-gkd-main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -c -o daemon/gnome_keyring_daemon-gkd-main.obj `if test -f 'daemon/gkd-main.c'; then $(CYGPATH_W) 'daemon/gkd-main.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gkd-main.c'; fi` + +daemon/gnome_keyring_daemon-gkd-capability.o: daemon/gkd-capability.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -MT daemon/gnome_keyring_daemon-gkd-capability.o -MD -MP -MF daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-capability.Tpo -c -o daemon/gnome_keyring_daemon-gkd-capability.o `test -f 'daemon/gkd-capability.c' || echo '$(srcdir)/'`daemon/gkd-capability.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-capability.Tpo daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-capability.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon/gkd-capability.c' object='daemon/gnome_keyring_daemon-gkd-capability.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -c -o daemon/gnome_keyring_daemon-gkd-capability.o `test -f 'daemon/gkd-capability.c' || echo '$(srcdir)/'`daemon/gkd-capability.c + +daemon/gnome_keyring_daemon-gkd-capability.obj: daemon/gkd-capability.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -MT daemon/gnome_keyring_daemon-gkd-capability.obj -MD -MP -MF daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-capability.Tpo -c -o daemon/gnome_keyring_daemon-gkd-capability.obj `if test -f 'daemon/gkd-capability.c'; then $(CYGPATH_W) 'daemon/gkd-capability.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gkd-capability.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-capability.Tpo daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-capability.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon/gkd-capability.c' object='daemon/gnome_keyring_daemon-gkd-capability.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -c -o daemon/gnome_keyring_daemon-gkd-capability.obj `if test -f 'daemon/gkd-capability.c'; then $(CYGPATH_W) 'daemon/gkd-capability.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gkd-capability.c'; fi` + +daemon/gnome_keyring_daemon-gkd-pkcs11.o: daemon/gkd-pkcs11.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -MT daemon/gnome_keyring_daemon-gkd-pkcs11.o -MD -MP -MF daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-pkcs11.Tpo -c -o daemon/gnome_keyring_daemon-gkd-pkcs11.o `test -f 'daemon/gkd-pkcs11.c' || echo '$(srcdir)/'`daemon/gkd-pkcs11.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-pkcs11.Tpo daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-pkcs11.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon/gkd-pkcs11.c' object='daemon/gnome_keyring_daemon-gkd-pkcs11.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -c -o daemon/gnome_keyring_daemon-gkd-pkcs11.o `test -f 'daemon/gkd-pkcs11.c' || echo '$(srcdir)/'`daemon/gkd-pkcs11.c + +daemon/gnome_keyring_daemon-gkd-pkcs11.obj: daemon/gkd-pkcs11.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -MT daemon/gnome_keyring_daemon-gkd-pkcs11.obj -MD -MP -MF daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-pkcs11.Tpo -c -o daemon/gnome_keyring_daemon-gkd-pkcs11.obj `if test -f 'daemon/gkd-pkcs11.c'; then $(CYGPATH_W) 'daemon/gkd-pkcs11.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gkd-pkcs11.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-pkcs11.Tpo daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-pkcs11.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon/gkd-pkcs11.c' object='daemon/gnome_keyring_daemon-gkd-pkcs11.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -c -o daemon/gnome_keyring_daemon-gkd-pkcs11.obj `if test -f 'daemon/gkd-pkcs11.c'; then $(CYGPATH_W) 'daemon/gkd-pkcs11.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gkd-pkcs11.c'; fi` + +daemon/gnome_keyring_daemon-gkd-util.o: daemon/gkd-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -MT daemon/gnome_keyring_daemon-gkd-util.o -MD -MP -MF daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-util.Tpo -c -o daemon/gnome_keyring_daemon-gkd-util.o `test -f 'daemon/gkd-util.c' || echo '$(srcdir)/'`daemon/gkd-util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-util.Tpo daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon/gkd-util.c' object='daemon/gnome_keyring_daemon-gkd-util.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -c -o daemon/gnome_keyring_daemon-gkd-util.o `test -f 'daemon/gkd-util.c' || echo '$(srcdir)/'`daemon/gkd-util.c + +daemon/gnome_keyring_daemon-gkd-util.obj: daemon/gkd-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -MT daemon/gnome_keyring_daemon-gkd-util.obj -MD -MP -MF daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-util.Tpo -c -o daemon/gnome_keyring_daemon-gkd-util.obj `if test -f 'daemon/gkd-util.c'; then $(CYGPATH_W) 'daemon/gkd-util.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gkd-util.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-util.Tpo daemon/$(DEPDIR)/gnome_keyring_daemon-gkd-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='daemon/gkd-util.c' object='daemon/gnome_keyring_daemon-gkd-util.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_keyring_daemon_CFLAGS) $(CFLAGS) -c -o daemon/gnome_keyring_daemon-gkd-util.obj `if test -f 'daemon/gkd-util.c'; then $(CYGPATH_W) 'daemon/gkd-util.c'; else $(CYGPATH_W) '$(srcdir)/daemon/gkd-util.c'; fi` + pkcs11/wrap-layer/test_create_credential-test-create-credential.o: pkcs11/wrap-layer/test-create-credential.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_create_credential_CFLAGS) $(CFLAGS) -MT pkcs11/wrap-layer/test_create_credential-test-create-credential.o -MD -MP -MF pkcs11/wrap-layer/$(DEPDIR)/test_create_credential-test-create-credential.Tpo -c -o pkcs11/wrap-layer/test_create_credential-test-create-credential.o `test -f 'pkcs11/wrap-layer/test-create-credential.c' || echo '$(srcdir)/'`pkcs11/wrap-layer/test-create-credential.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pkcs11/wrap-layer/$(DEPDIR)/test_create_credential-test-create-credential.Tpo pkcs11/wrap-layer/$(DEPDIR)/test_create_credential-test-create-credential.Po diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/NEWS new/gnome-keyring-3.18.1/NEWS --- old/gnome-keyring-3.18.0/NEWS 2015-09-28 15:54:41.000000000 +0200 +++ new/gnome-keyring-3.18.1/NEWS 2015-10-16 22:52:01.000000000 +0200 @@ -1,3 +1,9 @@ +Changes in version 3.18.1 are: + * Fix regression initializing gnome-keyring-daemon [#756059] + * Fix regression racing for DBus name during startup [#756006] + * Build and testing fixes [#755873] + * Updated translations + Changes in version 3.18.0 are: * Fix test crash [#731802] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/build/tap-gtester new/gnome-keyring-3.18.1/build/tap-gtester --- old/gnome-keyring-3.18.0/build/tap-gtester 2014-09-23 09:45:13.000000000 +0200 +++ new/gnome-keyring-3.18.1/build/tap-gtester 2015-10-01 17:50:08.000000000 +0200 @@ -79,6 +79,8 @@ print "ok %d %s" % (self.test_num, self.test_name) if data == "FAIL": print "not ok %d %s", (self.test_num, self.test_name) + if data == "SKIP": + print "ok %d %s # skip" % (self.test_num, self.test_name) self.test_name = None elif cmd == "skipping": if "/subprocess" not in data: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/configure new/gnome-keyring-3.18.1/configure --- old/gnome-keyring-3.18.0/configure 2015-09-28 16:00:04.000000000 +0200 +++ new/gnome-keyring-3.18.1/configure 2015-10-16 22:52:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-keyring 3.18.0. +# Generated by GNU Autoconf 2.69 for gnome-keyring 3.18.1. # # Report bugs to <gnome-keyring-l...@gnome.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='gnome-keyring' PACKAGE_TARNAME='gnome-keyring' -PACKAGE_VERSION='3.18.0' -PACKAGE_STRING='gnome-keyring 3.18.0' +PACKAGE_VERSION='3.18.1' +PACKAGE_STRING='gnome-keyring 3.18.1' PACKAGE_BUGREPORT='gnome-keyring-l...@gnome.org' PACKAGE_URL='https://wiki.gnome.org/Projects/GnomeKeyring' @@ -1458,7 +1458,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-keyring 3.18.0 to adapt to many kinds of systems. +\`configure' configures gnome-keyring 3.18.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1528,7 +1528,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-keyring 3.18.0:";; + short | recursive ) echo "Configuration of gnome-keyring 3.18.1:";; esac cat <<\_ACEOF @@ -1697,7 +1697,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-keyring configure 3.18.0 +gnome-keyring configure 3.18.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2120,7 +2120,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-keyring $as_me 3.18.0, which was +It was created by gnome-keyring $as_me 3.18.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3010,7 +3010,7 @@ # Define the identity of the package. PACKAGE='gnome-keyring' - VERSION='3.18.0' + VERSION='3.18.1' cat >>confdefs.h <<_ACEOF @@ -17601,7 +17601,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-keyring $as_me 3.18.0, which was +This file was extended by gnome-keyring $as_me 3.18.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17668,7 +17668,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-keyring config.status 3.18.0 +gnome-keyring config.status 3.18.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/configure.ac new/gnome-keyring-3.18.1/configure.ac --- old/gnome-keyring-3.18.0/configure.ac 2015-09-28 15:49:04.000000000 +0200 +++ new/gnome-keyring-3.18.1/configure.ac 2015-10-16 22:52:07.000000000 +0200 @@ -1,5 +1,5 @@ AC_INIT(gnome-keyring, - 3.18.0, + 3.18.1, [gnome-keyring-l...@gnome.org], [gnome-keyring], [https://wiki.gnome.org/Projects/GnomeKeyring]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/daemon/Makefile.am new/gnome-keyring-3.18.1/daemon/Makefile.am --- old/gnome-keyring-3.18.0/daemon/Makefile.am 2015-08-04 13:45:04.000000000 +0200 +++ new/gnome-keyring-3.18.1/daemon/Makefile.am 2015-10-16 22:30:18.000000000 +0200 @@ -27,6 +27,8 @@ libgkm-xdg-store.la \ libgkm.la \ $(DAEMON_LIBS) +gnome_keyring_daemon_CFLAGS = \ + $(DAEMON_CFLAGS) service_in_files = \ daemon/org.gnome.keyring.service.in \ @@ -61,7 +63,7 @@ daemon/gkd-test.h daemon_CFLAGS = \ - $(DBUS_CFLAGS) \ + $(GIO_CFLAGS) \ $(GCR_CFLAGS) daemon_LIBS = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/daemon/dbus/gkd-dbus-secrets.c new/gnome-keyring-3.18.1/daemon/dbus/gkd-dbus-secrets.c --- old/gnome-keyring-3.18.0/daemon/dbus/gkd-dbus-secrets.c 2015-08-04 13:41:30.000000000 +0200 +++ new/gnome-keyring-3.18.1/daemon/dbus/gkd-dbus-secrets.c 2015-10-13 08:38:09.000000000 +0200 @@ -74,6 +74,7 @@ guint res; g_return_val_if_fail (dbus_conn, FALSE); + g_return_val_if_fail (!secrets_service, FALSE); #ifdef WITH_DEBUG service = g_getenv ("GNOME_KEYRING_TEST_SERVICE"); @@ -86,6 +87,9 @@ /* Figure out which slot to use */ slot = calculate_secrets_slot (); g_return_val_if_fail (slot, FALSE); + secrets_service = g_object_new (GKD_SECRET_TYPE_SERVICE, + "connection", dbus_conn, "pkcs11-slot", slot, NULL); + g_object_unref (slot); /* Try and grab our name */ request_variant = g_dbus_connection_call_sync (dbus_conn, @@ -120,16 +124,12 @@ g_message ("another secret service is running"); break; default: + g_clear_object (&secrets_service); g_return_val_if_reached (FALSE); break; }; } - g_return_val_if_fail (!secrets_service, FALSE); - secrets_service = g_object_new (GKD_SECRET_TYPE_SERVICE, - "connection", dbus_conn, "pkcs11-slot", slot, NULL); - - g_object_unref (slot); return TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/daemon/gkd-main.c new/gnome-keyring-3.18.1/daemon/gkd-main.c --- old/gnome-keyring-3.18.0/daemon/gkd-main.c 2015-06-29 17:24:02.000000000 +0200 +++ new/gnome-keyring-3.18.1/daemon/gkd-main.c 2015-10-16 22:30:18.000000000 +0200 @@ -58,6 +58,8 @@ #include <sys/stat.h> #include <sys/wait.h> +#include <gio/gunixinputstream.h> +#include <gio/gunixoutputstream.h> #include <glib.h> #include <glib/gi18n.h> #include <glib-object.h> @@ -125,6 +127,7 @@ static guint timeout_id = 0; static gboolean initialization_completed = FALSE; static GMainLoop *loop = NULL; +static int parent_wakeup_fd = -1; static GOptionEntry option_entries[] = { { "start", 's', 0, G_OPTION_ARG_NONE, &run_for_start, @@ -605,22 +608,43 @@ } static void +redirect_fds_after_fork (void) +{ + int fd, i; + + for (i = 0; i < 3; ++i) { + fd = open ("/dev/null", O_RDONLY); + sane_dup2 (fd, i); + close (fd); + } +} + +static void +block_on_fd (int fd) +{ + unsigned char dummy; + read (fd, &dummy, 1); +} + +static int fork_and_print_environment (void) { int status; pid_t pid; - int fd, i; + int wakeup_fds[2] = { -1, -1 }; if (run_foreground) { - print_environment (); - return; + return -1; } + if (!g_unix_open_pipe (wakeup_fds, FD_CLOEXEC, NULL)) + exit (1); + pid = fork (); if (pid != 0) { - /* Here we are in the initial process */ + close (wakeup_fds[1]); if (run_daemonized) { @@ -633,8 +657,8 @@ exit (WEXITSTATUS (status)); } else { - /* Not double forking */ - print_environment (); + /* Not double forking, wait for child */ + block_on_fd (wakeup_fds[0]); } /* The initial process exits successfully */ @@ -654,6 +678,7 @@ pid = fork (); if (pid != 0) { + close (wakeup_fds[1]); /* Here we are in the intermediate child process */ @@ -665,7 +690,7 @@ exit (1); /* We've done two forks. */ - print_environment (); + block_on_fd (wakeup_fds[0]); /* The intermediate child exits */ exit (0); @@ -674,12 +699,7 @@ } /* Here we are in the resulting daemon or background process. */ - - for (i = 0; i < 3; ++i) { - fd = open ("/dev/null", O_RDONLY); - sane_dup2 (fd, i); - close (fd); - } + return wakeup_fds[1]; } static gboolean @@ -807,6 +827,14 @@ return FALSE; } +static void +on_vanished_quit_loop (GDBusConnection *connection, + const gchar *name, + gpointer user_data) +{ + g_main_loop_quit (user_data); +} + int main (int argc, char *argv[]) { @@ -830,6 +858,9 @@ * predictable startup. */ + GDBusConnection *connection = NULL; + GError *error = NULL; + /* * Before we do ANYTHING, we drop privileges so we don't become * a security issue ourselves. @@ -876,16 +907,37 @@ exit (0); } + if (perform_unlock) { + login_password = read_login_password (STDIN); + atexit (clear_login_password); + } + + /* The whole forking and daemonizing dance starts here. */ + parent_wakeup_fd = fork_and_print_environment(); + /* The --start option */ if (run_for_start) { if (discover_other_daemon (initialize_daemon_at, TRUE)) { /* - * Another daemon was initialized, print out environment - * for any callers, and quit or go comatose. + * Another daemon was initialized, print out environment, + * tell parent we're done, and quit or go comatose. */ print_environment (); - if (run_foreground) - while (sleep(0x08000000) == 0); + close (parent_wakeup_fd); + if (run_foreground) { + connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); + if (error) { + g_warning ("Couldn't connect to session bus: %s", error->message); + g_clear_error (&error); + } + loop = g_main_loop_new (NULL, FALSE); + g_bus_watch_name (G_BUS_TYPE_SESSION, "org.gnome.keyring", + G_BUS_NAME_WATCHER_FLAGS_NONE, + NULL, on_vanished_quit_loop, loop, NULL); + g_main_loop_run (loop); + g_clear_pointer (&loop, g_main_loop_unref); + g_clear_object (&connection); + } cleanup_and_exit (0); } @@ -908,11 +960,6 @@ if (!gkd_control_listen ()) return FALSE; - if (perform_unlock) { - login_password = read_login_password (STDIN); - atexit (clear_login_password); - } - /* The --login option. Delayed initialization */ if (run_for_login) { timeout_id = g_timeout_add_seconds (LOGIN_TIMEOUT, (GSourceFunc) on_login_timeout, NULL); @@ -926,8 +973,12 @@ signal (SIGPIPE, SIG_IGN); - /* The whole forking and daemonizing dance starts here. */ - fork_and_print_environment(); + /* Print the environment and tell the parent we're done */ + print_environment (); + close (parent_wakeup_fd); + + if (!run_foreground) + redirect_fds_after_fork (); g_unix_signal_add (SIGTERM, on_signal_term, loop); g_unix_signal_add (SIGHUP, on_signal_term, loop); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/egg/test-asn1x.c new/gnome-keyring-3.18.1/egg/test-asn1x.c --- old/gnome-keyring-3.18.0/egg/test-asn1x.c 2014-09-23 09:45:13.000000000 +0200 +++ new/gnome-keyring-3.18.1/egg/test-asn1x.c 2015-10-01 17:50:07.000000000 +0200 @@ -186,7 +186,7 @@ g_test_init (&argc, &argv, NULL); for (i = 0; i < G_N_ELEMENTS (parse_test_fixtures); i++) { - name = g_strdup_printf ("/asn1x/encode-decode-%s", parse_test_fixtures[i].identifier); + name = g_strdup_printf ("/asn1x/encode-decode-%d-%s", i, parse_test_fixtures[i].identifier); g_test_add (name, Test, &parse_test_fixtures[i], setup_parsing, test_decode_encode, teardown); g_free (name); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/gkm-marshal.c new/gnome-keyring-3.18.1/gkm-marshal.c --- old/gnome-keyring-3.18.0/gkm-marshal.c 2015-08-29 08:05:57.000000000 +0200 +++ new/gnome-keyring-3.18.1/gkm-marshal.c 2015-10-16 21:30:25.000000000 +0200 @@ -61,9 +61,9 @@ { typedef gboolean (*GMarshalFunc_BOOLEAN__VOID) (gpointer data1, gpointer data2); - register GMarshalFunc_BOOLEAN__VOID callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + GMarshalFunc_BOOLEAN__VOID callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; gboolean v_return; g_return_if_fail (return_value != NULL); @@ -100,9 +100,9 @@ gpointer arg_1, gulong arg_2, gpointer data2); - register GMarshalFunc_VOID__STRING_ULONG callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + GMarshalFunc_VOID__STRING_ULONG callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; g_return_if_fail (n_param_values == 3); @@ -137,9 +137,9 @@ gpointer arg_1, gulong arg_2, gpointer data2); - register GMarshalFunc_VOID__OBJECT_ULONG callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + GMarshalFunc_VOID__OBJECT_ULONG callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; g_return_if_fail (n_param_values == 3); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/pam/gkr-pam-module.c new/gnome-keyring-3.18.1/pam/gkr-pam-module.c --- old/gnome-keyring-3.18.0/pam/gkr-pam-module.c 2014-09-23 09:45:13.000000000 +0200 +++ new/gnome-keyring-3.18.1/pam/gkr-pam-module.c 2015-10-13 09:07:26.000000000 +0200 @@ -311,7 +311,6 @@ } #ifdef WITH_SELINUX -#include <selinux/flask.h> #include <selinux/selinux.h> /* Attempt to set SELinux Context. We are ignoring failure and just going with default behaviour @@ -327,7 +326,7 @@ ret = getfilecon(command, &fcon); if (ret < 0) goto err; - ret = security_compute_create(execcon, fcon, SECCLASS_PROCESS, &newcon); + ret = security_compute_create(execcon, fcon, string_to_security_class ("process"), &newcon); if (ret < 0) goto err; setexeccon(newcon); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/pkcs11/gkm/test-transaction.c new/gnome-keyring-3.18.1/pkcs11/gkm/test-transaction.c --- old/gnome-keyring-3.18.0/pkcs11/gkm/test-transaction.c 2014-09-23 09:45:13.000000000 +0200 +++ new/gnome-keyring-3.18.1/pkcs11/gkm/test-transaction.c 2015-10-01 17:50:07.000000000 +0200 @@ -541,10 +541,13 @@ }; int i; + gchar test_name[39]; for (i = 0; buffersizes[i]; i++) - g_test_add ("/gkm/transaction/write_large_file", - Test, GUINT_TO_POINTER (buffersizes[i]), + { + g_sprintf (test_name, "/gkm/transaction/write_large_file_%u", buffersizes[i]); + g_test_add (test_name, Test, GUINT_TO_POINTER (buffersizes[i]), setup, test_write_large_file, teardown); + } } g_test_add ("/gkm/transaction/write_file_abort_gone", Test, NULL, setup, test_write_file_abort_gone, teardown); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/pkcs11/secret-store/test-secret-schema.c new/gnome-keyring-3.18.1/pkcs11/secret-store/test-secret-schema.c --- old/gnome-keyring-3.18.0/pkcs11/secret-store/test-secret-schema.c 2014-09-23 09:45:13.000000000 +0200 +++ new/gnome-keyring-3.18.1/pkcs11/secret-store/test-secret-schema.c 2015-10-01 17:50:07.000000000 +0200 @@ -230,7 +230,7 @@ Test, NULL, setup, test_match_network_xdg_schema_without_schema_locked, teardown); g_test_add ("/secret-store/schema/note-xdg-schema-without-schema-unlocked", Test, NULL, setup, test_match_note_xdg_schema_without_schema_unlocked, teardown); - g_test_add ("/secret-store/schema/unknown-schema-without-schema-locked", + g_test_add ("/secret-store/schema/note-xdg-schema-without-schema-locked", Test, NULL, setup, test_match_note_xdg_schema_without_schema_locked, teardown); g_test_add ("/secret-store/schema/unknown-schema-without-schema-unlocked", Test, NULL, setup, test_match_unknown_xdg_schema_without_schema_unlocked, teardown); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/po/el.po new/gnome-keyring-3.18.1/po/el.po --- old/gnome-keyring-3.18.0/po/el.po 2014-09-23 09:45:13.000000000 +0200 +++ new/gnome-keyring-3.18.1/po/el.po 2015-10-13 08:38:09.000000000 +0200 @@ -9,8 +9,8 @@ "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; "keyring&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-07-09 06:49+0000\n" -"PO-Revision-Date: 2014-08-13 15:33+0200\n" +"POT-Creation-Date: 2015-10-05 19:46+0000\n" +"PO-Revision-Date: 2015-10-06 09:59+0300\n" "Last-Translator: Tom Tryfonidis <tomt...@gmail.com>\n" "Language-Team: t...@gnome.gr\n" "Language: el\n" @@ -18,11 +18,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.5\n" +"X-Generator: Poedit 1.8.5\n" #. TRANSLATORS: This is the label for an keyring created without a label -#: ../daemon/dbus/gkd-secret-change.c:85 -#: ../daemon/dbus/gkd-secret-change.c:121 +#: ../daemon/dbus/gkd-secret-change.c:84 ../daemon/dbus/gkd-secret-change.c:120 #: ../daemon/dbus/gkd-secret-create.c:78 #: ../pkcs11/secret-store/gkm-secret-collection.c:324 #: ../pkcs11/wrap-layer/gkm-wrap-login.c:345 @@ -30,12 +29,12 @@ msgid "Unnamed" msgstr "Χωρίς όνομα" -#: ../daemon/dbus/gkd-secret-change.c:90 +#: ../daemon/dbus/gkd-secret-change.c:89 #, c-format msgid "Enter the old password for the '%s' keyring" msgstr "Εισάγετε τον παλιό κωδικό πρόσβασης για την κλειδοθήκη '%s'" -#: ../daemon/dbus/gkd-secret-change.c:94 +#: ../daemon/dbus/gkd-secret-change.c:93 #, c-format msgid "" "An application wants to change the password for the '%s' keyring. Enter the " @@ -44,21 +43,20 @@ "Μια εφαρμογή επιθυμεί να αλλάξει το κωδικό πρόσβασης για την κλειδοθήκη " "'%s'. Εισάγετε τον παλιό κωδικό πρόσβασης για αυτό." -#: ../daemon/dbus/gkd-secret-change.c:100 -#: ../daemon/dbus/gkd-secret-change.c:136 -#: ../daemon/dbus/gkd-secret-change.c:147 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1143 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1255 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1290 +#: ../daemon/dbus/gkd-secret-change.c:99 ../daemon/dbus/gkd-secret-change.c:135 +#: ../daemon/dbus/gkd-secret-change.c:146 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1163 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1276 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1311 msgid "Continue" msgstr "Συνέχεια" -#: ../daemon/dbus/gkd-secret-change.c:126 +#: ../daemon/dbus/gkd-secret-change.c:125 #, c-format msgid "Choose a new password for the '%s' keyring" msgstr "Επιλέξτε νέο κωδικό πρόσβασης για την κλειδοθήκη '%s'" -#: ../daemon/dbus/gkd-secret-change.c:130 +#: ../daemon/dbus/gkd-secret-change.c:129 #, c-format msgid "" "An application wants to change the password for the '%s' keyring. Choose the " @@ -67,13 +65,11 @@ "Μια εφαρμογή επιθυμεί να αλλάξει το κωδικό πρόσβασης για την κλειδοθήκη " "'%s'. Επιλέξετε τον κωδικό πρόσβασης που θέλετε να χρησιμοποιήσετε για αυτό." -#: ../daemon/dbus/gkd-secret-change.c:143 -#: ../daemon/dbus/gkd-secret-create.c:94 +#: ../daemon/dbus/gkd-secret-change.c:142 ../daemon/dbus/gkd-secret-create.c:94 msgid "Store passwords unencrypted?" msgstr "Αποθήκευση κωδικών πρόσβασης χωρίς κρυπτογράφηση;" -#: ../daemon/dbus/gkd-secret-change.c:145 -#: ../daemon/dbus/gkd-secret-create.c:96 +#: ../daemon/dbus/gkd-secret-change.c:144 ../daemon/dbus/gkd-secret-create.c:96 msgid "" "By choosing to use a blank password, your stored passwords will not be " "safely encrypted. They will be accessible by anyone with access to your " @@ -83,11 +79,11 @@ "με ασφάλεια οι αποθηκευμένοι σας κωδικοί πρόσβασης. Θα είναι προσβάσιμοι " "στον καθένα που έχει πρόσβαση στα αρχεία σας." -#: ../daemon/dbus/gkd-secret-change.c:153 +#: ../daemon/dbus/gkd-secret-change.c:152 msgid "The original password was incorrect" -msgstr "Ο αρχικός κωδικός πρόσβασξς ήταν λάθος" +msgstr "Ο αρχικός κωδικός πρόσβασης ήταν λάθος" -#: ../daemon/dbus/gkd-secret-change.c:354 +#: ../daemon/dbus/gkd-secret-change.c:348 msgid "Change Keyring Password" msgstr "Αλλαγή κωδικού πρόσβασης κλειδοθήκης" @@ -104,18 +100,10 @@ msgid "Choose password for new keyring" msgstr "Επιλέξτε κωδικό πρόσβασης για νέα κλειδοθήκη" -#: ../daemon/dbus/gkd-secret-create.c:311 +#: ../daemon/dbus/gkd-secret-create.c:308 msgid "New Keyring Password" msgstr "Νέος κωδικός πρόσβασης κλειδοθήκης" -#: ../daemon/gnome-keyring-gpg.desktop.in.in.h:1 -msgid "GPG Password Agent" -msgstr "Πράκτορας κωδικού πρόσβασης GPG" - -#: ../daemon/gnome-keyring-gpg.desktop.in.in.h:2 -msgid "GNOME Keyring: GPG Agent" -msgstr "Κλειδοθήκη GNOME: Πράκτορας GPG" - #: ../daemon/gnome-keyring-pkcs11.desktop.in.in.h:1 msgid "Certificate and Key Storage" msgstr "Αποθήκη πιστοποιητικών και κλειδιών" @@ -140,36 +128,8 @@ msgid "GNOME Keyring: SSH Agent" msgstr "Κλειδοθήκη GNOME: Πράκτορας SSH" -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:105 -msgid "Unknown" -msgstr "Άγνωστο" - -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:202 -#, c-format -msgid "PGP Key: %s" -msgstr "Κλειδί PGP: %s" - -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:349 -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:350 -msgid "Enter Passphrase" -msgstr "Εισάγετε συνθηματικό" - -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:354 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:602 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:630 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:645 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:721 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:767 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:799 -msgid "Unlock" -msgstr "Ξεκλείδωμα" - -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:383 -msgid "Automatically unlock this key, whenever I'm logged in" -msgstr "Αυτόματο ξεκλείδωμα αυτού του κλειδιού, όποτε συνδέομαι" - #. TRANSLATORS: This is the display label for the login keyring -#: ../daemon/login/gkd-login.c:150 +#: ../daemon/login/gkd-login.c:158 msgid "Login" msgstr "Σύνδεση" @@ -405,6 +365,15 @@ "Η κλειδοθήκη εισόδου σας δεν ξεκλειδώθηκε όταν συνδεθήκατε σε αυτόν τον " "υπολογιστή." +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:602 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:630 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:645 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:721 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:767 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:799 +msgid "Unlock" +msgstr "Ξεκλείδωμα" + #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:616 msgid "Unlock Keyring" msgstr "Ξεκλείδωμα κλειδοθήκης" @@ -462,8 +431,8 @@ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:674 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:796 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1140 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1288 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1160 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1309 msgid "Automatically unlock whenever I'm logged in" msgstr "Αυτόματο ξεκλείδωμα όποτε συνδέομαι" @@ -520,15 +489,15 @@ "Μια εφαρμογή επιθυμεί πρόσβαση στο πιστοποιητικό/αποθήκη κλειδιών '%s', αλλά " "αυτό είναι κλειδωμένο" -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1131 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1151 msgid "New Password Required" msgstr "Απαιτείται νέος κωδικός πρόσβασης" -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1132 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1152 msgid "New password required for secure storage" msgstr "Απαιτείται νέος κωδικός πρόσβασης για την ασφαλή αποθήκευση" -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1134 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1154 #, c-format msgid "" "In order to prepare '%s' for storage of certificates or keys, a password is " @@ -537,45 +506,63 @@ "Απαιτείται κωδικός πρόσβασης για την προετοιμασία του '%s' για αποθήκευση " "πιστοποιητικών ή κλειδιών" -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1248 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1279 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1269 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1300 msgid "Change Password" msgstr "Αλλαγή κωδικού πρόσβασης" -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1249 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1270 msgid "Original password for secure storage" msgstr "Αρχικός κωδικός πρόσβασης για ασφαλή αποθήκευση" -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1251 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1272 #, c-format msgid "To change the password for '%s', the original password is required" msgstr "" "Για να αλλάξετε τον κωδικό πρόσβασης για '%s', απαιτείται ο αρχικός κωδικός " "πρόσβασης" -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1280 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1301 msgid "Change password for secure storage" msgstr "Αλλαγή κωδικού πρόσβασης για ασφαλή αποθήκευση" -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1282 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1303 #, c-format msgid "Type a new password for '%s'" msgstr "Πληκτρολογήστε έναν νέο κωδικό πρόσβασης για '%s'" -#: ../tool/gkr-tool.c:101 +#: ../tool/gkr-tool.c:100 #, c-format msgid "usage: gnome-keyring command [options]\n" msgstr "χρήση: gnome-keyring εντολή [επιλογές]\n" -#: ../tool/gkr-tool.c:103 +#: ../tool/gkr-tool.c:102 msgid "commands: " msgstr "εντολές:" #. Translators: keep same length as translated message "commands: " -#: ../tool/gkr-tool.c:107 +#: ../tool/gkr-tool.c:106 msgid " " msgstr " " +#~ msgid "GPG Password Agent" +#~ msgstr "Πράκτορας κωδικού πρόσβασης GPG" + +#~ msgid "GNOME Keyring: GPG Agent" +#~ msgstr "Κλειδοθήκη GNOME: Πράκτορας GPG" + +#~ msgid "Unknown" +#~ msgstr "Άγνωστο" + +#~ msgid "PGP Key: %s" +#~ msgstr "Κλειδί PGP: %s" + +#~ msgid "Enter Passphrase" +#~ msgstr "Εισάγετε συνθηματικό" + +#~ msgid "Automatically unlock this key, whenever I'm logged in" +#~ msgstr "Αυτόματο ξεκλείδωμα αυτού του κλειδιού, όποτε συνδέομαι" + #~ msgid "Forget this password if idle for" #~ msgstr "Να ξεχαστεί αυτός ο κωδικός αν είναι αδρανής για" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-keyring-3.18.0/po/vi.po new/gnome-keyring-3.18.1/po/vi.po --- old/gnome-keyring-3.18.0/po/vi.po 2015-06-29 17:24:02.000000000 +0200 +++ new/gnome-keyring-3.18.1/po/vi.po 2015-10-01 17:50:03.000000000 +0200 @@ -1,18 +1,19 @@ # Vietnamese translation of GNOME Keyring. -# Copyright © 2014 GNOME i18n Project for Vietnamese. +# Bản dịch tiếng Việt dành cho GNOME Keyring. +# Copyright © 2015 GNOME i18n Project for Vietnamese. # This file is distributed under the same license as the gnome-keyring package. # Nguyễn Thái Ngọc Duy <pclo...@gmail.com>, 2004,2008,2011-2012. # Clytie Siddall <cly...@riverland.net.au>, 2005-2010. # Nguyen Vu Hung <vuhung16p...@gmail.com>, 2011. -# Trần Ngọc Quân <vnwild...@gmail.com>, 2014. +# Trần Ngọc Quân <vnwild...@gmail.com>, 2014, 2015. # msgid "" msgstr "" "Project-Id-Version: gnome-keyring master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; "keyring&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-11-20 20:13+0000\n" -"PO-Revision-Date: 2014-11-21 14:15+0700\n" +"POT-Creation-Date: 2015-09-30 19:51+0000\n" +"PO-Revision-Date: 2015-10-01 07:47+0700\n" "Last-Translator: Trần Ngọc Quân <vnwild...@gmail.com>\n" "Language-Team: Vietnamese <gnome-vi-l...@gnome.org>\n" "Language: vi\n" @@ -20,24 +21,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Gtranslator 2.91.7\n" #. TRANSLATORS: This is the label for an keyring created without a label -#: ../daemon/dbus/gkd-secret-change.c:85 -#: ../daemon/dbus/gkd-secret-change.c:121 +#: ../daemon/dbus/gkd-secret-change.c:84 ../daemon/dbus/gkd-secret-change.c:120 #: ../daemon/dbus/gkd-secret-create.c:78 #: ../pkcs11/secret-store/gkm-secret-collection.c:324 #: ../pkcs11/wrap-layer/gkm-wrap-login.c:345 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:753 msgid "Unnamed" -msgstr "Không tên" +msgstr "Chưa đặt tên" -#: ../daemon/dbus/gkd-secret-change.c:90 +#: ../daemon/dbus/gkd-secret-change.c:89 #, c-format msgid "Enter the old password for the '%s' keyring" msgstr "Nhập mật khẩu cũ cho chùm chìa khóa “%s”" -#: ../daemon/dbus/gkd-secret-change.c:94 +#: ../daemon/dbus/gkd-secret-change.c:93 #, c-format msgid "" "An application wants to change the password for the '%s' keyring. Enter the " @@ -46,21 +46,20 @@ "Một ứng dụng muốn thay đổi mật khẩu cho chùm chìa khóa “%s”. Nhập mật khẩu " "cũ của nó." -#: ../daemon/dbus/gkd-secret-change.c:100 -#: ../daemon/dbus/gkd-secret-change.c:136 -#: ../daemon/dbus/gkd-secret-change.c:147 +#: ../daemon/dbus/gkd-secret-change.c:99 ../daemon/dbus/gkd-secret-change.c:135 +#: ../daemon/dbus/gkd-secret-change.c:146 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1163 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1276 #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1311 msgid "Continue" msgstr "Tiếp tục" -#: ../daemon/dbus/gkd-secret-change.c:126 +#: ../daemon/dbus/gkd-secret-change.c:125 #, c-format msgid "Choose a new password for the '%s' keyring" msgstr "Hãy chọn một mật khẩu mới cho chùm chìa khóa “%s”" -#: ../daemon/dbus/gkd-secret-change.c:130 +#: ../daemon/dbus/gkd-secret-change.c:129 #, c-format msgid "" "An application wants to change the password for the '%s' keyring. Choose the " @@ -69,26 +68,24 @@ "Một ứng dụng muốn thay đổi mật khẫu cho chùm chìa khóa “%s”. Hãy chọn mật " "khẩu cần sử dụng với nó." -#: ../daemon/dbus/gkd-secret-change.c:143 -#: ../daemon/dbus/gkd-secret-create.c:94 +#: ../daemon/dbus/gkd-secret-change.c:142 ../daemon/dbus/gkd-secret-create.c:94 msgid "Store passwords unencrypted?" msgstr "Lưu mật khẩu không mã hóa không?" -#: ../daemon/dbus/gkd-secret-change.c:145 -#: ../daemon/dbus/gkd-secret-create.c:96 +#: ../daemon/dbus/gkd-secret-change.c:144 ../daemon/dbus/gkd-secret-create.c:96 msgid "" "By choosing to use a blank password, your stored passwords will not be " "safely encrypted. They will be accessible by anyone with access to your " "files." msgstr "" -"Dùng một mật khẩu trắng thì mật khẩu đã lưu sẽ không được mã hoá an toàn. " +"Dùng một mật khẩu trắng thì mật khẩu đã lưu sẽ không được mã hóa an toàn. " "Mọi người đều có thể truy cập vào tập tin của bạn." -#: ../daemon/dbus/gkd-secret-change.c:153 +#: ../daemon/dbus/gkd-secret-change.c:152 msgid "The original password was incorrect" msgstr "Bạn đã gõ sai mật khẩu gốc" -#: ../daemon/dbus/gkd-secret-change.c:354 +#: ../daemon/dbus/gkd-secret-change.c:348 msgid "Change Keyring Password" msgstr "Đổi mật khẩu chùm chìa khóa" @@ -105,18 +102,10 @@ msgid "Choose password for new keyring" msgstr "Hãy chọn mật khẩu cho chùm chìa khóa mới" -#: ../daemon/dbus/gkd-secret-create.c:311 +#: ../daemon/dbus/gkd-secret-create.c:308 msgid "New Keyring Password" msgstr "Mật khẩu chùm chìa khóa mới" -#: ../daemon/gnome-keyring-gpg.desktop.in.in.h:1 -msgid "GPG Password Agent" -msgstr "Agent cho mật khẩu GPG" - -#: ../daemon/gnome-keyring-gpg.desktop.in.in.h:2 -msgid "GNOME Keyring: GPG Agent" -msgstr "Chùm chìa khóa GNOME: Đại diện GPG" - #: ../daemon/gnome-keyring-pkcs11.desktop.in.in.h:1 msgid "Certificate and Key Storage" msgstr "Lưu trữ Chứng nhận và khóa" @@ -141,34 +130,6 @@ msgid "GNOME Keyring: SSH Agent" msgstr "Chùm chìa khóa GNOME: Đại diện SSH" -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:82 -msgid "Unknown" -msgstr "Không biết" - -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:144 -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:145 -msgid "Enter Passphrase" -msgstr "Nhập mật mã" - -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:149 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:602 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:630 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:645 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:721 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:767 -#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:799 -msgid "Unlock" -msgstr "Mở khóa" - -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:162 -msgid "Automatically unlock this key, whenever I'm logged in" -msgstr "Tự động gỡ khóa khóa này khi nào tôi đã đăng nhập" - -#: ../daemon/gpg-agent/gkd-gpg-agent-ops.c:225 -#, c-format -msgid "PGP Key: %s" -msgstr "Khóa PGP: %s" - #. TRANSLATORS: This is the display label for the login keyring #: ../daemon/login/gkd-login.c:158 msgid "Login" @@ -200,7 +161,7 @@ #: ../egg/dotlock.c:1084 #, c-format msgid "waiting for lock (held by %d%s) %s...\n" -msgstr "chờ khóa (được giữ bởi %d%s) %s...\n" +msgstr "đang chờ khóa (được giữ bởi %d%s) %s…\n" # http://vi.wikipedia.org/wiki/Deadlock # deadlock (Khóa chết) Là trạng thái xảy ra trong môi trường đa nhiệm (Muti-Threading) khi hai hoặc nhiều tiến trình đi vào vòng lặp chờ tài nguyên mãi mãi. @@ -216,7 +177,7 @@ #: ../egg/dotlock.c:1150 #, c-format msgid "waiting for lock %s...\n" -msgstr "chờ khóa %s...\n" +msgstr "chờ khóa %s…\n" #: ../egg/egg-oid.c:40 msgid "Domain Component" @@ -288,7 +249,7 @@ #: ../egg/egg-oid.c:82 msgid "Title" -msgstr "Tuổi tác" +msgstr "Tước hiệu" #: ../egg/egg-oid.c:84 msgid "Telephone Number" @@ -304,11 +265,11 @@ #: ../egg/egg-oid.c:90 msgid "Generation Qualifier" -msgstr "Thế hệ dè dặt" +msgstr "Hạn định phát sinh" #: ../egg/egg-oid.c:92 msgid "DN Qualifier" -msgstr "Tên miền dè dặt" +msgstr "Hạn định tên miền" #: ../egg/egg-oid.c:94 msgid "Pseudonym" @@ -320,15 +281,15 @@ #: ../egg/egg-oid.c:98 msgid "MD2 with RSA" -msgstr "MD2 với mã hoá RSA" +msgstr "MD2 với mã hóa RSA" #: ../egg/egg-oid.c:99 msgid "MD5 with RSA" -msgstr "MD5 với mã hoá RSA" +msgstr "MD5 với mã hóa RSA" #: ../egg/egg-oid.c:100 msgid "SHA1 with RSA" -msgstr "SHA1 với mã hoá RSA" +msgstr "SHA1 với mã hóa RSA" #: ../egg/egg-oid.c:102 msgid "DSA" @@ -336,7 +297,7 @@ #: ../egg/egg-oid.c:103 msgid "SHA1 with DSA" -msgstr "SHA1 với mã hoá DSA" +msgstr "SHA1 với mã hóa DSA" #. Extended Key Usages #: ../egg/egg-oid.c:106 @@ -377,7 +338,7 @@ #: ../pkcs11/ssh-store/gkm-ssh-private-key.c:341 msgid "Couldn't parse public SSH key" -msgstr "Không thể phân tích cú pháp của khóa SSH công" +msgstr "Không thể phân tích cú pháp của khóa công SSH" #. Get the label ready #: ../pkcs11/wrap-layer/gkm-wrap-login.c:345 @@ -408,6 +369,15 @@ "Chùm chìa khóa đăng nhập đã không được gỡ khóa khi bạn đăng nhập vào máy " "tính này." +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:602 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:630 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:645 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:721 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:767 +#: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:799 +msgid "Unlock" +msgstr "Mở khóa" + #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:616 msgid "Unlock Keyring" msgstr "Mở khóa chùm chìa khóa" @@ -440,19 +410,19 @@ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:654 msgid "Enter password to unlock the private key" -msgstr "Gõ mật khẩu để mở khóa riêng" +msgstr "Nhập mật khẩu để mở khóa riêng" #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:656 msgid "Enter password to unlock the certificate" -msgstr "Gõ mật khẩu để mở chứng nhận" +msgstr "Nhập mật khẩu để mở chứng nhận" #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:658 msgid "Enter password to unlock the public key" -msgstr "Gõ mật khẩu để mở khóa công khai" +msgstr "Nhập mật khẩu để mở khóa công khai" #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:660 msgid "Enter password to unlock" -msgstr "Gõ mật khẩu để gỡ khóa" +msgstr "Nhập mật khẩu để gỡ khóa" #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:670 msgid "Automatically unlock this key whenever I'm logged in" @@ -557,7 +527,7 @@ #: ../tool/gkr-tool.c:100 #, c-format msgid "usage: gnome-keyring command [options]\n" -msgstr "cách dùng: gnome-keyring lệnh [tuỳ chọn]\n" +msgstr "cách dùng: gnome-keyring lệnh [các tùy chọn]\n" #: ../tool/gkr-tool.c:102 msgid "commands: " @@ -568,6 +538,24 @@ msgid " " msgstr " " +#~ msgid "GPG Password Agent" +#~ msgstr "Agent cho mật khẩu GPG" + +#~ msgid "GNOME Keyring: GPG Agent" +#~ msgstr "Chùm chìa khóa GNOME: Đại diện GPG" + +#~ msgid "Unknown" +#~ msgstr "Không biết" + +#~ msgid "Enter Passphrase" +#~ msgstr "Nhập mật mã" + +#~ msgid "Automatically unlock this key, whenever I'm logged in" +#~ msgstr "Tự động gỡ khóa khóa này khi nào tôi đã đăng nhập" + +#~ msgid "PGP Key: %s" +#~ msgstr "Khóa PGP: %s" + #~ msgid "Forget this password if idle for" #~ msgstr "Quên mật khẩu này nếu không dùng trong"
