x2go-commits June 2012

x2go-commits@lists.x2go.org

1 participants
114 discussions

python-x2go.git - master (branch) updated: 0.2.0.5-5-g69b60b4
by git-admin＠x2go.org 30 Jun '12

30 Jun '12

The branch, master has been updated via 69b60b4eebbfc5fac4050a96d8185009a13a1f6b (commit) from 8acf5a8dde4daa53fa696b1188ed32e4f934fe6b (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 69b60b4eebbfc5fac4050a96d8185009a13a1f6b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 30 13:51:58 2012 +0200 typo ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 504bd72..aa3a156 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -619,7 +619,7 @@ class X2goSession(object): return eval("self.%s" % option) else: raise x2go_exceptions.X2goProfileException('Unknown session profile option: %s.' % option) - __get_session_profile_name = get_session_profile_name + __get_session_profile_option = get_session_profile_option def __str__(self): return self.__get_uuid() 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

python-x2go.git - master (branch) updated: 0.2.0.5-4-g8acf5a8
by git-admin＠x2go.org 30 Jun '12

30 Jun '12

The branch, master has been updated via 8acf5a8dde4daa53fa696b1188ed32e4f934fe6b (commit) via ca6ee3d9c05a9c67adaf02b39fe1b66516bdebcd (commit) via 74e94b351511c2dd1c8e7a7ca6eb92e97f4ec220 (commit) from 1cfff12e78fdcd63758a31100f3decbbc6be98a4 (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 8acf5a8dde4daa53fa696b1188ed32e4f934fe6b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 30 13:43:29 2012 +0200 Add several double underscore method aliases in X2goClient class. commit ca6ee3d9c05a9c67adaf02b39fe1b66516bdebcd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 30 13:38:28 2012 +0200 Add several double underscore method aliases in X2goSession class. commit 74e94b351511c2dd1c8e7a7ca6eb92e97f4ec220 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 30 13:28:53 2012 +0200 Ignore non-master sessions before calling the foldersharing-not-available hook. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++++- x2go/client.py | 8 ++++++++ x2go/session.py | 49 +++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 52 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2aa2f35..2ae2cb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ python-x2go (0.2.0.6-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.2.0.6) + - Ignore non-master sessions before calling the foldersharing- + not-available hook. + - Add several double underscore method aliases in X2goSession class. + - Add several double underscore method aliases in X2goClient class. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Jun 2012 15:51:52 +0200 diff --git a/x2go/client.py b/x2go/client.py index c9527bb..e52b535 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1014,6 +1014,7 @@ class X2goClient(object): """ return self.session_registry.session_summary(session_uuid) + __get_session_summary = get_session_summary ### ### WRAPPER METHODS FOR X2goSession objects @@ -1180,6 +1181,7 @@ class X2goClient(object): """ return self.session_registry(session_uuid).set_username(username=username) + __set_session_username = set_session_username def check_session_host(self, session_uuid): """\ @@ -2269,6 +2271,7 @@ class X2goClient(object): for session_uuid in self.client_connected_sessions(): _all_alive = _all_alive and self.server_is_alive(session_uuid) return _all_alive + __all_servers_are_alive = all_servers_are_alive def server_valid_x2gouser(self, session_uuid, username=None): """\ @@ -2331,6 +2334,7 @@ class X2goClient(object): """ return session_name in self._X2goClient__server_running_sessions(session_uuid) + __server_has_running_session_of_name = server_has_running_session_of_name def server_suspended_sessions(self, session_uuid): """\ @@ -2362,6 +2366,7 @@ class X2goClient(object): """ return len(self._X2goClient__server_suspended_sessions(session_uuid)) > 0 + __server_has_suspended_sessions = server_has_suspended_sessions def server_has_suspended_session_of_name(self, session_uuid, session_name): """\ @@ -2376,6 +2381,7 @@ class X2goClient(object): """ return session_name in self._X2goClient__server_suspended_sessions(session_uuid) + __server_has_suspended_session_of_name = server_has_suspended_session_of_name ### ### CLIENT OPERATIONS ON SESSIONS (listing sessions, terminating non-associated sessions etc.) @@ -2579,6 +2585,7 @@ class X2goClient(object): for session in sessions: _list_mounts.update(self.__list_mounts(session_uuid=session(), no_cache=no_cache, refresh_cache=refresh_cache, raw=False)) return _list_mounts + __list_mounts_by_profile_name = list_mounts_by_profile_name def list_mounts(self, session_uuid, no_cache=False, refresh_cache=False, @@ -2639,6 +2646,7 @@ class X2goClient(object): """ return self.session_profiles.profile_names + __profile_names = profile_names def get_client_settings(self): """\ diff --git a/x2go/session.py b/x2go/session.py index 160ee53..504bd72 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -357,6 +357,7 @@ class X2goSession(object): """ return self.client_instance + __get_client_instance = get_client_instance def HOOK_on_control_session_death(self): """\ @@ -505,6 +506,7 @@ class X2goSession(object): sessions_rootdir=self.sessions_rootdir, ssh_rootdir=self.ssh_rootdir, logger=self.logger) + __init_control_session = init_control_session def is_master_session(self): """\ @@ -523,6 +525,7 @@ class X2goSession(object): if self.master_session is None and self.client_instance is None: return True return bool(self.master_session) + __is_master_session = is_master_session def set_master_session(self, wait=0, max_wait=20): """\ @@ -552,6 +555,7 @@ class X2goSession(object): gevent.spawn_later(wait, self.share_all_local_folders) else: gevent.spawn(self.share_all_local_folders) + __set_master_session = set_master_session def unset_master_session(self): """\ @@ -562,6 +566,7 @@ class X2goSession(object): if self.has_terminal_session(): self.unshare_all_local_folders() self.master_session = False + __unset_master_session = unset_master_session def set_server(self, server): """\ @@ -572,6 +577,7 @@ class X2goSession(object): """ self.server = server + __set_server = set_server def set_port(self, port): """\ @@ -582,6 +588,7 @@ class X2goSession(object): """ self.port = port + __set_port = set_port def set_profile_name(self, profile_name): """\ @@ -593,6 +600,7 @@ class X2goSession(object): """ self.profile_name = profile_name self.control_session.set_profile_name(profile_name) + __set_profile_name = set_profile_name def get_session_profile_option(self, option): """\ @@ -611,6 +619,7 @@ class X2goSession(object): return eval("self.%s" % option) else: raise x2go_exceptions.X2goProfileException('Unknown session profile option: %s.' % option) + __get_session_profile_name = get_session_profile_name def __str__(self): return self.__get_uuid() @@ -889,6 +898,7 @@ class X2goSession(object): return self.terminal_session.get_session_type() else: return None + __get_session_type = get_session_type def get_session_title(self): """\ @@ -903,6 +913,7 @@ class X2goSession(object): return self.terminal_session.session_title else: return 'X2GO-%s' % self.get_session_name() + __get_session_title = get_session_title def get_control_session(self): """\ @@ -979,6 +990,7 @@ class X2goSession(object): """ return self.use_sshproxy + __uses_sshproxy = uses_sshproxy def can_sshproxy_auto_connect(self): """\ @@ -1050,6 +1062,7 @@ class X2goSession(object): gevent.spawn(self.connect) elif self.auto_connect: gevent.spawn(self.HOOK_auto_connect) + __do_auto_connect = do_auto_connect def connect(self, username='', password='', add_to_known_hosts=False, force_password_auth=False, use_sshproxy=False, sshproxy_user='', sshproxy_password=''): @@ -1174,6 +1187,7 @@ class X2goSession(object): """ self.server_features = self.control_session.query_server_features() + __retrieve_server_features = retrieve_server_features def get_server_features(self): """\ @@ -1184,6 +1198,7 @@ class X2goSession(object): """ return self.server_features + __get_server_features = get_server_features def has_server_feature(self, feature): """\ @@ -1197,6 +1212,7 @@ class X2goSession(object): """ return feature in self.get_server_features() + __has_server_feature = has_server_feature def set_session_window_title(self, title=''): """\ @@ -1210,6 +1226,7 @@ class X2goSession(object): """ if self.terminal_session is not None: self.terminal_session.set_session_window_title(title=title) + __set_session_window_title = set_session_window_title def raise_session_window(self): """\ @@ -1219,6 +1236,7 @@ class X2goSession(object): """ if self.terminal_session is not None: self.terminal_session.raise_session_window() + __raise_session_window = raise_session_window def set_print_action(self, print_action, **kwargs): """\ @@ -1337,6 +1355,7 @@ class X2goSession(object): self.HOOK_on_control_session_death() self._X2goSession__disconnect() return None + __list_mounts = list_mounts def update_status(self, session_list=None, force_update=False): """\ @@ -1428,6 +1447,7 @@ class X2goSession(object): if self.has_terminal_session() and self.is_running() : return self.terminal_session.is_published_applications_provider() return False + __is_published_applications_provider = is_published_applications_provider def is_desktop_session(self): """\ @@ -1440,6 +1460,7 @@ class X2goSession(object): if self.has_terminal_session(): return self.terminal_session.is_desktop_session() return False + __is_desktop_session = is_desktop_session def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=defaults.PUBAPP_MAX_NO_SUBMENUS): """\ @@ -1464,6 +1485,7 @@ class X2goSession(object): if self.client_instance and hasattr(self.client_instance, 'lang'): lang = self.client_instance.lang return self.control_session.get_published_applications(lang=lang, refresh=refresh, raw=raw, very_raw=very_raw, max_no_submenus=max_no_submenus) + __get_published_applications = get_published_applications def exec_published_application(self, exec_name, timeout=20): """\ @@ -1525,6 +1547,7 @@ class X2goSession(object): else: if not self.published_applications: return self.start() + __do_auto_start_or_resume = do_auto_start_or_resume def resume(self, session_name=None, session_list=None, cmd=None): """\ @@ -2015,6 +2038,7 @@ class X2goSession(object): else: self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) return False + __is_folder_sharing_available = is_folder_sharing_available def share_local_folder(self, local_path=None, folder_name=None): """\ @@ -2057,17 +2081,19 @@ class X2goSession(object): """ _retval = False if self.has_terminal_session() and self.share_local_folders and not self.faulty and self.is_running() and self.allow_share_local_folders: - if self.is_folder_sharing_available() and self.is_master_session(): - if self.control_session.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: - _retval = True - for _folder in self.share_local_folders: - try: - _retval = self.share_local_folder(_folder) and _retval - except x2go_exceptions.X2goUserException, e: - self.logger('%s' % str(e), loglevel=log.loglevel_WARN) - else: - self.HOOK_foldersharing_not_available() + if self.is_master_session(): + if self.is_folder_sharing_available(): + if self.control_session.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: + _retval = True + for _folder in self.share_local_folders: + try: + _retval = self.share_local_folder(_folder) and _retval + except x2go_exceptions.X2goUserException, e: + self.logger('%s' % str(e), loglevel=log.loglevel_WARN) + else: + self.HOOK_foldersharing_not_available() return _retval + __share_all_local_folders = share_all_local_folders def unshare_all_local_folders(self, force_all=False): """\ @@ -2189,6 +2215,7 @@ class X2goSession(object): if self.control_session is not None: return self.control_session.locked or self.locked return None + __is_locked = is_locked def session_cleanup(self): """\ @@ -2208,3 +2235,5 @@ class X2goSession(object): self.terminal_session.__del__() self.terminal_session = None + __session_cleanup = session_cleanup + 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

buildscripts.git - master (branch) updated: 1dae61656659006075f2a75065a968122025e5d8
by git-admin＠x2go.org 29 Jun '12

29 Jun '12

The branch, master has been updated via 1dae61656659006075f2a75065a968122025e5d8 (commit) via 90d36fce22eb970aef23c4f28cfd75ccfd71eb29 (commit) via 29049bd9b11c428d93957030951c81497f37cd97 (commit) from 401c50405a8c0d739fb55f4296b37484290c83c0 (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 1dae61656659006075f2a75065a968122025e5d8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 29 22:25:55 2012 +0200 use dash instead of underscore as version delimiter commit 90d36fce22eb970aef23c4f28cfd75ccfd71eb29 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 29 22:25:40 2012 +0200 whitespace fix commit 29049bd9b11c428d93957030951c81497f37cd97 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 29 22:25:06 2012 +0200 fix updatebuildmain, add flexible origin repos as $2 ----------------------------------------------------------------------- Summary of changes: bin/gitcreate | 1 - bin/tarballrelease | 10 +++++----- bin/updatebuildmain | 6 ++++-- 3 files changed, 9 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/bin/gitcreate b/bin/gitcreate index 3d93faf..bfceb21 100755 --- a/bin/gitcreate +++ b/bin/gitcreate @@ -9,7 +9,6 @@ GIT_SSH_PORT=22 PREFIX=$(echo `basename $0` | cut -d"-" -f1) . ~/.buildscripts/$PREFIX.conf - for pkg in "$@"; do subdir=$(dirname $pkg)/ pkg=$(basename $pkg) diff --git a/bin/tarballrelease b/bin/tarballrelease index 1b58077..84b0648 100755 --- a/bin/tarballrelease +++ b/bin/tarballrelease @@ -35,9 +35,9 @@ TEMP_DIR="$(mktemp -d)" echo $MANIFEST trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 -git clone . "$TEMP_DIR/${PROJECT}_$RELEASE" -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && git checkout ${CHECKOUT} 2>/dev/null || true ) -( set -e; cd "$TEMP_DIR" && rm -Rf "${PROJECT}_$RELEASE/.git"* ) -( set -e; cd "$TEMP_DIR" && find "${PROJECT}_$RELEASE" -type f | sed 's/^\.*\/*//' | sort > "$MANIFEST" ) +git clone . "$TEMP_DIR/${PROJECT}-$RELEASE" +( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && git checkout ${CHECKOUT} 2>/dev/null || true ) +( set -e; cd "$TEMP_DIR" && rm -Rf "${PROJECT}-$RELEASE/.git"* ) +( set -e; cd "$TEMP_DIR" && find "${PROJECT}-$RELEASE" -type f | sed 's/^\.*\/*//' | sort > "$MANIFEST" ) mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/" -tar c -C "$TEMP_DIR" --owner 0 --group 0 --numeric-owner --no-recursion --files-from "$MANIFEST" | gzip -n > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}_$RELEASE.tar.gz" +tar c -C "$TEMP_DIR" --owner 0 --group 0 --numeric-owner --no-recursion --files-from "$MANIFEST" | gzip -n > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-$RELEASE.tar.gz" diff --git a/bin/updatebuildmain b/bin/updatebuildmain index 54c3544..5a46ea4 100755 --- a/bin/updatebuildmain +++ b/bin/updatebuildmain @@ -21,6 +21,7 @@ set -e GITPROJECT=$(basename $(pwd)) REF=${1-HEAD} +ORIGIN=${2:-origin} # we need to be within a working copy (base folder) and we need a <REF>!!! test -z $1 || test -d ./.git || { @@ -32,5 +33,6 @@ test -z $1 || test -d ./.git || { # update the build-main branch with our newest blessed reference git branch -d build-main &>/dev/null || true git tag -d build-main &>/dev/null || true -git checkout -b build-main $REF -git push origin build-main:build-main +git checkout -b build-main $REF || true +git push $ORIGIN build-main:build-main +git checkout master hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

nx-libs.git - nx-buildscripts (branch) updated: 64180edd7c0bf040d828659af0380678277565fa
by git-admin＠x2go.org 29 Jun '12

29 Jun '12

The branch, nx-buildscripts has been updated via 64180edd7c0bf040d828659af0380678277565fa (commit) from 6ef1f6ac8ed996097df92fa800d47876390090ee (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 64180edd7c0bf040d828659af0380678277565fa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 29 22:23:48 2012 +0200 use dash instead of underscore as version delimiter ----------------------------------------------------------------------- Summary of changes: bin/nx-tarballrelease | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/bin/nx-tarballrelease b/bin/nx-tarballrelease index 8f71762..0465179 100755 --- a/bin/nx-tarballrelease +++ b/bin/nx-tarballrelease @@ -57,39 +57,39 @@ echo $MANIFEST trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 # create local copy of Git project at temp location -git clone . "$TEMP_DIR/${PROJECT}_$RELEASE" +git clone . "$TEMP_DIR/${PROJECT}-$RELEASE" if [ "x$RELEASE" != "xHEAD" ]; then - ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && git checkout $CHECKOUT; ) + ( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && git checkout $CHECKOUT; ) fi # prepare patches for lite and full tarball if [ "x$MODE" = "xfull" ]; then - ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mkdir -p doc/applied-patches && find debian/patches | egrep "(debian/patches/[0-9]+_.*\.(full|full\+lite)\.patch)" | while read file; do cp -a $file doc/applied-patches; done) - ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && cat debian/patches/series | egrep "[0-9]+_.*\.(full|full\+lite)\.patch" > doc/applied-patches/series) + ( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && mkdir -p doc/applied-patches && find debian/patches | egrep "(debian/patches/[0-9]+_.*\.(full|full\+lite)\.patch)" | while read file; do cp -a $file doc/applied-patches; done) + ( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && cat debian/patches/series | egrep "[0-9]+_.*\.(full|full\+lite)\.patch" > doc/applied-patches/series) else - ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nxcompshad"* ) - ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nxcompext"* ) - ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "nx-X11"* ) - ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mkdir -p doc/applied-patches && find debian/patches | egrep "(series|debian/patches/[0-9]+_.*\.full\+lite\.patch)" | while read file; do cp -a $file doc/applied-patches; done) - ( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && cat debian/patches/series | egrep "[0-9]+_.*\.full\+lite\.patch" > doc/applied-patches/series) + ( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && rm -Rf "nxcompshad"* ) + ( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && rm -Rf "nxcompext"* ) + ( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && rm -Rf "nx-X11"* ) + ( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && mkdir -p doc/applied-patches && find debian/patches | egrep "(series|debian/patches/[0-9]+_.*\.full\+lite\.patch)" | while read file; do cp -a $file doc/applied-patches; done) + ( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && cat debian/patches/series | egrep "[0-9]+_.*\.full\+lite\.patch" > doc/applied-patches/series) fi # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && QUILT_PATCHES=doc/applied-patches quilt push -a) -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mv -f README* doc/) -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && mv -f debian/changelog doc/changelog) +( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && QUILT_PATCHES=doc/applied-patches quilt push -a) +( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && mv -f README* doc/) +( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && mv -f debian/changelog doc/changelog) # remove folders that we do not want to roll into the tarball -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf ".git"* ) -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf ".pc"* ) -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf "debian"* ) +( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && rm -Rf ".git"* ) +( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && rm -Rf ".pc"* ) +( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && rm -Rf "debian"* ) # remove files, that we do not want in the tarballs (build cruft) -( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && rm -Rf nxcomp*/configure nxproxy/autom4te.cache* ) +( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && rm -Rf nxcomp*/configure nxproxy/autom4te.cache* ) # create target location for tarball mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/" # roll the ball... -( set -e; cd "$TEMP_DIR" && find "${PROJECT}_$RELEASE" -type f | sed 's/^\.*\/*//' | sort > "$MANIFEST" ) +( set -e; cd "$TEMP_DIR" && find "${PROJECT}-$RELEASE" -type f | sed 's/^\.*\/*//' | sort > "$MANIFEST" ) tar c -C "$TEMP_DIR" --owner 0 --group 0 --numeric-owner --no-recursion --files-from "$MANIFEST" | gzip -n > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz" hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

x2goserver.git - master (branch) updated: 3.1.1.2-4-ge305a0a
by git-admin＠x2go.org 29 Jun '12

29 Jun '12

The branch, master has been updated via e305a0a9cc943453a2e3508926967dc6b38bd525 (commit) via e1d66fc8929ff79495414e48068192a65c7d072d (commit) via 44cbc5037875d6f5755abfd39271ab1c41347228 (commit) from f1f73d203353f5d5f29c156a0298a2de927602a4 (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 e305a0a9cc943453a2e3508926967dc6b38bd525 Author: Jan Engelhardt <jengelh(a)inai.de> Date: Fri Jun 29 22:16:07 2012 +0200 Avoid using ls in Makefiles. commit e1d66fc8929ff79495414e48068192a65c7d072d Author: Jan Engelhardt <jengelh(a)inai.de> Date: Fri Jun 29 22:15:08 2012 +0200 Avoid using archaic tools during free port detection. commit 44cbc5037875d6f5755abfd39271ab1c41347228 Author: Jan Engelhardt <jengelh(a)inai.de> Date: Fri Jun 29 22:13:08 2012 +0200 Do not block /etc/X11/Xresources with a directory (in Makefile). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++++- x2goserver-compat/Makefile | 8 ++++---- x2goserver-extensions/Makefile | 8 ++++---- x2goserver-fmbindings/Makefile | 8 ++++---- x2goserver-printing/Makefile | 8 ++++---- x2goserver-pyhoca/Makefile | 8 ++++---- x2goserver-xsession/Makefile | 11 +++++------ x2goserver/Makefile | 8 ++++---- x2goserver/bin/x2goresume-session | 8 ++++++-- x2goserver/bin/x2gostartagent | 10 +++++++--- 10 files changed, 47 insertions(+), 36 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6d36b6a..b18f45e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2goserver (3.1.1.3-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ 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 <mike.gabriel(a)das-netzwerkteam.de> Fri, 29 Jun 2012 17:49:04 +0200 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-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-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-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-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-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/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/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

x2goserver.git - master (branch) updated: 3.1.1.2-1-gf1f73d2
by git-admin＠x2go.org 29 Jun '12

29 Jun '12

The branch, master has been updated 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 ----------------------------------------------------------------- commit f1f73d203353f5d5f29c156a0298a2de927602a4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 29 17:49:15 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 f31cd4e..6d36b6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (3.1.1.3-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 29 Jun 2012 17:49:04 +0200 + x2goserver (3.1.1.2-0~x2go1) unstable; urgency=low [ Mike Gabriel ] 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/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/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/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-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/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/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 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.2
by git-admin＠x2go.org 29 Jun '12

29 Jun '12

The branch, build-main has been updated via 4b25144ff4a9b71347e04e841c0b7dee3eb5f86d (commit) via 5c11e7e4e870b057bccba4c87d2e42209d5e899a (commit) via 1368c7b4026cf2c8b0c81c890179eaa8bfc39f58 (commit) via 2ca1e9eb6500ebceb0a37df33bbd785bc7b91f1b (commit) via 00a58a2e62e849fa85e2a996957bdd6a371c17d4 (commit) via b625d7b3c3bcc55d632360377424a0101765abb6 (commit) via 84027cfd24dfdbba3b1eb602728a3baf6cd810df (commit) via 0c300e8537a7049872ff468802d50dc783c67995 (commit) via c9e29f65b5f2d176db850832d0f801576279f711 (commit) via 197c283ddac5dad3d438b28bdb8404aea610d3b8 (commit) via ffd7b50051f441dd63ed724216c67ff657cbf99b (commit) via 85cbd8a06b78ed13d9ad2a3de47b4d854ae9e5d7 (commit) via 49688c37bb09861fee632a40130278e312f6216b (commit) via 612f5ecbe31f42cbeb5148d9126660e09bbc7adb (commit) from dc092a92bb23b613d76c6357022fc04c30acd213 (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 | 21 ++++++++++++ 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 +- .../bin}/.placeholder | 0 .../man/man8}/.placeholder | 0 x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/Makefile | 2 +- x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/x2gomountdirs | 12 +++--- x2goserver/bin/x2goruncommand | 2 +- x2goserver/bin/x2gostartagent | 18 ++++++++-- x2goserver/bin/x2goumount-session | 24 ++++++++++++-- x2goserver/man/man8/x2gosetkeyboard.8 | 34 ++++++++++++++++++++ x2goserver/sbin/x2gocleansessions | 7 ++-- x2goserver/sbin/x2golistsessions_root | 2 +- 18 files changed, 109 insertions(+), 27 deletions(-) copy {x2goserver-extensions/lib/extensions/fail-resume.d => x2goserver-pyhoca/bin}/.placeholder (100%) copy {x2goserver-extensions/lib/extensions/fail-resume.d => x2goserver-pyhoca/man/man8}/.placeholder (100%) create mode 100644 x2goserver/man/man8/x2gosetkeyboard.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 845e2b7..f31cd4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +x2goserver (3.1.1.2-0~x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * New upstream version (3.1.1.2): + - Place session.log into /tmp directory, make x2gocleansessions and + x2golistsessions_root work even if home directories are mounted + via NFSv4+Krb5 and not accessible by root. + - Use -fPIE gcc (position independed executable) for building + x2gosqlitewrapper.c (as suggested by Jan Engelhardt). + - Clean up session.log tmp directory if empty. + - Move all X2Go tmp folders (mount points) to /tmp/.x2go-<user>. + Make sure all tmp folders get removed if not used any more. Drop + symlink ~/media if no client-side folders are mounted into a + session. + - Fix crashes of x2gocleansessions due to faulty syslog calls. + - Drop redundant hostname calls in x2gocleansessions. + - Launch x2goagent with $NX_TEMP=/tmp, otherwise it will fail to + create the X11 Unix domain sockets. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 29 Jun 2012 17:44:57 +0200 + x2goserver (3.1.1.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 164a848..2fc27ca 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 164a848..2fc27ca 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 646c786..ff03238 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.1.1 +3.1.1.2 diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 164a848..2fc27ca 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 164a848..2fc27ca 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder b/x2goserver-pyhoca/bin/.placeholder similarity index 100% copy from x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder copy to x2goserver-pyhoca/bin/.placeholder diff --git a/x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder b/x2goserver-pyhoca/man/man8/.placeholder similarity index 100% copy from x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder copy to x2goserver-pyhoca/man/man8/.placeholder diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 164a848..2fc27ca 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver/Makefile b/x2goserver/Makefile index c90f1c9..be689c5 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -37,7 +37,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - gcc -o x2gosqlitewrapper x2gosqlitewrapper.c + gcc -fPIE -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 164a848..2fc27ca 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.1.1 \ No newline at end of file +3.1.1.2 \ No newline at end of file diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 88948e3..d4249ad 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -33,7 +33,7 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); syslog('info', "x2gomountdirs has been called with options: @ARGV"); -my $tmp_dir = $ENV{'TMP'} || '/tmp'; +my $tmp_dir = '/tmp'; my $type=shift; my $session=shift; @@ -100,12 +100,12 @@ close(F); chmod(0600,"$key"); chmod(0600,"$key.ident"); -my $mdir="$tmp_dir/$ENV{'USER'}_media"; +my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media"; my $ldir="$ENV{'HOME'}/media"; my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool"; -my $spooldir="$tmp_dir/spool_$ENV{'USER'}"; +my $spooldir="$tmp_dir/.x2go-$ENV{'USER'}/spool"; my $mimeboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/mimebox"; -my $mimeboxdir="$tmp_dir/mimebox_$ENV{'USER'}"; +my $mimeboxdir="$tmp_dir/.x2go-$ENV{'USER'}/mimebox"; if (! -e $mdir) { @@ -139,7 +139,7 @@ if (! -e $spooldir) } chmod(0700,$spooldir); -$spooldir="$spooldir/$session"; +$spooldir="$spooldir/C-$session"; if (! -e $spooldir) { mkdir($spooldir); @@ -152,7 +152,7 @@ if (! -e $mimeboxdir) } chmod(0700,$mimeboxdir); -$mimeboxdir="$mimeboxdir/$session"; +$mimeboxdir="$mimeboxdir/C-$session"; if (! -e $mimeboxdir) { mkdir($mimeboxdir); diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 012f713..6e62709 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -246,5 +246,5 @@ test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout # clean up session dir if not in debug mode and if session has been successful if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ] && [ "x$successful_run" = "xtrue" ]; then - (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")& + (sleep 10; rm -Rf "${HOME}/.x2go/C-${X2GO_SESSION}"; rm -f "/tmp/.x2go-${USER}/session-C-${X2GO_SESSION}.log"; rmdir --ignore-fail-on-non-empty "/tmp/.x2go-${USER}"; )& fi diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index e772bf4..fedd6ba 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -190,6 +190,14 @@ fi SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}" +# do not use $TMP or $TEMP here, the session.log file location has to be accessible by root +SESSION_LOG="/tmp/.x2go-${USER}/session-C-${SESSION_NAME}.log" +mkdir -p $(dirname "${SESSION_LOG}") +chmod -f 0700 $(dirname "${SESSION_LOG}") +touch "${SESSION_LOG}" +chmod -f 0600 "${SESSION_LOG}" +ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}" + if [ ! -d "$X2GO_ROOT" ]; then mkdir "$X2GO_ROOT" fi @@ -215,9 +223,9 @@ xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ];then - X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=null/null,geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" + X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_LOG},kbtype=null/null,geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" else - X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=${X2GO_KBD_TYPE},geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" + X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_LOG},kbtype=${X2GO_KBD_TYPE},geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" fi @@ -247,9 +255,11 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then - x2goagent -nolisten tcp $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + # set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use + NX_TEMP=/tmp x2goagent -nolisten tcp $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & else - x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + # set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use + NX_TEMP=/tmp x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi X2GO_AGENT_PID=$! diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 6d5f062..01d3857 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -34,13 +34,17 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); syslog('info', "x2goumount-session has been called with options: @ARGV"); -my $tmp_dir = $ENV{'TMP'} || '/tmp'; +my $tmp_dir = '/tmp'; my $session=shift; my $only_path=shift; my $uname=$ENV{'USER'}; my $serv=hostname; +my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media"; +my $spooldir="$tmp_dir/.x2go-$ENV{'USER'}/spool"; +my $mimeboxdir="$tmp_dir/.x2go-$ENV{'USER'}/mimebox"; + if ($only_path) { $only_path=~s/\/ramdrive\/mnt\///; @@ -57,8 +61,8 @@ if ($only_path) ### FIXME: handle CDROM and Removable Media mounts here, as well!!! - $only_path="$tmp_dir/$ENV{'USER'}_media/disk/$only_path"; - # ^^^^ + $only_path="$tmp_dir/.x2go-$ENV{'USER'}/media/disk/$only_path"; + # ^^^^ syslog('debug',"x2goumount-session unmounting $only_path only"); } @@ -193,6 +197,20 @@ break: cont: } +# try to eliminate parent directory of mountpoints +rmdir ("$mdir/disk"); +rmdir ("$mdir/cd"); +rmdir ("$mdir/rm"); +rmdir ("$mdir"); +if (( ! -d "$mdir" ) && ( -l "$ENV{'HOME'}/media" )) +{ + system("rm -f $ENV{'HOME'}/media"); +} +rmdir ("$spooldir/C-$session"); +rmdir ("$spooldir"); +rmdir ("$mimeboxdir/C-$session"); +rmdir ("$mimeboxdir"); + # closing syslog closelog; diff --git a/x2goserver/man/man8/x2gosetkeyboard.8 b/x2goserver/man/man8/x2gosetkeyboard.8 new file mode 100644 index 0000000..3e9baaf --- /dev/null +++ b/x2goserver/man/man8/x2gosetkeyboard.8 @@ -0,0 +1,34 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gosetkeyboard 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (PyHoca)" +.SH NAME +x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client +.SH SYNOPSIS +'nh +.fi +.ad l +x2gosetkeyboard + +.SH DESCRIPTION +\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2Go session directory and introspects +the X2Go session keyboard settings requested from the client side. +.PP +If no 'keyboard' file is present in the X2Go session directory, nothing happens (i.e. no error +will be raised). +.SH RETURN VALUES +If \fBx2gosetkeyboard\fR successfully sets the session's keyboard parameters an exit code of 0 is +returned. Also, if the file ${HOME}/.x2go/C-${X2GO_SESSION}/keyboard is not presented at the +expected location, a zero-exitcode is returned. +.PP +If the command fails on its way, then the exitcode of the failing command is returned. +.SH FILES +${HOME}/.x2go/C-${X2GO_SESSION}/keyboard +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 6e21482..aaed31d 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -55,7 +55,7 @@ sub check_stat { my $sess=shift; my $user=shift; - my $log="~$user/.x2go/C-$sess/session.log"; + my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; my $text=`tail -1 $log 2>/dev/null`; if ($text =~ m/Session suspended/) { @@ -93,7 +93,6 @@ elsif ($pid == 0 ) while(sleep 5) { - $serv=`hostname`; my $outp=`$x2go_lib_path/x2golistsessions_sql $serv 2>/dev/null`; my @outp=split("\n","$outp"); for (my $i=0;$i<@outp;$i++) @@ -119,8 +118,8 @@ elsif ($pid == 0 ) if (!check_stat(@sinfo[1],@sinfo[11])) { system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); - syslog("@sinfo[1] is suspended, changing status from @sinfo[4] to S"); - syslog("@sinfo[1]: unmounting all shares"); + syslog('debug', "@sinfo[1] is suspended, changing status from @sinfo[4] to S"); + syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } } diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index dddcae3..71fc5dd 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -34,7 +34,7 @@ sub check_stat { my $sess=shift; my $user=shift; - my $log="~$user/.x2go/C-$sess/session.log"; + my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; my $text=`tail -1 $log 2>/dev/null`; if ($text =~ m/Session suspended/) { 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.1-14-g4b25144
by git-admin＠x2go.org 29 Jun '12

29 Jun '12

The branch, master has been updated via 4b25144ff4a9b71347e04e841c0b7dee3eb5f86d (commit) from 5c11e7e4e870b057bccba4c87d2e42209d5e899a (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 4b25144ff4a9b71347e04e841c0b7dee3eb5f86d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 29 17:45:20 2012 +0200 release 3.1.1.2 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4860dac..f31cd4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (3.1.1.2-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.1.2-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (3.1.1.2): @@ -17,7 +17,7 @@ x2goserver (3.1.1.2-0~x2go1) UNRELEASED; urgency=low - Launch x2goagent with $NX_TEMP=/tmp, otherwise it will fail to create the X11 Unix domain sockets. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 26 Jun 2012 09:32:31 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 29 Jun 2012 17:44:57 +0200 x2goserver (3.1.1.1-0~x2go1) unstable; urgency=low 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.1-13-g5c11e7e
by git-admin＠x2go.org 28 Jun '12

28 Jun '12

The branch, master has been updated via 5c11e7e4e870b057bccba4c87d2e42209d5e899a (commit) from 1368c7b4026cf2c8b0c81c890179eaa8bfc39f58 (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 5c11e7e4e870b057bccba4c87d2e42209d5e899a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 28 22:26:22 2012 +0200 add placeholder directories for x2goserver-pyhoca ----------------------------------------------------------------------- Summary of changes: .../bin}/.placeholder | 0 .../man/man8}/.placeholder | 0 2 files changed, 0 insertions(+), 0 deletions(-) copy {x2goserver-extensions/lib/extensions/fail-resume.d => x2goserver-pyhoca/bin}/.placeholder (100%) copy {x2goserver-extensions/lib/extensions/fail-resume.d => x2goserver-pyhoca/man/man8}/.placeholder (100%) The diff of changes is: diff --git a/x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder b/x2goserver-pyhoca/bin/.placeholder similarity index 100% copy from x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder copy to x2goserver-pyhoca/bin/.placeholder diff --git a/x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder b/x2goserver-pyhoca/man/man8/.placeholder similarity index 100% copy from x2goserver-extensions/lib/extensions/fail-resume.d/.placeholder copy to x2goserver-pyhoca/man/man8/.placeholder 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.1-12-g1368c7b
by git-admin＠x2go.org 28 Jun '12

28 Jun '12

The branch, master has been updated via 1368c7b4026cf2c8b0c81c890179eaa8bfc39f58 (commit) from 2ca1e9eb6500ebceb0a37df33bbd785bc7b91f1b (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 1368c7b4026cf2c8b0c81c890179eaa8bfc39f58 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 28 22:25:36 2012 +0200 forgot to add x2gosetkeyboard.8 man page ----------------------------------------------------------------------- Summary of changes: x2goserver/man/man8/x2gosetkeyboard.8 | 34 +++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 x2goserver/man/man8/x2gosetkeyboard.8 The diff of changes is: diff --git a/x2goserver/man/man8/x2gosetkeyboard.8 b/x2goserver/man/man8/x2gosetkeyboard.8 new file mode 100644 index 0000000..3e9baaf --- /dev/null +++ b/x2goserver/man/man8/x2gosetkeyboard.8 @@ -0,0 +1,34 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gosetkeyboard 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (PyHoca)" +.SH NAME +x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client +.SH SYNOPSIS +'nh +.fi +.ad l +x2gosetkeyboard + +.SH DESCRIPTION +\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2Go session directory and introspects +the X2Go session keyboard settings requested from the client side. +.PP +If no 'keyboard' file is present in the X2Go session directory, nothing happens (i.e. no error +will be raised). +.SH RETURN VALUES +If \fBx2gosetkeyboard\fR successfully sets the session's keyboard parameters an exit code of 0 is +returned. Also, if the file ${HOME}/.x2go/C-${X2GO_SESSION}/keyboard is not presented at the +expected location, a zero-exitcode is returned. +.PP +If the command fails on its way, then the exitcode of the failing command is returned. +.SH FILES +${HOME}/.x2go/C-${X2GO_SESSION}/keyboard +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits June 2012