From patchwork Wed Dec 4 17:02:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 16380 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3D59617838; Wed, 4 Dec 2019 17:11:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E92F017834 for ; Wed, 4 Dec 2019 17:11:01 +0000 (GMT) Received: from localhost ([::1]:41768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icYB1-0000xU-Qz for patchwork@mira.cbaines.net; Wed, 04 Dec 2019 12:11:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42730) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icY3U-0003NP-QK for guix-patches@gnu.org; Wed, 04 Dec 2019 12:03:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icY3M-0003QV-17 for guix-patches@gnu.org; Wed, 04 Dec 2019 12:03:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36605) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1icY3L-0003Lp-Rj for guix-patches@gnu.org; Wed, 04 Dec 2019 12:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1icY3K-0008QP-OL for guix-patches@gnu.org; Wed, 04 Dec 2019 12:03:02 -0500 Subject: bug#38160: GNOME Keyring service Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 04 Dec 2019 17:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 38160 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Leo Prikler Cc: 38160-done@debbugs.gnu.org Mail-Followup-To: 38160@debbugs.gnu.org, ludo@gnu.org, leo.prikler@student.tugraz.at Received: via spool by 38160-done@debbugs.gnu.org id=D38160.157547894432335 (code D ref 38160); Wed, 04 Dec 2019 17:03:02 +0000 Received: (at 38160-done) by debbugs.gnu.org; 4 Dec 2019 17:02:24 +0000 Received: from localhost ([127.0.0.1]:42577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icY2h-0008PT-UT for submit@debbugs.gnu.org; Wed, 04 Dec 2019 12:02:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icY2g-0008PG-1j for 38160-done@debbugs.gnu.org; Wed, 04 Dec 2019 12:02:22 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1icY2Z-0004uR-HA; Wed, 04 Dec 2019 12:02:15 -0500 Received: from [160.174.176.236] (port=48152 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1icY2Y-0008PJ-5V; Wed, 04 Dec 2019 12:02:14 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <057a95242009b1560b82547f7e0bec8b41a437c9.camel@student.tugraz.at> Date: Wed, 04 Dec 2019 18:02:11 +0100 In-Reply-To: <057a95242009b1560b82547f7e0bec8b41a437c9.camel@student.tugraz.at> (Leo Prikler's message of "Sun, 10 Nov 2019 14:06:30 +0100") Message-ID: <87muc8c9d8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Leo, Leo Prikler skribis: > From 9ac5f99a65f0599a3210443305042155f9b06e39 Mon Sep 17 00:00:00 2001 > From: Leo Prikler > Date: Sat, 9 Nov 2019 16:14:45 +0100 > Subject: [PATCH] gnu: Add GNOME Keyring service > > * gnu/services/desktop.scm: (): New record type. > (gnome-keyring-service-type): New service type. > * doc/guix.texi: Document it. Nice! Applied with the minor doc changes below. Thanks, Ludo’. diff --git a/doc/guix.texi b/doc/guix.texi index 51948dc0f7..712f814cdc 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15755,7 +15755,8 @@ Users need to be in the @code{lp} group to access the D-Bus service. @defvr {Scheme Variable} gnome-keyring-service-type This is the type of the service that adds the -@uref{https://wiki.gnome.org/Projects/GnomeKeyring, GNOME Keyring}. Its value is a @code{gnome-keyring-configuration} object (see below.) +@uref{https://wiki.gnome.org/Projects/GnomeKeyring, GNOME Keyring}. Its +value is a @code{gnome-keyring-configuration} object (see below.) This service adds the @code{gnome-keyring} package to the system profile and extends PAM with entries using @code{pam_gnome_keyring.so}, unlocking @@ -15768,14 +15769,18 @@ Configuration record for the GNOME Keyring service. @table @asis @item @code{keyring} (default: @code{gnome-keyring}) The GNOME keyring package to use. + @item @code{pam-services} -An alist (SERVICE . KIND) of PAM services to extend. SERVICE is the name -of an existing service to extend and KIND is one of @code{login} or -@code{passwd}. If @code{login} is given, it adds an optional +A list of @code{(@var{service} . @var{kind})} pairs denoting PAM +services to extend, where @var{service} is the name of an existing +service to extend and @var{kind} is one of @code{login} or +@code{passwd}. + +If @code{login} is given, it adds an optional @code{pam_gnome_keyring.so} to the auth block without arguments and to -the session block with @code{auto_start}. -If @code{passwd} is given, it adds an optional @code{pam_gnome_keyring.so} -to the password block without arguments. +the session block with @code{auto_start}. If @code{passwd} is given, it +adds an optional @code{pam_gnome_keyring.so} to the password block +without arguments. By default, this field contains ``gdm-password'' with the value @code{login} and ``passwd'' is with the value @code{passwd}.