packages: lxdm/lxdm.spec, lxdm/lxdm-pl.po.patch (NEW), lxdm/lxdm-setuid.pat...

[witekfl]

Author: witekfl                      Date: Tue Sep 28 10:26:45 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- readded lxdm-setuid.patch
- added pl.po.patch
- rel 2

---- Files affected:
packages/lxdm:
   lxdm.spec (1.6 -> 1.7) , lxdm-pl.po.patch (NONE -> 1.1)  (NEW), lxdm-setuid.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/lxdm/lxdm.spec
diff -u packages/lxdm/lxdm.spec:1.6 packages/lxdm/lxdm.spec:1.7
--- packages/lxdm/lxdm.spec:1.6	Tue Sep 28 09:58:56 2010
+++ packages/lxdm/lxdm.spec	Tue Sep 28 12:26:40 2010
@@ -2,7 +2,7 @@
 Summary:	Light weight X11 display manager
 Name:		lxdm
 Version:	0.3.0
-Release:	1
+Release:	2
 License:	GPL v3
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
@@ -10,6 +10,8 @@
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.Xsession
+Patch0:		%{name}-setuid.patch
+Patch1:		%{name}-pl.po.patch
 URL:		http://wiki.lxde.org/en/LXDM
 BuildRequires:	ConsoleKit-devel
 BuildRequires:	gettext-devel
@@ -38,6 +40,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 rm -f data/lxdm.conf
@@ -89,6 +93,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/09/28 10:26:40  witekfl
+- readded lxdm-setuid.patch
+- added pl.po.patch
+- rel 2
+
 Revision 1.6  2010/09/28 07:58:56  glen
 - up to 0.3.0, assume setuid patch obsolete
 

================================================================
Index: packages/lxdm/lxdm-pl.po.patch
diff -u /dev/null packages/lxdm/lxdm-pl.po.patch:1.1
--- /dev/null	Tue Sep 28 12:26:45 2010
+++ packages/lxdm/lxdm-pl.po.patch	Tue Sep 28 12:26:39 2010
@@ -0,0 +1,57 @@
+--- lxdm-0.3.0/po/pl.po.old	2010-09-28 11:42:26.000000000 +0200
++++ lxdm-0.3.0/po/pl.po	2010-09-28 11:43:16.000000000 +0200
+@@ -25,18 +25,18 @@ msgstr "Pulpit:"
+ 
+ #: ../data/lxdm.glade.h:2
+ msgid "Keyboard Layout:"
+-msgstr "UkÅ?ad klawiatury:"
++msgstr "Układ klawiatury:"
+ 
+ #: ../data/lxdm.glade.h:3
+ msgid "Language:"
+-msgstr "JÄ?zyk:"
++msgstr "Język:"
+ 
+ #: ../data/lxdm.glade.h:4
+ #: ../src/greeter.c:163
+ #: ../src/greeter.c:540
+ #: ../src/greeter.c:810
+ msgid "User:"
+-msgstr "Użytkownik:"
++msgstr "Użytkownik:"
+ 
+ #: ../src/gdm/gdm-languages.c:611
+ msgid "Unspecified"
+@@ -45,12 +45,12 @@ msgstr "Niezdefiniowany"
+ #: ../src/greeter.c:102
+ #: ../src/greeter.c:526
+ msgid "Password:"
+-msgstr "HasÅ?o:"
++msgstr "Hasło:"
+ 
+ #: ../src/greeter.c:231
+ #: ../src/lang.c:103
+ msgid "Default"
+-msgstr "DomyÅ?lny"
++msgstr "Domyślny"
+ 
+ #: ../src/greeter.c:421
+ msgid "_Reboot"
+@@ -58,7 +58,7 @@ msgstr "_Uruchom ponownie"
+ 
+ #: ../src/greeter.c:425
+ msgid "_Shutdown"
+-msgstr "_WyÅ?Ä?cz komputer"
++msgstr "_Wyłącz komputer"
+ 
+ #: ../src/greeter.c:613
+ msgid ""
+@@ -71,7 +71,7 @@ msgstr ""
+ #: ../src/greeter.c:626
+ #: ../src/lang.c:125
+ msgid "More ..."
+-msgstr "WiÄ?cej..."
++msgstr "Więcej..."
+ 
+ #~ msgid "US English"
+ #~ msgstr "Angielski US"

================================================================
Index: packages/lxdm/lxdm-setuid.patch
diff -u /dev/null packages/lxdm/lxdm-setuid.patch:1.3
--- /dev/null	Tue Sep 28 12:26:45 2010
+++ packages/lxdm/lxdm-setuid.patch	Tue Sep 28 12:26:39 2010
@@ -0,0 +1,10 @@
+--- lxdm-0.3.0/src/ui.c.old	2010-09-28 11:29:22.000000000 +0200
++++ lxdm-0.3.0/src/ui.c	2010-09-28 11:29:40.000000000 +0200
+@@ -196,6 +196,7 @@ void ui_prepare(void)
+ 		struct passwd *pw;
+ 		g_shell_parse_argv(p, NULL, &argv, NULL);
+ 		pw=getpwnam("lxdm");endpwent();
++		setuid(0);
+ 		ret = g_spawn_async_with_pipes(NULL, argv, NULL,
+ 				   G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,greeter_setup, pw,
+ 				   &greeter, greeter_pipe + 0, greeter_pipe + 1, NULL, NULL);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lxdm/lxdm.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lxdm/lxdm-setuid.patch?r1=1.2&r2=1.3&f=u