From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D9C3B138010 for ; Sun, 28 Oct 2012 17:26:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D3FB21C059; Sun, 28 Oct 2012 17:26:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F3F3A21C059 for ; Sun, 28 Oct 2012 17:26:19 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 324A733D920 for ; Sun, 28 Oct 2012 17:26:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C1D88E5436 for ; Sun, 28 Oct 2012 17:26:12 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1351445173.95b017ba6e25970976a2f562400362c0ec369ea5.xmw@gentoo> Subject: [gentoo-commits] dev/xmw:master commit in: x11-misc/trivdm/, x11-misc/trivdm/files/ X-VCS-Repository: dev/xmw X-VCS-Files: x11-misc/trivdm/ChangeLog x11-misc/trivdm/Manifest x11-misc/trivdm/files/trivdm-0_p20120321 x11-misc/trivdm/files/trivdm-0_p20120423 x11-misc/trivdm/files/trivdm-0_p20121028 x11-misc/trivdm/trivdm-0_p20120423.ebuild x11-misc/trivdm/trivdm-0_p20121028.ebuild X-VCS-Directories: x11-misc/trivdm/ x11-misc/trivdm/files/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 95b017ba6e25970976a2f562400362c0ec369ea5 X-VCS-Branch: master Date: Sun, 28 Oct 2012 17:26:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a1b09adf-f000-4960-a12a-6dc083bfbbe6 X-Archives-Hash: fc7f55f6ebc2fd92ce6aadd329f1002e commit: 95b017ba6e25970976a2f562400362c0ec369ea5 Author: Michael Weber gentoo org> AuthorDate: Sun Oct 28 17:26:13 2012 +0000 Commit: Michael Weber gentoo 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 -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 -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: [/]|!halt|!reboot - 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 ''} | 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: [/]|!halt|!reboot + | sed 's/ *$//g;/^$/d' ; echo +( uname -srp ; echo " (" ; date +%H:%M:%S ; echo ")" ) | tr -d '\n' +print -n "\n\nUsage: [/]|!halt|!reboot 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