| 1 |
commit: 7227efd7908626546265bff8aa146cde78795adc |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 11 12:18:40 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 22 15:36:12 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7227efd7 |
| 7 |
|
| 8 |
lxde-base/lxdm: remove unused patches |
| 9 |
|
| 10 |
.../lxdm/files/lxdm-0.3.0-consolekit-disable.patch | 14 ---------- |
| 11 |
.../files/lxdm-0.3.0-pam_console-disable.patch | 8 ------ |
| 12 |
...c-entry-as-pointer-for-xsessions-dir-file.patch | 32 ---------------------- |
| 13 |
.../lxdm-0.4.1-pam-use-system-local-login.patch | 15 ---------- |
| 14 |
4 files changed, 69 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index 3d02d32..00000000 |
| 19 |
--- a/lxde-base/lxdm/files/lxdm-0.3.0-consolekit-disable.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,14 +0,0 @@ |
| 22 |
---- lxdm-0.3.0-old/src/lxdm.c |
| 23 |
-+++ lxdm-0.3.0/src/lxdm.c |
| 24 |
-@@ -1332,4 +1332,5 @@ |
| 25 |
- if(option) |
| 26 |
- s->option=g_strdup(option); |
| 27 |
-+#if HAVE_LIBCK_CONNECTOR |
| 28 |
- if(s->ckc) |
| 29 |
- { |
| 30 |
-@@ -1337,4 +1338,5 @@ |
| 31 |
- s->ckc=NULL; |
| 32 |
- } |
| 33 |
-+#endif |
| 34 |
- #if HAVE_LIBPAM |
| 35 |
- setup_pam_session(s,pw,session_name); |
| 36 |
|
| 37 |
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 |
| 38 |
deleted file mode 100644 |
| 39 |
index c920bc8..00000000 |
| 40 |
--- a/lxde-base/lxdm/files/lxdm-0.3.0-pam_console-disable.patch |
| 41 |
+++ /dev/null |
| 42 |
@@ -1,8 +0,0 @@ |
| 43 |
---- lxdm-0.2.0.a/pam/lxdm |
| 44 |
-+++ lxdm-0.2.0.b/pam/lxdm |
| 45 |
-@@ -4,4 +4,4 @@ |
| 46 |
- session optional pam_keyinit.so force revoke |
| 47 |
- session include system-auth |
| 48 |
- session required pam_loginuid.so |
| 49 |
--session optional pam_console.so |
| 50 |
-+# session optional pam_console.so |
| 51 |
|
| 52 |
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 |
| 53 |
deleted file mode 100644 |
| 54 |
index 928fd2b..00000000 |
| 55 |
--- a/lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch |
| 56 |
+++ /dev/null |
| 57 |
@@ -1,32 +0,0 @@ |
| 58 |
-diff -Nurp lxdm-0.3.0.orig/src/lxdm.c lxdm-0.3.0/src/lxdm.c |
| 59 |
---- lxdm-0.3.0.orig/src/lxdm.c 2011-07-03 01:53:26.262780480 +0200 |
| 60 |
-+++ lxdm-0.3.0/src/lxdm.c 2011-07-03 01:52:11.975780526 +0200 |
| 61 |
-@@ -1174,7 +1174,27 @@ gboolean lxdm_get_session_info(char *ses |
| 62 |
- } |
| 63 |
- else |
| 64 |
- { |
| 65 |
-- name=g_strdup(session); |
| 66 |
-+ GKeyFile *f; |
| 67 |
-+ char *file_path; |
| 68 |
-+ gboolean loaded; |
| 69 |
-+ |
| 70 |
-+ f = g_key_file_new(); |
| 71 |
-+ char *desktop_name = g_strconcat(session, ".desktop", NULL); |
| 72 |
-+ file_path = g_build_filename(XSESSIONS_DIR, desktop_name, NULL); |
| 73 |
-+ loaded = g_key_file_load_from_file(f, file_path, G_KEY_FILE_NONE, NULL); |
| 74 |
-+ g_free(file_path); |
| 75 |
-+ g_free(desktop_name); |
| 76 |
-+ |
| 77 |
-+ if ( loaded ) |
| 78 |
-+ { |
| 79 |
-+ name = g_key_file_get_locale_string(f, "Desktop Entry", "Name", NULL, NULL); |
| 80 |
-+ exec = g_key_file_get_string(f, "Desktop Entry", "Exec", NULL); |
| 81 |
-+ } |
| 82 |
-+ else |
| 83 |
-+ { |
| 84 |
-+ name=g_strdup(session); |
| 85 |
-+ } |
| 86 |
-+ g_key_file_free(f); |
| 87 |
- } |
| 88 |
- } |
| 89 |
- if(name && !exec) |
| 90 |
|
| 91 |
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 |
| 92 |
deleted file mode 100644 |
| 93 |
index 9f723a2..00000000 |
| 94 |
--- a/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch |
| 95 |
+++ /dev/null |
| 96 |
@@ -1,15 +0,0 @@ |
| 97 |
---- lxdm-0.4.1.orig/pam/lxdm |
| 98 |
-+++ lxdm-0.4.1/pam/lxdm |
| 99 |
-@@ -1,9 +1,9 @@ |
| 100 |
- #%PAM-1.0 |
| 101 |
--auth substack system-auth |
| 102 |
-+auth substack system-local-login |
| 103 |
- auth optional pam_gnome_keyring.so |
| 104 |
--account include system-auth |
| 105 |
-+account include system-local-login |
| 106 |
- session optional pam_keyinit.so force revoke |
| 107 |
--session include system-auth |
| 108 |
-+session include system-local-login |
| 109 |
- session required pam_loginuid.so |
| 110 |
- #session optional pam_console.so |
| 111 |
- session optional pam_gnome_keyring.so auto_start |
Archives