x2go-commits May 2013

x2go-commits@lists.x2go.org

2 participants
1156 discussions

python-x2go.git - master (branch) updated: 0.4.0.3-6-gb433567
by git-admin＠x2go.org 08 May '13

08 May '13

The branch, master has been updated via b4335679fa7400e2e57c3992f9f25c4d1b719f3c (commit) from 5b554af5af1a2521f5d1070ea21ef4d3bf46036d (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 b4335679fa7400e2e57c3992f9f25c4d1b719f3c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 8 13:22:30 2013 +0200 Become aware of fixed paramiko features since paramiko 1.11.0. Stop monkey patching those methods that got fixed in 1.11.0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- x2go/_paramiko.py | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c191470..589f0b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,9 @@ python-x2go (0.4.0.4-0~x2go1) UNRELEASED; urgency=low if the session profile parameter restoreexports is set. - Fix the restoreexports logic on mount/unmount/unmount all requests. Make sure client-side offline network shares do not get purged from the - session profile configuration if unavailable. (Fixes: #192). + session profile configuration if unavailable. (Fixes: #192). + - Become aware of fixed paramiko features since paramiko 1.11.0. Stop + monkey patching those methods that got fixed in 1.11.0. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 21 Apr 2013 23:21:29 +0200 diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py index 3b93d14..dd83bd0 100644 --- a/x2go/_paramiko.py +++ b/x2go/_paramiko.py @@ -31,13 +31,13 @@ PARAMIKO_FEATURE = { 'forward-ssh-agent': compare_versions(PARAMIKO_VERSION, ">=", '1.8.0') and (platform.system() != "Windows"), 'use-compression': compare_versions(PARAMIKO_VERSION, ">=", '1.7.7.1'), 'hash-host-entries': compare_versions(PARAMIKO_VERSION, ">=", '99'), - 'host-entries-reloadable': compare_versions(PARAMIKO_VERSION, ">=", '99'), - 'preserve-known-hosts': compare_versions(PARAMIKO_VERSION, ">=", '99'), + 'host-entries-reloadable': compare_versions(PARAMIKO_VERSION, ">=", '1.11.0'), + 'preserve-known-hosts': compare_versions(PARAMIKO_VERSION, ">=", '1.11.0'), } def _SSHClient_save_host_keys(self, filename): """\ - FIXME!!! --- this method should become part of Paramiko + Available since paramiko 1.11.0... This method has been taken from SSHClient class in Paramiko and has been improved and adapted to latest SSH implementations. @@ -71,6 +71,8 @@ def _SSHClient_save_host_keys(self, filename): def _HostKeys_load(self, filename): """\ + Available since paramiko 1.11.0... + Read a file of known SSH host keys, in the format used by openssh. This type of file unfortunately doesn't exist on Windows, but on posix, it will usually be stored in 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

x2gobroker.git - master (branch) updated: 0.0.2.0-6-g1cbf2c3
by git-admin＠x2go.org 07 May '13

07 May '13

The branch, master has been updated via 1cbf2c397ba3253681e4303e52017da30f48f2eb (commit) from 32d9d26f987613ad9d4fe7893ce07241975707af (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 1cbf2c397ba3253681e4303e52017da30f48f2eb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 7 21:23:15 2013 +0200 remove obsolete X2GOBROKER_LOGCONFIG env var parsing ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-pubkeyauthorizer | 4 ---- 1 file changed, 4 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 2308a72..f6ebaa4 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -55,10 +55,6 @@ if os.environ.has_key('X2GOBROKER_DAEMON_GROUP'): X2GOBROKER_DAEMON_GROUP=os.environ['X2GOBROKER_DAEMON_GROUP'] else: X2GOBROKER_DAEMON_GROUP="x2gobroker" -if os.environ.has_key('X2GOBROKER_LOGCONFIG'): - X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] -else: - X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" if os.environ.has_key('X2GOBROKER_DEBUG'): X2GOBROKER_DEBUG = ( os.environ['X2GOBROKER_DEBUG'].lower() in ('1', 'on', 'true', 'yes', ) ) else: hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.0-5-g32d9d26
by git-admin＠x2go.org 07 May '13

07 May '13

The branch, master has been updated via 32d9d26f987613ad9d4fe7893ce07241975707af (commit) from 3e0b0a48d874da2238d8fbb725f476a87f9f51ca (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 32d9d26f987613ad9d4fe7893ce07241975707af Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 7 20:34:48 2013 +0200 fix help text in x2gobroker.conf ----------------------------------------------------------------------- Summary of changes: etc/x2gobroker.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index cf544bb..a64361b 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -104,7 +104,7 @@ # immediately. # # This option can be overridden by the session profile parameter -# broker-session-autologin=<file-location> +# broker-session-autologin={true|false} #default-session-autologin=false hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.20-8-gdafbbf2
by git-admin＠x2go.org 07 May '13

07 May '13

The branch, master has been updated via dafbbf21ae9763bd33a43151c290cd9f031d91a9 (commit) from 995b70cdc7f65bbfd72afd75e86032307117a78b (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 dafbbf21ae9763bd33a43151c290cd9f031d91a9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 7 20:20:43 2013 +0200 For vanilla nxagent move keystrokes.cfg from /etc/nx to /etc/nxagent. ----------------------------------------------------------------------- Summary of changes: debian/Makefile.nx-libs | 2 +- debian/changelog | 1 + .../302_nxagent_configurable-keystrokes.full.patch | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 3083a08..ac814dd 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -7,7 +7,7 @@ COPY_SYMLINK=cp -a RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -ETCDIR_NX ?= /etc/nx +ETCDIR_NX ?= /etc/nxagent ETCDIR_X2GO ?= /etc/x2go PREFIX ?= /usr/local BINDIR=$(PREFIX)/bin diff --git a/debian/changelog b/debian/changelog index 32985e6..4de9a36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ nx-libs (2:3.5.0.21-0) UNRELEASED; urgency=low * Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go (for x2goagent). (Fixes: #199). * Set NXAGENT_KEYSTROKEFILE to /etc/x2go/keystrokes.cfg for wrapper x2goagent. + * For vanilla nxagent move keystrokes.cfg from /etc/nx to /etc/nxagent. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Mar 2013 21:07:42 +0100 diff --git a/debian/patches/302_nxagent_configurable-keystrokes.full.patch b/debian/patches/302_nxagent_configurable-keystrokes.full.patch index 8fb34df..e7a3e4a 100644 --- a/debian/patches/302_nxagent_configurable-keystrokes.full.patch +++ b/debian/patches/302_nxagent_configurable-keystrokes.full.patch @@ -4,7 +4,7 @@ Description: Make nxagent-specific keyboard bindings configurable table of keybindings. The default configuration is the same as the original one, to maintain compatibility. A user/administrator can either specify a command line parameter, environment variable or place a file - in ~/.nx/config/keystroke.cfg or /etc/nx/keystroke.cfg to reconfigure + in ~/.nx/config/keystroke.cfg or /etc/nxagent/keystroke.cfg to reconfigure these keybindings. . The configuration file format is XML, a dependency on libxml2 is added @@ -397,7 +397,7 @@ Description: Make nxagent-specific keyboard bindings configurable + * - '-keystrokefile' commandline parameter + * - $NXAGENT_KEYSTROKEFILE environment variable + * - $HOME/.nx/config/keystroke.cfg -+ * - /etc/nx/keystroke.cfg ++ * - /etc/nxagent/keystroke.cfg + * - hardcoded traditional NX default settings + */ +static void parse_keystroke_file(void) @@ -411,7 +411,7 @@ Description: Make nxagent-specific keyboard bindings configurable - { - *result = doSwitchDeferMode; + char *homefile = "/.nx/config/keystroke.cfg"; -+ char *etcfile = "/etc/nx/keystroke.cfg"; ++ char *etcfile = "/etc/nxagent/keystroke.cfg"; - break; + if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0) @@ -916,7 +916,7 @@ Description: Make nxagent-specific keyboard bindings configurable +- in the location given by the '-keystrokefile' command line parameter +- in the location given by the NXAGENT_KEYSTROKEFILE environment variable +- in ~/.nx/config/keystroke.cfg -+- in /etc/nx/keystroke.cfg ++- in /etc/nxagent/keystroke.cfg + +If none of those files is accessible, the default configuration is used which +is the same as the old, traditional nxagent keybindings. 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

nx-libs.git - master (branch) updated: redist-client/3.5.0.20-7-g995b70c
by git-admin＠x2go.org 07 May '13

07 May '13

The branch, master has been updated via 995b70cdc7f65bbfd72afd75e86032307117a78b (commit) from ee35c3ff93ee328fee93d6447bdd514bccbf392d (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 995b70cdc7f65bbfd72afd75e86032307117a78b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 7 20:03:27 2013 +0200 /debian/rules: clean etc/keystrokes.cfg symlink ----------------------------------------------------------------------- Summary of changes: debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/rules b/debian/rules index 195cbfb..d8315b4 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ override_dh_clean: rm -f nx*/changelog rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog - rm -Rf replace.sh Makefile bin rgb VERSION.x2goagent + rm -Rf replace.sh Makefile bin rgb VERSION.x2goagent etc/keystrokes.cfg dh_clean override_dh_auto_install: 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

nx-libs.git - master (branch) updated: redist-client/3.5.0.20-6-gee35c3f
by git-admin＠x2go.org 07 May '13

07 May '13

The branch, master has been updated via ee35c3ff93ee328fee93d6447bdd514bccbf392d (commit) from e0fb697e9f86ff2e734a7530b5f4096ec1668c14 (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 ee35c3ff93ee328fee93d6447bdd514bccbf392d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 7 20:00:51 2013 +0200 fix broker symlink ----------------------------------------------------------------------- Summary of changes: debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/rules b/debian/rules index ac9f306..195cbfb 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ override_dh_auto_build: ln -s debian/Makefile.replace.sh replace.sh ln -s debian/wrappers bin mkdir -p etc/ - ln -s debian/keystrokes.cfg etc/keystrokes.cfg + ln -s ../debian/keystrokes.cfg etc/keystrokes.cfg ln -s debian/rgb ln -s debian/VERSION.x2goagent LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel 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

x2gobroker.git - master (branch) updated: 0.0.2.0-4-g3e0b0a4
by git-admin＠x2go.org 07 May '13

07 May '13

The branch, master has been updated via 3e0b0a48d874da2238d8fbb725f476a87f9f51ca (commit) from b82e0ece59e929ba5245f483f0ee7a1b9c4ba37f (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 3e0b0a48d874da2238d8fbb725f476a87f9f51ca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 7 09:20:00 2013 +0200 fix comments in *.postrm script ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-agent.postrm | 2 +- debian/x2gobroker-authservice.postrm | 2 +- debian/x2gobroker-daemon.postrm | 2 +- debian/x2gobroker-wsgi.postrm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm index f5c6be0..0739da6 100755 --- a/debian/x2gobroker-agent.postrm +++ b/debian/x2gobroker-agent.postrm @@ -31,7 +31,7 @@ case "$1" in fi if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then - # remove user/group x2gobroker from system (if not in use by x2gobroker-daemon + # remove user/group x2gobroker from system (if not in use by x2gobroker-daemon, x2gobroker-authservice, x2gobroker-wsgi) getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/debian/x2gobroker-authservice.postrm b/debian/x2gobroker-authservice.postrm index bf336f5..851bfa5 100755 --- a/debian/x2gobroker-authservice.postrm +++ b/debian/x2gobroker-authservice.postrm @@ -27,7 +27,7 @@ case "$1" in fi if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then - # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent + # remove user/group x2gobroker from system (only if not in use by x2gobroker-daemon, x2gobroker-agent, x2gobroker-wsgi) getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm index f4d0af9..5d76a1b 100755 --- a/debian/x2gobroker-daemon.postrm +++ b/debian/x2gobroker-daemon.postrm @@ -27,7 +27,7 @@ case "$1" in fi if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then - # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent + # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent, x2gobroker-authservice, x2gobroker-wsgi) getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/debian/x2gobroker-wsgi.postrm b/debian/x2gobroker-wsgi.postrm index 9db9cfe..d976222 100755 --- a/debian/x2gobroker-wsgi.postrm +++ b/debian/x2gobroker-wsgi.postrm @@ -27,7 +27,7 @@ case "$1" in fi if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then - # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent + # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent, x2gobroker-authservice, x2gobroker-daemon) getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.0-3-gb82e0ec
by git-admin＠x2go.org 07 May '13

07 May '13

The branch, master has been updated via b82e0ece59e929ba5245f483f0ee7a1b9c4ba37f (commit) from a43eae3a35698c7e8f39a6a70fb159bfbaea3f61 (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 b82e0ece59e929ba5245f483f0ee7a1b9c4ba37f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 3 15:50:40 2013 +0200 official name of src:x2gobroker is: X2Go Session Broker ----------------------------------------------------------------------- Summary of changes: debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/copyright b/debian/copyright index 7b2fde0..fdf8b88 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: X2Go Broker +Upstream-Name: X2Go Session Broker Upstream-Contact: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.20-5-ge0fb697
by git-admin＠x2go.org 06 May '13

06 May '13

The branch, master has been updated via e0fb697e9f86ff2e734a7530b5f4096ec1668c14 (commit) from fc118b4bbb02dd9994c266c74772216084dab705 (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 e0fb697e9f86ff2e734a7530b5f4096ec1668c14 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 6 23:09:35 2013 +0200 Set NXAGENT_KEYSTROKEFILE to /etc/x2go/keystrokes.cfg for wrapper x2goagent. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/wrappers/x2goagent | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c25941e..32985e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ nx-libs (2:3.5.0.21-0) UNRELEASED; urgency=low * Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go (for x2goagent). (Fixes: #199). + * Set NXAGENT_KEYSTROKEFILE to /etc/x2go/keystrokes.cfg for wrapper x2goagent. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Mar 2013 21:07:42 +0100 diff --git a/debian/wrappers/x2goagent b/debian/wrappers/x2goagent index a74f44c..129c7ca 100644 --- a/debian/wrappers/x2goagent +++ b/debian/wrappers/x2goagent @@ -29,4 +29,7 @@ test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS export LD_LIBRARY_PATH -exec $NX_LIBS/../x2go/bin/$NXAPP "$@" \ No newline at end of file +NXAGENT_KEYSTROKEFILE=/etc/x2go/keystrokes.cfg +export NXAGENT_KEYSTROKEFILE + +exec $NX_LIBS/../x2go/bin/$NXAPP "$@" 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.3-149-gea2dc32
by git-admin＠x2go.org 06 May '13

06 May '13

The branch, master has been updated via ea2dc32520bec21f39d05284270bb6f6b6b46e08 (commit) from d82c2044f94705ba3884168b2b6f35066d5f0f8e (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 ea2dc32520bec21f39d05284270bb6f6b6b46e08 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 6 23:02:52 2013 +0200 Use make_path from File::Path in x2godbadmin to create user directory if not present. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2goserver/sbin/x2godbadmin | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6b2b0fd..825de8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low - Use x2gopath in Perl scripts to set the lib path. (Fixes: #103). [ Mike Gabriel ] + * New upstream version (4.0.0.2): + - Use make_path from File::Path in x2godbadmin to create user directory if + not present. /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index b0de568..5362905 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -22,6 +22,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); +use File::Path qw( make_path ); use Getopt::Long; use Config::Simple; use DBI; @@ -81,7 +82,7 @@ my $user="x2gouser"; { if (! -d "$dir" ) { - mkdir("$dir"); + make_path("$dir"); } if ( -e $dbfile) { @@ -341,7 +342,7 @@ sub add_user() if (! -d "$dir/.x2go" ) { - mkdir("$dir/.x2go"); + make_path("$dir/.x2go"); } #save user password 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:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits May 2013