From 7224c1253228e5c29c78cb3f0f26ce34770f2356 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sat, 15 Feb 2014 23:24:26 +0200 Subject: Added ebuilds for kogaion desktop --- lxde-base/lxdm/Manifest | 18 +++++ .../lxdm/files/lxdm-0.4.1-configure-add-pam.patch | 45 +++++++++++ .../files/lxdm-0.4.1-fix-event-check-bug.patch | 25 ++++++ .../lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch | 16 ++++ .../lxdm/files/lxdm-0.4.1-fix-session-args.patch | 29 +++++++ .../lxdm-0.4.1-git-fix-null-pointer-deref.patch | 51 ++++++++++++ .../files/lxdm-0.4.1-missing-pam-defines.patch | 29 +++++++ .../files/lxdm-0.4.1-optional-consolekit.patch | 38 +++++++++ .../lxdm-0.4.1-pam-use-system-local-login.patch | 15 ++++ .../files/lxdm-0.4.1-pam_console-disable.patch | 9 +++ .../lxdm/files/lxdm-0.4.1-rogentos-1-theme.patch | 32 ++++++++ .../lxdm/files/lxdm-0.4.1-rogentos-conf.patch | 11 +++ lxde-base/lxdm/files/lxdm.service | 11 +++ lxde-base/lxdm/files/xinitrc | 52 ++++++++++++ lxde-base/lxdm/lxdm-0.4.1-r7.ebuild | 89 +++++++++++++++++++++ lxde-base/lxdm/lxdm-0.4.1-r8.ebuild | 93 ++++++++++++++++++++++ lxde-base/lxdm/metadata.xml | 5 ++ 17 files changed, 568 insertions(+) create mode 100644 lxde-base/lxdm/Manifest create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-fix-event-check-bug.patch create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-fix-session-args.patch create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-rogentos-1-theme.patch create mode 100644 lxde-base/lxdm/files/lxdm-0.4.1-rogentos-conf.patch create mode 100644 lxde-base/lxdm/files/lxdm.service create mode 100644 lxde-base/lxdm/files/xinitrc create mode 100644 lxde-base/lxdm/lxdm-0.4.1-r7.ebuild create mode 100644 lxde-base/lxdm/lxdm-0.4.1-r8.ebuild create mode 100644 lxde-base/lxdm/metadata.xml (limited to 'lxde-base') diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest new file mode 100644 index 00000000..5e013e46 --- /dev/null +++ b/lxde-base/lxdm/Manifest @@ -0,0 +1,18 @@ +AUX lxdm-0.4.1-configure-add-pam.patch 1410 SHA256 22d9a569755acd1ffadc23939b6b2d0845f0956efafda31b3a91dbd5580a5815 SHA512 4a5f2f4a282739e74e63d583036e0cc84f3613983d3fac2795827d9065ade3e2cfc353472345be1948444ac4c2f037f5bc97c62a79a9b170e8fd6e0fc23ab6dd WHIRLPOOL d8ac31e16fce57b037cef36f88461ccb1e3669e5cef947aea2ed9ff32604aaee1ec959010e9a0e4099eebc86f34986cb774d2e6ddcc571afdc6b1104825dfb6d +AUX lxdm-0.4.1-fix-event-check-bug.patch 700 SHA256 dfc4248e4cbb2f84c7f65aba3d8105c5b49fde23c7a7c629a9104517a3a8291f SHA512 77845eb6a7dd9b59bac96bdf25de90daed13d4b45a103d83d983ea5f8e7747d1cfa65574d1849444ae73439b748c5d78b719fc70a0d592870d123d04f100d750 WHIRLPOOL 5e37fb882b5b2753ad9516c9ca43a4eea426e2344981868dc3d6fabb60424d52e70924493978de7e6a5f8ac4d18d8a128f5c41acc603076f16ecb88b7ec52243 +AUX lxdm-0.4.1-fix-pam-100-cpu.patch 444 SHA256 cf5aa1cd633c510be44cbb2d9dfa09fe6541c83c77297d000c010d5f0348ffde SHA512 2aef14d7dc9e2f10fda1d22b5837225f61af9a8fb46267ad98eb65149e72c165c6588c4816dc8c20ec90f49a2db5289b519f9b1c0b4b5b9ec430bea73fbac9a6 WHIRLPOOL 6039273a31292cc6903db4a84d89a2dc80fd0d776a9dc6f8dd438cf5d2d574e84b877a397e510267d4d7a690a0ed3520232c9225d8b590fc4b7e98c323d5e543 +AUX lxdm-0.4.1-fix-session-args.patch 1109 SHA256 192583f98adf2d13fd24e67ea026f3f4fbe1e4e04afc40e73b26efa51705c936 SHA512 01f9efddc52f803bba2a2a31b01f8316dbe0abcf39faec23ca6688e0eee81305046a0df91591e45040fc6f784514c0082775c53252f38b8483842062caa5db3b WHIRLPOOL 157c1c9e9fad4d6ae5b4d28019e4a7bbc00354de6486383b0d331aef8f83abe70bb39e01a29e089149e5cf1d5453a034f0991db2872dd681a2b5a8ce3e2840bc +AUX lxdm-0.4.1-git-fix-null-pointer-deref.patch 1560 SHA256 a33e3226c463bc445d7d27b11e34de8b09c7c1fdf44be8628d54334fd41b7ea3 SHA512 204124b2558280183e71799c2e006c9efb97b17bc5ef5f9cbf68afd0a4da2568d6e3d7a8d7dc3e12283b8d2febea541793fd72861ca7d692f1595be209d47f62 WHIRLPOOL 9f253d5b674c4a156e9fc99389c62c6271ca674beb109293992ba040520751310d229b270834a172c98275b2a5db6090679c41c663003a970c2bc60ddf631545 +AUX lxdm-0.4.1-missing-pam-defines.patch 583 SHA256 b9aa62fc73ce8f52f354388bcec0a03c228b40ba1a86e2aba1071501ecc1a5d8 SHA512 e7ebb98cae18874152ed5ae528db452428db5f0311cf92eeec93dc9bffaefb101fb587466e9f7c015199cf25c1fbc45ac1c20e3f41d7dd087622ac2e53b812e9 WHIRLPOOL ea2e3b6db573642ea79573e5a473a1ac00d6216fa1a848bb0b10b690a0f39a643fa43ff9f3f58467f6a4ad5083df8ee553f6315ed290e6d76d306ad023889707 +AUX lxdm-0.4.1-optional-consolekit.patch 1206 SHA256 7563a5cd8d121e6915c9e1fdfeb6bd94308f005a12e0a141b6249a99d711bb5a SHA512 74a4ab1460fcbbb0fb7632e8bd27afa3b1f737e41131816ad739c9e41678cd7abafa6811c0a72ce9eb3aeddb661e771d3707476df8940a5e670636764881fcd2 WHIRLPOOL 9be18b671bd5a27620462922a240dea1e9ce89820a0478930f81450a742b587dc7ed34b74c9c2cc724c4fc9eb872eaacfc534b6ec33146d9fa31ef399a1279c7 +AUX lxdm-0.4.1-pam-use-system-local-login.patch 513 SHA256 4200ca07cae26479d449de2cc0e0f4acf83b621f7dfcf314e8f91dd0e7a1e02d SHA512 82c21faf6fdc07bae6ea9af7b186d3ce2cae84879e1f6e1675d232d5d26883ba0f0eae66b8fbfa9da67fede2b017c867195c23ff68d80818d44452f5c06d34cd WHIRLPOOL c74c57560e557ff4d8a4719b485975b054397a8dc88e85a68cc5acdead318d611f1a597c58a3f2097609967c28fed506a3f82a0c88656f6a2bc1088853ea90fb +AUX lxdm-0.4.1-pam_console-disable.patch 344 SHA256 51d1a0f0b5749e451e313df3bd3d08b3f5181f00eb01993973393c1b4dcd8ad2 SHA512 15ebae762ca266da2986c6dc29b866068e7120457da253cc0513fb285c386869f35c074c2cd1cc1ff05045f533e565400cf39ae2f484eafb29fb2faeb2d260e4 WHIRLPOOL 42255d3a834333a0c830b1a8a045e526dd3ef93271a943eea542932cf04533de7e43ba3eea459c0c758e4851f3736b3a50f158c49a5a770fafce6dfefee173f5 +AUX lxdm-0.4.1-rogentos-1-theme.patch 708 SHA256 d78293c51bf67eabb33c703d7777900d06f954cf17a986f409dd83ba7f1b91e8 SHA512 614cf84a0cfdc5efa324bcb7c0596deca32ec8ebe1d3ec9bf82a6a6b5b92b5e82a75eeda1aef37f21c71ab094964a3fc275af62b7794f7f3b48de26efe08323a WHIRLPOOL 222e089c889abfae08fd2d7c5a0ccbbba79b0b66594d010b04d81aeee30036c4d0cca86d30567e71bf15256e8bd62097c4a2ea5514ce27fad2e81bc32a6b95e7 +AUX lxdm-0.4.1-rogentos-conf.patch 294 SHA256 9bfcb7d0eaada8485eed6d422943aea8aa8d3ea163203ac632ce7daa0041e095 SHA512 04395123bbdb536965376c9b5a1ade2d385d7b9aeaee584355fe770d9057970e10c4ced54df6a434b145403561741177fca53d0e40da923214ab4bc20043384a WHIRLPOOL cffae38828bcb88da2d66cd2a55b81ca4143e1088a6fb66ae0ad348922a06bc78c7def4e444fea19c2bbb63f27a60d60ec84cc7682de197ca96a0b249d7ab278 +AUX lxdm.service 212 SHA256 fbd01d0ecfa46c6451b63fb6d059e4ae602d0abbcf628ed7da5e12b2f6bbd45e SHA512 e73f7a956667e55a220db7745730f4cdaeb4f1912259d05eaf2208a32447b72d7f227cad78ec4dc765deedd6dc4b52b706825f0a71cd86d8b011aae64877c113 WHIRLPOOL f379741ce3bee813dd438727369635ecb7000f10f9cbf864bdb7f7f22de2ff31f9f55bcb32ec03398204affb0c17e52238bc6b9f0500bc12796a96ba48a93859 +AUX xinitrc 1549 SHA256 59b2f69c3a5eba060b2eaae43fc871d9b014419e3b51c84af95cee10f429880c SHA512 a3824b572eb661a8c0b823beafeef44112aa2d83d89a59090ea5c669c98b177a6cf8ec5b9ae69a000bbc0b6613a0c9fd750a96cfed0898b434705b3f811d4753 WHIRLPOOL fcc5968454cc889d412f26be1c41f3fc7c163cfb39b71a0dbed12823095f9472ce2fc9f4bd5dc9135f4434329923d88958526065fac74a95a9f4f566b1e36eee +DIST lxdm-0.4.1.tar.gz 296714 SHA256 9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08 SHA512 8ed4a955a910def4db66958d1cb24976db178b8763199a024b6c2119894745e3646566c42d01472dffbbcbb7fd21784b01e74dc88038e01caebaa3b6d720ff27 WHIRLPOOL 1bbb55bf955f46aaac54ca3372c09308baa496297e56026456e464217f115d6b26994e8be6b6b228b663bb2e14cf9d5ace6930f75024f6426825dd4fefc5349f +EBUILD lxdm-0.4.1-r6.ebuild 1859 SHA256 92fe6c6d9b1ac26b7e85e21b98f88add5b55bdfe99d43366e9930790866c2821 SHA512 ab3df64a8f7e1a728b52c99394b9e1ac5db4c93df029a7cda41ab6768b73fdcf746e2c4688ef86a638a6ce435fa97c1a418c3c8d0655eb339ccc6383c626f16f WHIRLPOOL 9640868392cbb935cf98228fbf5141be3f492bf147777004f843dbbd90e06a27eb44a79fb5746b37aca93c0d478c9e9c86569d7de9bc72c19435232871c48266 +EBUILD lxdm-0.4.1-r7.ebuild 2160 SHA256 7ce9242f57210450540a8cd9197257285c1b939e7dbffc0a2a5a4ac1d79e9d4a SHA512 19b8f9908ff2acc7dce755c89dbcd893e376e082c80b41d286a7693044b17b36c4f326116b2f8e92b081b5daf35670419386abc433793a33affb97af4a2f3a16 WHIRLPOOL 8e081f25e9c8af0de111914c7eb0a0c9317464ad44184c8a94114e424f980f385cea611b01439b3ff4f09bec547369b8c76cfec535fe35b26a9f6d8e10f0586c +EBUILD lxdm-0.4.1-r8.ebuild 2299 SHA256 2da589b3a21ff5a2d965ca5767fbd2164638d20c9d5ce14a00a2d689192716e8 SHA512 eb88a293dcecb27946e501afc8fbafcdf186ce83c7fa2adc823664bea8ade54b0bd59d713b3840dd84a0996c967ee9b8f61e6cb8495300467db26748a6573e29 WHIRLPOOL 143e059dee411a44a3dece1c0a4ade0b1846632cd02c42d6e8623f708ac0d5c1858518e58e7d8e09c1efb1836e508d2760418ad9c5b3ef4adcd40922a01f89a9 +MISC metadata.xml 158 SHA256 9a4e79f77bc3e825c79c2d57e658c8460f7f7535a25a7beacbe0c94f2378ba57 SHA512 c6d71f05dbe4c805971c6f9798798a8d1da6155b3fdb2ed19c8a6df33b82467a878127640612304bc29c9f7f5209e604cfdab49d1084ff3dab1d15a8129eb7bc WHIRLPOOL 04c34cac223f8b7d6fd0940386fdb553545be42018e7e4a4d315da3562ba5006b9d4a9dc7625ec80b4bfa4175cb2ef1f5482b540c7d29b27b3884a4cdd81ed9b diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch new file mode 100644 index 00000000..d91bf75a --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch @@ -0,0 +1,45 @@ +From 949ee91acb55baeb4b8761957eabd2e5a345d2ae Mon Sep 17 00:00:00 2001 +From: Mitch Harder +Date: Thu, 8 Dec 2011 11:02:28 -0600 +Subject: Fix configure.ac test for pam libs. + +A bug report on Gentoo noted that the configure test for pam +wasn't working correctly. +https://bugs.gentoo.org/show_bug.cgi?id=384615 + +This corrections borrows the configure.ac pam testing method used in xdm. +--- + configure.ac | 13 +++++++++++-- + 1 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e952473..eaa883a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,12 +14,21 @@ AC_PROG_INSTALL + AM_PROG_CC_C_O + + # Checks for libraries. + AC_CHECK_LIB([crypt], [crypt]) + +-AC_ARG_WITH(pam,AC_HELP_STRING([--without-pam],[build without pam]), +-[],[AC_CHECK_LIB([pam], [pam_open_session])]) ++# Check for PAM support ++AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]), ++ [USE_PAM=$withval], [USE_PAM=$use_pam_default]) ++if test "x$USE_PAM" != "xno" ; then ++ AC_SEARCH_LIBS(pam_open_session,[pam]) ++ AC_CHECK_FUNC(pam_open_session, ++ [AC_DEFINE(USE_PAM,1,[Use PAM for authentication])], ++ [if test "x$USE_PAM" != "xtry" ; then ++ AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."]) ++ fi]) ++fi + + AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) + + # Checks for header files. + AC_PATH_X +-- +1.7.3.4 + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-event-check-bug.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-event-check-bug.patch new file mode 100644 index 00000000..f0ca23be --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-event-check-bug.patch @@ -0,0 +1,25 @@ +From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001 +From: dgod +Date: Sun, 25 Dec 2011 15:23:19 +0800 +Subject: [PATCH] fix event check bug caused cpu 100% + +--- + src/lxcom.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/lxcom.c b/src/lxcom.c +index 02763eb..18ee12e 100644 +--- a/src/lxcom.c ++++ b/src/lxcom.c +@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) + + static gboolean lxcom_check(GSource *source) + { +- return TRUE; ++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE; + } + + static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data) +-- +1.7.4.1 + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch new file mode 100644 index 00000000..103268ef --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch @@ -0,0 +1,16 @@ +--- lxdm-0.4.1.orig/src/lxdm.c ++++ lxdm-0.4.1/src/lxdm.c +@@ -1458,8 +1458,12 @@ void lxdm_do_login(struct passwd *pw, ch + setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1); + } + #endif ++ int i; ++ for(i=2;i<256;i++) ++ g_source_remove(i); ++ + char** env, *path; +- int n_env,i; ++ int n_env; + n_env = g_strv_length(environ); + /* copy all environment variables and override some of them */ + env = g_new(char*, n_env + 1 + 13); diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-session-args.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-session-args.patch new file mode 100644 index 00000000..11bacdbb --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-session-args.patch @@ -0,0 +1,29 @@ +diff -Nurp data//Xsession data.new//Xsession +--- data//Xsession 2011-07-29 15:42:33.000000000 +0200 ++++ data.new//Xsession 2012-01-04 15:49:39.009452532 +0100 +@@ -20,7 +20,7 @@ if [ -f /etc/X11/xinit/xinitrc-common ]; + elif [ -x /usr/bin/ck-launch-session -a -z "$CK_XINIT_SESSION" ]; then + CK_XINIT_SESSION="/usr/bin/ck-launch-session" + fi +- exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" ++ exec -l "$SHELL" -c "$CK_XINIT_SESSION $LXSESSION" + elif [ -x /etc/X11/xinit/Xsession ]; then + # fedora + exec /etc/X11/xinit/Xsession "$LXSESSION" +@@ -30,7 +30,7 @@ elif [ -x /etc/X11/Xsession ]; then + elif [ -x /etc/X11/xinit/xinitrc ]; then + #suse + export WINDOWMANAGER=$LXSESSION +- exec -l $SHELL -c /etc/X11/xinit/xinitrc ++ exec -l "$SHELL" -c /etc/X11/xinit/xinitrc + else + # unknown, user should custom /etc/lxdm/xinitrc self + if [ -x /etc/lxdm/xinitrc ]; then +@@ -41,6 +41,6 @@ else + elif [ -x /usr/bin/ck-launch-session ]; then + CK_XINIT_SESSION="/usr/bin/ck-launch-session" + fi +- exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" ++ exec -l "$SHELL" -c "$CK_XINIT_SESSION $LXSESSION" + fi + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch b/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch new file mode 100644 index 00000000..7abdbd47 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch @@ -0,0 +1,51 @@ +From 19f82a206b2cec964cea0475395d63dedf183788 Mon Sep 17 00:00:00 2001 +From: Andrea Florio +Date: Fri, 29 Jul 2011 23:59:32 +0200 +Subject: [PATCH] fix null pointer dereference + +--- + src/config.c | 25 ++++++++++--------------- + 1 files changed, 10 insertions(+), 15 deletions(-) + +diff --git a/src/config.c b/src/config.c +index 3f92f7b..4603ab4 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename) + static void update_face_image(GtkWidget *w) + { + GdkPixbuf *pixbuf; +- char *path; +- path=g_build_filename(user->pw_dir,".face",NULL); +- if(access(path,R_OK)) +- { +- g_free(path); +- if(ui_nobody) +- pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); +- if(!pixbuf) +- pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), ++ char *path=g_build_filename(user->pw_dir,".face",NULL); ++ pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); ++ g_free(path); ++ if(!pixbuf && ui_nobody) ++ pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); ++ if(!pixbuf) ++ pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), + "avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL); +- } +- else ++ if(pixbuf) + { +- pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); +- g_free(path); ++ gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); ++ g_object_unref(pixbuf); + } +- gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); +- g_object_unref(pixbuf); + } + + static void set_face_file(const char *filename) +-- +1.7.0.1 + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch b/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch new file mode 100644 index 00000000..a59273cc --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch @@ -0,0 +1,29 @@ +From 0f9e8e53a8d30f5c8ccfb03edc282148f58bfd30 Mon Sep 17 00:00:00 2001 +From: dgod +Date: Sun, 1 Jan 2012 17:05:22 +0800 +Subject: [PATCH] fix bug introduced from pam detect + +--- + src/lxdm.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/lxdm.c b/src/lxdm.c +index b5a90be..07be1e0 100644 +--- a/src/lxdm.c ++++ b/src/lxdm.c +@@ -25,8 +25,12 @@ + #include + #endif + #ifndef HAVE_LIBPAM ++#ifdef USE_PAM ++#define HAVE_LIBPAM 1 ++#else + #define HAVE_LIBPAM 0 + #endif ++#endif + + #include + #include +-- +1.7.4.1 + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch new file mode 100644 index 00000000..021f3212 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch @@ -0,0 +1,38 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then + fi]) + fi + +-AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) +- + # Checks for header files. + AC_PATH_X + AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h]) +@@ -89,11 +87,21 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules]) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + +-PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ +- AC_SUBST(CONSOLEKIT_CFLAGS) +- AC_SUBST(CONSOLEKIT_LIBS)],[ +- echo "ConsoleKit devel package not found" +- ]) ++AC_ARG_ENABLE(consolekit, ++AC_HELP_STRING([--enable-consolekit], [enable ConsoleKit support]), ++[case "${enableval}" in ++ yes) enable_ck=yes ;; ++ no) enable_ck=no ;; ++ *) AC_MSG_ERROR([bad value "${enableval}" for --enable-consolekit, use "yes" (default) or "no".]) ;; ++esac],[]) ++if test "x$enable_ck" = "xyes" ; then ++ AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) ++ PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ ++ AC_SUBST(CONSOLEKIT_CFLAGS) ++ AC_SUBST(CONSOLEKIT_LIBS)],[ ++ echo "ConsoleKit devel package not found" ++ ]) ++fi + + AC_ARG_ENABLE(password, + AC_HELP_STRING([--enable-password],[enable to load autologin password store at config file]), 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 new file mode 100644 index 00000000..9f723a2f --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch @@ -0,0 +1,15 @@ +--- 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 diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch b/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch new file mode 100644 index 00000000..628e9a51 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch @@ -0,0 +1,9 @@ +--- lxdm-0.4.0.orig/pam/lxdm ++++ lxdm-0.4.0/pam/lxdm +@@ -5,5 +5,5 @@ account include system-auth + 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 + session optional pam_gnome_keyring.so auto_start diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-1-theme.patch b/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-1-theme.patch new file mode 100644 index 00000000..1a7f84a7 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-1-theme.patch @@ -0,0 +1,32 @@ +--- orig/data/lxdm.conf.in 2013-07-01 01:20:22.289454072 +0300 ++++ data/lxdm.conf.in 2013-07-01 01:19:34.353452789 +0300 +@@ -1,6 +1,6 @@ + [base] + ## uncomment and set autologin username to enable autologin +-# autologin=dgod ++# autologin=rogentosuser + + ## uncomment and set timeout to enable timeout autologin, + ## the value should >=5 +@@ -24,10 +24,10 @@ + + [display] + ## gtk theme used by greeter +-gtk_theme=Clearlooks ++gtk_theme=Kogaion-light + + ## background of the greeter +-bg=/usr/share/backgrounds/default.png ++bg=/usr/share/lxdm/themes/Kogaion/kogaion.png + + ## if show bottom pane + bottom_pane=1 +@@ -39,7 +39,7 @@ + keyboard=0 + + ## the theme of greeter +-theme=Industrial ++theme=Kogaion + + [input] + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-conf.patch b/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-conf.patch new file mode 100644 index 00000000..bfa28b6c --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-conf.patch @@ -0,0 +1,11 @@ +--- orig/data/lxdm.conf 2013-07-01 01:27:22.793465333 +0300 ++++ data/lxdm.conf 2013-07-01 01:27:34.691465652 +0300 +@@ -24,7 +24,7 @@ + + [display] + ## gtk theme used by greeter +-gtk_theme=Clearlooks ++gtk_theme=Kogaion-light + + ## background of the greeter + bg=/usr/share/backgrounds/default.png diff --git a/lxde-base/lxdm/files/lxdm.service b/lxde-base/lxdm/files/lxdm.service new file mode 100644 index 00000000..298914b5 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm.service @@ -0,0 +1,11 @@ +[Unit] +Description=LXDM (Lightweight X11 Display Manager) +After=systemd-user-sessions.service + +[Service] +ExecStart=/usr/sbin/lxdm +Restart=always + +[Install] +Alias=display-manager.service +WantedBy=graphical.target diff --git a/lxde-base/lxdm/files/xinitrc b/lxde-base/lxdm/files/xinitrc new file mode 100644 index 00000000..013b8164 --- /dev/null +++ b/lxde-base/lxdm/files/xinitrc @@ -0,0 +1,52 @@ +# Source for this script borrowed from portions of kdm's Xsession. + +case $SHELL in + */bash) + [ -z "$BASH" ] && exec $SHELL $0 "$@" + set +o posix + [ -f /etc/profile ] && . /etc/profile + if [ -f $HOME/.bash_profile ]; then + . $HOME/.bash_profile + elif [ -f $HOME/.bash_login ]; then + . $HOME/.bash_login + elif [ -f $HOME/.profile ]; then + . $HOME/.profile + fi + ;; + */zsh) + [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" + emulate -R zsh + [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc + zhome=${ZDOTDIR:-$HOME} + # zshenv is always sourced automatically. + [ -f $zdir/zprofile ] && . $zdir/zprofile + [ -f $zhome/.zprofile ] && . $zhome/.zprofile + [ -f $zdir/zlogin ] && . $zdir/zlogin + [ -f $zhome/.zlogin ] && . $zhome/.zlogin + ;; + */csh|*/tcsh) + # [t]cshrc is always sourced automatically. + # Note that sourcing csh.login after .cshrc is non-standard. + xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX` + $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp" + . $xsess_tmp + rm -f $xsess_tmp + ;; + *) # Plain sh, ksh, and anything we do not know. + [ -f /etc/profile ] && . /etc/profile + [ -f $HOME/.profile ] && . $HOME/.profile + ;; +esac + +[ -f /etc/xprofile ] && . /etc/xprofile +[ -f $HOME/.xprofile ] && . $HOME/.xprofile + +# run all system xinitrc shell scripts. +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for i in /etc/X11/xinit/xinitrc.d/* ; do + if [ -x "$i" ]; then + . "$i" + fi + done +fi + diff --git a/lxde-base/lxdm/lxdm-0.4.1-r7.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r7.ebuild new file mode 100644 index 00000000..7ac178d7 --- /dev/null +++ b/lxde-base/lxdm/lxdm-0.4.1-r7.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils autotools systemd + +DESCRIPTION="LXDE Display Manager" +HOMEPAGE="http://lxde.org" +SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" + +IUSE="debug gtk3 nls pam" + +RDEPEND="sys-auth/consolekit + x11-libs/libxcb + >=x11-themes/kogaion-artwork-lxde-1 + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + nls? ( sys-devel/gettext ) + pam? ( virtual/pam )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40 + dev-util/pkgconfig" + +src_prepare() { + # Upstream bug, tarball contains pre-made lxdm.conf + epatch "${FILESDIR}/${P}-rogentos-conf.patch" + rm "${S}"/data/lxdm.conf || die + + # There is consolekit + epatch "${FILESDIR}/${P}-pam_console-disable.patch" + # Backported, drop it when 0.4.2 + epatch "${FILESDIR}/${P}-git-fix-null-pointer-deref.patch" + # RogentOS specific theme patch + epatch "${FILESDIR}/${P}-rogentos-1-theme.patch" + # Fix sessions with arguments, see: + # http://lists.sabayon.org/pipermail/devel/2012-January/007582.html + epatch "${FILESDIR}/${P}-fix-session-args.patch" + + epatch "${FILESDIR}"/${P}-configure-add-pam.patch + + # 403999 + epatch "${FILESDIR}"/${P}-missing-pam-defines.patch + + epatch "${FILESDIR}"/${P}-fix-event-check-bug.patch + + # Also see #422495 + epatch "${FILESDIR}"/${P}-pam-use-system-local-login.patch + + # See https://bugs.launchpad.net/ubuntu/+source/lxdm/+bug/922363 + epatch "${FILESDIR}/${P}-fix-pam-100-cpu.patch" + + # this replaces the bootstrap/autogen script in most packages + eautoreconf + + # process LINGUAS + if use nls; then + einfo "Running intltoolize ..." + intltoolize --force --copy --automake || die + strip-linguas -i "${S}/po" || die + fi +} +src_configure() { + econf --enable-password \ + --with-x \ + --with-xconn=xcb \ + $(use_enable gtk3) \ + $(use_enable nls) \ + $(use_enable debug) \ + $(use_with pam) +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS README TODO || die + + systemd_dounit "${FILESDIR}/lxdm.service" +} + +pkg_postinst() { + echo + elog "LXDM in the early stages of development!" + echo +} diff --git a/lxde-base/lxdm/lxdm-0.4.1-r8.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r8.ebuild new file mode 100644 index 00000000..9ea406ac --- /dev/null +++ b/lxde-base/lxdm/lxdm-0.4.1-r8.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils autotools systemd + +DESCRIPTION="LXDE Display Manager" +HOMEPAGE="http://lxde.org" +SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" + +IUSE="consolekit debug gtk3 nls pam" + +RDEPEND="consolekit? ( sys-auth/consolekit ) + x11-libs/libxcb + >=x11-themes/kogaion-artwork-lxde-1 + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + nls? ( sys-devel/gettext ) + pam? ( virtual/pam )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40 + dev-util/pkgconfig" + +src_prepare() { + # Upstream bug, tarball contains pre-made lxdm.conf + epatch "${FILESDIR}"/"${P}"-rogentos-conf.patch + rm "${S}"/data/lxdm.conf || die + + # There is consolekit + epatch "${FILESDIR}/${P}-pam_console-disable.patch" + # Backported, drop it when 0.4.2 + epatch "${FILESDIR}/${P}-git-fix-null-pointer-deref.patch" + # Sabayon specific theme patch + epatch "${FILESDIR}/${P}-rogentos-1-theme.patch" + # Fix sessions with arguments, see: + # http://lists.sabayon.org/pipermail/devel/2012-January/007582.html + epatch "${FILESDIR}/${P}-fix-session-args.patch" + + epatch "${FILESDIR}"/${P}-configure-add-pam.patch + + # 403999 + epatch "${FILESDIR}"/${P}-missing-pam-defines.patch + + epatch "${FILESDIR}"/${P}-fix-event-check-bug.patch + + # Also see #422495 + epatch "${FILESDIR}"/${P}-pam-use-system-local-login.patch + + # See https://bugs.launchpad.net/ubuntu/+source/lxdm/+bug/922363 + epatch "${FILESDIR}/${P}-fix-pam-100-cpu.patch" + + # Make consolekit optional + epatch "${FILESDIR}/${P}-optional-consolekit.patch" + + # this replaces the bootstrap/autogen script in most packages + eautoreconf + + # process LINGUAS + if use nls; then + einfo "Running intltoolize ..." + intltoolize --force --copy --automake || die + strip-linguas -i "${S}/po" || die + fi +} +src_configure() { + econf --enable-password \ + --with-x \ + --with-xconn=xcb \ + $(use_enable consolekit) \ + $(use_enable gtk3) \ + $(use_enable nls) \ + $(use_enable debug) \ + $(use_with pam) +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS README TODO || die + + systemd_dounit "${FILESDIR}/lxdm.service" +} + +pkg_postinst() { + echo + elog "LXDM in the early stages of development!" + echo +} diff --git a/lxde-base/lxdm/metadata.xml b/lxde-base/lxdm/metadata.xml new file mode 100644 index 00000000..06d7ed17 --- /dev/null +++ b/lxde-base/lxdm/metadata.xml @@ -0,0 +1,5 @@ + + + + lxde + -- cgit v1.2.3