Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a61001e2170908aa4d634542465941c603db96ec)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a61001e2170908aa4d634542465941c603db96ec)
  • Date: Sun, 22 Jan 2012 04:12:43 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

xorg-data/xkeyboard-config/DETAILS | 6 +++---
xorg-data/xkeyboard-config/HISTORY | 9 ++++-----
xorg-data/xkeyboard-config/PRE_BUILD | 8 ++++++++
3 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit a61001e2170908aa4d634542465941c603db96ec
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-data/xkeyboard-config: fixed security issue mentioned at
http://www.phoronix.com/scan.php?page=news_item&px=MTA0NTA

commit 92f07c2237be5c394e6ffa96c64eae4937ac0132
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

Revert "xorg-data/xkeyboard-config: version 2.5, fixes security issue
that"

This reverts commit c09757e99e4f3cf4012a4ffb05c0d132ec414f76.

seems to be incompatible with our version of X11

diff --git a/xorg-data/xkeyboard-config/DETAILS
b/xorg-data/xkeyboard-config/DETAILS
index 3fcc121..13525c2 100755
--- a/xorg-data/xkeyboard-config/DETAILS
+++ b/xorg-data/xkeyboard-config/DETAILS
@@ -1,9 +1,9 @@
SPELL=xkeyboard-config
- VERSION=2.5
+ VERSION=2.0
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:36691d609dca6dbc5eac75f80e81721dbfc869baabe50a3f2b81bc6b9f0d87404ab137799d6bb4dd8a69a46e2dd67f0f8e6ab46b3da0b76cea9db7905f974ec4
+
SOURCE_HASH=sha512:2ccbfedf7bbf8138c1982c2e4d97cef51090fb6f3fdf4643843c73e306d8a9805d93b7c4ca269f922c86a4c999cdcc86b4fb4dbf6bc233112c7f8dc4e058c3ec
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://xorg.freedesktop.org/archive/individual/data/$SOURCE
+ SOURCE_URL[0]=http://people.freedesktop.org/~svu/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://xorg.freedesktop.org/
diff --git a/xorg-data/xkeyboard-config/HISTORY
b/xorg-data/xkeyboard-config/HISTORY
index 4207b85..2d63410 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,9 +1,8 @@
-2012-01-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 2.5, SECURITY_PATCH++
- fixes the issue mentioned at
+2012-01-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD: fixed security issue mentioned at
http://www.phoronix.com/scan.php?page=news_item&px=MTA0NTA
- where any user could terminate the screensaver by pressing
- CTRL+ALT+numpad multiply
+ which allows any user to unlock a locked screen
+ * DETAILS: SECURITY_PATCH++

2011-08-19 Bor Kraljič <pyrobor AT ver.si>
* BUILD: commented unrecognized option (issue #30)
diff --git a/xorg-data/xkeyboard-config/PRE_BUILD
b/xorg-data/xkeyboard-config/PRE_BUILD
new file mode 100755
index 0000000..c74cfb2
--- /dev/null
+++ b/xorg-data/xkeyboard-config/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+find symbols -type f -exec sed \
+ -e 's/XF86_Ungrab/NoSymbol/g' \
+ -e 's/XF86_ClearGrab/NoSymbol/g' \
+ -e 's/XF86_LogWindowTree/NoSymbol/g' \
+ -e 's/XF86_LogGrabInfo/NoSymbol/g' \
+ -i {} +



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a61001e2170908aa4d634542465941c603db96ec), Florian Franzmann, 01/22/2012

Archive powered by MHonArc 2.6.24.

Top of Page