Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6b11cd283ca15e3d56f8fcc259d27aadc8fa5d41)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6b11cd283ca15e3d56f8fcc259d27aadc8fa5d41)
  • Date: Sun, 22 Jan 2012 19:12:14 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

shell-term-fm/rdesktop/DEPENDS | 7 ++++++-
shell-term-fm/rdesktop/HISTORY | 5 +++++
shell-term-fm/rdesktop/PRE_BUILD | 4 ++++
shell-term-fm/rdesktop/config.patch | 11 +++++++++++
xorg-data/xkeyboard-config/DETAILS | 1 -
xorg-data/xkeyboard-config/HISTORY | 6 ------
xorg-data/xkeyboard-config/PRE_BUILD | 8 --------
7 files changed, 26 insertions(+), 16 deletions(-)

New commits:
commit 6b11cd283ca15e3d56f8fcc259d27aadc8fa5d41
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "xorg-data/xkeyboard-config: fixed security issue mentioned at"

This reverts commit a61001e2170908aa4d634542465941c603db96ec.

commit 62ab739f836b2f89c78c8ee79d8d2e387cd53106
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

rdesktop: added libvncserver optional dependency

diff --git a/shell-term-fm/rdesktop/DEPENDS b/shell-term-fm/rdesktop/DEPENDS
index 0572b1d..f517441 100755
--- a/shell-term-fm/rdesktop/DEPENDS
+++ b/shell-term-fm/rdesktop/DEPENDS
@@ -3,4 +3,9 @@ if list_find $RDESKTOP_SOUND alsa; then
depends alsa-lib
elif list_find $RDESKTOP_SOUND libao; then
depends libao
-fi
+fi &&
+
+optional_depends libvncserver \
+ "--with-libvncserver" \
+ "--without-libvncserver" \
+ "to build rdp2vnc"
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index 117b112..e52b415 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,8 @@
+2012-01-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added libvncserver optional dependency
+ * PRE_BUILD: added, to apply the patch
+ * config.patch: added, to fix configure script for broken flags
+
2012-01-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.7.1

diff --git a/shell-term-fm/rdesktop/PRE_BUILD
b/shell-term-fm/rdesktop/PRE_BUILD
new file mode 100755
index 0000000..5aa3cfd
--- /dev/null
+++ b/shell-term-fm/rdesktop/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/config.patch"
diff --git a/shell-term-fm/rdesktop/config.patch
b/shell-term-fm/rdesktop/config.patch
new file mode 100644
index 0000000..a1c5aa1
--- /dev/null
+++ b/shell-term-fm/rdesktop/config.patch
@@ -0,0 +1,11 @@
+--- configure.orig 2012-01-09 17:11:57.000000000 +0400
++++ configure 2012-01-23 02:08:14.837525307 +0400
+@@ -5555,7 +5555,7 @@
+
+
+ # Check whether --with-libvncserver was given.
+-if test "${with_libvncserver+set}" = set; then :
++if test "x$with_libvncserver" != "xno"; then :
+ withval=$with_libvncserver;
+ VNCINC=`$vncserverconfig --cflags`
+
diff --git a/xorg-data/xkeyboard-config/DETAILS
b/xorg-data/xkeyboard-config/DETAILS
index 13525c2..92e917c 100755
--- a/xorg-data/xkeyboard-config/DETAILS
+++ b/xorg-data/xkeyboard-config/DETAILS
@@ -1,6 +1,5 @@
SPELL=xkeyboard-config
VERSION=2.0
- SECURITY_PATCH=1

SOURCE_HASH=sha512:2ccbfedf7bbf8138c1982c2e4d97cef51090fb6f3fdf4643843c73e306d8a9805d93b7c4ca269f922c86a4c999cdcc86b4fb4dbf6bc233112c7f8dc4e058c3ec
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://people.freedesktop.org/~svu/$SOURCE
diff --git a/xorg-data/xkeyboard-config/HISTORY
b/xorg-data/xkeyboard-config/HISTORY
index 2d63410..91b7634 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,9 +1,3 @@
-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
- 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
deleted file mode 100755
index c74cfb2..0000000
--- a/xorg-data/xkeyboard-config/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-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 Vlad Glagolev (6b11cd283ca15e3d56f8fcc259d27aadc8fa5d41), Vlad Glagolev, 01/22/2012

Archive powered by MHonArc 2.6.24.

Top of Page