Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

8 files changed, 183 insertions, 6 deletions

diff --git a/extra/consolekit/.footprint.x86_64 b/extra/consolekit/.footprint.x86_64
index 708e896b9..577382604 100755
--- a/extra/consolekit/.footprint.x86_64
+++ b/extra/consolekit/.footprint.x86_64
@@ -7,6 +7,10 @@ drwxr-xr-x	root/root	etc/ConsoleKit/seats.d/
 drwxr-xr-x	root/root	etc/dbus-1/
 drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/ConsoleKit.conf
+drwxr-xr-x	root/root	lib/
+drwxr-xr-x	root/root	lib/security/
+-rwxr-xr-x	root/root	lib/security/pam_ck_connector.la
+-rwxr-xr-x	root/root	lib/security/pam_ck_connector.so
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ck-history
@@ -18,6 +22,9 @@ drwxr-xr-x	root/root	usr/include/ConsoleKit/ck-connector/
 -rw-r--r--	root/root	usr/include/ConsoleKit/ck-connector/ck-connector.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/ConsoleKit/
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/ck-collect-session-info
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/ck-get-x11-display-device
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/ck-get-x11-server-pid
 drwxr-xr-x	root/root	usr/lib/ConsoleKit/run-seat.d/
 drwxr-xr-x	root/root	usr/lib/ConsoleKit/run-session.d/
 drwxr-xr-x	root/root	usr/lib/ConsoleKit/scripts/
@@ -29,12 +36,6 @@ lrwxrwxrwx	root/root	usr/lib/libck-connector.so.0 -> libck-connector.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libck-connector.so.0.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/ck-connector.pc
-drwxr-xr-x	root/root	usr/libexec/
--rwxr-xr-x	root/root	usr/libexec/ck-collect-session-info
--rwxr-xr-x	root/root	usr/libexec/ck-get-x11-display-device
--rwxr-xr-x	root/root	usr/libexec/ck-get-x11-server-pid
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man8/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/ck-log-system-restart
 -rwxr-xr-x	root/root	usr/sbin/ck-log-system-start
@@ -48,6 +49,13 @@ drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
 drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
 -rw-r--r--	root/root	usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/ConsoleKit/
+drwxr-xr-x	root/root	usr/share/doc/ConsoleKit/spec/
+-rw-r--r--	root/root	usr/share/doc/ConsoleKit/spec/ConsoleKit.html
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/pam_ck_connector.8.gz
 drwxr-xr-x	root/root	usr/share/polkit-1/
 drwxr-xr-x	root/root	usr/share/polkit-1/actions/
 -rw-r--r--	root/root	usr/share/polkit-1/actions/org.freedesktop.consolekit.policy
