commit 897cb76792c25f7a6534300282ecf5e4a3bb1c97
Author: Jacek Konieczny <[email protected]>
Date: Mon Oct 12 21:33:33 2015 +0200
Version: 0.5.1
- fixes logout problems
- two patches already applied upstream
- package upstream.service file, but do not enable it by default and
mask it in the -init subpackage
greeter-skip-services.patch | 16 ++++++++--------
lxdm-werror.patch | 12 ------------
lxdm.spec | 20 +++++++++-----------
softlockup.patch | 21 ---------------------
4 files changed, 17 insertions(+), 52 deletions(-)
---
diff --git a/lxdm.spec b/lxdm.spec
index fc47798..eb5dcdc 100644
--- a/lxdm.spec
+++ b/lxdm.spec
@@ -1,18 +1,16 @@
Summary: Light weight X11 display manager
Name: lxdm
-Version: 0.4.1
-Release: 14
+Version: 0.5.1
+Release: 1
License: GPL v3
Group: X11/Applications
-Source0: http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
-# Source0-md5: 8da1cfc2be6dc9217c85a7cf51e1e821
+Source0: http://downloads.sourceforge.net/lxdm/%{name}-%{version}.tar.xz
+# Source0-md5: 9e03ce5f6d303bc9b689732401934dc6
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}.Xsession
Patch0: %{name}-setuid.patch
Patch1: greeter-skip-services.patch
-Patch2: softlockup.patch
-Patch3: %{name}-werror.patch
URL: http://wiki.lxde.org/en/LXDM
BuildRequires: ConsoleKit-devel
BuildRequires: gettext-tools
@@ -52,8 +50,6 @@ Skrypt init dla lxdm-a.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
rm -f data/lxdm.conf
@@ -63,7 +59,7 @@ rm -f data/lxdm.conf
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
- $RPM_BUILD_ROOT%{systemdunitdir}
+ $RPM_BUILD_ROOT{/etc/systemd/system,%{systemdunitdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -73,7 +69,7 @@ install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/lxdm
install -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Xsession
touch $RPM_BUILD_ROOT/etc/security/blacklist.lxdm
-ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/lxdm.service
+ln -s /dev/null $RPM_BUILD_ROOT/etc/systemd/system/lxdm.service
%find_lang %{name}
@@ -114,9 +110,11 @@ fi
%attr(755,root,root) %{_libexecdir}/%{name}-greeter-gtk
%attr(755,root,root) %{_libdir}/%{name}-greeter-gdk
%attr(755,root,root) %{_libdir}/%{name}-numlock
+%attr(755,root,root) %{_libdir}/%{name}-session
%{_datadir}/%{name}
+%{systemdunitdir}/lxdm.service
%files init
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%{systemdunitdir}/lxdm.service
+%config(noreplace) %verify(not md5 mtime size) /etc/systemd/system/lxdm.service
diff --git a/greeter-skip-services.patch b/greeter-skip-services.patch
index 19fbf41..3641928 100644
--- a/greeter-skip-services.patch
+++ b/greeter-skip-services.patch
@@ -1,14 +1,14 @@
---- lxdm-0.3.0/src/lxdm.c~ 2010-09-24 18:43:49.000000000 +0300
-+++ lxdm-0.3.0/src/lxdm.c 2011-07-10 22:35:30.209784033 +0300
-@@ -1560,6 +1560,11 @@
- {
+diff -dur lxdm-0.5.1.bak/src/lxdm.c lxdm-0.5.1/src/lxdm.c
+--- lxdm-0.5.1.bak/src/lxdm.c 2015-02-14 04:07:16.000000000 +0100
++++ lxdm-0.5.1/src/lxdm.c 2015-10-12 21:08:11.385134263 +0200
+@@ -1588,6 +1588,10 @@
if(strstr(pw->pw_shell, "nologin"))
continue;
-+
+
+ // PLD Linux: skip users with homedir = /home/services
+ if(!strncmp(pw->pw_dir,"/home/services/",15))
+ continue;
+
- if(strncmp(pw->pw_dir,"/home/",6))
- {
- if(!strv_find(white,pw->pw_name))
+ ret = FALSE;
+ setusershell();
+ while ((valid_shell = getusershell()) != NULL) {
diff --git a/lxdm-werror.patch b/lxdm-werror.patch
deleted file mode 100644
index ea9c388..0000000
--- a/lxdm-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur lxdm-0.4.1.orig/src/ui.c lxdm-0.4.1.fix/src/ui.c
---- lxdm-0.4.1.orig/src/ui.c 2013-07-19 07:38:38.000000000 +0000
-+++ lxdm-0.4.1.fix/src/ui.c 2013-07-19 07:53:15.643067820 +0000
-@@ -146,7 +146,7 @@
- else if( !strncmp(str, "shutdown", 6) )
- lxdm_do_shutdown();
- else if( !strncmp(str, "log ", 4) )
-- g_message(str + 4);
-+ g_message("%s", str + 4);
- else if( !strncmp(str, "login ", 6) )
- {
- char *user = greeter_param(str, "user");
diff --git a/softlockup.patch b/softlockup.patch
deleted file mode 100644
index 034707c..0000000
--- a/softlockup.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: dgod <[email protected]>
-Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800)
-Subject: fix event check bug caused cpu 100%
-X-Git-Url:
http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb36a1ea29482b75674d804bb0f05540b2;hp=f0951bdf736026b041001e846d2cb93f7f2852e1
-
-fix event check bug caused cpu 100%
----
-
-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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lxdm.git/commitdiff/897cb76792c25f7a6534300282ecf5e4a3bb1c97
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
