summaryrefslogtreecommitdiff
path: root/system/gdm/patches
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2016-01-03 18:58:26 -0600
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commitb1350ddf30629bb5a87b6ba9ca16de6d504725af (patch)
tree56229b78be98058f4ab4960c0781b96d94a9581f /system/gdm/patches
parent3d937eb43dcd20ce24c951307eadb74c3a38d809 (diff)
downloadslackbuilds-b1350ddf30629bb5a87b6ba9ca16de6d504725af.tar.gz
system/gdm: Removed (not functional with CK2)
I looked around in the gdm code and don't see anything obvious that would make it not work with CK2, and google turned up nothing useful. I did notice that PCLinuxOS is using gdm-2.20.11 as well, but aside from a special dbus config file (which I tried here with no change to behavior), I don't see anything special that they do. They use PAM though, so maybe that makes a difference. These days, I don't even use gdm any more - I'm on xdm with alienBOB's config (slightly modified) from his livecd work. The only things that users might miss are a session chooser (change $HOME.xinitrc instead) and switching users (I don't like that anyway), so good riddance to this one. Signed-off-by: Robby Workman <rworkman@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/gdm/patches')
-rw-r--r--system/gdm/patches/do_not_start_ssh-agent.diff18
-rw-r--r--system/gdm/patches/gdm-2.20.11-crypt.diff150
-rw-r--r--system/gdm/patches/make_xfce_default_session.diff11
3 files changed, 0 insertions, 179 deletions
diff --git a/system/gdm/patches/do_not_start_ssh-agent.diff b/system/gdm/patches/do_not_start_ssh-agent.diff
deleted file mode 100644
index c437bdadf8..0000000000
--- a/system/gdm/patches/do_not_start_ssh-agent.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur gdm-2.20.11.orig//config/Xsession.in gdm-2.20.11/config/Xsession.in
---- gdm-2.20.11.orig//config/Xsession.in 2010-06-02 20:06:25.000000000 -0500
-+++ gdm-2.20.11/config/Xsession.in 2010-12-20 00:02:58.480225271 -0600
-@@ -213,14 +213,6 @@
- fi
- 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
diff --git a/system/gdm/patches/gdm-2.20.11-crypt.diff b/system/gdm/patches/gdm-2.20.11-crypt.diff
deleted file mode 100644
index 57860d39e6..0000000000
--- a/system/gdm/patches/gdm-2.20.11-crypt.diff
+++ /dev/null
@@ -1,150 +0,0 @@
-From cb04d3cb6b3899b5386f940a385d08c66dcd0da1 Mon Sep 17 00:00:00 2001
-From: mancha <mancha1@hush.com>
-Date: Fri, 31 Jan 2014
-Subject: Handle new crypt() behavior in glibc 2.17+
-
-Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
-(w/ NULL return) if the salt violates specifications. Additionally,
-on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
-passed to crypt() fail with EPERM (w/ NULL return).
-
-If using glibc's crypt(), check return value to avoid a possible
-NULL pointer dereference.
-
-Note: gdm 2.20.11 is the last version that support non-PAM
- authentication which is why it is the latest stable
- maintained for Slackware Linux via slackbuilds.org.
-
----
- daemon/verify-crypt.c | 13 ++++++++++---
- daemon/verify-shadow.c | 13 ++++++++++---
- 2 files changed, 20 insertions(+), 6 deletions(-)
-
---- a/daemon/verify-crypt.c
-+++ b/daemon/verify-crypt.c
-@@ -104,7 +104,7 @@ gdm_verify_user (GdmDisplay *d,
- const char *username,
- gboolean allow_retry)
- {
-- gchar *login, *passwd, *ppasswd;
-+ gchar *login, *passwd, *ppasswd, *cpasswd;
- struct passwd *pwent;
- #if defined (HAVE_PASSWDEXPIRED) && defined (HAVE_CHPASS) \
- || defined (HAVE_LOGINRESTRICTIONS)
-@@ -190,8 +190,10 @@ gdm_verify_user (GdmDisplay *d,
- }
-
- /* Check whether password is valid */
-- if (ppasswd == NULL || (ppasswd[0] != '\0' &&
-- strcmp (crypt (passwd, ppasswd), ppasswd) != 0)) {
-+ cpasswd = ppasswd ? g_strdup(crypt (passwd, ppasswd)) : NULL;
-+ if (ppasswd == NULL || cpasswd == NULL ||
-+ (ppasswd[0] != '\0' &&
-+ strcmp (cpasswd, ppasswd) != 0)) {
- gdm_sleep_no_signal (gdm_daemon_config_get_value_int (GDM_KEY_RETRY_DELAY));
- gdm_debug ("Couldn't authenticate user");
-
-@@ -200,6 +202,7 @@ gdm_verify_user (GdmDisplay *d,
- g_free (login);
- g_free (passwd);
- g_free (ppasswd);
-+ g_free (cpasswd);
- return NULL;
- }
-
-@@ -217,6 +220,7 @@ gdm_verify_user (GdmDisplay *d,
- g_free (login);
- g_free (passwd);
- g_free (ppasswd);
-+ g_free (cpasswd);
- return NULL;
- }
-
-@@ -233,6 +237,7 @@ gdm_verify_user (GdmDisplay *d,
- g_free (login);
- g_free (passwd);
- g_free (ppasswd);
-+ g_free (cpasswd);
- if (message != NULL)
- free (message);
- return NULL;
-@@ -259,6 +264,7 @@ gdm_verify_user (GdmDisplay *d,
- g_free (login);
- g_free (passwd);
- g_free (ppasswd);
-+ g_free (cpasswd);
- return NULL;
- }
-
-@@ -266,6 +272,7 @@ gdm_verify_user (GdmDisplay *d,
-
- g_free (passwd);
- g_free (ppasswd);
-+ g_free (cpasswd);
-
- if ( ! gdm_slave_check_user_wants_to_log_in (login)) {
- g_free (login);
---- a/daemon/verify-shadow.c
-+++ b/daemon/verify-shadow.c
-@@ -105,7 +105,7 @@ gdm_verify_user (GdmDisplay *d,
- const char *username,
- gboolean allow_retry)
- {
-- gchar *login, *passwd, *ppasswd;
-+ gchar *login, *passwd, *ppasswd, *cpasswd;
- struct passwd *pwent;
- struct spwd *sp;
- #if defined (HAVE_PASSWDEXPIRED) && defined (HAVE_CHPASS) \
-@@ -211,8 +211,10 @@ gdm_verify_user (GdmDisplay *d,
- }
-
- /* Check whether password is valid */
-- if (ppasswd == NULL || (ppasswd[0] != '\0' &&
-- strcmp (crypt (passwd, ppasswd), ppasswd) != 0)) {
-+ cpasswd = ppasswd ? g_strdup(crypt (passwd, ppasswd)) : NULL;
-+ if (ppasswd == NULL || cpasswd == NULL ||
-+ (ppasswd[0] != '\0' &&
-+ strcmp (cpasswd, ppasswd) != 0)) {
- gdm_sleep_no_signal (gdm_daemon_config_get_value_int (GDM_KEY_RETRY_DELAY));
- gdm_debug ("Couldn't authenticate user");
-
-@@ -221,6 +223,7 @@ gdm_verify_user (GdmDisplay *d,
- g_free (login);
- g_free (passwd);
- g_free (ppasswd);
-+ g_free (cpasswd);
- return NULL;
- }
-
-@@ -238,6 +241,7 @@ gdm_verify_user (GdmDisplay *d,
- g_free (login);
- g_free (passwd);
- g_free (ppasswd);
-+ g_free (cpasswd);
- return NULL;
- }
-
-@@ -254,6 +258,7 @@ gdm_verify_user (GdmDisplay *d,
- g_free (login);
- g_free (passwd);
- g_free (ppasswd);
-+ g_free (cpasswd);
- if (message != NULL)
- free (message);
- return NULL;
-@@ -280,6 +285,7 @@ gdm_verify_user (GdmDisplay *d,
- g_free (login);
- g_free (passwd);
- g_free (ppasswd);
-+ g_free (cpasswd);
- return NULL;
- }
-
-@@ -287,6 +293,7 @@ gdm_verify_user (GdmDisplay *d,
-
- g_free (passwd);
- g_free (ppasswd);
-+ g_free (cpasswd);
-
- if ( ! gdm_slave_check_user_wants_to_log_in (login)) {
- g_free (login);
diff --git a/system/gdm/patches/make_xfce_default_session.diff b/system/gdm/patches/make_xfce_default_session.diff
deleted file mode 100644
index e5b220a5a1..0000000000
--- a/system/gdm/patches/make_xfce_default_session.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/gdm/custom.conf 2009-07-31 00:32:22.065895378 -0500
-+++ b/etc/gdm/custom.conf 2009-07-31 00:32:38.975622851 -0500
-@@ -54,6 +54,8 @@
-
- [daemon]
-
-+DefaultSession=xfce.desktop
-+
- [security]
-
- [xdmcp]