x2go-commits September 2013

x2go-commits@lists.x2go.org

2 participants
2415 discussions

page changed: wiki:development:build-howto-mswin:x2goclient
by wiki-admin＠x2go.org 20 Sep '13

20 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/20 07:55 Browser : Mozilla/5.0 (Windows NT 6.1; WOW64; rv:23.0) Gecko/20100101 Firefox/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient Edit Summary: User : sunweaver @@ -25,9 +25,9 @@ ==== Installing Qt ==== You need Qt to build X2Go Client from source. Qt-4.8 is tested and recommended for current version of X2Go Client. - Download and install a **minGW** version of Qt-4.8 for Windows from [[http://qt-project.org/downloads|here]] + Download and install a **MinGW** version of Qt-4.8 for Windows from [[http://qt-project.org/downloads|here]] In this example D:\Qt will be chosen as installation directory ==== Configuring Qt ==== @@ -49,28 +49,28 @@ It is recommended to configure Qt to build statically linked applications. It will take some time to reconfigure Qt for static builds. You surely can skip this step, but in this case you must provide Qt libraries with your X2Go Client binary. Open Qt Command Prompt and start configuration script <code> - >configure -release -static -openssl + $ configure -release -static -openssl </code> Rebuild Qt <code> - >make sub-src + $ make sub-src </code> ===== Dynamically linked builds of Qt with SSL support ===== If you choose to build dynamically linked applications with Qt, you still have to rebuild Qt in order to get OpenSSL support into Qt. Open Qt Command Prompt and start configuration script <code> - >configure -release -openssl + $ configure -release -openssl </code> Rebuild Qt <code> - >make sub-src + $ make sub-src </code> ==== Installing libssh ==== -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-mswin:x2goclient
by wiki-admin＠x2go.org 20 Sep '13

20 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/20 07:54 Browser : Mozilla/5.0 (Windows NT 6.1; WOW64; rv:23.0) Gecko/20100101 Firefox/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient Edit Summary: User : sunweaver @@ -31,15 +31,23 @@ In this example D:\Qt will be chosen as installation directory ==== Configuring Qt ==== - It is recommended to configure Qt to build statically linked applications. It will take some time and you can skip that step, but in this case you must provide a Qt libraries with your X2Go Client binary. + ===== Providing OpenSSL support in Qt ===== - As X2Go Client need a Qt with SSL support you must install OpenSSL for windows. You can download OpenSSL for Windows [[http://slproweb.com/download/Win32OpenSSL-1_0_1e.exe|here]] or from [[http://code.x2go.org/releases/binary-win32/3rd-party/Win32OpenSSL/|our site]]. Install it to your system (for example to directory d:\OpenSSL-Win32) + As X2Go Client needs a Qt with SSL support you must install OpenSSL for MS Windows. OpenSSL depends on the [[http://www.microsoft.com/en-us/download/details.aspx?id=29|Microsoft Visual C++ 2008 Redistributables]]. Get that from the Microsoft site and install it prior to installing OpenSSL. - After installation, copy OpenSSL header files into include directory from MinGW + The OpenSSL installer for Windows [[http://slproweb.com/download/Win32OpenSSL-1_0_1e.exe|here]] or from [[http://code.x2go.org/releases/binary-win32/3rd-party/Win32OpenSSL/|our site]]. Install it on your build system (for example to directory ''d:\OpenSSL-Win32''). + After installation, copy OpenSSL header files into MinGW's include directory: + + <code> d:\OpenSSL-Win32\include\openssl -> d:\mingw\include\openssl + </code> + + ===== Static builds of Qt with SSL support ===== + + It is recommended to configure Qt to build statically linked applications. It will take some time to reconfigure Qt for static builds. You surely can skip this step, but in this case you must provide Qt libraries with your X2Go Client binary. Open Qt Command Prompt and start configuration script <code> >configure -release -static -openssl @@ -48,8 +56,23 @@ Rebuild Qt <code> >make sub-src </code> + + ===== Dynamically linked builds of Qt with SSL support ===== + + If you choose to build dynamically linked applications with Qt, you still have to rebuild Qt in order to get OpenSSL support into Qt. + + Open Qt Command Prompt and start configuration script + <code> + >configure -release -openssl + </code> + + Rebuild Qt + <code> + >make sub-src + </code> + ==== Installing libssh ==== You need libssh to build X2Go Client. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-212-gf7f414b
by git-admin＠x2go.org 18 Sep '13

18 Sep '13

The branch, master has been updated via f7f414b7b87e13e89e9eb9109e00562fa6aecc86 (commit) from 5223f882a4ad051a3fdaedf0340cda67c1cd473f (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 f7f414b7b87e13e89e9eb9109e00562fa6aecc86 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 18 23:56:35 2013 +0200 Provide sudoers.d/x2goserver file that allows sudoed commands under KDE (by pertaining the env var QT_GRAPHICSSYSTEM. (Fixes: #276). Conflicts (resolved by Mike Gabriel): debian/x2goserver.install debian/x2goserver.postrm x2goserver/Makefile ----------------------------------------------------------------------- Summary of changes: INSTALL | 1 + debian/changelog | 2 ++ debian/x2goserver.install | 1 + debian/x2goserver.postinst | 6 ++++++ debian/x2goserver.postrm | 6 +++++- x2goserver/Makefile | 5 ++++- x2goserver/etc/sudoers.d/x2goserver | 1 + 7 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 x2goserver/etc/sudoers.d/x2goserver The diff of changes is: diff --git a/INSTALL b/INSTALL index 7a0d689..d71e20a 100644 --- a/INSTALL +++ b/INSTALL @@ -42,6 +42,7 @@ libx2go-server-db-sqlite3-wrapper and x2goprint: $ chown root:x2goprint /usr/bin/x2goprint $ chmod 2755 /usr/bin/x2goprint + $ chown 0440 /etc/sudoers.d/x2goserver 4.) INIT SCRIPT --------------- diff --git a/debian/changelog b/debian/changelog index 42f36f1..2b362eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -68,6 +68,8 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low (Fixes: #278). - Fix automatic keyboard setup (via x2gosetkeyboard) while resuming a session. (Fixes: #285). + - Provide sudoers.d/x2goserver file that allows sudoed commands under + KDE (by pertaining the env var QT_GRAPHICSSYSTEM. (Fixes: #276). * /debian/control: - Update LONG_DESCRIPTIONS. - Move xfonts-base from Recommends: field to Depends: field (bin:package diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 6427950..d8405dd 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -3,5 +3,6 @@ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/lib/x2go* /usr/lib/x2go/ x2goserver/etc/x2go_logout* /etc/x2go/ x2goserver/etc/x2goagent.options /etc/x2go/ +x2goserver/etc/sudoers.d/x2goserver /etc/sudoers.d/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index d7d6952..b4fe116 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -47,6 +47,12 @@ case "$1" in dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper fi + # sudoers.d files have to be installed 0440:root:root + if ! dpkg-statoverride --list /etc/sudoers.d/x2goserver >/dev/null; then + dpkg-statoverride --add --update root root 0440 /etc/sudoers.d/x2goserver + fi + + # create /etc/x2go/applications symlink if not already there (as link or as dir) if ! test -e /etc/x2go/applications; then ln -s /usr/share/applications /etc/x2go/applications diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index d563665..7b1b3a4 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -18,6 +18,10 @@ set -e case "$1" in purge) + if dpkg-statoverride --list /etc/sudoers.d/x2goserver >/dev/null; then + dpkg-statoverride --remove /etc/sudoers.d/x2goserver + fi + rm -Rf /etc/x2go/applications rm -Rf /etc/x2go/x2go_logout.d rmdir --ignore-fail-on-non-empty /etc/x2go @@ -35,4 +39,4 @@ esac #DEBHELPER# -exit 0 \ No newline at end of file +exit 0 diff --git a/x2goserver/Makefile b/x2goserver/Makefile index c7ced06..d0ba7e9 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -70,7 +70,8 @@ install_config: $(INSTALL_FILE) etc/x2goagent.options $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/x2go_logout $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/x2go_logout.d/* $(DESTDIR)$(ETCDIR)/x2go_logout.d/ - + $(INSTALL_DIR) $(DESTDIR)/etc/sudoers.d || true + $(INSTALL_FILE) etc/sudoers.d/x2goserver $(DESTDIR)/etc/sudoers.d/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -99,6 +100,8 @@ uninstall_config: $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2go_logout $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d || true $(RM_DIR) $(DESTDIR)$(ETCDIR) || true + $(RM_FILE) $(DESTDIR)/etc/sudoers.d/x2goserver + $(RM_DIR) $(DESTDIR)/etc/sudoers.d || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done diff --git a/x2goserver/etc/sudoers.d/x2goserver b/x2goserver/etc/sudoers.d/x2goserver new file mode 100644 index 0000000..8d4cd73 --- /dev/null +++ b/x2goserver/etc/sudoers.d/x2goserver @@ -0,0 +1 @@ +Defaults env_keep +="QT_GRAPHICSSYSTEM" 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 - master (branch) updated: 3.1.1.3-211-g5223f88
by git-admin＠x2go.org 18 Sep '13

18 Sep '13

The branch, master has been updated via 5223f882a4ad051a3fdaedf0340cda67c1cd473f (commit) from 88acc5fef88df9c2e40b8ba356b950f5ee519848 (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 5223f882a4ad051a3fdaedf0340cda67c1cd473f Author: Jürgen Hötzel <juergen(a)archlinux.org> Date: Wed Sep 11 21:21:33 2013 +0200 Use bash-builtin 'type' instead of to be avoided 'which'. (Fixes: #305). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2goserver/bin/x2goruncommand | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b6ffa89..42f36f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,6 +73,10 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low - Move xfonts-base from Recommends: field to Depends: field (bin:package x2goserver). + [ Jürgen Hötzel ] + * New upstream version (4.0.1.7): + - Use bash-builtin 'type' instead of to be avoided 'which'. (Fixes: #305). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 13:37:12 +0200 x2goserver (4.0.1.6-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 64469ed..7dcc7fb 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -194,14 +194,14 @@ if [ "$cmd" == "TERMINAL" ]; then fi fi -EXEC=`which $cmd` +EXEC=`type -P $cmd` EXEC_WRAPPER="" BNAME=`basename "$EXEC"` if [ "$BNAME" == "rdesktop" ] then IMEXIT="true" - if which padsp >/dev/null; then + if type padsp >/dev/null; then EXEC_WRAPPER="padsp" args=" -r sound:local" fi 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/4.0.1.x (branch) updated: 4.0.1.6-8-geff2d25
by git-admin＠x2go.org 18 Sep '13

18 Sep '13

The branch, release/4.0.1.x has been updated via eff2d25a50671382d578e3fc9a9f0a1e04f75bb1 (commit) from 057048d2f62841894c39a2ca00cd5a62a529d02f (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 eff2d25a50671382d578e3fc9a9f0a1e04f75bb1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 18 23:56:35 2013 +0200 Provide sudoers.d/x2goserver file that allows sudoed commands under KDE (by pertaining the env var QT_GRAPHICSSYSTEM. (Fixes: #276). ----------------------------------------------------------------------- Summary of changes: INSTALL | 1 + debian/changelog | 2 ++ debian/x2goserver.install | 3 ++- debian/x2goserver.postinst | 6 ++++++ debian/x2goserver.postrm | 3 +++ x2goserver/Makefile | 4 ++++ x2goserver/etc/sudoers.d/x2goserver | 1 + 7 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 x2goserver/etc/sudoers.d/x2goserver The diff of changes is: diff --git a/INSTALL b/INSTALL index 4bbf432..c006039 100644 --- a/INSTALL +++ b/INSTALL @@ -41,6 +41,7 @@ Configure ownership, permissions and setgid group bits of x2gosqlitewrapper and $ chown root:x2goprint /usr/bin/x2goprint $ chmod 2755 /usr/bin/x2goprint + $ chown 0440 /etc/sudoers.d/x2goserver 4.) INIT SCRIPT --------------- diff --git a/debian/changelog b/debian/changelog index 9ac7b64..ae4f45c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low (Fixes: #278). - Fix automatic keyboard setup (via x2gosetkeyboard) while resuming a session. (Fixes: #285). + - Provide sudoers.d/x2goserver file that allows sudoed commands under + KDE (by pertaining the env var QT_GRAPHICSSYSTEM. (Fixes: #276). * /debian/control: - Update LONG_DESCRIPTIONS. - Move xfonts-base from Recommends: field to Depends: field (bin:package diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 4ed8986..5cd66c7 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,7 +1,8 @@ x2goserver/bin/x2go* /usr/bin/ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/lib/x2go* /usr/lib/x2go/ -x2goserver/etc/* /etc/x2go/ +x2goserver/etc/x2go* /etc/x2go/ +x2goserver/etc/sudoers.d/x2goserver /etc/sudoers.d x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/x2gosqlitewrapper /usr/lib/x2go/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 2837629..5ef2357 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -98,6 +98,12 @@ case "$1" in dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/x2gosqlitewrapper fi + # sudoers.d files have to be installed 0440:root:root + if ! dpkg-statoverride --list /etc/sudoers.d/x2goserver >/dev/null; then + dpkg-statoverride --add --update root root 0440 /etc/sudoers.d/x2goserver + fi + + # create /etc/x2go/applications symlink if not already there (as link or as dir) if ! test -e /etc/x2go/applications; then ln -s /usr/share/applications /etc/x2go/applications diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index 2d965cc..f3666b3 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -21,6 +21,9 @@ case "$1" in if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper >/dev/null; then dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper fi + if dpkg-statoverride --list /etc/sudoers.d/x2goserver >/dev/null; then + dpkg-statoverride --remove /etc/sudoers.d/x2goserver + fi echo "Removing x2go session database" >&2 rm -vf /var/lib/x2go/x2go_sessions rm -vf /etc/x2go/x2gosql/passwords/pgadmin diff --git a/x2goserver/Makefile b/x2goserver/Makefile index d324bc5..828ce1a 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -84,6 +84,8 @@ install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d $(INSTALL_FILE) etc/x2go_logout $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/x2go_logout.d/* $(DESTDIR)$(ETCDIR)/x2go_logout.d/ + $(INSTALL_DIR) $(DESTDIR)/etc/sudoers.d || true + $(INSTALL_FILE) etc/sudoers.d/x2goserver $(DESTDIR)/etc/sudoers.d/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -114,6 +116,8 @@ uninstall_config: $(RM_DIR) $(DESTDIR)$(ETCDIR) || true $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true + $(RM_FILE) $(DESTDIR)/etc/sudoers.d/x2goserver + $(RM_DIR) $(DESTDIR)/etc/sudoers.d || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done diff --git a/x2goserver/etc/sudoers.d/x2goserver b/x2goserver/etc/sudoers.d/x2goserver new file mode 100644 index 0000000..8d4cd73 --- /dev/null +++ b/x2goserver/etc/sudoers.d/x2goserver @@ -0,0 +1 @@ +Defaults env_keep +="QT_GRAPHICSSYSTEM" 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

x2gobroker.git - master (branch) updated: 0.0.2.3-21-ga09cb5d
by git-admin＠x2go.org 18 Sep '13

18 Sep '13

The branch, master has been updated via a09cb5d919db85333e4e45d4935f430dbee8a8f2 (commit) from 8a8ad57326d713aa46ef00d17ad8b9a95620ba40 (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 a09cb5d919db85333e4e45d4935f430dbee8a8f2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 18 23:28:03 2013 +0200 Revert "Do not let the broker crash if an agent is not reachable. Capture X2GoBrokerAgentExceptions when pinging the remote agent." This reverts commit 8a8ad57326d713aa46ef00d17ad8b9a95620ba40. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 -- x2gobroker/brokers/base_broker.py | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6cf3969..9628994 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,6 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Get the cookie based extra-authentication working for SSH mode. - Get the cookie based extra-authentication working for HTTP mode. - Fix output of HTTP based connectivity test. - - Do not let the broker crash if an agent is not reachable. Capture - X2GoBrokerAgentExceptions when pinging the remote agent. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 7254377..3a7aa7a 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -816,11 +816,8 @@ class X2GoBroker(object): remote_agent_port = profile[u'sshport'] remote_agent = {u'hostname': remote_agent_server, u'port': remote_agent_port, } - try: - if x2gobroker.agent.ping(query_mode=agent_query_mode, remote_agent=remote_agent): - break - except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException: - pass + if x2gobroker.agent.ping(query_mode=agent_query_mode, remote_agent=remote_agent): + break server_list = server_list[0:-1] hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-22-g98a3df6
by git-admin＠x2go.org 18 Sep '13

18 Sep '13

The branch, master has been updated via 98a3df64e2c149490afa98293e22c3882f57b6f5 (commit) from a09cb5d919db85333e4e45d4935f430dbee8a8f2 (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 98a3df64e2c149490afa98293e22c3882f57b6f5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 18 23:28:36 2013 +0200 Do not let the broker crash if an agent is not reachable. Capture X2GoBrokerAgentExceptions when pinging the remote agent. (Fixes: #306). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9628994..1424b3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Get the cookie based extra-authentication working for SSH mode. - Get the cookie based extra-authentication working for HTTP mode. - Fix output of HTTP based connectivity test. + - Do not let the broker crash if an agent is not reachable. Capture + X2GoBrokerAgentExceptions when pinging the remote agent. (Fixes: #306). * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 3a7aa7a..7254377 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -816,8 +816,11 @@ class X2GoBroker(object): remote_agent_port = profile[u'sshport'] remote_agent = {u'hostname': remote_agent_server, u'port': remote_agent_port, } - if x2gobroker.agent.ping(query_mode=agent_query_mode, remote_agent=remote_agent): - break + try: + if x2gobroker.agent.ping(query_mode=agent_query_mode, remote_agent=remote_agent): + break + except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException: + pass server_list = server_list[0:-1] hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-6-g56785cb
by git-admin＠x2go.org 18 Sep '13

18 Sep '13

The branch, master has been updated via 56785cbc26c68ff4704b347add58ea559956aa5f (commit) from 2fd089264b743449013522b386e7fc8086a552ae (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 56785cbc26c68ff4704b347add58ea559956aa5f Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Wed Sep 18 13:45:34 2013 +0200 - support for keys "shadowuser" "shadowdisplay" and "shadowmode" in config file. This allow to choose default display for shadow sessions ----------------------------------------------------------------------- Summary of changes: config_linux_static_plugin.sh | 4 +++- debian/changelog | 6 ++++++ onmainwindow.cpp | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/config_linux_static_plugin.sh b/config_linux_static_plugin.sh index 4776a3c..f5efaf2 100755 --- a/config_linux_static_plugin.sh +++ b/config_linux_static_plugin.sh @@ -2,5 +2,7 @@ make distclean +lrelease x2goclient.pro + export X2GO_LINUX_STATIC=x2go_linux_static -X2GO_CLIENT_TARGET=plugin /usr/local/Trolltech/Qt-4.7.1/bin/qmake -config release -spec linux-g++ +X2GO_CLIENT_TARGET=plugin /usr/local/Trolltech/Qt-4.8.5/bin/qmake -config release -spec linux-g++ diff --git a/debian/changelog b/debian/changelog index 1af832e..9075947 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (4.0.1.2): + Provide Keywords: key in .desktop file. * Pull-in packaging changes from Debian. + [ Oleksandr Shneyder ] + * New upstream version (4.0.1.2): + - support for keys "shadowuser" "shadowdisplay" and "shadowmode" in + config file. This allow to choose default display for shadow sessions + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 11 Sep 2013 12:17:43 +0200 x2goclient (4.0.1.1-0~x2go1) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index e77360f..6a3fb66 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -4339,6 +4339,31 @@ void ONMainWindow::selectSession ( QStringList& sessions ) filterDesktops ( "" ); desktopFilter->setFocus(); desktopFilter->selectAll(); + if ( !embedMode ) + { + X2goSettings* st; + + if (!brokerMode) + { + st=new X2goSettings( "sessions" ); + + QString sid=lastSession->id(); + QString suser = st->setting()->value(sid + "/shadowuser", (QVariant) QString::null).toString(); + QString sdisplay = st->setting()->value(sid + "/shadowdisplay", (QVariant) QString::null).toString(); + bool fullAccess= st->setting()->value(sid + "/shadowfullaccess", (QVariant) false).toBool(); + if(suser != QString::null && sdisplay != QString::null) + { + shadowUser=suser; + shadowDisplay=sdisplay; + if(fullAccess) + shadowMode=SHADOW_FULL; + else + shadowMode=SHADOW_VIEWONLY; + startNewSession(); + return; + } + } + } } sessTv->setCurrentIndex ( sessTv->model()->index ( 0, 0 ) ); 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

page changed: wiki:development:build-howto-mswin:x2goclient
by wiki-admin＠x2go.org 18 Sep '13

18 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/18 10:24 Browser : Mozilla/5.0 (Windows NT 6.1; WOW64; rv:23.0) Gecko/20100101 Firefox/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient Edit Summary: [Build X2Go Client from source] User : sunweaver @@ -74,9 +74,9 @@ Build X2Go Client <code> >cd x2goclient >config_win.bat - >mingw32_make + >mingw32-make </code> X2Go Client (x2goclient.exe) binary is in d:\build\x2goclient\release directory -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-mswin:x2goclient
by wiki-admin＠x2go.org 18 Sep '13

18 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/18 10:22 Browser : Mozilla/5.0 (Windows NT 6.1; WOW64; rv:23.0) Gecko/20100101 Firefox/23.0 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient Edit Summary: [Installing MinGW] User : sunweaver @@ -17,9 +17,11 @@ ==== Installing MinGW ==== MinGW is a gcc compiler for Windows. You need it to build X2Go Client. Qt-4.8 for Windows should be used with MinGw-4.4. Unfortunately, you can not download binaries for this version from MinGW project site any more. You can build it from source or download it from [[http://code.x2go.org/releases/binary-win32/tools/MinGW-gcc440_1.zip|X2Go Site ]] - Extract it to your disk (D:\mingw in this example) + Extract it to your disk (''D:\mingw'' in this example). + + Finally, you have to add these MinGW executable directories to your PATH environment variable: ''D:\mingw\bin'', ''D:\mingw\libexec\gcc\mingw32\<version>''. ==== Installing Qt ==== You need Qt to build X2Go Client from source. Qt-4.8 is tested and recommended for current version of X2Go Client. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
242
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2013