rpms/lxdm/devel lxdm-svn2145-tty1-patch, NONE, 1.1 lxdm-svn2262-pam.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 lxdm.spec, 1.2, 1.3 sources, 1.2, 1.3

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29472

Modified Files:
	.cvsignore lxdm.spec sources 
Added Files:
	lxdm-svn2145-tty1-patch lxdm-svn2262-pam.patch 
Log Message:
* Fri Jan 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
- Update to 0.1.0
- Change license to GPLv2+ and LGPLv2+
- Use tty1 by default
- PAM fixes for SELinux (#552885)



--- NEW FILE lxdm-svn2145-tty1-patch ---
--- lxdm/src/lxdm.c.orig	2009-12-20 23:53:16.000000000 +0100
+++ lxdm/src/lxdm.c	2009-12-20 23:54:00.000000000 +0100
@@ -57,7 +57,7 @@
 static pid_t child;
 static int reason;
 static char mcookie[33];
-static int tty=7;
+static int tty=1;
 
 static int get_active_vt (void)
 {

lxdm-svn2262-pam.patch:
 lxdm |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

--- NEW FILE lxdm-svn2262-pam.patch ---
--- lxdm/pam/lxdm.orig	2010-01-06 13:42:29.000000000 +0100
+++ lxdm/pam/lxdm	2010-01-08 16:00:04.000000000 +0100
@@ -1,7 +1,17 @@
 #%PAM-1.0
-auth       include	system-auth
-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
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_succeed_if.so user != root quiet
+auth       required    pam_env.so
+auth       substack    system-auth
+auth       optional    pam_gnome_keyring.so
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    optional    pam_gnome_keyring.so auto_start
+session    include     system-auth


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Nov 2009 02:29:53 -0000	1.2
+++ .cvsignore	8 Jan 2010 15:45:04 -0000	1.3
@@ -1 +1 @@
-lxdm-20091116svn2145.tar.bz2
+lxdm-0.1.0.tar.gz


Index: lxdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/devel/lxdm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lxdm.spec	24 Nov 2009 02:31:59 -0000	1.2
+++ lxdm.spec	8 Jan 2010 15:45:05 -0000	1.3
@@ -1,23 +1,21 @@
 # Review at https://bugzilla.redhat.com/show_bug.cgi?id=540034
 
-%global alphatag 20091116svn2145
+#%global alphatag 20091231svn2262
 
 Name:           lxdm
-Version:        0.0.3
-Release:        0.2.%{alphatag}%{?dist}
+Version:        0.1.0
+Release:        0.1%{?dist}
 Summary:        Lightweight X11 Display Manager
 
 Group:          User Interface/Desktops
-# FIXME: change lizense tag to GPLv2+ after response from upstream
-License:        GPLv3+
+License:        GPLv2+ and LGPLv2+
 URL:            http://lxde.org
-# Source= was generated as follows:
-# svn co -r 2145 https://lxde.svn.sourceforge.net/svnroot/lxde/trunk/lxdm lxdm
-# cd lxdm
-# ./autogen.sh
-# cd ..
-# tar -cjf lxdm-`date +%G%m%d`svn2145.tar.bz2 lxdm --exclude=.svn
-Source0:        lxdm-%{alphatag}.tar.bz2
+Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+## distro specific patches ##
+# we use tty1 by default
+Patch10:        lxdm-svn2145-tty1-patch
+# SELinux, permit graphical root login etc.
+Patch11:        lxdm-svn2262-pam.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0
@@ -37,7 +35,9 @@ KDM in LXDE distros. It's still in very 
 
 
 %prep
-%setup -qn %{name}
+%setup -q
+%patch10 -p1 -b .tty7
+%patch11 -p1 -b .orig
 
 
 %build
@@ -64,7 +64,7 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 # FIXME add ChangeLog and NEWS if not empty
-%doc AUTHORS COPYING README 
+%doc AUTHORS COPYING README TODO gpl-2.0.txt lgpl-2.1.txt
 %dir %{_sysconfdir}/%{name}
 %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/xinitrc
 %config(noreplace) %{_sysconfdir}/%{name}/Xsession
@@ -79,6 +79,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
+- Update to 0.1.0
+- Change license to GPLv2+ and LGPLv2+
+- Use tty1 by default
+- PAM fixes for SELinux (#552885)
+
 * Mon Nov 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.3-0.2.20091116svn2145
 - Review fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Nov 2009 02:29:54 -0000	1.2
+++ sources	8 Jan 2010 15:45:05 -0000	1.3
@@ -1 +1 @@
-27b6f0187a009c54cc67b84b1f30e04d  lxdm-20091116svn2145.tar.bz2
+656e2e7e296368edd97699605f8bd3cb  lxdm-0.1.0.tar.gz