x2goserver.git - master (branch) updated: 3.1.1.2-4-ge305a0a - x2go-commits

29 Jun 2012

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@inai.de>
Date:   Fri Jun 29 22:16:07 2012 +0200

    Avoid using ls in Makefiles.

commit e1d66fc8929ff79495414e48068192a65c7d072d
Author: Jan Engelhardt <jengelh@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@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@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).

    