x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

x2gothinclient.git - master (branch) updated: 1.0.1.7-6-gbf757b4
by git-admin＠x2go.org 04 Jul '12

04 Jul '12

The branch, master has been updated via bf757b40e4a378e416aefa140bd27222ef7b816d (commit) from ff471f1564e8de9c229abe408d5324fe48a51b40 (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 bf757b40e4a378e416aefa140bd27222ef7b816d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 4 12:17:14 2012 +0200 fix negation for last commit ----------------------------------------------------------------------- Summary of changes: debian/x2gothinclient.init | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index c62863f..c0950a1 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -36,7 +36,7 @@ NAME=x2gothinclient DESC="X2Go Thinclient Service" test -x $DAEMON || exit 0 -if [ -x /etc/x2go/x2gothinclient_init ] || [ -x /etc/x2go/x2gothinclient_start ]; then +if [ ! -x /etc/x2go/x2gothinclient_init ] || [ ! -x /etc/x2go/x2gothinclient_start ]; then echo "X2go thin client system will not start as it is not configured, yet." echo "See http://wiki.x2go.org/installing_x2go_thin_client_environment_debian" exit 0 hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.7-5-gff471f1
by git-admin＠x2go.org 04 Jul '12

04 Jul '12

The branch, master has been updated via ff471f1564e8de9c229abe408d5324fe48a51b40 (commit) from aa9d755a0ffbe67b1cd7e02ec4fc0fae08f96a6b (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 ff471f1564e8de9c229abe408d5324fe48a51b40 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 4 12:14:12 2012 +0200 Stop x2gothinclient init script if either x2gothinclient_init or x2gothinclient_start is missing/non-executable. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/x2gothinclient.init | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6ea83fa..2e29800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ x2gothinclient (1.0.1.8-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.1.8): - Remove .halt file before shutting down. - Make x2gothinclient init script more robust. + - Stop x2gothinclient init script if either x2gothinclient_init or + x2gothinclient_start is missing/non-executable. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Jun 2012 22:27:46 +0200 diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index 3f48c12..c62863f 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -36,7 +36,11 @@ NAME=x2gothinclient DESC="X2Go Thinclient Service" test -x $DAEMON || exit 0 -test -x /etc/x2go/x2gothinclient_init || test -x /etc/x2go/x2gothinclient_start || { echo "X2go thin client system will not start as it is not configured, yet.\nSee http://wiki.x2go.org/installing_x2go_thin_client_environment_debian"; exit 0; } +if [ -x /etc/x2go/x2gothinclient_init ] || [ -x /etc/x2go/x2gothinclient_start ]; then + echo "X2go thin client system will not start as it is not configured, yet." + echo "See http://wiki.x2go.org/installing_x2go_thin_client_environment_debian" + exit 0 +fi # pre-init X2Go Thin Client through init script... test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.7-4-gaa9d755
by git-admin＠x2go.org 04 Jul '12

04 Jul '12

The branch, master has been updated via aa9d755a0ffbe67b1cd7e02ec4fc0fae08f96a6b (commit) from b4eade6e6f9c503243bba2e26961dce069473fcd (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 aa9d755a0ffbe67b1cd7e02ec4fc0fae08f96a6b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 4 11:56:20 2012 +0200 check for .halt file earlier in x2gothinclientd script ----------------------------------------------------------------------- Summary of changes: x2gothinclient/sbin/x2gothinclientd | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 68ed553..d3be9a7 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -63,6 +63,9 @@ sub check_client return 0; } +# make sure the .halt file is not present when we start this script +system("rm -f /home/x2goclient/.halt"); + # pre-load the thinclient initialization script system("su x2goclient -c \". /etc/x2go/x2gothinclient_init\""); @@ -92,7 +95,6 @@ elsif ($pid == 0 ) # test if shutdown button on X2Go Client was clicked if ( -e "/home/x2goclient/.halt") { - system("rm -f /home/x2goclient/.halt"); system("shutdown -h now"); } # test if XServer is running, if not launch it... hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.7-3-gb4eade6
by git-admin＠x2go.org 04 Jul '12

04 Jul '12

The branch, master has been updated via b4eade6e6f9c503243bba2e26961dce069473fcd (commit) from aed2aa67af3352fd03f7d5986a81804824c38b58 (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 b4eade6e6f9c503243bba2e26961dce069473fcd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 4 11:44:53 2012 +0200 Make x2gothinclient init script more robust. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gothinclient.init | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 21123d4..6ea83fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2gothinclient (1.0.1.8-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.1.8): - Remove .halt file before shutting down. + - Make x2gothinclient init script more robust. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Jun 2012 22:27:46 +0200 diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index 7035ca8..3f48c12 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -33,7 +33,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin export HOSTNAME DAEMON=/usr/sbin/x2gothinclientd NAME=x2gothinclient -DESC=x2gothinclient +DESC="X2Go Thinclient Service" test -x $DAEMON || exit 0 test -x /etc/x2go/x2gothinclient_init || test -x /etc/x2go/x2gothinclient_start || { echo "X2go thin client system will not start as it is not configured, yet.\nSee http://wiki.x2go.org/installing_x2go_thin_client_environment_debian"; exit 0; } @@ -52,9 +52,7 @@ case "$1" in ;; stop) echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid - - echo "$NAME." + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid && echo "$NAME." || echo "not running" ;; #reload) # @@ -82,12 +80,9 @@ case "$1" in ;; restart) echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --pidfile \ - /var/run/$NAME.pid + $0 stop sleep 1 - start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." + $0 start ;; *) N=/etc/init.d/$NAME hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.7-2-gaed2aa6
by git-admin＠x2go.org 04 Jul '12

04 Jul '12

The branch, master has been updated via aed2aa67af3352fd03f7d5986a81804824c38b58 (commit) from e61158f8989d9d1e4a978dd61ba756714201a1bf (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 aed2aa67af3352fd03f7d5986a81804824c38b58 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 4 10:50:37 2012 +0200 Remove .halt file before shutting down. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2gothinclient/sbin/x2gothinclientd | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0a8ddd3..21123d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x2gothinclient (1.0.1.8-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (1.0.1.8): + - Remove .halt file before shutting down. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Jun 2012 22:27:46 +0200 diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 49e04a9..68ed553 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -92,6 +92,7 @@ elsif ($pid == 0 ) # test if shutdown button on X2Go Client was clicked if ( -e "/home/x2goclient/.halt") { + system("rm -f /home/x2goclient/.halt"); system("shutdown -h now"); } # test if XServer is running, if not launch it... hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

python-x2go.git - master (branch) updated: 0.2.0.6-4-gbc957c4
by git-admin＠x2go.org 03 Jul '12

03 Jul '12

The branch, master has been updated via bc957c408401c7583cb07618c0fc9aee762de3ec (commit) from 4d9aad32b35c89acda9c1a6980d4de6d24eb5f02 (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 bc957c408401c7583cb07618c0fc9aee762de3ec Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 4 01:02:06 2012 +0200 Fix property method X2goControlSession._x2go_remote_home on broken connections. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1392858..2bb8c70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ python-x2go (0.2.0.7-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.0.7): - Refresh server feature list on re-connecting (log-off, log-on). + - Fix property method X2goControlSession._x2go_remote_home on broken + connections. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 02 Jul 2012 20:57:37 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 2b22b0c..b58445c 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -462,8 +462,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): """ if self._remote_home is None: (stdin, stdout, stderr) = self._x2go_exec_command('echo $HOME') - self._remote_home = stdout.read().split()[0] - self.logger('remote user\' home directory: %s' % self._remote_home, loglevel=log.loglevel_DEBUG) + stdout_r = stdout.read() + if stdout_r: + self._remote_home = stdout_r.split()[0] + self.logger('remote user\' home directory: %s' % self._remote_home, loglevel=log.loglevel_DEBUG) return self._remote_home else: return self._remote_home @@ -819,13 +821,14 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): ssh_transport._x2go_session_marker = True self._session_password = password - if not self.home_exists(): - raise x2go_exceptions.X2goRemoteHomeException('remote home directory does not exist') - if self.get_transport(): self.session_died = False self.query_server_features(force=True) + self._remote_home = None + if not self.home_exists(): + raise x2go_exceptions.X2goRemoteHomeException('remote home directory does not exist') + return (self.get_transport() is not None) def dissociate(self, terminal_session): hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.1-3-g123028d
by git-admin＠x2go.org 03 Jul '12

03 Jul '12

The branch, master has been updated via 123028d8ae1b24d27874760bd5dbefd0fca2ba08 (commit) from 002bd87ff82e3896fb3753da08ffae4f4f7803b5 (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 123028d8ae1b24d27874760bd5dbefd0fca2ba08 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 4 00:01:36 2012 +0200 Allow SSH ports less than 22 in session profile manager. SSH ports below port 22 is not that much of a common practice, but it eases keyboard input in the corresponding wx widgets. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ pyhoca/wxgui/profilemanager.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 32de408..6ed9aa7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ pyhoca-gui (0.2.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.0.2): - Allow modifications of session icon and shared folder tab while a session profile is connected. + - Allow SSH ports less than 22 in session profile manager. SSH ports + below port 22 is not that much of a common practice, but it eases + keyboard input in the corresponding wx widgets. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 02 Jul 2012 20:51:37 +0200 diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index b47ce2c..2ff1987 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -225,7 +225,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.HostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host")+':') self.Host = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) self.SSHPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+':') - self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=65534) + self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=1, max=65534) self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"RSA/DSA private key")+':') self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) @@ -239,10 +239,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+':') self.SSHProxyTunnelFromHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=65534) + self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=1, max=65534) self.SSHProxyTunnelBetweenLabel = wx.StaticText(self.tab_Connection, -1, " -> ") self.SSHProxyTunnelToHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=65534) + self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=1, max=65534) self.LinkSpeed = wx.Slider(self.tab_Connection, -1, 0, 0, 4) self.ModemLabel = wx.StaticText(self.tab_Connection, -1, "|\n "+_(u"Modem"), style=wx.ALIGN_CENTRE) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.1-2-g002bd87
by git-admin＠x2go.org 03 Jul '12

03 Jul '12

The branch, master has been updated via 002bd87ff82e3896fb3753da08ffae4f4f7803b5 (commit) from 4c4ad0c0754ab33ebfc0005c8fcb3ca3078a3575 (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 002bd87ff82e3896fb3753da08ffae4f4f7803b5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 3 17:02:56 2012 +0200 Allow modifications of session icon and shared folder tab while a session profile is connected. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- pyhoca/wxgui/profilemanager.py | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b2318a2..32de408 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ pyhoca-gui (0.2.0.2-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.2.0.2): + - Allow modifications of session icon and shared folder tab while + a session profile is connected. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 02 Jul 2012 20:51:37 +0200 diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index ea5f823..b47ce2c 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -1116,8 +1116,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.staticbox_Profile.Enable(False) self.ProfileNameLabel.Enable(False) self.ProfileName.Enable(False) - self.IconButton.Enable(False) - self.IconButtonLabel.Enable(False) self.HostLabel.Enable(False) self.Host.Enable(False) self.UserNameLabel.Enable(False) @@ -1141,7 +1139,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyTunnelBetweenLabel.Enable(False) self.SSHProxyTunnelToHost.Enable(False) self.SSHProxyTunnelToPort.Enable(False) - self.tab_SharedFilesAndFolders.Enable(False) def __update_from_screen(self): """\ hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-1-g15f93bf
by git-admin＠x2go.org 03 Jul '12

03 Jul '12

The branch, master has been updated via 15f93bffe63a7d9eea3a7cb1fe12d531e92c113f (commit) from 1bbfded0225f0790c727cbf2e13e41aa19bee92d (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 15f93bffe63a7d9eea3a7cb1fe12d531e92c113f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 3 10:04:09 2012 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e69b220..5b282e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200 + x2goserver (3.1.1.3-0~x2go1) unstable; urgency=low [ Jan Engelhardt ] diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index c7271d2..f927970 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.3 \ No newline at end of file +3.1.1.4 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index c7271d2..f927970 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.3 \ No newline at end of file +3.1.1.4 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index c7271d2..f927970 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.3 \ No newline at end of file +3.1.1.4 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index c7271d2..f927970 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.3 \ No newline at end of file +3.1.1.4 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index c7271d2..f927970 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.3 \ No newline at end of file +3.1.1.4 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index c7271d2..f927970 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.3 \ No newline at end of file +3.1.1.4 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index c7271d2..f927970 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.3 \ No newline at end of file +3.1.1.4 \ No newline at end of file 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 - build-main (branch) updated: 3.1.1.3
by git-admin＠x2go.org 03 Jul '12

03 Jul '12

The branch, build-main has been updated via 1bbfded0225f0790c727cbf2e13e41aa19bee92d (commit) via 90f7a40a659b98d62f936890aa7c786ea914cc44 (commit) via c13d693dfd13f19bac13ad430b2165b2e6322f2a (commit) via 33fc7739485510ff8fbc28e16aa038c99eac93b2 (commit) via e305a0a9cc943453a2e3508926967dc6b38bd525 (commit) via e1d66fc8929ff79495414e48068192a65c7d072d (commit) via 44cbc5037875d6f5755abfd39271ab1c41347228 (commit) via f1f73d203353f5d5f29c156a0298a2de927602a4 (commit) from 4b25144ff4a9b71347e04e841c0b7dee3eb5f86d (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 17 +++++++++++++++++ debian/x2goserver.init | 4 ++-- x2goserver-compat/Makefile | 8 ++++---- x2goserver-compat/VERSION.x2goserver-compat | 2 +- x2goserver-extensions/Makefile | 8 ++++---- .../VERSION.x2goserver-extensions | 2 +- x2goserver-fmbindings/Makefile | 8 ++++---- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/Makefile | 8 ++++---- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-printing/bin/x2goprint | 4 ++-- x2goserver-pyhoca/Makefile | 8 ++++---- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/Makefile | 11 +++++------ x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/Makefile | 8 ++++---- x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/x2goresume-session | 8 ++++++-- x2goserver/bin/x2gostartagent | 10 +++++++--- 19 files changed, 70 insertions(+), 46 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f31cd4e..e69b220 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +x2goserver (3.1.1.3-0~x2go1) unstable; urgency=low + + [ Jan Engelhardt ] + * New upstream version (3.1.1.3): + - Do not block /etc/X11/Xresources with a directory (in Makefile). + - Avoid using archaic tools during free port detection. + - Avoid using ls in Makefiles. + + [ Mike Gabriel ] + * New upstream version (3.1.1.3): + - Fix broken X2Go client-side printing. Adapt x2goprint to new spool job + directory. + * /debian/x2goserver.init: + + Orthography fix: X2Go instead of x2go. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:00:32 +0200 + x2goserver (3.1.1.2-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/x2goserver.init b/debian/x2goserver.init index be3631c..b56a4cb 100644 --- a/debian/x2goserver.init +++ b/debian/x2goserver.init @@ -12,7 +12,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin case "$1" in start) - echo "Cleaning up stale x2go sessions." + echo "Cleaning up stale X2Go sessions." /usr/sbin/x2gocleansessions ;; stop) @@ -22,7 +22,7 @@ case "$1" in reload|force-reload|restart) # kill x2gocleansessions, ignore on failure killall x2gocleansessions || true - echo "Cleaning up stale x2go sessions." + echo "Cleaning up stale X2Go sessions." /usr/sbin/x2gocleansessions ;; *) diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index 6bdc94c..d8a3c95 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -19,10 +19,10 @@ BINDIR=$(PREFIX)/bin MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go -BIN_SCRIPTS=$(shell cd bin && ls) -#SBIN_SCRIPTS=$(shell cd sbin && ls) -#LIB_FILES=$(shell cd lib && ls) -FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) +BIN_SCRIPTS=$(shell cd bin && echo *) +#SBIN_SCRIPTS=$(shell cd sbin && echo *) +#LIB_FILES=$(shell cd lib && echo *) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 2fc27ca..c7271d2 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.2 \ No newline at end of file +3.1.1.3 \ No newline at end of file diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index d3bbbb6..13cf560 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go -BIN_SCRIPTS=$(shell cd bin && ls) -#SBIN_SCRIPTS=$(shell cd sbin && ls) -#LIB_FILES=$(shell cd lib && ls) -FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features .placeholder) +BIN_SCRIPTS=$(shell cd bin && echo *) +#SBIN_SCRIPTS=$(shell cd sbin && echo *) +#LIB_FILES=$(shell cd lib && echo *) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features .placeholder) man_pages = `cd man && find * -type f` diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 2fc27ca..c7271d2 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.2 \ No newline at end of file +3.1.1.3 \ No newline at end of file diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index a9d8da5..8661e83 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go -BIN_SCRIPTS=$(shell cd bin && ls) -#SBIN_SCRIPTS=$(shell cd sbin && ls) -#LIB_FILES=$(shell cd lib && ls) -FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && ls *.features) +BIN_SCRIPTS=$(shell cd bin && echo *) +#SBIN_SCRIPTS=$(shell cd sbin && echo *) +#LIB_FILES=$(shell cd lib && echo *) +FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index ff03238..c7271d2 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.2 +3.1.1.3 \ No newline at end of file diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 28ee92a..1c956f4 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -19,10 +19,10 @@ BINDIR=$(PREFIX)/bin MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go -BIN_SCRIPTS=$(shell cd bin && ls) -#SBIN_SCRIPTS=$(shell cd sbin && ls) -#LIB_FILES=$(shell cd lib && ls) -FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) +BIN_SCRIPTS=$(shell cd bin && echo *) +#SBIN_SCRIPTS=$(shell cd sbin && echo *) +#LIB_FILES=$(shell cd lib && echo *) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 2fc27ca..c7271d2 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.2 \ No newline at end of file +3.1.1.3 \ No newline at end of file diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index 113e5f6..e3f3f8f 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -92,8 +92,8 @@ syslog('notice', "x2goprint is processing $printdir/$pdfFile with print job titl # with user privileges ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$homedir)=getpwnam($user); -my $spoolbase="/tmp/spool_$user"; -my $spooldir="$spoolbase/$session"; +my $spoolbase="/tmp/.x2go-$user/spool"; +my $spooldir="$spoolbase/C-$session"; my $spooltmp="$spoolbase/tmp"; mkpath($spooltmp); chown $uid, $gid, "$spooltmp"; diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile index c24be41..95ab06d 100755 --- a/x2goserver-pyhoca/Makefile +++ b/x2goserver-pyhoca/Makefile @@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go -BIN_SCRIPTS=$(shell cd bin && ls) -#SBIN_SCRIPTS=$(shell cd sbin && ls) -#LIB_FILES=$(shell cd lib && ls) -FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) +BIN_SCRIPTS=$(shell cd bin && echo *) +#SBIN_SCRIPTS=$(shell cd sbin && echo *) +#LIB_FILES=$(shell cd lib && echo *) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 2fc27ca..c7271d2 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.2 \ No newline at end of file +3.1.1.3 \ No newline at end of file diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 7a56c87..50c2818 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -20,11 +20,11 @@ ETCDIR=/etc/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go -#BIN_SCRIPTS=$(shell cd bin && ls) -#SBIN_SCRIPTS=$(shell cd sbin && ls) -#LIB_FILES=$(shell cd lib && ls) -ETC_FILES=$(shell cd etc && ls) -FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) +#BIN_SCRIPTS=$(shell cd bin && echo *) +#SBIN_SCRIPTS=$(shell cd sbin && echo *) +#LIB_FILES=$(shell cd lib && echo *) +ETC_FILES=$(shell cd etc && echo *) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) #man_pages = `cd man && find * -type f` @@ -64,7 +64,6 @@ install_scripts: install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) # provide target dirs for X11 related symlinks - mkdir -p $(DESTDIR)/etc/X11/Xresources mkdir -p $(DESTDIR)/etc/X11/Xsession.d touch $(DESTDIR)/etc/X11/Xsession.options $(INSTALL_FILE) etc/Xsession $(DESTDIR)$(ETCDIR)/ diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 2fc27ca..c7271d2 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.2 \ No newline at end of file +3.1.1.3 \ No newline at end of file diff --git a/x2goserver/Makefile b/x2goserver/Makefile index be689c5..115c929 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -19,10 +19,10 @@ LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go -BIN_SCRIPTS=$(shell cd bin && ls) -SBIN_SCRIPTS=$(shell cd sbin && ls) -LIB_FILES=$(shell cd lib && ls) -FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) +BIN_SCRIPTS=$(shell cd bin && echo *) +SBIN_SCRIPTS=$(shell cd sbin && echo *) +LIB_FILES=$(shell cd lib && echo *) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 2fc27ca..c7271d2 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.2 \ No newline at end of file +3.1.1.3 \ No newline at end of file diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 3a9772f..cddbf05 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -64,8 +64,12 @@ SERVER=`echo "$SESSIONINFO" | awk -F, {'print $4'}` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "old ports: $GR_PORT, $SOUND_PORT, $FS_PORT" -#Get all used in system ports from netstat output -SYSTEM_PORTS=`netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'` +#Get all used in system ports from ss output +ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss); +USED_PORTS=$( + "$ss" -lnt | + perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}'; +); #check if saved in DB ports free if grep -q "|${GR_PORT}|" <<<$SYSTEM_PORTS ; then diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index fedd6ba..abf1422 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -124,9 +124,13 @@ fi USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` -#Get all used in system ports from X2Go database and netstat output -USED_PORTS=`$X2GO_LIB_PATH/x2gogetports $HOSTNAME ; netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'` - +#Get all used in system ports from X2Go database and ss output +ss=$(PATH="$PATH:/usr/sbin:/sbin" type -P ss); +USED_PORTS=$( + "$X2GO_LIB_PATH/x2gogetports" "$HOSTNAME"; + "$ss" -lnt | + perl -lne 'print$d{$2}="|$2|"if/^(\S+\s+){2}\S+:(\d+)/&&!exists$d{$2}'; +); while [ "$OUTPUT" != "inserted" ]; do X2GO_PORT=$(($X2GO_PORT + 1)) 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits