From nobody Sat Apr 16 20:32:35 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F156D5D564B; Sat, 16 Apr 2022 20:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KglHl6Rt0z3MW1; Sat, 16 Apr 2022 20:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650141155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mY2YC/kX9vUk7Nov8NmcR9GcINkQwFQmsi8ZIHGlFzM=; b=SB9u/LmWSOLHz+HloNiG1lirlUvdfOMRJfbs7QQfygethcOhWm+bsfsh5nrgclNwuOxJJW yyv6T64T7hHBBrSUqR/d7UfvbxdWijT6UHALhhepQxMnMF4T/M5AO3Vqzo2i7hlTANR4Ay ouEqfC1cYAvAH/M8njHlNzA1IYCHw67yyWbo9/qcPzX4QUOyt1sT5rFdvJmvXkWk49SfTo XLs7DBp8XKDbQo1ZPT1uueDLVILLfgnvF/1g7cgbuZpuW9LnprvJ09S3fjpTYgD1Xc0MC7 XpO7rpOsuipzHCbxTn07GNZa4j/cSV6VuSeZC46Oaf+m3Jl0z2O4GbosnoMJeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD2FE10F9B; Sat, 16 Apr 2022 20:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23GKWZPv017444; Sat, 16 Apr 2022 20:32:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23GKWZqV017443; Sat, 16 Apr 2022 20:32:35 GMT (envelope-from git) Date: Sat, 16 Apr 2022 20:32:35 GMT Message-Id: <202204162032.23GKWZqV017443@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: a21252d17fda - main - x11/gdm: Unlock the user's keyring during login List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a21252d17fda424c84c09f9a3af2d9f27d5107ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650141155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mY2YC/kX9vUk7Nov8NmcR9GcINkQwFQmsi8ZIHGlFzM=; b=K21gs1CdD7fuWwR2VtCSEKVhUe5G31hkfZuxSt6mGT8gRtK0oXqlitDZhBQHepRomP4bXB kJDmqMIQMxb60WkXRnQSsQcwBSbMv3SpQ4zdn03K52fdeYAYSEk1nEp7goLofLaPeqMzkY 9VdWzaE4PjeZnnWgJPb35i718SO3Jn9Cb4FZjgbxsEIQD7NIN1B9dYfkpLhx1mwHqbYl5f wxF5/vgNc85tRwDCyi3nu9Uxuply50LmoOmcpzHJsmXeiMIzO2BRD9WKPDfRDE0gfa1qRy dldfdEJAgaYLwv+Z7XQQBSfAEZ0ryBAvJLAN7z0r5jF+j/d+4QinoNOk2gHAQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650141155; a=rsa-sha256; cv=none; b=rnqEx/C4eTplYmH5PiI+dG5os/mw3YnJSeD58LBmF/XjJ1/CC62ziHaUaHf2g27q3MTEOj g5YzKPLogi2C70kAgw3Kg7KLMkI+OnHQchayDre6HdkmSDk6rRdPkI0SzHwXeO5iV/9WJH ecj5NsS6YeDHcc+lrV9doNG29ZsYWgxVMROiFZh+pRfnO7V3j0YrC9CLZFwZMPsOUsPrYp g7ghKAeUN/0xhOK6X+dQ280m9So6JRPTp8ahQNRSbX1WpcUOxcD9Wqi1JulJ+c2sWxOWPh rLre3h4jbUIqYeuViieCn0U/6bJ4Aqv89bPU8UJ3cdJkJ0wAPglfmOYFpY9+Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=a21252d17fda424c84c09f9a3af2d9f27d5107ce commit a21252d17fda424c84c09f9a3af2d9f27d5107ce Author: Neel Chauhan AuthorDate: 2022-04-16 20:30:50 +0000 Commit: Neel Chauhan CommitDate: 2022-04-16 20:32:34 +0000 x11/gdm: Unlock the user's keyring during login PR: 263309 Reported by: cyclaero AT gmail DOT com --- x11/gdm/Makefile | 2 +- x11/gdm/files/gdm-autologin.in | 4 ++++ x11/gdm/files/gdm-password.in | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index eb2116ffa0b8..44ed781324f5 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -2,7 +2,7 @@ PORTNAME= gdm PORTVERSION= 42.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome diff --git a/x11/gdm/files/gdm-autologin.in b/x11/gdm/files/gdm-autologin.in index 378cd549e9bd..9e89fd1fcbbb 100644 --- a/x11/gdm/files/gdm-autologin.in +++ b/x11/gdm/files/gdm-autologin.in @@ -4,9 +4,13 @@ auth required pam_permit.so +auth optional /usr/local/lib/pam_ck_connector.so +auth optional /usr/local/lib/pam_gnome_keyring.so + account required pam_nologin.so account include system password include system session include system +session optional /usr/local/lib/pam_gnome_keyring.so auto_start diff --git a/x11/gdm/files/gdm-password.in b/x11/gdm/files/gdm-password.in index 01ca683c7967..3b7b48e2e9b9 100644 --- a/x11/gdm/files/gdm-password.in +++ b/x11/gdm/files/gdm-password.in @@ -4,9 +4,13 @@ auth include system +auth optional /usr/local/lib/pam_ck_connector.so +auth optional /usr/local/lib/pam_gnome_keyring.so + account required pam_nologin.so account include system password include system session include system +session optional /usr/local/lib/pam_gnome_keyring.so auto_start