summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-05-29 09:17:50 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-29 09:17:50 +0000
commitba33bb7c0a4af155d0efe0f5b72b75254b0cb91e (patch)
tree471c63adfcd5e24af5dad870950ccbf04f433443 /packages
parent130a448a3293d3918a26c573c3317315c5d8187a (diff)
parent38da3ad2a494bd7d15de59ffea5a1909def1b39f (diff)
merge of a615f71806dc9ceee0102ed403b1e7fe4f948b5d
and aac02cf2eb8931c6f1e4df467cc5ff36a36a2051
Diffstat (limited to 'packages')
-rw-r--r--packages/gpe-login/files/chvt-keylaunch.patch11
-rw-r--r--packages/gpe-login/gpe-login_0.86.bb3
-rw-r--r--packages/keylaunch/files/80chvt-SUID25
-rw-r--r--packages/keylaunch/files/akita/keylaunchrc4
-rw-r--r--packages/keylaunch/files/spitz/keylaunchrc4
-rw-r--r--packages/keylaunch/keylaunch_2.0.10.bb2
6 files changed, 47 insertions, 2 deletions
diff --git a/packages/gpe-login/files/chvt-keylaunch.patch b/packages/gpe-login/files/chvt-keylaunch.patch
new file mode 100644
index 0000000000..5e62a1107e
--- /dev/null
+++ b/packages/gpe-login/files/chvt-keylaunch.patch
@@ -0,0 +1,11 @@
+--- gpe-login-0.86/gpe-login.keylaunchrc.orig 2006-05-28 20:38:39.846547024 +0200
++++ gpe-login-0.86/gpe-login.keylaunchrc 2006-05-28 20:38:56.800969560 +0200
+@@ -1,3 +1,8 @@
+ key=???XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
+ key=???XF86PowerDown:-:/usr/bin/apm --suspend
+ key=???Held XF86PowerDown:-:bl toggle
++
++# VT changing
++key=...*Left:-:~chvt 1
++key=...*Right:-:~chvt 3
++key=...*Escape:-:~/etc/init.d/gpe-dm stop
diff --git a/packages/gpe-login/gpe-login_0.86.bb b/packages/gpe-login/gpe-login_0.86.bb
index f6eb0c921a..1dd6818903 100644
--- a/packages/gpe-login/gpe-login_0.86.bb
+++ b/packages/gpe-login/gpe-login_0.86.bb
@@ -7,7 +7,7 @@ PRIORITY = "optional"
DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
RDEPENDS = "xkbd"
RPROVIDES = "gpe-session-starter"
-PR = "r0"
+PR = "r1"
#apply a patch to set the fontsize for bigdpi (200+) devices to 5
SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1"
@@ -16,3 +16,4 @@ SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append += " file://chvt-keylaunch.patch;patch=1 "
diff --git a/packages/keylaunch/files/80chvt-SUID b/packages/keylaunch/files/80chvt-SUID
new file mode 100644
index 0000000000..e3b4efef5d
--- /dev/null
+++ b/packages/keylaunch/files/80chvt-SUID
@@ -0,0 +1,25 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: chvt-SUID.sh
+# Date: 28-May-06
+
+
+#
+# Sets the SUID bit on chvt to allow changing to the VT from inside X by
+# any user. Since a SUID binary still is a security risk, we chmod only
+# when keylaunch is used and not by default.
+#
+
+for target in /usr/bin/chvt.console-tools
+do
+ if test "`ls -l "$target" | awk '{print $1}'|cut -c 2-4`" != "rws"
+ then
+ echo "Making [$target] SUID root..."
+ chmod u+s "$target"
+ else
+ echo "Ignoring [$target]"
+ fi
+done
diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc
index 0379c719c4..27cce24e93 100644
--- a/packages/keylaunch/files/akita/keylaunchrc
+++ b/packages/keylaunch/files/akita/keylaunchrc
@@ -22,3 +22,7 @@ key=....F18:-:gpe-calendar
#key=....F19:-:
#key=....F19:-:
#key=....F10:-:
+
+# VT changing
+key=...*Left:-:~chvt 1
+key=...*Right:-:~chvt 3
diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc
index f5e1fd70be..433221a586 100644
--- a/packages/keylaunch/files/spitz/keylaunchrc
+++ b/packages/keylaunch/files/spitz/keylaunchrc
@@ -22,3 +22,7 @@ key=....F18:-:gpe-calendar
#key=....F19:-:
#key=....F19:-:
#key=....F10:-:
+
+# VT changing
+key=...*Left:-:~chvt 1
+key=...*Right:-:~chvt 3
diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb
index c06c9c4587..67ed0923f2 100644
--- a/packages/keylaunch/keylaunch_2.0.10.bb
+++ b/packages/keylaunch/keylaunch_2.0.10.bb
@@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
program is already running, keylaunch can bring its window to the front\
rather than just running another copy."
PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r4"
+PR = "r5"
SRC_URI += " file://keylaunchrc"