From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- gnome-base/gdm/files/49-keychain-r1 | 9 ------ gnome-base/gdm/files/50-ssh-agent-r1 | 10 ------- .../gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch | 32 ---------------------- .../gdm/files/gdm-3.8.4-fingerprint-auth.patch | 29 -------------------- gnome-base/gdm/files/gdm-3.8.4-logo.patch | 25 ----------------- 5 files changed, 105 deletions(-) delete mode 100644 gnome-base/gdm/files/49-keychain-r1 delete mode 100644 gnome-base/gdm/files/50-ssh-agent-r1 delete mode 100644 gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch delete mode 100644 gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch delete mode 100644 gnome-base/gdm/files/gdm-3.8.4-logo.patch (limited to 'gnome-base/gdm/files') diff --git a/gnome-base/gdm/files/49-keychain-r1 b/gnome-base/gdm/files/49-keychain-r1 deleted file mode 100644 index 51a1ca87905c..000000000000 --- a/gnome-base/gdm/files/49-keychain-r1 +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# source keychain variables - -keychain="`which keychain 2>/dev/null`" -if [ -n "$keychain" ] && [ -x "$keychain" ] && [ -f "$HOME/.bash_profile" ] -then - . "${HOME}/.bash_profile" -fi diff --git a/gnome-base/gdm/files/50-ssh-agent-r1 b/gnome-base/gdm/files/50-ssh-agent-r1 deleted file mode 100644 index 4d94fb04a14a..000000000000 --- a/gnome-base/gdm/files/50-ssh-agent-r1 +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# add ssh-agent if found - -sshagent="`which ssh-agent 2>/dev/null`" -if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then - command="$sshagent -- $command" -elif [ -z "$sshagent" ] ; then - echo "$0: ssh-agent not found!" -fi diff --git a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch deleted file mode 100644 index bfd8398af2b3..000000000000 --- a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c0581264d5e2b412aa27dc30623512b461024e4f Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Tue, 2 Nov 2010 23:19:31 +0100 -Subject: [PATCH 2/4] ssh-agent handling must be done at xinitrc.d - -Gentoo bug: #220603 ---- - data/Xsession.in | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/data/Xsession.in b/data/Xsession.in -index 201be92..88f1fd9 100755 ---- a/data/Xsession.in -+++ b/data/Xsession.in -@@ -191,14 +191,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then - done - fi - --# add ssh-agent if found --sshagent="`gdmwhich ssh-agent`" --if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then -- command="$sshagent -- $command" --elif [ -z "$sshagent" ] ; then -- echo "$0: ssh-agent not found!" --fi -- - echo "$0: Setup done, will execute: $command" - - eval exec $command --- -1.8.5.1 - diff --git a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch deleted file mode 100644 index cd19077a5f1d..000000000000 --- a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 75fe02c2b383b27b202940bdedd7d8d2c64169fb Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Tue, 30 Jul 2013 22:56:30 -0400 -Subject: [PATCH 3/4] Gentoo does not have a fingerprint-auth pam stack - ---- - data/pam-exherbo/gdm-fingerprint.pam | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/data/pam-exherbo/gdm-fingerprint.pam b/data/pam-exherbo/gdm-fingerprint.pam -index 41639ec..d9633fb 100644 ---- a/data/pam-exherbo/gdm-fingerprint.pam -+++ b/data/pam-exherbo/gdm-fingerprint.pam -@@ -1,6 +1,11 @@ - account include system-login - --auth substack fingerprint-auth -+auth optional pam_env.so -+auth required pam_tally2.so onerr=succeed -+auth required pam_shells.so -+auth required pam_nologin.so -+auth required pam_fprintd.so -+auth required pam_permit.so - auth optional pam_gnome_keyring.so - - password required pam_deny.so --- -1.8.5.1 - diff --git a/gnome-base/gdm/files/gdm-3.8.4-logo.patch b/gnome-base/gdm/files/gdm-3.8.4-logo.patch deleted file mode 100644 index 151d4bc77f42..000000000000 --- a/gnome-base/gdm/files/gdm-3.8.4-logo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bcc651df77a429a6bf9b13892f71fedb1b87a069 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 11 Dec 2013 22:46:58 +0100 -Subject: [PATCH 4/4] Apply Gentoo branding - ---- - data/org.gnome.login-screen.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.gnome.login-screen.gschema.xml.in b/data/org.gnome.login-screen.gschema.xml.in -index 03da374..5e81bc0 100644 ---- a/data/org.gnome.login-screen.gschema.xml.in -+++ b/data/org.gnome.login-screen.gschema.xml.in -@@ -31,7 +31,7 @@ - - - -- '' -+ '/usr/share/pixmaps/gentoo-gdm.svg' - <_summary> - Path to small image at top of user list - --- -1.8.5.1 - -- cgit v1.2.3