This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit f8c89a6490b6e0fe06d6fc5dc8842752a0dc2946 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. --- debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c4b6ba1..c36f85e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,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 release/4.0.1.x in repository x2goserver. commit aa29e1efcad514c183b038a1771fbfa36678b003 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. --- debian/changelog | 2 ++ x2goserver.spec | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0027582..65487f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -103,6 +103,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 33d02f5..72a9e0f 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -276,6 +276,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 release/4.0.1.x in repository x2goserver. commit 65e9b8c308aad422c3e84760b63789ce58efedae 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. --- debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5af3e93..f125f8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,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