On Friday 2012-06-29 19:40, Mike Gabriel wrote:
> Dear all,
>
> The X2Go Project is proud to announce another X2Go component releases:
>
> - x2goserver (3.1.1.2)
>
> The new X2Go server packages will be available in our stable repositories
> (Debian, Ubuntu) within the next 24h.
More patches given.
From: Jan Engelhardt <jeng...@medozas.de>
Date: 2012-02-13 11:08:16.627899794 +0100
x2goserver: avoid using archaic tools
Unmaintained, full of bugs, and so on.
---
x2goserver/bin/x2goresume-session | 8 ++++++--
x2goserver/bin/x2gostartagent | 10 +++++++---
2 files changed, 13 insertions(+), 5 deletions(-)
Index: x2goserver_3.1.1.1/x2goserver/bin/x2goresume-session
===================================================================
--- x2goserver_3.1.1.1.orig/x2goserver/bin/x2goresume-session
+++ x2goserver_3.1.1.1/x2goserver/bin/x2goresume-session
@@ -64,8 +64,12 @@ SERVER=`echo "$SESSIONINFO" | awk -F, {'
$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
Index: x2goserver_3.1.1.1/x2goserver/bin/x2gostartagent
===================================================================
--- x2goserver_3.1.1.1.orig/x2goserver/bin/x2gostartagent
+++ x2goserver_3.1.1.1/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))
From: Jan Engelhardt <jeng...@medozas.de>
Date: 2012-02-28 08:39:25.478170352 +0100
install: avoid useless use of ls for file globbing
Have a good read of http://partmaps.org/era/unix/award.html
---
x2goserver-compat/Makefile | 8 ++++----
x2goserver-extensions/Makefile | 8 ++++----
x2goserver-fmbindings/Makefile | 8 ++++----
x2goserver-printing/Makefile | 8 ++++----
x2goserver-pyhoca/Makefile | 8 ++++----
x2goserver-xsession/Makefile | 10 +++++-----
x2goserver/Makefile | 8 ++++----
7 files changed, 29 insertions(+), 29 deletions(-)
Index: x2goserver_3.1.1.1/x2goserver-compat/Makefile
===================================================================
--- x2goserver_3.1.1.1.orig/x2goserver-compat/Makefile
+++ x2goserver_3.1.1.1/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`
Index: x2goserver_3.1.1.1/x2goserver-extensions/Makefile
===================================================================
--- x2goserver_3.1.1.1.orig/x2goserver-extensions/Makefile
+++ x2goserver_3.1.1.1/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`
Index: x2goserver_3.1.1.1/x2goserver-fmbindings/Makefile
===================================================================
--- x2goserver_3.1.1.1.orig/x2goserver-fmbindings/Makefile
+++ x2goserver_3.1.1.1/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`
Index: x2goserver_3.1.1.1/x2goserver-printing/Makefile
===================================================================
--- x2goserver_3.1.1.1.orig/x2goserver-printing/Makefile
+++ x2goserver_3.1.1.1/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`
Index: x2goserver_3.1.1.1/x2goserver-pyhoca/Makefile
===================================================================
--- x2goserver_3.1.1.1.orig/x2goserver-pyhoca/Makefile
+++ x2goserver_3.1.1.1/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`
Index: x2goserver_3.1.1.1/x2goserver-xsession/Makefile
===================================================================
--- x2goserver_3.1.1.1.orig/x2goserver-xsession/Makefile
+++ x2goserver_3.1.1.1/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`
Index: x2goserver_3.1.1.1/x2goserver/Makefile
===================================================================
--- x2goserver_3.1.1.1.orig/x2goserver/Makefile
+++ x2goserver_3.1.1.1/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`
From: Jan Engelhardt <jeng...@medozas.de>
Date: 2012-02-13 12:42:50.413016000 +0100
build: remove bogus Xresources directory
The object /etc/X11/Xresources is a file already owned by xorg-x11,
so do not overwrite it. Especially not with a directory.
---
x2goserver-xsession/Makefile | 1 -
1 file changed, 1 deletion(-)
Index: x2goserver_3.0.99.10/x2goserver-xsession/Makefile
===================================================================
--- x2goserver_3.0.99.10.orig/x2goserver-xsession/Makefile
+++ x2goserver_3.0.99.10/x2goserver-xsession/Makefile
@@ -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)/
_______________________________________________
X2Go-Dev mailing list
X2Go-Dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-dev
