This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from ef7dc6a Unset LD_LIBRARY_PATH for the case when x2gostartagent started from x2godesktopsharing. new 6471448 x2goserver-xsession/etc/Xsession: fix uname calls when (potentially) creating session log/error file and add uname call where necessary. new 205a1ba x2goserver-xsession/etc/Xsession: include hostname in session-x2go-errors file name. Part of #923. new c108fa4 x2goserver.spec: add new dependency on perl and the Cwd module to x2goserver-xsession. Part of #923. new 7785445 debian/control: add new dependency on perl-modules for Cwd. Part of #923. new 7710b47 x2goserver-xsession/etc/Xsession: rotate old log/error file before appending new data. Fixes: #923. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 9 +++++++++ debian/control | 1 + x2goserver-xsession/etc/Xsession | 25 ++++++++++++++++++++----- x2goserver.spec | 12 ++++++++++++ 4 files changed, 42 insertions(+), 5 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 6471448dcf26876067f9f7c52f0a3f47c6de8078 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 13 03:14:47 2016 +0200 x2goserver-xsession/etc/Xsession: fix uname calls when (potentially) creating session log/error file and add uname call where necessary. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e50ba19..aee1dc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -317,6 +317,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low -h, -? and --man options. Fixes: #1065. Also print a usage message on unknown options. - x2goserver/man/man8/x2gocleansessions.8: drop obsolete man page. + - x2goserver-xsession/etc/Xsession: fix uname calls when (potentially) + creating session log/error file and add uname call where necessary. * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 7ad477f..5bfc60a 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -73,9 +73,9 @@ ALTUSERXSESSION=$HOME/.Xsession-x2go ERRFILE=$HOME/.xsession-x2go-errors # attempt to create an error file; abort if we cannot -if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [ ! -L "$ERRFILE" ]; then +if (umask 177 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [ ! -L "$ERRFILE" ]; then chmod 600 "$ERRFILE" -elif ERRFILE=$(mktemp 2> /dev/null); then +elif ERRFILE=$(umask 077 && mktemp 2> /dev/null); then if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-x2go-$USER"; then message "warning: unable to symlink \"$TMPDIR/xsession-x2go-$USER\" to" \ "\"$ERRFILE\"; look for session log/errors in" \ -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 205a1ba6a270b7aa2d23c6c241ef309e4bd959d7 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 13 03:11:23 2016 +0200 x2goserver-xsession/etc/Xsession: include hostname in session-x2go-errors file name. Part of #923. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index aee1dc4..244cd10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -319,6 +319,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low - x2goserver/man/man8/x2gocleansessions.8: drop obsolete man page. - x2goserver-xsession/etc/Xsession: fix uname calls when (potentially) creating session log/error file and add uname call where necessary. + - x2goserver-xsession/etc/Xsession: include hostname in + xsession-x2go-errors file name. Part of #923. * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 5bfc60a..81264a0 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -59,6 +59,11 @@ for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; d fi done +cur_hostname="$(hostname)" +if [ -z "${cur_name}" ] || [ "${cur_hostname}" = "(none)" ] || [ "${cur_hostname}" = "localhost" ]; then + errormsg "Hostname not set correctly; aborting." +fi + # initialize variables for use by all session scripts OPTIONFILE=/etc/x2go/Xsession.options @@ -70,14 +75,14 @@ SYSSESSIONDIR=/etc/x2go/Xsession.d USERXSESSION=$HOME/.xsession-x2go USERXSESSIONRC=$HOME/.xsessionrc-x2go ALTUSERXSESSION=$HOME/.Xsession-x2go -ERRFILE=$HOME/.xsession-x2go-errors +ERRFILE="${HOME}/.xsession-x2go-${cur_hostname}-errors" # attempt to create an error file; abort if we cannot if (umask 177 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [ ! -L "$ERRFILE" ]; then chmod 600 "$ERRFILE" elif ERRFILE=$(umask 077 && mktemp 2> /dev/null); then - if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-x2go-$USER"; then - message "warning: unable to symlink \"$TMPDIR/xsession-x2go-$USER\" to" \ + if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-x2go-${cur_hostname}-$USER"; then + message "warning: unable to symlink \"$TMPDIR/xsession-x2go-${cur_hostname}-$USER\" to" \ "\"$ERRFILE\"; look for session log/errors in" \ "\"$TMPDIR/xsession-x2go-$USER\"." fi -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit c108fa45e5c316f808570892cb5d56930ab7e916 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 13 03:36:55 2016 +0200 x2goserver.spec: add new dependency on perl and the Cwd module to x2goserver-xsession. Part of #923. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver.spec | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 244cd10..1363f06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -334,6 +334,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low sub package. - Add new dependency on bash. - Add new dependency on xkeyboard-config to x2goserver. Fixes: #903. + - Add new dependency on perl and the Cwd module to x2goserver-xsession. + Part of #923. * debian/control: - Add new dependency on bash. - Add new dependency on xkb-data to x2goserver. diff --git a/x2goserver.spec b/x2goserver.spec index fd54f1b..bdec626 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -421,6 +421,18 @@ Group: Applications/Communications Group: Productivity/Networking/Remote Desktop %endif +%if 0%{?suse_version} +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else +%{perl_requires} +%endif +%else +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif + +Requires: perl(Cwd) + %description xsession X2Go is a server based computing environment with - session resuming -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 77854455018d0bc42f907be6a5634f8d6b5e93a3 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 13 03:37:52 2016 +0200 debian/control: add new dependency on perl-modules for Cwd. Part of #923. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1363f06..0e23523 100644 --- a/debian/changelog +++ b/debian/changelog @@ -342,6 +342,7 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Uploaders: add myself. Also, force a rebuild due to the changed versioning. + - Add new dependency on perl-modules for Cwd. Part of #923. [ Henning Heinold ] * New upstream version (4.0.1.20): diff --git a/debian/control b/debian/control index 86b4c8d..bfe08cc 100644 --- a/debian/control +++ b/debian/control @@ -256,6 +256,7 @@ Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), x11-common, + perl-modules Description: X2Go Server (Xsession runner) X2Go is a server based computing environment with - session resuming -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 7710b477798a4b7cb310ccd23d460aea361d37fc Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 13 03:26:26 2016 +0200 x2goserver-xsession/etc/Xsession: rotate old log/error file before appending new data. Fixes: #923. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0e23523..f424215 100644 --- a/debian/changelog +++ b/debian/changelog @@ -321,6 +321,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low creating session log/error file and add uname call where necessary. - x2goserver-xsession/etc/Xsession: include hostname in xsession-x2go-errors file name. Part of #923. + - x2goserver-xsession/etc/Xsession: rotate old log/error file before + appending new data. Fixes: #923. * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 81264a0..2bf3e33 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -77,6 +77,16 @@ USERXSESSIONRC=$HOME/.xsessionrc-x2go ALTUSERXSESSION=$HOME/.Xsession-x2go ERRFILE="${HOME}/.xsession-x2go-${cur_hostname}-errors" +# Move the old error log file away. +if [ -f "${ERRFILE}" ]; then + if [ -L "${ERRFILE}" ]; then + resolved_errfile="$(perl -e 'use Cwd qw (abs_path); print abs_path ("' "${ERRFILE}" '") . "\n";')" + mv "${resolved_errfile}" "${resolved_errfile}.old" || errormsg "Unable to move symlinked old log/error file '${resolved_errfile}'; aborting." + else + mv "${ERRFILE}" "${ERRFILE}.old" || errormsg "Unable to move old log/error file '${ERRFILE}'; aborting." + fi +fi + # attempt to create an error file; abort if we cannot if (umask 177 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [ ! -L "$ERRFILE" ]; then chmod 600 "$ERRFILE" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org