commit: 7227efd7908626546265bff8aa146cde78795adc
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail
<DOT> com>
AuthorDate: Sun Dec 11 12:18:40 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 15:36:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7227efd7
lxde-base/lxdm: remove unused patches
.../lxdm/files/lxdm-0.3.0-consolekit-disable.patch | 14 ----------
.../files/lxdm-0.3.0-pam_console-disable.patch | 8 ------
...c-entry-as-pointer-for-xsessions-dir-file.patch | 32 ----------------------
.../lxdm-0.4.1-pam-use-system-local-login.patch | 15 ----------
4 files changed, 69 deletions(-)
diff --git a/lxde-base/lxdm/files/lxdm-0.3.0-consolekit-disable.patch
b/lxde-base/lxdm/files/lxdm-0.3.0-consolekit-disable.patch
deleted file mode 100644
index 3d02d32..00000000
--- a/lxde-base/lxdm/files/lxdm-0.3.0-consolekit-disable.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- lxdm-0.3.0-old/src/lxdm.c
-+++ lxdm-0.3.0/src/lxdm.c
-@@ -1332,4 +1332,5 @@
- if(option)
- s->option=g_strdup(option);
-+#if HAVE_LIBCK_CONNECTOR
- if(s->ckc)
- {
-@@ -1337,4 +1338,5 @@
- s->ckc=NULL;
- }
-+#endif
- #if HAVE_LIBPAM
- setup_pam_session(s,pw,session_name);
diff --git a/lxde-base/lxdm/files/lxdm-0.3.0-pam_console-disable.patch
b/lxde-base/lxdm/files/lxdm-0.3.0-pam_console-disable.patch
deleted file mode 100644
index c920bc8..00000000
--- a/lxde-base/lxdm/files/lxdm-0.3.0-pam_console-disable.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- lxdm-0.2.0.a/pam/lxdm
-+++ lxdm-0.2.0.b/pam/lxdm
-@@ -4,4 +4,4 @@
- session optional pam_keyinit.so force revoke
- session include system-auth
- session required pam_loginuid.so
--session optional pam_console.so
-+# session optional pam_console.so
diff --git
a/lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch
b/lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch
deleted file mode 100644
index 928fd2b..00000000
---
a/lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Nurp lxdm-0.3.0.orig/src/lxdm.c lxdm-0.3.0/src/lxdm.c
---- lxdm-0.3.0.orig/src/lxdm.c 2011-07-03 01:53:26.262780480 +0200
-+++ lxdm-0.3.0/src/lxdm.c 2011-07-03 01:52:11.975780526 +0200
-@@ -1174,7 +1174,27 @@ gboolean lxdm_get_session_info(char *ses
- }
- else
- {
-- name=g_strdup(session);
-+ GKeyFile *f;
-+ char *file_path;
-+ gboolean loaded;
-+
-+ f = g_key_file_new();
-+ char *desktop_name = g_strconcat(session, ".desktop",
NULL);
-+ file_path = g_build_filename(XSESSIONS_DIR,
desktop_name, NULL);
-+ loaded = g_key_file_load_from_file(f, file_path,
G_KEY_FILE_NONE, NULL);
-+ g_free(file_path);
-+ g_free(desktop_name);
-+
-+ if ( loaded )
-+ {
-+ name = g_key_file_get_locale_string(f, "Desktop
Entry", "Name", NULL, NULL);
-+ exec = g_key_file_get_string(f, "Desktop
Entry", "Exec", NULL);
-+ }
-+ else
-+ {
-+ name=g_strdup(session);
-+ }
-+ g_key_file_free(f);
- }
- }
- if(name && !exec)
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch
b/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch
deleted file mode 100644
index 9f723a2..00000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- lxdm-0.4.1.orig/pam/lxdm
-+++ lxdm-0.4.1/pam/lxdm
-@@ -1,9 +1,9 @@
- #%PAM-1.0
--auth substack system-auth
-+auth substack system-local-login
- auth optional pam_gnome_keyring.so
--account include system-auth
-+account include system-local-login
- session optional pam_keyinit.so force revoke
--session include system-auth
-+session include system-local-login
- session required pam_loginuid.so
- #session optional pam_console.so
- session optional pam_gnome_keyring.so auto_start
