The branch, master has been updated via e793b709e8dfcbfbe49e88d4dd235bcf589b4907 (commit) from 3c0fe48d0db3422d7c71984aaec879c8414cca4b (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 e793b709e8dfcbfbe49e88d4dd235bcf589b4907 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jun 7 21:19:03 2013 +0200 Partially revert USED_PORTS detection code back to the old-style awk-way. (Fixes: #155). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2goserver/bin/x2goresume-session | 4 ++-- x2goserver/bin/x2gostartagent | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 03e5a61..37091e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low script is called without session as first argument and $X2GO_SESSION not set. (Fixes: #82). * Make x2goruncommand aware of the Cinnamon desktop shell. (Fixes: #117). + * [ Otto Kjell ] * New upstream version (4.1.0.0): @@ -68,6 +69,8 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. - Make x2gomountdirs / x2goumount-session UNC path aware. + - Partially revert USED_PORTS detection code back to the old-style awk-way. + (Fixes: #155). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 75fa1b0..75d06d0 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -67,8 +67,8 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "old ports: $GR_PORT, $SOUND_PORT, $FS_PO #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}'; + "$ss" -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])} }'; ); #check if saved in DB ports free diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 752695e..4418542 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -137,8 +137,8 @@ USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME` 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}'; + "$ss" -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])} }'; ); while [ "$OUTPUT" != "inserted" ]; do 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).