[X2go-Commits] x2goserver.git - build-main (branch) updated: 3.1.0.1

X2Go dev team git-admin at x2go.org
Wed Mar 7 21:07:05 CET 2012


The branch, build-main has been updated
       via  739e7c35df6ace61ff5a16609ab641055938ecae (commit)
       via  d10fdac8adf5e55d5ffa4c8cd018501ee5586cbd (commit)
       via  91360c402b53119703ff4a63c56ba808a42fd543 (commit)
       via  dd6fb08b75cec6f5b0cf159dd3dc1c0adafd5d53 (commit)
       via  8fd1754c73f52028db96187f2d810e0c534b2777 (commit)
       via  c3a457cf4ffe605dc8d200084925ad9fe5812171 (commit)
       via  5cd74c75ba45c8844686e1e8bdca74dee28a6149 (commit)
       via  6c88e6857b0742963705e35a44d889d8a8becab4 (commit)
       via  a21e0dc286c89e94790fe13de7a083cf8be5f5b9 (commit)
       via  dd4e3c8884977e33ca053a93bb80b0a3102fc557 (commit)
      from  988da7922e3dc848d49c42ad2b6cff8fb2783297 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |   17 +++++++++++-
 debian/changelog                                   |   12 +++++++++
 debian/x2goserver-fmbindings.postinst              |    2 +-
 debian/x2goserver-fmbindings.postrm                |    2 +-
 debian/x2goserver.install                          |    3 +-
 x2goserver-compat/VERSION.x2goserver-compat        |    2 +-
 x2goserver-extensions/Makefile                     |   26 +++++++++++++++++++-
 .../VERSION.x2goserver-extensions                  |    2 +-
 x2goserver-fmbindings/Makefile                     |    8 +++---
 .../VERSION.x2goserver-fmbindings                  |    2 +-
 x2goserver-printing/VERSION.x2goserver-printing    |    2 +-
 x2goserver-pyhoca/VERSION.x2goserver-pyhoca        |    2 +-
 x2goserver-xsession/VERSION.x2goserver-xsession    |    2 +-
 x2goserver/VERSION.x2goserver                      |    2 +-
 x2goserver/bin/x2goruncommand                      |    3 ++
 x2goserver/bin/x2goterminate-session               |    6 ----
 x2goserver/etc/x2go_logout                         |   12 +++++++++
 x2goserver/etc/x2go_logout.d/010_userscripts.sh    |    3 ++
 18 files changed, 84 insertions(+), 24 deletions(-)
 create mode 100644 x2goserver/etc/x2go_logout
 create mode 100644 x2goserver/etc/x2go_logout.d/010_userscripts.sh

The diff of changes is:
diff --git a/Makefile b/Makefile
index da9d5db..3be40f9 100755
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,14 @@
 #!/usr/bin/make -f
 
+RM_FILE=rm -f
+RM_DIR=rmdir -p --ignore-fail-on-non-empty
+
+DESTDIR=
+PREFIX=/usr/local
+ETCDIR=/etc/x2go
+LIBDIR=$(PREFIX)/lib/x2go
+SHAREDIR=$(PREFIX)/share/x2go
+
 all: build
 
 build: build-arch build-indep
@@ -51,10 +60,14 @@ install:
 	$(MAKE) -C x2goserver-pyhoca $@
 
 uninstall:
-	$(MAKE) -C x2goserver $@
 	$(MAKE) -C x2goserver-printing $@
 	$(MAKE) -C x2goserver-compat $@
-	$(MAKE) -C x2goserver-extensions $@
 	$(MAKE) -C x2goserver-xsession $@
 	$(MAKE) -C x2goserver-fmbindings $@
 	$(MAKE) -C x2goserver-pyhoca $@
+	$(MAKE) -C x2goserver-extensions $@
+	$(MAKE) -C x2goserver $@
+	if test -d $(DESTDIR)$(LIBDIR); then $(RM_DIR) $(DESTDIR)$(LIBDIR); fi
+	if test -d $(DESTDIR)$(SHAREDIR)/x2gofeature.d; then $(RM_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d; fi
+	if test -d $(DESTDIR)$(SHAREDIR); then $(RM_DIR) $(DESTDIR)$(SHAREDIR); fi
+	if test -d $(DESTDIR)$(ETCDIR); then $(RM_DIR) $(DESTDIR)$(ETCDIR); fi
diff --git a/debian/changelog b/debian/changelog
index 84f0a9c..45606d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+x2goserver (3.1.0.1-0~x2go1) unstable; urgency=low
+
+  * New upstream version (3.1.0.1):
+    - Provide infrastructure for on-logout script calls.
+    - Do only run session cleanup scripts from within
+      x2goruncommand. Dropping them from x2goterminate-session.
+    - Be tolerant against x2go_logout script failures.
+    - Fix Makefile of x2goserver-fmbindings (thanks to Oliver Burger),
+      improve uninstall code in Makefiles.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 Mar 2012 21:05:28 +0100
+
 x2goserver (3.1.0.0-0~x2go1) unstable; urgency=low
 
   [ Oleksandr Shneyder ]
diff --git a/debian/x2goserver-fmbindings.postinst b/debian/x2goserver-fmbindings.postinst
index cbe42ae..b64235f 100755
--- a/debian/x2goserver-fmbindings.postinst
+++ b/debian/x2goserver-fmbindings.postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for x2gognomebindings
+# postinst script for x2goserver-fmbindings
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/x2goserver-fmbindings.postrm b/debian/x2goserver-fmbindings.postrm
index 4c31ba2..f3b3c83 100755
--- a/debian/x2goserver-fmbindings.postrm
+++ b/debian/x2goserver-fmbindings.postrm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for x2gognomebindings
+# postrm script for x2goserver-fmbindings
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/x2goserver.install b/debian/x2goserver.install
index ea91840..4ed8986 100644
--- a/debian/x2goserver.install
+++ b/debian/x2goserver.install
@@ -1,8 +1,7 @@
 x2goserver/bin/x2go*                    /usr/bin/
 x2goserver/sbin/x2go*                   /usr/sbin/
 x2goserver/lib/x2go*                    /usr/lib/x2go/
-x2goserver/etc/x2gosql/sql              /etc/x2go/x2gosql/
-x2goserver/etc/x2goserver.conf          /etc/x2go/
+x2goserver/etc/*                        /etc/x2go/
 x2goserver/VERSION.x2goserver           /usr/share/x2go/versions/
 x2goserver/x2gosqlitewrapper            /usr/lib/x2go/
 x2goserver/share/x2gofeature.d          /usr/share/x2go/
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat
index 075493a..c59e32f 100644
--- a/x2goserver-compat/VERSION.x2goserver-compat
+++ b/x2goserver-compat/VERSION.x2goserver-compat
@@ -1 +1 @@
-3.1.0.0
\ No newline at end of file
+3.1.0.1
\ No newline at end of file
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index 2fe807c..d3bbbb6 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -22,7 +22,7 @@ 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)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features .placeholder)
 
 man_pages = `cd man && find * -type f`
 
@@ -110,6 +110,30 @@ uninstall_scripts:
 #	for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done
 #	for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
 	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/ || true
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-resume.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-resume.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-suspend.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-suspend.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-suspend.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/.placeholder
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-resume.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-resume.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-suspend.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-suspend.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-suspend.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/
 	for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done
 
 uninstall_config:
diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions
index 075493a..c59e32f 100644
--- a/x2goserver-extensions/VERSION.x2goserver-extensions
+++ b/x2goserver-extensions/VERSION.x2goserver-extensions
@@ -1 +1 @@
-3.1.0.0
\ No newline at end of file
+3.1.0.1
\ No newline at end of file
diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile
index bd9aa69..a9d8da5 100755
--- a/x2goserver-fmbindings/Makefile
+++ b/x2goserver-fmbindings/Makefile
@@ -22,7 +22,7 @@ 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)
+FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && ls *.features)
 
 man_pages = `cd man && find * -type f`
 
@@ -53,7 +53,7 @@ install: install_scripts install_config install_man install_version
 install_scripts:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
-	$(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
+	$(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
 
 install_config:
 
@@ -66,7 +66,7 @@ install_man:
 install_version:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
-	$(INSTALL_FILE) VERSION.x2goserver-extensions     $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions
+	$(INSTALL_FILE) VERSION.x2goserver-fmbindings     $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-fmbindings
 
 uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
 
@@ -81,5 +81,5 @@ uninstall_man:
 	$(RM_DIR)  $(DESTDIR)$(MANDIR) || true
 
 uninstall_version:
-	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions
+	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-fmbindings
 	$(RM_DIR)  $(DESTDIR)$(SHAREDIR)/versions || true
diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
index f8d7555..a9e279d 100644
--- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
+++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings
@@ -1 +1 @@
-3.1.0.0
+3.1.0.1
diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing
index 075493a..c59e32f 100644
--- a/x2goserver-printing/VERSION.x2goserver-printing
+++ b/x2goserver-printing/VERSION.x2goserver-printing
@@ -1 +1 @@
-3.1.0.0
\ No newline at end of file
+3.1.0.1
\ No newline at end of file
diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
index 075493a..c59e32f 100644
--- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
+++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
@@ -1 +1 @@
-3.1.0.0
\ No newline at end of file
+3.1.0.1
\ No newline at end of file
diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession
index 075493a..c59e32f 100644
--- a/x2goserver-xsession/VERSION.x2goserver-xsession
+++ b/x2goserver-xsession/VERSION.x2goserver-xsession
@@ -1 +1 @@
-3.1.0.0
\ No newline at end of file
+3.1.0.1
\ No newline at end of file
diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver
index 075493a..c59e32f 100644
--- a/x2goserver/VERSION.x2goserver
+++ b/x2goserver/VERSION.x2goserver
@@ -1 +1 @@
-3.1.0.0
\ No newline at end of file
+3.1.0.1
\ No newline at end of file
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 0a664b6..fd9f82d 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -167,6 +167,9 @@ $X2GO_LIB_PATH/x2gochangestatus 'F' "$X2GO_SESSION"  > /dev/null
 export HOSTNAME
 x2goumount-session "$X2GO_SESSION"
 
+# run logout scripts
+test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout
+
 # clean up session dir if not in debug mode and if session has been successful
 if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ] && [ "x$successful_run" = "xtrue" ]; then
 	(sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")&
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index 271f714..a661dfc 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -60,10 +60,4 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && {
 
 }
 
-export HOSTNAME
-x2goumount-session "$SESSION_NAME"
 
-# if we are not running in log level debug (=7) then clean up session dir
-if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ]; then
-	(sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")&
-fi
diff --git a/x2goserver/etc/x2go_logout b/x2goserver/etc/x2go_logout
new file mode 100644
index 0000000..d321a03
--- /dev/null
+++ b/x2goserver/etc/x2go_logout
@@ -0,0 +1,12 @@
+# /etc/x2go/x2go_logout: system-wide .x2go_logout file for X2Go sessions
+# for Bash and Bash compatible shells (bash(1), ksh(1), ash(1), ...).
+
+if [ -d /etc/x2go/x2go_logout.d ]; then
+  for subscript in /etc/x2go/x2go_logout.d/*; do
+    if [ -r $subscript ]; then
+      # subscripts may fail, we ignore that here...
+      . $subscript || true
+    fi
+  done
+  unset subscript
+fi
diff --git a/x2goserver/etc/x2go_logout.d/010_userscripts.sh b/x2goserver/etc/x2go_logout.d/010_userscripts.sh
new file mode 100644
index 0000000..5ba1edf
--- /dev/null
+++ b/x2goserver/etc/x2go_logout.d/010_userscripts.sh
@@ -0,0 +1,3 @@
+# call $HOME/.x2go_logout script...
+
+test -r $HOME/.x2go_logout && . $HOME/.x2go_logout


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).




More information about the x2go-commits mailing list