commit 2e68d15355213e32face010e91b5e56741f5cd23
Author: Daiki Ueno <dueno@src.gnome.org>
Date: 2019-02-10
Release 3.31.90
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit a5055e0a20318df8e5bb9eb58bbdb1573ba1b7ca
Merge: 4ff3917c 0155663e
Author: Daiki Ueno <ueno@gnu.org>
Date: 2019-02-10
Merge branch 'wip/dueno/pkcs11-enable-in' into 'master'
pkcs11: Expose module to specific programs
See merge request GNOME/gnome-keyring!8
commit 0155663e0523dfe4c706c74e02c7aa1e6afe227d
Author: Daiki Ueno <dueno@src.gnome.org>
Date: 2018-12-29
pkcs11: Expose module to specific programs
pkcs11/rpc-layer/gnome-keyring.module.in | 6 ++++++
1 file changed, 6 insertions(+)
commit 4ff3917c8372c5953c7d8bd1be6dc470d2c34c21
Merge: 4fa0719d e910963b
Author: Daiki Ueno <ueno@gnu.org>
Date: 2019-02-09
Merge branch 'jjardon/gnome-common-removal' into 'master'
autogen.sh: Use autoreconf instead deprecated gnome-common
See merge request GNOME/gnome-keyring!10
commit e910963b9bd15d2d923343890170702d56380c4f
Author: Javier Jardón <jjardon@gnome.org>
Date: 2019-02-09
autogen.sh: Use autoreconf instead deprecated gnome-common
See https://wiki.gnome.org/Projects/GnomeCommon/Migration
autogen.sh | 48 ++++++++++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 20 deletions(-)
commit 4fa0719dfb15c631758e623e90e6677b856b7f97
Merge: 7a2a4a26 7aba0e6a
Author: Daiki Ueno <ueno@gnu.org>
Date: 2019-01-30
Merge branch 'wip/header-order' into 'master'
Don't assume iterating a hash table will give items in the same order they were inserted
Closes #21
See merge request GNOME/gnome-keyring!9
commit 7aba0e6aadd75fc688bf7f086a620e4dc41da6d0
Author: Iain Lane <iainl@gnome.org>
Date: 2019-01-30
gkm-mock: Also store objects in the order they are taken
With GLib 2.59, the `test-login-auto` test fails:
Gcr-CRITICAL **: 14:34:24.126: expected prompt property 'choice-label'
to be "Automatically unlock this keyring whenever I\342\200\231m
logged in", but it is instead ""
This is because, in `mock_secret_C_Initialize()` we assign two sets of
fields to the mock module, one with `CKA_G_LOGIN_COLLECTION` → `CK_TRUE`
and one with it pointing to `CK_FALSE`.
This variable is used to decide, via `is_login_keyring()`, whether to call
`setup_unlock_keyring_login()` or `setup_unlock_keyring_other()`. The
first one sets `choice-label` to the empty string. The second one is
what we want, and upgrading GLib made it flip.
The reason is the same as the previous two fixes: the mock-secret-store
expects to be able to insert items into a hash table and then iterate it
and get them out in the same order. That was never guaranteed, and now
doesn't happen.
Let's keep a parallel list which keeps track of the order things were
added. And then instead of iterating the hash table, we iterate this
list.
Closes #21
pkcs11/gkm/gkm-mock.c | 67 ++++++++++++++++++++++++++++-----
pkcs11/secret-store/gkm-secret-fields.c | 4 +-
2 files changed, 58 insertions(+), 13 deletions(-)
commit 3091bf66c07f8df66876ecc7832371170743b052
Author: Iain Lane <iainl@gnome.org>
Date: 2019-01-30
secret-store: Sort fields alphabetically before outputting
The assumption that we'd get values out of a hash table in the same
order we put them in stopped holding with GLib 2.59:
ERROR:…/gnome-keyring/pkcs11/secret-store/test-secret-item.c:379:test_fields_attr:
assertion failed: (memcmp (buffer, "name1\0value1\0name2\0value2", 26)
== 0)
Let's ensure a consistent order by sorting the fields before returning
them.
Closes #21.
pkcs11/secret-store/gkm-secret-fields.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
commit 23fdfe728a27a01ef50affd849be5188c0cda954
Author: Iain Lane <iainl@gnome.org>
Date: 2019-01-28
egg: Write Proc-Type header before DEK-Info
These headers (at least for OpenSSL) must come in this order. We
shouldn't assume that `g_hash_table_foreach` is going to give a
particular ordering - it's not guaranteed, and has changed with GLib
2.59.
Fixes #21
egg/egg-armor.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
commit 7a2a4a265643f2cf1c2f278343e9dd230f982758
Author: Ryuta Fujii <translation@sicklylife.jp>
Date: 2019-01-03
Update Japanese translation
po/ja.po | 491 +++++++++++++++++++++++++++++++++------------------------------
1 file changed, 260 insertions(+), 231 deletions(-)
commit 2d03ae466eb3b02b74466b396624debddc377fcf
Merge: c897a163 a955ae82
Author: Daiki Ueno <ueno@gnu.org>
Date: 2018-12-29
Merge branch 'mjog/reinstate-p11kit-module' into 'master'
Revert "pkcs11: Don't install p11-kit module configuration"
Closes #20
See merge request GNOME/gnome-keyring!7
commit a955ae82a9828ec115bc6fadd56abe00bc49f3ae
Author: Michael James Gratton <mike@vee.net>
Date: 2018-12-25
Revert "pkcs11: Don't install p11-kit module configuration"
This reverts commit 5d8326eaf1ebce1cde2ee797c03f261da3159aae.
Fixes #20
.gitignore | 3 +++
configure.ac | 1 +
pkcs11/rpc-layer/Makefile.am | 5 +++++
pkcs11/rpc-layer/gnome-keyring.module.in | 7 +++++++
4 files changed, 16 insertions(+)
commit c897a1633b3da2da1b766f50e405dbd727a63dde
Author: Andre Klapper <a9016009@gmx.de>
Date: 2018-12-15
Replace Bugzilla by Gitlab URL in DOAP file
gnome-keyring.doap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit bf2ccadbafb797802b0091c9067bc6878ca7e88f
Author: Charles Monzat <charles.monzat@numericable.fr>
Date: 2018-12-02
Update French translation
po/fr.po | 323 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 165 insertions(+), 158 deletions(-)
commit b948b2e83773af25064fbf726eb4eaf758f75d17
Author: Cédric Valmary <cvalmary@yahoo.fr>
Date: 2018-10-31
Update Occitan translation
po/oc.po | 483 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 259 insertions(+), 224 deletions(-)
commit c72fb231ad5cad8727b02c0ce56b03cb8cd6ccf7
Author: Carmen Bianca BAKKER <carmen@carmenbianca.eu>
Date: 2018-10-27
Update Esperanto translation
po/eo.po | 406 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 201 insertions(+), 205 deletions(-)
commit 8a3fafced5c77b7a44c23794d2c72ac144f33de7
Merge: aace7a26 b22d058a
Author: Daiki Ueno <ueno@gnu.org>
Date: 2018-10-10
Merge branch 'jk-fix-reading-xdg-runtime-dir' into 'master'
pam: lookup XDG_RUNTIME_DIR using get_any_env
See merge request GNOME/gnome-keyring!5
commit b22d058a055ec3e0f31ae16417f16b42baadb42f
Author: Jacob Keller <jacob.keller@gmail.com>
Date: 2018-10-05
pam: lookup XDG_RUNTIME_DIR using get_any_env
The pam_gnome_keyring.so PAM module needs to find the daemon control
file, which is stored in $XDG_RUNTIME_DIR/keyring/control.
Unfortunately when commit 2ca51a0aef5b ("daemon: Stop exporting the
$GNOME_KEYRING_CONTROL env variable", 2014-03-06) switched to using
XDG_RUNTIME_DIR preferentially over GNOME_KEYRING_CONTROL, it was looked
up using getenv().
Unfortunately XDG_RUNTIME_DIR isn't always set in the environment, but
may need to be looked up from pam_getenv. Indeed, the function
get_any_env already exists for this purpose.
Because of the incorrect environment lookup, lookup_daemon will
incorrectly report that the gnome-keyring-daemon is not running, even
though it is. This results in starting the daemon multiple times, and
potentially failing to shut it down, or start it correctly when changing
the password.
To fix this, move the code for determining the control file path from
gkr-pam-client.c into gkr-pam-module.c This will using get_any_env(),
and avoids the need for passing the pam_handle_t variable into
gkr-pam-client.c
It does mean that the control variable must be allocated with space,
since we need to combine the environment value with a different suffix
depending on if we use GNOME_KEYRING_CONTROL or XDG_RUNTIME_DIR.
Add a function get_control_file, so that the logic for determining the
control file path remains in one location.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
pam/gkr-pam-client.c | 17 +++------------
pam/gkr-pam-module.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++------
2 files changed, 55 insertions(+), 20 deletions(-)
commit aace7a266a37a7e9a915060189e48b9ebd2552f2
Merge: 23b1a878 c7a09c4f
Author: Daiki Ueno <ueno@gnu.org>
Date: 2018-08-28
Merge branch 'tap-python3' into 'master'
build: Update tap scripts for Python 3 compat
See merge request GNOME/gnome-keyring!4
commit c7a09c4fe480fa002ee22078ff3c2765da47443e
Author: Jan Tojnar <jtojnar@gmail.com>
Date: 2018-08-25
build: Update tap scripts for Python 3 compat
This replaces tap-driver and tap-gtester with fresh versions from Cockpit.
https://github.com/cockpit-project/cockpit/pull/9500
https://wiki.gnome.org/Initiatives/GnomeGoals/Python3Porting
Also returned the following commits that are not included in Cockpit:
* 918ab836fd23f9b2c0bf655c7f4f575bffff3189
* 7e75a62e846551c19b9c875f7b237a07ee3b93e1
* 7120f44ceedd5c10802781d64a5829b3c6d8e13f
Maybe they should be upstreamed.
build/tap-driver | 108 ++++++++++++++++++++++++++++++++++++++++++------------
build/tap-gtester | 61 +++++++++++++++++++++---------
2 files changed, 128 insertions(+), 41 deletions(-)
commit 23b1a878462ef20a6fcb44dabd3496a02cbcd70f
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: 2018-08-16
Update MSGID_BUGS_ADDRESS in po/Makevars
po/Makevars | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 0e50bb44ea4f19146bf2a1936ce33eac188ce721
Merge: 5388c93e 2e133d11
Author: Daiki Ueno <ueno@gnu.org>
Date: 2018-07-24
Merge branch 'wip/dueno/gitlab-ci' into 'master'
gitlab-ci: Switch to fedora:latest from fedora:rawhide
See merge request GNOME/gnome-keyring!3
commit 2e133d116607d610d05a10866f72bbee54420385
Author: Daiki Ueno <dueno@src.gnome.org>
Date: 2018-07-24
gitlab-ci: Switch to fedora:latest from fedora:rawhide
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 5388c93e398a484147039225e500ce8beb9f0c5e
Merge: 2a26b20a cc8d6cd1
Author: Daiki Ueno <ueno@gnu.org>
Date: 2018-07-18
Merge branch 'wip/dueno/openssh-parse' into 'master'
ssh-agent: Make public key parsing even robuster
See merge request GNOME/gnome-keyring!2
commit cc8d6cd12aff280f1a32b15238508a64931381d6
Author: Daiki Ueno <dueno@src.gnome.org>
Date: 2018-07-14
ssh-agent: Make public key parsing even robuster
This amends commit f3f3cc70 to take into account of the fact that the
key type is prefixed to the decoded blob. Suggested by Mantas
Mikulėnas in:
https://bugzilla.gnome.org/show_bug.cgi?id=795699
daemon/ssh-agent/gkd-ssh-agent-util.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
commit 2a26b20ab61919fee8b4d0ffae5e18303e41501c
Merge: 1c83f5bf 660b125c
Author: Daiki Ueno <ueno@unixuser.org>
Date: 2018-06-12
Merge branch 'wip/dueno/gitlab-ci' into 'master'
build: Enable gitlab-ci
See merge request GNOME/gnome-keyring!1
commit 660b125cd8f4e44128eafbbe9fda42bdc08d9fd3
Author: Daiki Ueno <dueno@src.gnome.org>
Date: 2018-06-11
build: Enable gitlab-ci
.gitlab-ci.yml | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
commit 3614aaecbd922cace83e53678ec58469597e8d58
Author: Daiki Ueno <dueno@src.gnome.org>
Date: 2018-06-11
pkcs11: Don't null terminate PKCS #11 string fields
pkcs11/wrap-layer/gkm-wrap-layer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 1c83f5bf6d3fdb646d31d4ac4f0f38c8f5e1ac9d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-25
doap: add <description>
gnome-keyring.doap | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 9f21625914c1b034f00abe029ee82170b8ea6655
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-25
doap: add myself as maintainer
gnome-keyring.doap | 8 ++++++++
1 file changed, 8 insertions(+)
commit fd47d414d615e2fddee620f387c8c2e6dea380d9
Author: Daiki Ueno <dueno@src.gnome.org>
Date: 2018-05-13
Revert "ssh-agent: Set may_block to TRUE while waiting for ssh-agent process"
This reverts commit fb0d66553753bdc0d700cb5c0bb2803d0690e9ff.
daemon/ssh-agent/gkd-ssh-agent-process.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit fb0d66553753bdc0d700cb5c0bb2803d0690e9ff