* [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/
@ 2011-09-23 21:52 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2011-09-23 21:52 UTC (permalink / raw
To: gentoo-commits
commit: db54be8dfd9705239a5356533b29752b10adabd7
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 21:52:45 2011 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 21:52:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=db54be8d
x11-misc/trivdm: initial import
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 62EEF090)
---
x11-misc/trivdm/ChangeLog | 10 +++++
x11-misc/trivdm/Manifest | 14 +++++++
x11-misc/trivdm/files/trivdm-0_p20110921 | 60 +++++++++++++++++++++++++++++
x11-misc/trivdm/metadata.xml | 10 +++++
x11-misc/trivdm/trivdm-0_p20110921.ebuild | 53 +++++++++++++++++++++++++
5 files changed, 147 insertions(+), 0 deletions(-)
diff --git a/x11-misc/trivdm/ChangeLog b/x11-misc/trivdm/ChangeLog
new file mode 100644
index 0000000..2aecf6e
--- /dev/null
+++ b/x11-misc/trivdm/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for x11-misc/trivdm
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*trivdm-0_p20110921 (23 Sep 2011)
+
+ 23 Sep 2011; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20110921,
+ +trivdm-0_p20110921.ebuild, +metadata.xml:
+ Initial import
+
diff --git a/x11-misc/trivdm/Manifest b/x11-misc/trivdm/Manifest
new file mode 100644
index 0000000..a53fae7
--- /dev/null
+++ b/x11-misc/trivdm/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX trivdm-0_p20110921 2319 RMD160 5898c658045a642da8dc9eec67db38f62a23dbf1 SHA1 394a9f9e816f4a8143660781fc20f0c1df09ea36 SHA256 c414ed6d9c06a1df0967a787e4e5fcc89ca8e8c8f6399adcf9c02dc421bc6786
+EBUILD trivdm-0_p20110921.ebuild 1293 RMD160 c907cf4dbba504804e49b60f603e787b0fea76fe SHA1 6f0b908cdce2253c394dd11e09d041d2fbe23a73 SHA256 b045b2d0dba35229bdaa048ed0049402ade36676cfb61a7f8ca6ca0a84dbd99c
+MISC ChangeLog 287 RMD160 7e59711261ef173fc9fd22be4ca0bbb0d2059df5 SHA1 3cb44a28290f92c95ebcd78065ca14de52d60876 SHA256 5f3667a5fb992b6d5366ff5bd8eabf3a28f12e8b698a8d17bd183f1b2585dfe5
+MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk58/60ACgkQknrdDGLu8JDsXwD9HISgha9WFWIpanuyHvkXZy7/
+WRkPmnxNO4EbjkWrWm8BAI9ummaHvWodau0GVScAZiTarpau2V9eGzHcH0Eg3agh
+=tLx3
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/trivdm/files/trivdm-0_p20110921 b/x11-misc/trivdm/files/trivdm-0_p20110921
new file mode 100644
index 0000000..d3cbf52
--- /dev/null
+++ b/x11-misc/trivdm/files/trivdm-0_p20110921
@@ -0,0 +1,60 @@
+#!/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
+# sumlinks 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 --gay -f mono9 $(hostname -f | sed 's:^[^\.]*\.::')
+print -n "Usage: <username>[/<session type>]
+ <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
+ "")
+ exit ;;
+ */*)
+ 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/metadata.xml b/x11-misc/trivdm/metadata.xml
new file mode 100644
index 0000000..02b909e
--- /dev/null
+++ b/x11-misc/trivdm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/trivdm/trivdm-0_p20110921.ebuild b/x11-misc/trivdm/trivdm-0_p20110921.ebuild
new file mode 100644
index 0000000..b298676
--- /dev/null
+++ b/x11-misc/trivdm/trivdm-0_p20110921.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="trivial display manager"
+HOMEPAGE="http://xmw.de/tmp/trivdm"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/toilet
+ app-shells/zsh
+ sys-apps/daemonize
+ sys-apps/kbd"
+DEPEND=""
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 /usr/bin/${PN} -1 ${PN}
+}
+
+src_install() {
+ newbin "${FILESDIR}"/${P} ${PN} || die
+}
+
+pkg_preinst() {
+ elog "you need some symlink to /usr/bin/trivdm to override"
+ elog "gdmflexiserver for xscreensaver->newlogin,"
+ elog "to display established sessions on w,"
+ elog "to fancy up the font on framebuffer console"
+ elog "and allow users change virtual terminal on xscreensaver->newlogin"
+ elog "update your inittab (etc-update, ...) and reload"
+ elog
+ elog "ln -s ../../bin/${PN} /usr/local/bin/gdmflexiserver"
+ elog "ln -s ../../bin/${PN} /usr/local/bin/w"
+ elog "ln -s ../../usr/bin/${PN} /etc/local.d/${PN}.start"
+ elog "chmod u+s /usr/bin/chvt"
+ elog "kill -HUP 1"
+
+ dodir /etc || die
+ local myinit=$(sed -n -e '/c7:/{s/^.*c7:/c7:/ ; s:/local/:/: ; p}' \
+ "${ED}"/usr/bin/${PN})
+ sed -e "/^c7:/d" \
+ -e "\$a$myinit\\" \
+ /etc/inittab > "${ED}"/etc/inittab || die
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/
@ 2011-09-23 22:08 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2011-09-23 22:08 UTC (permalink / raw
To: gentoo-commits
commit: a77bfb14a3837fdd7fba5c4fec659e693299a0f8
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 22:07:46 2011 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 22:07:46 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=a77bfb14
x11-misc/trivdm: initial import
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 62EEF090)
---
x11-misc/trivdm/ChangeLog | 10 +++++
x11-misc/trivdm/Manifest | 14 +++++++
x11-misc/trivdm/files/trivdm-0_p20110921 | 60 +++++++++++++++++++++++++++++
x11-misc/trivdm/metadata.xml | 10 +++++
x11-misc/trivdm/trivdm-0_p20110921.ebuild | 54 ++++++++++++++++++++++++++
5 files changed, 148 insertions(+), 0 deletions(-)
diff --git a/x11-misc/trivdm/ChangeLog b/x11-misc/trivdm/ChangeLog
new file mode 100644
index 0000000..2aecf6e
--- /dev/null
+++ b/x11-misc/trivdm/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for x11-misc/trivdm
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*trivdm-0_p20110921 (23 Sep 2011)
+
+ 23 Sep 2011; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20110921,
+ +trivdm-0_p20110921.ebuild, +metadata.xml:
+ Initial import
+
diff --git a/x11-misc/trivdm/Manifest b/x11-misc/trivdm/Manifest
new file mode 100644
index 0000000..c83ee2d
--- /dev/null
+++ b/x11-misc/trivdm/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX trivdm-0_p20110921 2319 RMD160 d5ea44d05528ee0d6d3a6f27d8bb00bd513fce5d SHA1 21cb08d686d6c9c8cb157660f903e9ae2e496b01 SHA256 eae817ac58331265e5f73c7d154e14524b90417a3560c826da4b55b49fe95a42
+EBUILD trivdm-0_p20110921.ebuild 1372 RMD160 e03319f38b7e6d5398b7d9ad70f19cecefa4bb98 SHA1 4d9946e7c0ff322e9600526be021151dc9ab8347 SHA256 28a5980ee288a5dff6ca820da6272567ff841d61bafd35f9a29b0b42c7025135
+MISC ChangeLog 287 RMD160 7e59711261ef173fc9fd22be4ca0bbb0d2059df5 SHA1 3cb44a28290f92c95ebcd78065ca14de52d60876 SHA256 5f3667a5fb992b6d5366ff5bd8eabf3a28f12e8b698a8d17bd183f1b2585dfe5
+MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk59AzIACgkQknrdDGLu8JAtOwD+PMfXdsC+gxXHrKIist1Py4sm
+nA6ftWSxCb5BNmLBV5MA/2OEDy6JDQUY7uISQf4Z5b/piVVEkZjPkox9YzUxT+W/
+=8FNu
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/trivdm/files/trivdm-0_p20110921 b/x11-misc/trivdm/files/trivdm-0_p20110921
new file mode 100644
index 0000000..6f00289
--- /dev/null
+++ b/x11-misc/trivdm/files/trivdm-0_p20110921
@@ -0,0 +1,60 @@
+#!/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 --gay -f mono9 $(hostname -f | sed 's:^[^\.]*\.::')
+print -n "Usage: <username>[/<session type>]
+ <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
+ "")
+ exit ;;
+ */*)
+ 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/metadata.xml b/x11-misc/trivdm/metadata.xml
new file mode 100644
index 0000000..02b909e
--- /dev/null
+++ b/x11-misc/trivdm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/trivdm/trivdm-0_p20110921.ebuild b/x11-misc/trivdm/trivdm-0_p20110921.ebuild
new file mode 100644
index 0000000..20e14bc
--- /dev/null
+++ b/x11-misc/trivdm/trivdm-0_p20110921.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="trivial display manager"
+HOMEPAGE="http://xmw.de/tmp/trivdm"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/toilet
+ app-shells/zsh
+ sys-apps/daemonize
+ sys-apps/kbd"
+DEPEND=""
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 /usr/bin/${PN} -1 ${PN}
+}
+
+src_install() {
+ newbin "${FILESDIR}"/${P} ${PN} || die
+}
+
+pkg_preinst() {
+ dodir /etc || die
+ local myinit=$(sed -n -e '/c7:/{s/^.*c7:/c7:/ ; s:/local/:/: ; p}' \
+ "${ED}"/usr/bin/${PN})
+ sed -e "/^c7:/d" \
+ -e "\$a$myinit\\" \
+ /etc/inittab > "${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 comartibility"
+ elog " ln -s ../../bin/${PN} /usr/local/bin/gdmflexiserver"
+ elog "2) tune w to display remote login sessions and daeonized 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"
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/
@ 2011-09-27 21:49 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2011-09-27 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 50fa44f844c7b35a6d7fc21922fda7520ce955c9
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 21:49:17 2011 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 21:49:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=50fa44f8
Version bump, added CONFIG_PROTECT
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 62EEF090)
---
x11-misc/trivdm/ChangeLog | 6 +++
x11-misc/trivdm/Manifest | 10 +++--
x11-misc/trivdm/files/trivdm-0_p20110927 | 62 +++++++++++++++++++++++++++++
x11-misc/trivdm/trivdm-0_p20110927.ebuild | 53 ++++++++++++++++++++++++
4 files changed, 127 insertions(+), 4 deletions(-)
diff --git a/x11-misc/trivdm/ChangeLog b/x11-misc/trivdm/ChangeLog
index 2aecf6e..3829c2f 100644
--- a/x11-misc/trivdm/ChangeLog
+++ b/x11-misc/trivdm/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trivdm-0_p20110927 (27 Sep 2011)
+
+ 27 Sep 2011; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20110927,
+ +trivdm-0_p20110927.ebuild:
+ Version bump, added CONFIG_PROTECT
+
*trivdm-0_p20110921 (23 Sep 2011)
23 Sep 2011; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20110921,
diff --git a/x11-misc/trivdm/Manifest b/x11-misc/trivdm/Manifest
index c83ee2d..73dbf38 100644
--- a/x11-misc/trivdm/Manifest
+++ b/x11-misc/trivdm/Manifest
@@ -2,13 +2,15 @@
Hash: SHA256
AUX trivdm-0_p20110921 2319 RMD160 d5ea44d05528ee0d6d3a6f27d8bb00bd513fce5d SHA1 21cb08d686d6c9c8cb157660f903e9ae2e496b01 SHA256 eae817ac58331265e5f73c7d154e14524b90417a3560c826da4b55b49fe95a42
+AUX trivdm-0_p20110927 2435 RMD160 7430356d28715ee4062d434da4fd18f1df9c79b1 SHA1 b8b11db1314ab9404e8bcafc9c86b3cab39cab85 SHA256 33e54114644860dc4aced2935e72d0188f016dbff5191f3fde4e70dbbb380cc6
EBUILD trivdm-0_p20110921.ebuild 1372 RMD160 e03319f38b7e6d5398b7d9ad70f19cecefa4bb98 SHA1 4d9946e7c0ff322e9600526be021151dc9ab8347 SHA256 28a5980ee288a5dff6ca820da6272567ff841d61bafd35f9a29b0b42c7025135
-MISC ChangeLog 287 RMD160 7e59711261ef173fc9fd22be4ca0bbb0d2059df5 SHA1 3cb44a28290f92c95ebcd78065ca14de52d60876 SHA256 5f3667a5fb992b6d5366ff5bd8eabf3a28f12e8b698a8d17bd183f1b2585dfe5
+EBUILD trivdm-0_p20110927.ebuild 1430 RMD160 25be98eeb10527e26be5126aabe585cbbed68318 SHA1 794da6899cd0b6c883141e574dee65759287dbfa SHA256 ad040c7033142c823ca27c66b392e6371f6afd8af5c45d170720001779226113
+MISC ChangeLog 463 RMD160 a2bf88f9761720e6d5dbc25c27b4b049bfd87abe SHA1 cf38de624c7dff5398883e5af0ee958a63f72db6 SHA256 2f05250a79307c84dbc3ae46a8eebca2415141760ebbeab9c70cd1d898478c22
MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk59AzIACgkQknrdDGLu8JAtOwD+PMfXdsC+gxXHrKIist1Py4sm
-nA6ftWSxCb5BNmLBV5MA/2OEDy6JDQUY7uISQf4Z5b/piVVEkZjPkox9YzUxT+W/
-=8FNu
+iF4EAREIAAYFAk6CRN0ACgkQknrdDGLu8JCVPwD/VQDOBMHu+ifAI5orQGVbxcQQ
+MSfhzp6j+7PYMsGf+RUA/0rC0dbMfxo4Iw5H2vM+/+bipPyvtqKqzUCizWQi74CB
+=aXXm
-----END PGP SIGNATURE-----
diff --git a/x11-misc/trivdm/files/trivdm-0_p20110927 b/x11-misc/trivdm/files/trivdm-0_p20110927
new file mode 100644
index 0000000..3bef475
--- /dev/null
+++ b/x11-misc/trivdm/files/trivdm-0_p20110927
@@ -0,0 +1,62 @@
+#!/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 -f | sed 's:^[^\.]*\.::') | 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'
+print -n "Usage: <username>[/<session type>]
+ <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
+ "")
+ exit ;;
+ */*)
+ 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_p20110927.ebuild b/x11-misc/trivdm/trivdm-0_p20110927.ebuild
new file mode 100644
index 0000000..8b1edd4
--- /dev/null
+++ b/x11-misc/trivdm/trivdm-0_p20110927.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="trivial display manager"
+HOMEPAGE="http://xmw.de/tmp/trivdm"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/toilet
+ app-shells/zsh
+ sys-apps/daemonize
+ sys-apps/kbd"
+DEPEND=""
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 /usr/bin/${PN} -1 ${PN}
+}
+
+src_install() {
+ newbin "${FILESDIR}"/${P} ${PN} || die
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=\"/usr/bin/${PN}\"" > "${D}"/etc/env.d/90${PN}
+}
+
+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"
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/
@ 2011-09-27 21:51 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2011-09-27 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 5d39317f7771c7c005d8a52c3397f64041583eed
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 21:50:50 2011 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 21:50:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=5d39317f
x11-misc/trivdm: Version bump, added CONFIG_PROTECT
(Portage version: 2.1.10.11/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_p20110927 | 62 +++++++++++++++++++++++++++++
x11-misc/trivdm/trivdm-0_p20110927.ebuild | 53 ++++++++++++++++++++++++
4 files changed, 137 insertions(+), 4 deletions(-)
diff --git a/x11-misc/trivdm/ChangeLog b/x11-misc/trivdm/ChangeLog
index 2aecf6e..3829c2f 100644
--- a/x11-misc/trivdm/ChangeLog
+++ b/x11-misc/trivdm/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trivdm-0_p20110927 (27 Sep 2011)
+
+ 27 Sep 2011; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20110927,
+ +trivdm-0_p20110927.ebuild:
+ Version bump, added CONFIG_PROTECT
+
*trivdm-0_p20110921 (23 Sep 2011)
23 Sep 2011; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20110921,
diff --git a/x11-misc/trivdm/Manifest b/x11-misc/trivdm/Manifest
index c83ee2d..290c0ac 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_p20110921 2319 RMD160 d5ea44d05528ee0d6d3a6f27d8bb00bd513fce5d SHA1 21cb08d686d6c9c8cb157660f903e9ae2e496b01 SHA256 eae817ac58331265e5f73c7d154e14524b90417a3560c826da4b55b49fe95a42
+AUX trivdm-0_p20110927 2435 RMD160 7430356d28715ee4062d434da4fd18f1df9c79b1 SHA1 b8b11db1314ab9404e8bcafc9c86b3cab39cab85 SHA256 33e54114644860dc4aced2935e72d0188f016dbff5191f3fde4e70dbbb380cc6
EBUILD trivdm-0_p20110921.ebuild 1372 RMD160 e03319f38b7e6d5398b7d9ad70f19cecefa4bb98 SHA1 4d9946e7c0ff322e9600526be021151dc9ab8347 SHA256 28a5980ee288a5dff6ca820da6272567ff841d61bafd35f9a29b0b42c7025135
-MISC ChangeLog 287 RMD160 7e59711261ef173fc9fd22be4ca0bbb0d2059df5 SHA1 3cb44a28290f92c95ebcd78065ca14de52d60876 SHA256 5f3667a5fb992b6d5366ff5bd8eabf3a28f12e8b698a8d17bd183f1b2585dfe5
+EBUILD trivdm-0_p20110927.ebuild 1430 RMD160 25be98eeb10527e26be5126aabe585cbbed68318 SHA1 794da6899cd0b6c883141e574dee65759287dbfa SHA256 ad040c7033142c823ca27c66b392e6371f6afd8af5c45d170720001779226113
+MISC ChangeLog 463 RMD160 a2bf88f9761720e6d5dbc25c27b4b049bfd87abe SHA1 cf38de624c7dff5398883e5af0ee958a63f72db6 SHA256 2f05250a79307c84dbc3ae46a8eebca2415141760ebbeab9c70cd1d898478c22
MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk6CRN0ACgkQknrdDGLu8JCVPwD/VQDOBMHu+ifAI5orQGVbxcQQ
+MSfhzp6j+7PYMsGf+RUA/0rC0dbMfxo4Iw5H2vM+/+bipPyvtqKqzUCizWQi74CB
+=aXXm
+- -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk59AzIACgkQknrdDGLu8JAtOwD+PMfXdsC+gxXHrKIist1Py4sm
-nA6ftWSxCb5BNmLBV5MA/2OEDy6JDQUY7uISQf4Z5b/piVVEkZjPkox9YzUxT+W/
-=8FNu
+iF4EAREIAAYFAk6CRToACgkQknrdDGLu8JC4oAD/b20CGtoY0PIG+cIQODS/lb1h
+ecrcLkx/F8XHRjbZd+4A/jRBFRJHeveIkRTC169UltoxuuDJulFNGkHUY0rPLePn
+=XwBm
-----END PGP SIGNATURE-----
diff --git a/x11-misc/trivdm/files/trivdm-0_p20110927 b/x11-misc/trivdm/files/trivdm-0_p20110927
new file mode 100644
index 0000000..3bef475
--- /dev/null
+++ b/x11-misc/trivdm/files/trivdm-0_p20110927
@@ -0,0 +1,62 @@
+#!/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 -f | sed 's:^[^\.]*\.::') | 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'
+print -n "Usage: <username>[/<session type>]
+ <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
+ "")
+ exit ;;
+ */*)
+ 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_p20110927.ebuild b/x11-misc/trivdm/trivdm-0_p20110927.ebuild
new file mode 100644
index 0000000..8b1edd4
--- /dev/null
+++ b/x11-misc/trivdm/trivdm-0_p20110927.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="trivial display manager"
+HOMEPAGE="http://xmw.de/tmp/trivdm"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/toilet
+ app-shells/zsh
+ sys-apps/daemonize
+ sys-apps/kbd"
+DEPEND=""
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 /usr/bin/${PN} -1 ${PN}
+}
+
+src_install() {
+ newbin "${FILESDIR}"/${P} ${PN} || die
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=\"/usr/bin/${PN}\"" > "${D}"/etc/env.d/90${PN}
+}
+
+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"
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/
@ 2011-10-10 22:04 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2011-10-10 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 51c6f92ad07666b06423fbcc96114b4fe4a6371b
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 22:03:27 2011 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 22:03:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=51c6f92a
x11-misc/trivdm: New version w/ more security fun
(Portage version: 2.1.10.11/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_p20111010 | 62 +++++++++++++++++++++++++++++
x11-misc/trivdm/trivdm-0_p20111010.ebuild | 59 +++++++++++++++++++++++++++
4 files changed, 133 insertions(+), 14 deletions(-)
diff --git a/x11-misc/trivdm/ChangeLog b/x11-misc/trivdm/ChangeLog
index 3829c2f..17cbd70 100644
--- a/x11-misc/trivdm/ChangeLog
+++ b/x11-misc/trivdm/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trivdm-0_p20111010 (10 Oct 2011)
+
+ 10 Oct 2011; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20111010,
+ +trivdm-0_p20111010.ebuild:
+ New version w/ more security fun
+
*trivdm-0_p20110927 (27 Sep 2011)
27 Sep 2011; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20110927,
diff --git a/x11-misc/trivdm/Manifest b/x11-misc/trivdm/Manifest
index 290c0ac..5c3db2a 100644
--- a/x11-misc/trivdm/Manifest
+++ b/x11-misc/trivdm/Manifest
@@ -1,26 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX trivdm-0_p20110921 2319 RMD160 d5ea44d05528ee0d6d3a6f27d8bb00bd513fce5d SHA1 21cb08d686d6c9c8cb157660f903e9ae2e496b01 SHA256 eae817ac58331265e5f73c7d154e14524b90417a3560c826da4b55b49fe95a42
AUX trivdm-0_p20110927 2435 RMD160 7430356d28715ee4062d434da4fd18f1df9c79b1 SHA1 b8b11db1314ab9404e8bcafc9c86b3cab39cab85 SHA256 33e54114644860dc4aced2935e72d0188f016dbff5191f3fde4e70dbbb380cc6
+AUX trivdm-0_p20111010 2563 RMD160 b2e376c89eaae8ea2e4ed97627abb989f2d08b6e SHA1 c09676bafd6c3d8b5ecc0da300b4dfb5dd1c914d SHA256 ba60fd9c8b87632b2fe1ec63dbdaad0ebf8c9db035a9e746cafd67f265c2ee04
EBUILD trivdm-0_p20110921.ebuild 1372 RMD160 e03319f38b7e6d5398b7d9ad70f19cecefa4bb98 SHA1 4d9946e7c0ff322e9600526be021151dc9ab8347 SHA256 28a5980ee288a5dff6ca820da6272567ff841d61bafd35f9a29b0b42c7025135
EBUILD trivdm-0_p20110927.ebuild 1430 RMD160 25be98eeb10527e26be5126aabe585cbbed68318 SHA1 794da6899cd0b6c883141e574dee65759287dbfa SHA256 ad040c7033142c823ca27c66b392e6371f6afd8af5c45d170720001779226113
-MISC ChangeLog 463 RMD160 a2bf88f9761720e6d5dbc25c27b4b049bfd87abe SHA1 cf38de624c7dff5398883e5af0ee958a63f72db6 SHA256 2f05250a79307c84dbc3ae46a8eebca2415141760ebbeab9c70cd1d898478c22
+EBUILD trivdm-0_p20111010.ebuild 1686 RMD160 032c3bdeabdaed07f71eebd52894607907d5f2f8 SHA1 b9a954ab3e1a7da070fa92720b35d8c27cdc38c5 SHA256 d6df9c06e74c8f478769ab4214ac30d69fe3805d46f07100c9966201e2add920
+MISC ChangeLog 637 RMD160 078203c7eca39c9fd6000ec9c6107876d754fd90 SHA1 de8ef89f74a895fa4357a573043665f752239529 SHA256 4e34b8a54dc904fade2f4fe278d9792b59bbc8d00fe54c8759af2209b8cfcd12
MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk6CRN0ACgkQknrdDGLu8JCVPwD/VQDOBMHu+ifAI5orQGVbxcQQ
-MSfhzp6j+7PYMsGf+RUA/0rC0dbMfxo4Iw5H2vM+/+bipPyvtqKqzUCizWQi74CB
-=aXXm
-- -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk6CRToACgkQknrdDGLu8JC4oAD/b20CGtoY0PIG+cIQODS/lb1h
-ecrcLkx/F8XHRjbZd+4A/jRBFRJHeveIkRTC169UltoxuuDJulFNGkHUY0rPLePn
-=XwBm
+iF4EAREIAAYFAk6Ta68ACgkQknrdDGLu8JD8pwEAgklGWIj3msJQXNHv9mvCrDqK
+xBRNleX5buDk8Kz36F8BAIjw0TYjU9bc9zTtA37497uaBNMdnK0RXvrrpk7EziBx
+=ndJj
-----END PGP SIGNATURE-----
diff --git a/x11-misc/trivdm/files/trivdm-0_p20111010 b/x11-misc/trivdm/files/trivdm-0_p20111010
new file mode 100644
index 0000000..30de0be
--- /dev/null
+++ b/x11-misc/trivdm/files/trivdm-0_p20111010
@@ -0,0 +1,62 @@
+#!/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 -f | sed 's:^[^\.]*\.::') | 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'
+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_p20111010.ebuild b/x11-misc/trivdm/trivdm-0_p20111010.ebuild
new file mode 100644
index 0000000..f65ff95
--- /dev/null
+++ b/x11-misc/trivdm/trivdm-0_p20111010.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="trivial display manager"
+HOMEPAGE="http://xmw.de/tmp/trivdm"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-misc/toilet
+ app-shells/zsh
+ sys-apps/daemonize
+ sys-apps/kbd"
+DEPEND=""
+
+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}"
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/
@ 2012-03-21 19:58 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2012-03-21 19:58 UTC (permalink / raw
To: gentoo-commits
commit: 11cf199ae4e000d31ac54938f8e8677ded19c853
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 19:58:02 2012 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Mar 21 19:58:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=11cf199a
Version bump, add app-admin/sudo dep, clean up old version
(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key 62EEF090)
---
x11-misc/trivdm/ChangeLog | 11 +++-
x11-misc/trivdm/Manifest | 16 ++---
x11-misc/trivdm/files/trivdm-0_p20110921 | 60 -------------------
x11-misc/trivdm/files/trivdm-0_p20110927 | 62 --------------------
.../{trivdm-0_p20111010 => trivdm-0_p20120321} | 2 +-
x11-misc/trivdm/trivdm-0_p20110921.ebuild | 54 -----------------
x11-misc/trivdm/trivdm-0_p20110927.ebuild | 53 -----------------
..._p20111010.ebuild => trivdm-0_p20120321.ebuild} | 9 ++-
8 files changed, 23 insertions(+), 244 deletions(-)
diff --git a/x11-misc/trivdm/ChangeLog b/x11-misc/trivdm/ChangeLog
index 17cbd70..8b1375f 100644
--- a/x11-misc/trivdm/ChangeLog
+++ b/x11-misc/trivdm/ChangeLog
@@ -1,7 +1,16 @@
# ChangeLog for x11-misc/trivdm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trivdm-0_p20120321 (21 Mar 2012)
+
+ 21 Mar 2012; Michael Weber <xmw@gentoo.org> -files/trivdm-0_p20110921,
+ -trivdm-0_p20110921.ebuild, -files/trivdm-0_p20110927,
+ -trivdm-0_p20110927.ebuild, -files/trivdm-0_p20111010,
+ -trivdm-0_p20111010.ebuild, +files/trivdm-0_p20120321,
+ +trivdm-0_p20120321.ebuild:
+ Version bump, add app-admin/sudo dep, clean up old version
+
*trivdm-0_p20111010 (10 Oct 2011)
10 Oct 2011; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20111010,
diff --git a/x11-misc/trivdm/Manifest b/x11-misc/trivdm/Manifest
index 5c3db2a..286719e 100644
--- a/x11-misc/trivdm/Manifest
+++ b/x11-misc/trivdm/Manifest
@@ -1,18 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX trivdm-0_p20110921 2319 RMD160 d5ea44d05528ee0d6d3a6f27d8bb00bd513fce5d SHA1 21cb08d686d6c9c8cb157660f903e9ae2e496b01 SHA256 eae817ac58331265e5f73c7d154e14524b90417a3560c826da4b55b49fe95a42
-AUX trivdm-0_p20110927 2435 RMD160 7430356d28715ee4062d434da4fd18f1df9c79b1 SHA1 b8b11db1314ab9404e8bcafc9c86b3cab39cab85 SHA256 33e54114644860dc4aced2935e72d0188f016dbff5191f3fde4e70dbbb380cc6
-AUX trivdm-0_p20111010 2563 RMD160 b2e376c89eaae8ea2e4ed97627abb989f2d08b6e SHA1 c09676bafd6c3d8b5ecc0da300b4dfb5dd1c914d SHA256 ba60fd9c8b87632b2fe1ec63dbdaad0ebf8c9db035a9e746cafd67f265c2ee04
-EBUILD trivdm-0_p20110921.ebuild 1372 RMD160 e03319f38b7e6d5398b7d9ad70f19cecefa4bb98 SHA1 4d9946e7c0ff322e9600526be021151dc9ab8347 SHA256 28a5980ee288a5dff6ca820da6272567ff841d61bafd35f9a29b0b42c7025135
-EBUILD trivdm-0_p20110927.ebuild 1430 RMD160 25be98eeb10527e26be5126aabe585cbbed68318 SHA1 794da6899cd0b6c883141e574dee65759287dbfa SHA256 ad040c7033142c823ca27c66b392e6371f6afd8af5c45d170720001779226113
-EBUILD trivdm-0_p20111010.ebuild 1686 RMD160 032c3bdeabdaed07f71eebd52894607907d5f2f8 SHA1 b9a954ab3e1a7da070fa92720b35d8c27cdc38c5 SHA256 d6df9c06e74c8f478769ab4214ac30d69fe3805d46f07100c9966201e2add920
-MISC ChangeLog 637 RMD160 078203c7eca39c9fd6000ec9c6107876d754fd90 SHA1 de8ef89f74a895fa4357a573043665f752239529 SHA256 4e34b8a54dc904fade2f4fe278d9792b59bbc8d00fe54c8759af2209b8cfcd12
+AUX trivdm-0_p20120321 2538 RMD160 78335c20844ac5ff8e351a72a37356d5bfd99b3a SHA1 10dbbedd2bf58e0ab06cf7f7fedfc38dcfe53e33 SHA256 64a4639913c9370e3f6fb28e244118da272b1382d3ad592d6fe9c8458c531abc
+EBUILD trivdm-0_p20120321.ebuild 1716 RMD160 49eebd9c396245e593c826a5b113f13e1ac23eae SHA1 96009deaa3d5cb184a40cc8ca0ef78e8d2fb852c SHA256 f3a860912c37d5d51520c0aa725dac6a993631992be535c268c51b20c7b753c4
+MISC ChangeLog 1008 RMD160 2d1950fb8d96b8a9e6ae581f5c406e60c2ccb0b4 SHA1 04e9a8ef87908ea7397333bede0136a06ea192dc SHA256 d163bb1a825a656efdb37d5e6b89a37b24ba5e66b8dc804376affbd8f533716a
MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk6Ta68ACgkQknrdDGLu8JD8pwEAgklGWIj3msJQXNHv9mvCrDqK
-xBRNleX5buDk8Kz36F8BAIjw0TYjU9bc9zTtA37497uaBNMdnK0RXvrrpk7EziBx
-=ndJj
+iF4EAREIAAYFAk9qMskACgkQknrdDGLu8JAuvgEAmyUqT3+fCKwJyKh4xzmNkuln
+UIQm3r1cCklTEU6Qh1cA/jAfVdg5agKe0Z/lc661IKE3zsd4fnHmpOOJA5FWrcr8
+=lYKQ
-----END PGP SIGNATURE-----
diff --git a/x11-misc/trivdm/files/trivdm-0_p20110921 b/x11-misc/trivdm/files/trivdm-0_p20110921
deleted file mode 100644
index 6f00289..0000000
--- a/x11-misc/trivdm/files/trivdm-0_p20110921
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/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 --gay -f mono9 $(hostname -f | sed 's:^[^\.]*\.::')
-print -n "Usage: <username>[/<session type>]
- <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
- "")
- exit ;;
- */*)
- 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/files/trivdm-0_p20110927 b/x11-misc/trivdm/files/trivdm-0_p20110927
deleted file mode 100644
index 3bef475..0000000
--- a/x11-misc/trivdm/files/trivdm-0_p20110927
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/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 -f | sed 's:^[^\.]*\.::') | 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'
-print -n "Usage: <username>[/<session type>]
- <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
- "")
- exit ;;
- */*)
- 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/files/trivdm-0_p20111010 b/x11-misc/trivdm/files/trivdm-0_p20120321
similarity index 97%
rename from x11-misc/trivdm/files/trivdm-0_p20111010
rename to x11-misc/trivdm/files/trivdm-0_p20120321
index 30de0be..5336dd6 100644
--- a/x11-misc/trivdm/files/trivdm-0_p20111010
+++ b/x11-misc/trivdm/files/trivdm-0_p20120321
@@ -27,7 +27,7 @@ case $NAME in
esac
clear
-toilet --font mono9 --gay $(hostname -f | sed 's:^[^\.]*\.::') | awk \
+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'
print -n "Usage: <username>[/<session type>]|!halt|!reboot
diff --git a/x11-misc/trivdm/trivdm-0_p20110921.ebuild b/x11-misc/trivdm/trivdm-0_p20110921.ebuild
deleted file mode 100644
index 20e14bc..0000000
--- a/x11-misc/trivdm/trivdm-0_p20110921.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="trivial display manager"
-HOMEPAGE="http://xmw.de/tmp/trivdm"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/toilet
- app-shells/zsh
- sys-apps/daemonize
- sys-apps/kbd"
-DEPEND=""
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 /usr/bin/${PN} -1 ${PN}
-}
-
-src_install() {
- newbin "${FILESDIR}"/${P} ${PN} || die
-}
-
-pkg_preinst() {
- dodir /etc || die
- local myinit=$(sed -n -e '/c7:/{s/^.*c7:/c7:/ ; s:/local/:/: ; p}' \
- "${ED}"/usr/bin/${PN})
- sed -e "/^c7:/d" \
- -e "\$a$myinit\\" \
- /etc/inittab > "${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 comartibility"
- elog " ln -s ../../bin/${PN} /usr/local/bin/gdmflexiserver"
- elog "2) tune w to display remote login sessions and daeonized 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"
-}
diff --git a/x11-misc/trivdm/trivdm-0_p20110927.ebuild b/x11-misc/trivdm/trivdm-0_p20110927.ebuild
deleted file mode 100644
index 8b1edd4..0000000
--- a/x11-misc/trivdm/trivdm-0_p20110927.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="trivial display manager"
-HOMEPAGE="http://xmw.de/tmp/trivdm"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/toilet
- app-shells/zsh
- sys-apps/daemonize
- sys-apps/kbd"
-DEPEND=""
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 /usr/bin/${PN} -1 ${PN}
-}
-
-src_install() {
- newbin "${FILESDIR}"/${P} ${PN} || die
- dodir /etc/env.d
- echo "CONFIG_PROTECT=\"/usr/bin/${PN}\"" > "${D}"/etc/env.d/90${PN}
-}
-
-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"
-}
diff --git a/x11-misc/trivdm/trivdm-0_p20111010.ebuild b/x11-misc/trivdm/trivdm-0_p20120321.ebuild
similarity index 94%
rename from x11-misc/trivdm/trivdm-0_p20111010.ebuild
rename to x11-misc/trivdm/trivdm-0_p20120321.ebuild
index f65ff95..1021f2f 100644
--- a/x11-misc/trivdm/trivdm-0_p20111010.ebuild
+++ b/x11-misc/trivdm/trivdm-0_p20120321.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
+EAPI=4
inherit eutils
@@ -15,12 +15,15 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="app-misc/toilet
+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}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/
@ 2012-04-23 8:29 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2012-04-23 8:29 UTC (permalink / raw
To: gentoo-commits
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}"
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/
@ 2012-10-28 17:26 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2012-10-28 17:26 UTC (permalink / raw
To: gentoo-commits
commit: 95b017ba6e25970976a2f562400362c0ec369ea5
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 17:26:13 2012 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 17:26:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=95b017ba
x11-misc/trivdm: Version bump, regular agetty style uname and clock, metal theme.
Package-Manager: portage-2.1.11.30
Manifest-Sign-Key: 62EEF090
---
x11-misc/trivdm/ChangeLog | 7 ++
x11-misc/trivdm/Manifest | 15 -----
x11-misc/trivdm/files/trivdm-0_p20120423 | 63 --------------------
.../{trivdm-0_p20120321 => trivdm-0_p20121028} | 7 +-
..._p20120423.ebuild => trivdm-0_p20121028.ebuild} | 0
5 files changed, 11 insertions(+), 81 deletions(-)
diff --git a/x11-misc/trivdm/ChangeLog b/x11-misc/trivdm/ChangeLog
index 1e4d35c..f782e98 100644
--- a/x11-misc/trivdm/ChangeLog
+++ b/x11-misc/trivdm/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trivdm-0_p20121028 (28 Oct 2012)
+
+ 28 Oct 2012; Michael Weber <xmw@gentoo.org> -files/trivdm-0_p20120321,
+ -files/trivdm-0_p20120423, -trivdm-0_p20120423.ebuild,
+ +files/trivdm-0_p20121028, +trivdm-0_p20121028.ebuild:
+ Version bump, regular agetty style uname and clock, metal theme.
+
25 Apr 2012; Michael Weber <xmw@gentoo.org> -trivdm-0_p20120321.ebuild:
Remove old version
diff --git a/x11-misc/trivdm/Manifest b/x11-misc/trivdm/Manifest
deleted file mode 100644
index 810f5f6..0000000
--- a/x11-misc/trivdm/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
------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_p20120423.ebuild 1716 RMD160 49eebd9c396245e593c826a5b113f13e1ac23eae SHA1 96009deaa3d5cb184a40cc8ca0ef78e8d2fb852c SHA256 f3a860912c37d5d51520c0aa725dac6a993631992be535c268c51b20c7b753c4
-MISC ChangeLog 1272 RMD160 bb1e22db64bc3279a538d16283ed93de9d0fb47b SHA1 cd85d56d02f56ca1a676230979958cae3b620a0d SHA256 e73a203eef5f68292b25871d40ffa97d93ba2282d8d81d936c8ce7c74ce172d3
-MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk+YF8oACgkQknrdDGLu8JAJNQD/UZPNeb7j4WTMoeLuKXXX/O5c
-cJQPdAIECmjKhLd9hysA/jdtq4lsMan2fW1Cetr8AwsNSI86yeU4h8eGXottyyx5
-=8erp
------END PGP SIGNATURE-----
diff --git a/x11-misc/trivdm/files/trivdm-0_p20120423 b/x11-misc/trivdm/files/trivdm-0_p20120423
deleted file mode 100644
index 2470cdd..0000000
--- a/x11-misc/trivdm/files/trivdm-0_p20120423
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/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/files/trivdm-0_p20120321 b/x11-misc/trivdm/files/trivdm-0_p20121028
similarity index 91%
rename from x11-misc/trivdm/files/trivdm-0_p20120321
rename to x11-misc/trivdm/files/trivdm-0_p20121028
index 5336dd6..31b4481 100644
--- a/x11-misc/trivdm/files/trivdm-0_p20120321
+++ b/x11-misc/trivdm/files/trivdm-0_p20121028
@@ -27,10 +27,11 @@ case $NAME in
esac
clear
-toilet --font mono9 --gay $(hostname) | awk \
+toilet --font mono9 --metal $(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'
-print -n "Usage: <username>[/<session type>]|!halt|!reboot
+ | sed 's/ *$//g;/^$/d' ; echo
+( uname -srp ; echo " (" ; date +%H:%M:%S ; echo ")" ) | tr -d '\n'
+print -n "\n\nUsage: <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:'
diff --git a/x11-misc/trivdm/trivdm-0_p20120423.ebuild b/x11-misc/trivdm/trivdm-0_p20121028.ebuild
similarity index 100%
rename from x11-misc/trivdm/trivdm-0_p20120423.ebuild
rename to x11-misc/trivdm/trivdm-0_p20121028.ebuild
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/
@ 2013-07-07 0:39 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2013-07-07 0:39 UTC (permalink / raw
To: gentoo-commits
commit: dc56f06bfc12ba788334c5a450254233fe719aaa
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 00:39:11 2013 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 00:39:11 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=dc56f06b
Version bump
Package-Manager: portage-2.2.0_alpha186
Manifest-Sign-Key: 62EEF090
---
x11-misc/trivdm/ChangeLog | 10 ++++++++--
.../trivdm/files/{trivdm-0_p20121028 => trivdm-0_p20130707} | 6 +++---
.../{trivdm-0_p20121028.ebuild => trivdm-0_p20130707.ebuild} | 6 +++---
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/x11-misc/trivdm/ChangeLog b/x11-misc/trivdm/ChangeLog
index f782e98..47d3c93 100644
--- a/x11-misc/trivdm/ChangeLog
+++ b/x11-misc/trivdm/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for x11-misc/trivdm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trivdm-0_p20130707 (07 Jul 2013)
+
+ 07 Jul 2013; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20130707,
+ +trivdm-0_p20130707.ebuild, -files/trivdm-0_p20121028,
+ -trivdm-0_p20121028.ebuild:
+ Version bump
+
*trivdm-0_p20121028 (28 Oct 2012)
28 Oct 2012; Michael Weber <xmw@gentoo.org> -files/trivdm-0_p20120321,
@@ -44,4 +51,3 @@
23 Sep 2011; Michael Weber <xmw@gentoo.org> +files/trivdm-0_p20110921,
+trivdm-0_p20110921.ebuild, +metadata.xml:
Initial import
-
diff --git a/x11-misc/trivdm/files/trivdm-0_p20121028 b/x11-misc/trivdm/files/trivdm-0_p20130707
similarity index 93%
rename from x11-misc/trivdm/files/trivdm-0_p20121028
rename to x11-misc/trivdm/files/trivdm-0_p20130707
index 31b4481..52eecad 100644
--- a/x11-misc/trivdm/files/trivdm-0_p20121028
+++ b/x11-misc/trivdm/files/trivdm-0_p20130707
@@ -6,10 +6,10 @@
# groupadd --system trivdm ; useradd --system -g trivdm -G wheel trivdm
# chmod u+s /usr/bin/chvt
-NAME=$(basename $0) ; USER=trivdm ; LANG=C
+NAME=$(basename $0) ; USER=trivdm ; LANG=C ; TTYNUM=7
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$" | \
+w() { ps haxo ruser,tty,comm | egrep -v "$USER|tty${TTYNUM}|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\' }
@@ -18,7 +18,7 @@ case $NAME in
gdmflexiserver)
[ "$1" = "-ls" ] && exec chvt 7 || exec /usr/bin/gdmflexiserver $@ ;;
trivdm.start)
- chvt 7 ; exec setfont sun12x22 ;;
+ chvt ${TTYNUM} ; exec setfont sun12x22 ;;
w)
w ; exec /usr/bin/w $@ ;;
*)
diff --git a/x11-misc/trivdm/trivdm-0_p20121028.ebuild b/x11-misc/trivdm/trivdm-0_p20130707.ebuild
similarity index 96%
rename from x11-misc/trivdm/trivdm-0_p20121028.ebuild
rename to x11-misc/trivdm/trivdm-0_p20130707.ebuild
index 1021f2f..e69e043 100644
--- a/x11-misc/trivdm/trivdm-0_p20121028.ebuild
+++ b/x11-misc/trivdm/trivdm-0_p20130707.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit eutils
+inherit eutils user
DESCRIPTION="trivial display manager"
HOMEPAGE="http://xmw.de/tmp/trivdm"
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-07-07 0:39 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-07 0:39 [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/ Michael Weber
-- strict thread matches above, loose matches on Subject: below --
2012-10-28 17:26 Michael Weber
2012-04-23 8:29 Michael Weber
2012-03-21 19:58 Michael Weber
2011-10-10 22:04 Michael Weber
2011-09-27 21:51 Michael Weber
2011-09-27 21:49 Michael Weber
2011-09-23 22:08 Michael Weber
2011-09-23 21:52 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox