x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2goclient.git - master (branch) updated: 3.99.3.0-16-g573b457
by git-admin＠x2go.org 12 Dec '12

12 Dec '12

The branch, master has been updated via 573b457d838c1a8455d0a57c7ed095be6c4f0237 (commit) from 202c4095c392d0c6c5bfaf8eb96d43d3229ce156 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 573b457d838c1a8455d0a57c7ed095be6c4f0237 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 12 12:50:19 2012 +0100 disable broken debug code ----------------------------------------------------------------------- Summary of changes: onmainwindow.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 76f8ba9..1f2e2b7 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -261,7 +261,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) QDesktopWidget wd; - x2goDebug<<"primary screen geometry: "<<wd.screenGeometry(wd.screenNumber(this)); + //x2goDebug<<"primary screen geometry: "<<wd.screenGeometry(wd.screenNumber(this)); if ( wd.screenGeometry(wd.screenNumber(this)).width() <1024 || wd.screenGeometry(wd.screenNumber(this)).height() <768 ) @@ -9375,7 +9375,7 @@ void ONMainWindow::slotSetProxyWinFullscreen() void ONMainWindow::resizeProxyWinOnDisplay(int disp) { QRect geom=QApplication::desktop()->screenGeometry(disp-1); - x2goDebug<<"resizing proxy win to fit display "<<disp<<"("<<geom<<")"<<endl; + //x2goDebug<<"resizing proxy win to fit display "<<disp<<"("<<geom<<")"<<endl; #ifdef Q_OS_LINUX XSync(QX11Info::display(),false); XMoveWindow(QX11Info::display(), proxyWinId,geom.x(),geom.y()); @@ -9425,7 +9425,7 @@ void ONMainWindow::slotConfigXinerama() if (newGeometry==lastDisplayGeometry) return; lastDisplayGeometry=newGeometry; - x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl; +// x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl; QDesktopWidget* root=QApplication::desktop(); QList<QRect> newXineramaScreens; for (int i=0; i< root->numScreens(); ++i) @@ -9437,17 +9437,17 @@ void ONMainWindow::slotConfigXinerama() intersection=root->screenGeometry(i).intersected(lastDisplayGeometry); if (!intersection.isNull()) { - x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl; +// x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl; intersection.moveLeft(intersection.x()-lastDisplayGeometry.x()); intersection.moveTop(intersection.y()-lastDisplayGeometry.y()); - x2goDebug<<"xinerama screen: "<<intersection<<endl; +// x2goDebug<<"xinerama screen: "<<intersection<<endl; newXineramaScreens<<intersection; } } if (xineramaScreens != newXineramaScreens) { xineramaScreens=newXineramaScreens; - x2goDebug<<"xinerama screen changed, new screens: "<<xineramaScreens<<endl; +// x2goDebug<<"xinerama screen changed, new screens: "<<xineramaScreens<<endl; xineramaTimer->stop(); QStringList screens; foreach (QRect disp, xineramaScreens) hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.3.0-15-g202c409
by git-admin＠x2go.org 12 Dec '12

12 Dec '12

The branch, master has been updated via 202c4095c392d0c6c5bfaf8eb96d43d3229ce156 (commit) from 23fbfaff062912fa4f5d42c6fac8e2f6f48ede6a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 202c4095c392d0c6c5bfaf8eb96d43d3229ce156 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 12 12:44:26 2012 +0100 Get rid of br html tags in client<->broker communication (closes upstream issue #81). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ httpbrokerclient.cpp | 17 ++++++++++++----- httpbrokerclient.h | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6b2831a..65d859b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (3.99.3.1): - Update German translation file. + - Get rid of br html tags in client<->broker communication (closes + upstream issue #81). [ Terje Andersen ] * New upstream version (3.99.3.1): diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index 3788600..f994891 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -319,16 +319,18 @@ void HttpBrokerClient::testConnection() } -void HttpBrokerClient::createIniFile(const QString& content) +void HttpBrokerClient::createIniFile(const QString& raw_content) { + QString content; + content = raw_content; + content.replace("<br>","\n"); + x2goDebug<<"inifile content: "<<content<<"\n"; QString cont; - QStringList lines=content.split("START_USER_SESSIONS<br>"); + QStringList lines=content.split("START_USER_SESSIONS\n"); if (lines.count()>1) { cont=lines[1]; - cont=cont.split("END_USER_SESSIONS")[0]; - cont.replace("\n",""); - cont.replace("<br>","\n"); + cont=cont.split("END_USER_SESSIONS\n")[0]; } mainWindow->config.iniFile=cont; } @@ -449,6 +451,7 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error ) void HttpBrokerClient::parseSession(QString sinfo) { + x2goDebug<<"starting parser\n"; QStringList lst=sinfo.split("SERVER:",QString::SkipEmptyParts); int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----"); QString endStr="-----END DSA PRIVATE KEY-----"; @@ -460,11 +463,15 @@ void HttpBrokerClient::parseSession(QString sinfo) config->serverIp=words[0]; if (words.count()>1) config->sshport=words[1]; + x2goDebug<<"server IP: "<<config->serverIp<<"\n"; + x2goDebug<<"server port: "<<config->sshport<<"\n"; if (sinfo.indexOf("SESSION_INFO")!=-1) { QStringList lst=sinfo.split("SESSION_INFO:",QString::SkipEmptyParts); config->sessiondata=(lst[1].split("\n"))[0]; + x2goDebug<<"session data: "<<config->sessiondata<<"\n"; } + x2goDebug<<"parsing has finished\n"; emit sessionSelected(); } diff --git a/httpbrokerclient.h b/httpbrokerclient.h index bb7e9cd..725989b 100644 --- a/httpbrokerclient.h +++ b/httpbrokerclient.h @@ -48,7 +48,7 @@ private: bool sshBroker; SshMasterConnection* sshConnection; private: - void createIniFile(const QString& content); + void createIniFile(const QString& raw_content); void parseSession(QString sInfo); void createSshConnection(); bool checkAccess(QString answer); hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-105-g381bbae
by git-admin＠x2go.org 12 Dec '12

12 Dec '12

The branch, master has been updated via 381bbae19c69112d37ed7fbef28f32c87ea1f17b (commit) via 309d4caa7717da5b3bec843e97dfd188567ef485 (commit) from 4110b7c3d0b6888022e17799856f59e0c99684f5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 381bbae19c69112d37ed7fbef28f32c87ea1f17b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 12 12:24:24 2012 +0100 apply CFLAGS patch to libx2go-server-db-perl/Makefile, as the sgid wrapper build has been moved to that file for 3.2.0.0 commit 309d4caa7717da5b3bec843e97dfd188567ef485 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 12 12:20:41 2012 +0100 Honour CFLAGS when compiling the server's sgid wrapper script (closes upstream.issue #83). Conflicts (resolved by Mike Gabriel): x2goserver/Makefile ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ libx2go-server-db-perl/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 03e44ed..07c485f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,11 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low - Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream issue #67). + [ Orion Poplawski ] + * New upstream version (3.1.1.10): + - Honour CFLAGS when compiling the server's sgid wrapper script (closes + upstream.issue #83). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 15:35:48 +0100 x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile index bde1379..3d57f2d 100755 --- a/libx2go-server-db-perl/Makefile +++ b/libx2go-server-db-perl/Makefile @@ -35,7 +35,7 @@ all: clean build build: build-arch build-indep build-arch: - gcc -fPIE -pie -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c + gcc -fPIE -pie $(CFLAGS) -o lib/libx2go-server-db-sqlite3-wrapper src/libx2go-server-db-sqlite3-wrapper.c build-indep: hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.9-6-ga306e36
by git-admin＠x2go.org 12 Dec '12

12 Dec '12

The branch, release/3.1.1.x has been updated via a306e368163608e4e8c3f6b7bf462b67654908e4 (commit) from 5a0b2cacaf99cefe524fd398b072aecb0710bbd7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a306e368163608e4e8c3f6b7bf462b67654908e4 Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Wed Dec 12 12:20:41 2012 +0100 Honour CFLAGS when compiling the server's sgid wrapper script (closes upstream.issue #83). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ x2goserver/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b703359..b3e7b4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,11 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low - Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream issue #67). + [ Orion Poplawski ] + * New upstream version (3.1.1.10): + - Honour CFLAGS when compiling the server's sgid wrapper script (closes + upstream.issue #83). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 15:35:48 +0100 x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 979283b..4f93d24 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -37,7 +37,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - gcc -fPIE -pie -o x2gosqlitewrapper x2gosqlitewrapper.c + gcc -fPIE -pie $(CFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

python-paramiko.git - x2go (branch) updated: 5132d4bc7c39d8dcbd5e751f2a1a0e5268cae4f3
by git-admin＠x2go.org 11 Dec '12

11 Dec '12

The branch, x2go has been updated via 5132d4bc7c39d8dcbd5e751f2a1a0e5268cae4f3 (commit) from f66c2d38dbe1643e5b1b827aa3ff857f4d936748 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5132d4bc7c39d8dcbd5e751f2a1a0e5268cae4f3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 11 15:31:04 2012 +0100 for the ppa:x2go we have to depend on python-crypto 2.1.0-0~... ----------------------------------------------------------------------- Summary of changes: debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 66693ff..4b63cd2 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: debhelper (>= 8.0.0~), python-all (>= 2.6.5-0~), - python-crypto (>= 2.1.0-2~), + python-crypto (>= 2.1.0-0~), python-epydoc, quilt, Standards-Version: 3.9.3 @@ -20,7 +20,7 @@ Package: python-paramiko Architecture: all Depends: ${misc:Depends}, ${python:Depends}, - python-crypto (>= 2.1.0-2~) + python-crypto (>= 2.1.0-0~) Provides: ${python:Provides} Description: Make ssh v2 connections with Python This is a library for making SSH2 connections (client or server). hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-paramiko.git" (Debian package python-paramiko).

1 0

python-paramiko.git - x2go (branch) updated: f66c2d38dbe1643e5b1b827aa3ff857f4d936748
by git-admin＠x2go.org 11 Dec '12

11 Dec '12

The branch, x2go has been updated via f66c2d38dbe1643e5b1b827aa3ff857f4d936748 (commit) from f387240a2b648081e403982d865e13e6ebda996f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f66c2d38dbe1643e5b1b827aa3ff857f4d936748 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 11 15:21:19 2012 +0100 version fix, add ~ char for python-crypto dependencies... ----------------------------------------------------------------------- Summary of changes: debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 897436f..66693ff 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: debhelper (>= 8.0.0~), python-all (>= 2.6.5-0~), - python-crypto (>= 2.1.0-2), + python-crypto (>= 2.1.0-2~), python-epydoc, quilt, Standards-Version: 3.9.3 @@ -20,7 +20,7 @@ Package: python-paramiko Architecture: all Depends: ${misc:Depends}, ${python:Depends}, - python-crypto (>= 2.1.0-2) + python-crypto (>= 2.1.0-2~) Provides: ${python:Provides} Description: Make ssh v2 connections with Python This is a library for making SSH2 connections (client or server). hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-paramiko.git" (Debian package python-paramiko).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-103-g4110b7c
by git-admin＠x2go.org 11 Dec '12

11 Dec '12

The branch, master has been updated via 4110b7c3d0b6888022e17799856f59e0c99684f5 (commit) from 88389bf045c33d96260ce5b1c6af92ff5d858e8f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4110b7c3d0b6888022e17799856f59e0c99684f5 Author: Reinhard Tartler <siretart(a)tauware.de> Date: Tue Dec 11 13:51:03 2012 +0100 do not inject the broken NX_libxrandr for kde sessions either I am not abe to reproduce the problem with an updated Kubuntu raring VM. If someone is, please provide a *complete* backtrace with all debugging symbols included. ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2goruncommand | 8 -------- 1 file changed, 8 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index d8d24da..cad9dd2 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -206,14 +206,6 @@ then X2GO_SESS_TYPE="R" fi -if [ "$cmd" == "startkde" ]; then - NX_XRANDR_LIBS=/usr/lib/nx/X11/Xrandr - LD_LIBRARY_PATH="$NX_XRANDR_LIBS:$LD_LIBRARY_PATH" - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "extending LD_LIBRARY_PATH=$LD_LIBRARY_PATH by Xrandr extension" - export LD_LIBRARY_PATH -fi - - # run x2goserver-extensions for pre-runcommand x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" pre-runcommand || true hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

python-paramiko.git - x2go (branch) updated: f387240a2b648081e403982d865e13e6ebda996f
by git-admin＠x2go.org 10 Dec '12

10 Dec '12

The branch, x2go has been updated via f387240a2b648081e403982d865e13e6ebda996f (commit) via 2e7914f8a44aa356cc73ed50c94a0d94bee2055c (commit) from e105d1bf6a99e9d36039708e10973d0bc42267d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f387240a2b648081e403982d865e13e6ebda996f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 10 21:21:49 2012 +0100 Revert "reduce python-crypto dependency to make build against lucid possible" This reverts commit e4601f783903ca327ab0bb1775149daedc1b7fe3. commit 2e7914f8a44aa356cc73ed50c94a0d94bee2055c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 10 21:21:38 2012 +0100 Revert "reduce Dependency of pycrypto for Ubuntu 10.04" This reverts commit e105d1bf6a99e9d36039708e10973d0bc42267d1. ----------------------------------------------------------------------- Summary of changes: debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 45a05fa..897436f 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: debhelper (>= 8.0.0~), python-all (>= 2.6.5-0~), - python-crypto (>= 2.0.1), - python-epydoc, + python-crypto (>= 2.1.0-2), + python-epydoc, quilt, Standards-Version: 3.9.3 Homepage: http://github.com/paramiko @@ -20,7 +20,7 @@ Package: python-paramiko Architecture: all Depends: ${misc:Depends}, ${python:Depends}, - python-crypto (>= 2.0.1-0~) + python-crypto (>= 2.1.0-2) Provides: ${python:Provides} Description: Make ssh v2 connections with Python This is a library for making SSH2 connections (client or server). hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-paramiko.git" (Debian package python-paramiko).

1 0

python-crypto.git - pristine-tar (branch) created: a569c0b8b4163aa87340c304747c9e960a40d594
by git-admin＠x2go.org 10 Dec '12

10 Dec '12

The branch, pristine-tar has been created at a569c0b8b4163aa87340c304747c9e960a40d594 (commit) - Log ----------------------------------------------------------------- commit a569c0b8b4163aa87340c304747c9e960a40d594 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 10 21:16:44 2012 +0100 pristine-tar data for python-crypto_2.1.0.orig.tar.gz ----------------------------------------------------------------------- hooks/post-receive -- python-crypto.git (Debian package python-crypto) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-crypto.git" (Debian package python-crypto).

1 0

python-crypto.git - upstream (branch) created: 916acad3a77181e74c478245ecbc9a214c3a9f9f
by git-admin＠x2go.org 10 Dec '12

10 Dec '12

The branch, upstream has been created at 916acad3a77181e74c478245ecbc9a214c3a9f9f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- python-crypto.git (Debian package python-crypto) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-crypto.git" (Debian package python-crypto).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits