[gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/

["Michael Weber" <xmw@gentoo.org>]

commit:     e5c1d80d2f143ceb4927d19c1fe5e8690adfceb7
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 23 08:29:36 2012 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 08:29:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=e5c1d80d

x11-misc/trivdm: Version bump w/ uname -srp

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key 62EEF090)

---
 x11-misc/trivdm/ChangeLog                 |    6 +++
 x11-misc/trivdm/Manifest                  |   20 +++++++--
 x11-misc/trivdm/files/trivdm-0_p20120423  |   63 +++++++++++++++++++++++++++++
 x11-misc/trivdm/trivdm-0_p20120423.ebuild |   62 ++++++++++++++++++++++++++++
 4 files changed, 147 insertions(+), 4 deletions(-)

diff --git a/x11-misc/trivdm/ChangeLog b/x11-misc/trivdm/ChangeLog
index 8b1375f..e20f793 100644
--- a/x11-misc/trivdm/ChangeLog
+++ b/x11-misc/trivdm/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trivdm-0_p20120423 (23 Apr 2012)
+
+  23 Apr 2012; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20120423,
+  +trivdm-0_p20120423.ebuild:
+  Version bump w/ uname -srp
+
 *trivdm-0_p20120321 (21 Mar 2012)
 
   21 Mar 2012; Michael Weber <xmw@gentoo.org> -files/trivdm-0_p20110921,

diff --git a/x11-misc/trivdm/Manifest b/x11-misc/trivdm/Manifest
index 286719e..9c2f4c1 100644
--- a/x11-misc/trivdm/Manifest
+++ b/x11-misc/trivdm/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+- -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX trivdm-0_p20120321 2538 RMD160 78335c20844ac5ff8e351a72a37356d5bfd99b3a SHA1 10dbbedd2bf58e0ab06cf7f7fedfc38dcfe53e33 SHA256 64a4639913c9370e3f6fb28e244118da272b1382d3ad592d6fe9c8458c531abc
+AUX trivdm-0_p20120423 2563 RMD160 c1189819a3855b7018c1b075036cc359de13631b SHA1 aea9affda4a0c33c72877733545c36b7907e2c32 SHA256 30be20dd063c4dac69c40d7c52c2e1b8b15c83cab601570086b97d657d5a97ca
 EBUILD trivdm-0_p20120321.ebuild 1716 RMD160 49eebd9c396245e593c826a5b113f13e1ac23eae SHA1 96009deaa3d5cb184a40cc8ca0ef78e8d2fb852c SHA256 f3a860912c37d5d51520c0aa725dac6a993631992be535c268c51b20c7b753c4
-MISC ChangeLog 1008 RMD160 2d1950fb8d96b8a9e6ae581f5c406e60c2ccb0b4 SHA1 04e9a8ef87908ea7397333bede0136a06ea192dc SHA256 d163bb1a825a656efdb37d5e6b89a37b24ba5e66b8dc804376affbd8f533716a
+EBUILD trivdm-0_p20120423.ebuild 1716 RMD160 49eebd9c396245e593c826a5b113f13e1ac23eae SHA1 96009deaa3d5cb184a40cc8ca0ef78e8d2fb852c SHA256 f3a860912c37d5d51520c0aa725dac6a993631992be535c268c51b20c7b753c4
+MISC ChangeLog 1176 RMD160 5154521635b8e442a78dd50cf63a716d8a240c0e SHA1 d75d8994c21b4ef6a47982dd9b4e730bef0a1378 SHA256 affedf1f45f2d68369ca210fad9f263a9b939525501c006700cb4b6fb55736b0
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk+VEswACgkQknrdDGLu8JCktgD/eZxOrmWZgMTLMLMtMN5JwRYP
+/GTZv2kMljzQkZr0iKoA/1TxV5DsYfhCrIa11bgfqlRXy9zRAf6nu3XgmVyEcg6h
+=HRWF
+- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9qMskACgkQknrdDGLu8JAuvgEAmyUqT3+fCKwJyKh4xzmNkuln
-UIQm3r1cCklTEU6Qh1cA/jAfVdg5agKe0Z/lc661IKE3zsd4fnHmpOOJA5FWrcr8
-=lYKQ
+iF4EAREIAAYFAk+VEvAACgkQknrdDGLu8JBDhgD9EAvAT5W7/uIAKsw8TctOsoQ2
+bFcd99q4jEOCbqXPWckA/jCeTNPvZD3xdNeSwzoL4yedIiJzHPDkjMXnphnHZxMK
+=n6M2
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/trivdm/files/trivdm-0_p20120423 b/x11-misc/trivdm/files/trivdm-0_p20120423
new file mode 100644
index 0000000..2470cdd
--- /dev/null
+++ b/x11-misc/trivdm/files/trivdm-0_p20120423
@@ -0,0 +1,63 @@
+#!/bin/zsh
+# trivdm by Christian Neukirchen, Michael Weber root@fs.lmu.de
+# wget http://xmw.de/tmp/trivdm -O /usr/local/bin/trivdm
+# c7:2345:respawn:/usr/bin/openvt -c 7 -f -w /usr/local/bin/trivdm
+# symlinks to /usr/local/bin/{gdmflexiserver,w} and /etc/local.d/trivdm.start
+# groupadd --system trivdm ; useradd --system -g trivdm -G wheel trivdm 
+# chmod u+s /usr/bin/chvt
+
+NAME=$(basename $0) ; USER=trivdm ; LANG=C
+log() { echo "$@" | logger -s -t $NAME }
+trap 'read -s -k -t 10 "?Press any key to continue ..." ; exit -1 ' ZERR
+w() { ps haxo ruser,tty,comm | grep -v $USER | egrep -v "agetty|login$" | \
+    awk '{ if ( $3 == "X" || $2 != "?" ) print $1" "$2 }' | sort -u | \
+    awk '{ ORS="" ; if ( u != $1 ) { u=$1 ; print "\n"u"\t" } ; print $2"," }' \
+    | sed -e '1d ; s:,$:: ; $a\' }
+
+case $NAME in
+    gdmflexiserver)
+	[ "$1" = "-ls" ] && exec chvt 7 || exec /usr/bin/gdmflexiserver $@ ;;
+    trivdm.start)
+	chvt 7 ; exec setfont sun12x22 ;;
+    w)
+	w ; exec /usr/bin/w $@ ;;
+    *)
+	[ "$1" = "update" ] && exec wget http://xmw.de/tmp/$NAME -O $0
+	[ "$(id -un)" = "$USER" ] || exec su -c $0 $USER ;;
+esac
+
+clear
+toilet --font mono9 --gay $(hostname) | awk \
+    '{a[NR%8]=a[NR%8] $0} END {for (i=1;i<=NR;i++) print a[i];print a[0]}' \
+    | sed 's/ *$//g;/^$/d'
+echo ; uname -srp ; echo
+print -n "Usage:  <username>[/<session type>]|!halt|!reboot
+	<session type> in ~/.xinitrc (default), Gnome (fallback),\n\t"
+find /etc/X11/Sessions -type f ! -name Gnome | \
+    awk -F / 'BEGIN { ORS=", " } { print $5 }' | sed 's:, $:\n\n:'
+print "connected users:\n$({ w | grep '' || print '<none>'} | sed 's:^:\t:')\n"
+read "login?$(hostname)/tty7 x11 login: "
+
+case $login in
+    "" ) [ ] ;;
+    !* ) if [ -z "$(w)" ] ; then sudo -n "${login[2,-1]}"
+	else log "$login denied, users logged in!" ; fi ; [ ] ;;
+    */* ) xclient=$(find /etc/X11/Sessions -iname "*${login#*/}*" \
+	    -type f | sort | head -n 1)
+	[ -n "$xclient" ] || { log invalid session ; [ ] }
+	login=${login%/*} ;;
+    * ) xclient="~/.xinitrc" ;;
+esac
+
+id "$login" 2>&1 >/dev/null | sed "s|^id:|$NAME:|"
+id "$login" 2>/dev/null >/dev/null 
+
+tty=$(ps h -eo ruser,tty,comm | grep "^$login " | awk '$3=="X" {print $2}')
+[ "$tty" ] && { log switching to console $tty ; chvt "${tty#tty}" ; [ ] }
+
+dpy=0 ; while [ -e /tmp/.X11-unix/X$dpy ] ; do (( dpy += 1 )) done
+su -l -c "export xclient=$xclient ; 
+    [ -x \"\$xclient\" ] || xclient=/etc/X11/Sessions/Gnome ; 
+    /usr/sbin/daemonize -a -e ~/.xorg-stderr -o ~/.xorg-stdout -c ~ \
+        /usr/bin/startx \$xclient -- :$dpy -retro" $login 
+[ ]

diff --git a/x11-misc/trivdm/trivdm-0_p20120423.ebuild b/x11-misc/trivdm/trivdm-0_p20120423.ebuild
new file mode 100644
index 0000000..1021f2f
--- /dev/null
+++ b/x11-misc/trivdm/trivdm-0_p20120423.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="trivial display manager"
+HOMEPAGE="http://xmw.de/tmp/trivdm"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/sudo
+	app-misc/toilet
+	app-shells/zsh
+	sys-apps/daemonize
+	sys-apps/kbd"
+DEPEND=""
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /usr/bin/${PN} -1 ${PN}
+}
+
+src_install() {
+	newbin "${FILESDIR}"/${P} ${PN} || die
+	dodir /etc/env.d || die
+	echo "CONFIG_PROTECT=\"/usr/bin/${PN}\"" \
+		> "${D}"/etc/env.d/90${PN} || die
+	dodir /etc/sudoers.d || die
+	echo "#${PN} ALL=(root) NOPASSWD: /sbin/reboot,/sbin/halt" \
+		> "${D}"/etc/sudoers.d/${PN} || die
+	chmod 0440 "${D}"/etc/sudoers.d/${PN} || die
+}
+
+pkg_preinst() {
+	sed -e "/^c7:/d" /etc/inittab > "${ED}"/etc/inittab || die
+	sed -n -e '/c7:/{s/^.*c7:/c7:/ ; s:/local/:/: ; p}' \
+		"${ED}"/usr/bin/${PN} >> "${ED}"/etc/inittab || die
+
+	elog "IMPORTANT NOTE"
+	elog "Your system needs 5 minor adjustments that"
+	elog "must not be made by Gentoo portage system:"
+	elog "1) enable xscreensaver->newlogin compartibility"
+	elog "    ln -s ../../bin/${PN} /usr/local/bin/gdmflexiserver"
+	elog "2) tune w to display remote login sessions and daemonized X11"
+	elog "    ln -s ../../bin/${PN} /usr/local/bin/w"
+	elog "3) set a fancy font on framebuffer console on startup"
+	elog "    ln -s ../../usr/bin/${PN} /etc/local.d/${PN}.start"
+	elog "4) grant chvt to everyone"
+	elog "    chmod u+s /usr/bin/chvt"
+	elog "5) updated /etc/inittab (etc-update, ...) and reload"
+	elog "    kill -HUP 1"
+	elog "Install app-admin/sudo and review /etc/sudoers.d/${PN}"
+}