diff --git a/extra/lxdm/.footprint.x86_64 b/extra/lxdm/.footprint.x86_64
new file mode 100644
index 000000000..b9253f018
--- /dev/null
+++ b/extra/lxdm/.footprint.x86_64
@@ -0,0 +1,46 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/lxdm/
+-rwxr-xr-x	root/root	etc/lxdm/LoginReady
+-rwxr-xr-x	root/root	etc/lxdm/PostLogin
+-rwxr-xr-x	root/root	etc/lxdm/PostLogout
+-rwxr-xr-x	root/root	etc/lxdm/PreLogin
+-rwxr-xr-x	root/root	etc/lxdm/PreReboot
+-rwxr-xr-x	root/root	etc/lxdm/PreShutdown
+-rwxr-xr-x	root/root	etc/lxdm/Xsession
+-rw-r-----	root/root	etc/lxdm/lxdm.conf
+drwxr-xr-x	root/root	etc/pam.d/
+-rw-r--r--	root/root	etc/pam.d/lxdm
+drwxr-xr-x	root/root	etc/rc.d/
+drwxr-xr-x	root/root	etc/rc.d/init.d/
+-rwxr-xr-x	root/root	etc/rc.d/init.d/lxdm
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/lxdm/
+-rwxr-xr-x	root/root	usr/lib/lxdm/lxdm-greeter-gdk
+-rwxr-xr-x	root/root	usr/lib/lxdm/lxdm-greeter-gtk
+-rwxr-xr-x	root/root	usr/lib/lxdm/lxdm-numlock
+drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/lxdm
+-rwxr-xr-x	root/root	usr/sbin/lxdm-binary
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/locale/
+drwxr-xr-x	root/root	usr/share/locale/fr/
+drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r--	root/root	usr/share/locale/fr/LC_MESSAGES/lxdm.mo
+drwxr-xr-x	root/root	usr/share/lxdm/
+-rw-r--r--	root/root	usr/share/lxdm/lxdm.glade
+drwxr-xr-x	root/root	usr/share/lxdm/themes/
+drwxr-xr-x	root/root	usr/share/lxdm/themes/Industrial/
+-rw-r--r--	root/root	usr/share/lxdm/themes/Industrial/greeter.ui
+-rw-r--r--	root/root	usr/share/lxdm/themes/Industrial/gtkrc
+-rw-r--r--	root/root	usr/share/lxdm/themes/Industrial/index.theme
+-rw-r--r--	root/root	usr/share/lxdm/themes/Industrial/lang.png
+-rw-r--r--	root/root	usr/share/lxdm/themes/Industrial/login.png
+-rw-r--r--	root/root	usr/share/lxdm/themes/Industrial/session.png
+-rw-r--r--	root/root	usr/share/lxdm/themes/Industrial/shade.png
+-rw-r--r--	root/root	usr/share/lxdm/themes/Industrial/wave.svg
+drwxr-xr-x	root/root	var/
+drwxr-xr-x	root/root	var/lib/
+drwxr-xr-x	root/root	var/lib/lxdm/
+drwxr-xr-x	root/root	var/run/
+drwxr-xr-x	root/root	var/run/lxdm/
diff --git a/extra/lxdm/.md5sum.x86_64 b/extra/lxdm/.md5sum.x86_64
new file mode 100644
index 000000000..7bf8fa6e8
--- /dev/null
+++ b/extra/lxdm/.md5sum.x86_64
@@ -0,0 +1,5 @@
+1d0688e088edab7c3c563263eb2f9654  lxdm-0.3.0.tar.gz
+9bdf95adb74d81d4b6b6176fb1142090  lxdm-Xsession.patch
+705f394052fdd0dec22e95321d170de0  lxdm-deamon
+b20fe3c8487a039050986d60e45233a9  lxdm-pam.patch
+baed9055e8825a5511712bc095197519  lxdm.patch
diff --git a/extra/lxdm/Pkgfile b/extra/lxdm/Pkgfile
new file mode 100644
index 000000000..fcef839d9
--- /dev/null
+++ b/extra/lxdm/Pkgfile
@@ -0,0 +1,34 @@
+# Description:  Display manager leger (partie de lxde)
+# URL: http://sourceforge.net/projects/lxdm/
+# Maintainer: NuTyX core team
+# Packager: lesibel at free dot fr
+# Depends on: gtk, consolekit, xorg-server 
+# Run on: 
+
+name=lxdm
+version=0.3.0
+release=2
+source=(http://downloads.sourceforge.net/project/lxdm/lxdm%20${version}/$name-$version.tar.gz
+	lxdm-Xsession.patch lxdm.patch lxdm-pam.patch lxdm-deamon)
+
+build() {
+	cd $name-$version
+	./configure --sysconfdir=/etc \
+		--prefix=/usr \
+		--libexecdir=/usr/lib/lxdm
+	make
+  	
+	patch -Np0 < ../lxdm.patch
+	patch -Np0 < ../lxdm-Xsession.patch
+
+	make DESTDIR=$PKG install
+	
+	install -m644 $SRC/lxdm-pam.patch $PKG/etc/pam.d/lxdm
+	install -Dm755 $SRC/lxdm-deamon $PKG/etc/rc.d/init.d/lxdm 
+		
+	mkdir -p $PKG/var/run/lxdm
+	mkdir -p $PKG/var/lib/lxdm
+
+	sed -i -e "s/libexec/lib\/lxdm/" $PKG/etc/lxdm/lxdm.conf
+}
+  
diff --git a/extra/lxdm/lxdm-Xsession.patch b/extra/lxdm/lxdm-Xsession.patch
new file mode 100644
index 000000000..a9ba63233
--- /dev/null
+++ b/extra/lxdm/lxdm-Xsession.patch
@@ -0,0 +1,14 @@
+--- data/Xsession.orig	2010-01-31 20:48:08.695677408 -0200
++++ data/Xsession	2010-01-31 20:47:48.260223292 -0200
+@@ -2,6 +2,11 @@
+
+ # use bash for "exec -l", howto run login shell by /bin/sh ?
+
++[[ -f /etc/profile ]] && . /etc/profile
++[[ -f "$HOME/.profile" ]] && . "$HOME/.profile"
++[[ -f /etc/xprofile ]] && . /etc/xprofile
++[[ -f "$HOME/.xprofile" ]] && . "$HOME/.xprofile"
++
+ if [ $# -eq 1 -a -n "$1" ]; then
+ 	LXSESSION=$1
+ else
diff --git a/extra/lxdm/lxdm-deamon b/extra/lxdm/lxdm-deamon
new file mode 100644
index 000000000..68eb6225d
--- /dev/null
+++ b/extra/lxdm/lxdm-deamon
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=$(pidof -o %PPID `which lxdm-binary`)
+case "$1" in
+  start)
+    stat_busy "Starting LXDM Display Manager"
+    [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon lxdm
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping LXDM Display Manager"
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon lxdm
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/extra/lxdm/lxdm-pam.patch b/extra/lxdm/lxdm-pam.patch
new file mode 100644
index 000000000..3f5df04a7
--- /dev/null
+++ b/extra/lxdm/lxdm-pam.patch
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+auth            required        pam_unix.so
+account         required        pam_unix.so
+session         required        pam_limits.so
+session         required        pam_unix.so
+password        required        pam_unix.so
diff --git a/extra/lxdm/lxdm.patch b/extra/lxdm/lxdm.patch
new file mode 100644
index 000000000..a703a386d
--- /dev/null
+++ b/extra/lxdm/lxdm.patch
@@ -0,0 +1,26 @@
+--- data/lxdm.orig	2010-01-24 16:58:42.262866825 -0200
++++ data/lxdm	2010-01-19 11:56:34.308668692 -0200
+@@ -1,21 +1,13 @@
+ #!/bin/sh
+
+-[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
+-
+-if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then
+-	. /etc/sysconfig/language
+-	if [ -n "$RC_LANG"]; then
+-		LANG=$RC_LANG
+-	fi
++if [ -r /etc/profile.d/locale.sh ]; then
++	. /etc/profile.d/locale.sh
+ fi
+
+ if [ -n "$LANG" ]; then
+ 	export LANG
+ fi
+
+-[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop
+-[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager
+-
+ if [ -n "$DEFAULT_WM" ]; then
+ 	PREFERRED=$DEFAULT_WM
+ fi