[X2Go-Commits] [x2goserver] 01/01: Update execution logic of the x2goagent wrapper script. The script now sets the env var $NXAPP and then calls the nxagent wrapper script. For this to work properly, the x2goagent symlinks has to be placed into directory where the nxagent executable is installed ($LIBDIR/nx/bin/, normally).

Mon Jul 4 11:47:50 CEST 2016

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 833484a5c7aaaf97769f6fef0d7960cc1c8edad6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 11:47:46 2016 +0200

    Update execution logic of the x2goagent wrapper script. The script now sets the env var $NXAPP and then calls the nxagent wrapper script. For this to work properly, the x2goagent symlinks has to be placed into directory where the nxagent executable is installed ($LIBDIR/nx/bin/, normally).
---
 Makefile                            |    1 -
 debian/changelog                    |    4 ++++
 debian/rules                        |   10 ++++++----
 debian/x2goserver-x2goagent.install |    2 +-
 x2goserver-x2goagent/Makefile       |    9 +++++----
 x2goserver-x2goagent/bin/x2goagent  |   14 ++------------
 x2goserver.spec                     |    4 ++--
 7 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index e4e5943..07408f8 100755
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty
 DESTDIR ?=
 PREFIX ?= /usr/local
 ETCDIR=/etc/x2go
-LIBDIR=$(PREFIX)/lib/x2go
 SHAREDIR=$(PREFIX)/share/x2go
 
 PERL ?= /usr/bin/perl
diff --git a/debian/changelog b/debian/changelog
index eeaa5c8..699d104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,10 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
     - Properly clean up shadow sessions for the session database.
     - Move x2goagent wrapper package around nxagent into X2Go Server.
       (Fixes: #1047).
+    - Update execution logic of the x2goagent wrapper script. The script now
+      sets the env var $NXAPP and then calls the nxagent wrapper script. For this
+      to work properly, the x2goagent symlinks has to be placed into directory
+      where the nxagent executable is installed ($LIBDIR/nx/bin/, normally).
   * debian/control:
     + Package X2Go::Log in separate package: libx2go-log-perl.
     + Package X2Go::Server::DB in separate package: libx2go-server-db-perl.
diff --git a/debian/rules b/debian/rules
index 384687b..f5fff6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,17 @@
 #!/usr/bin/make -f
 
+export LIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)"
+
 %:
-	PREFIX=/usr dh $@
+	PREFIX=/usr LIBDIR=$(LIBDIR) dh $@
 
 override_dh_auto_build:
-	PREFIX=/usr PERL_INSTALLDIRS=vendor dh_auto_build
+	PREFIX=/usr LIBDIR=$(LIBDIR) PERL_INSTALLDIRS=vendor dh_auto_build
 
 override_dh_auto_install:
 	if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog ChangeLog; fi
 	$(MAKE) -f Makefile build-arch
-	PREFIX=/usr dh_auto_install
+	PREFIX=/usr LIBDIR=$(LIBDIR) dh_auto_install
 
 override_dh_auto_clean:
 	rm -f ChangeLog
@@ -18,5 +20,5 @@ override_dh_auto_clean:
 	rm -f ChangeLog.gitlog
 	rm -f MYMETA.yml
 	rm -f Makefile.perl.old
-	PREFIX=/usr dh_auto_clean
+	PREFIX=/usr LIBDIR=$(LIBDIR) dh_auto_clean
 	rm -f Makefile.perl
diff --git a/debian/x2goserver-x2goagent.install b/debian/x2goserver-x2goagent.install
index 11a2369..0c3fdc7 100644
--- a/debian/x2goserver-x2goagent.install
+++ b/debian/x2goserver-x2goagent.install
@@ -1,5 +1,5 @@
 usr/bin/x2goagent
-usr/lib/x2go/bin/x2goagent
+usr/lib/*/nx/bin/x2goagent
 usr/share/pixmaps/x2go.xpm
 usr/share/x2go/rgb
 usr/share/man/man1/x2goagent.1*
diff --git a/x2goserver-x2goagent/Makefile b/x2goserver-x2goagent/Makefile
index 8a42ac9..1a46943 100755
--- a/x2goserver-x2goagent/Makefile
+++ b/x2goserver-x2goagent/Makefile
@@ -15,7 +15,8 @@ DESTDIR ?=
 PREFIX ?= /usr/local
 ETCDIR=/etc/x2go
 BINDIR=$(PREFIX)/bin
-LIBDIR=$(PREFIX)/lib/x2go
+LIBDIR ?= $(PREFIX)/lib
+NXLIBDIR=$(LIBDIR)/nx
 MANDIR=$(PREFIX)/share/man
 SHAREDIR=$(PREFIX)/share/x2go
 
@@ -56,8 +57,8 @@ install_scripts:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
 	$(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
-	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/bin/
-	$(INSTALL_SYMLINK) ../../nx/bin/nxagent $(DESTDIR)$(LIBDIR)/bin/x2goagent
+	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin/
+	$(INSTALL_SYMLINK) nxagent $(DESTDIR)$(NXLIBDIR)/bin/x2goagent
 
 install_data:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/
@@ -88,7 +89,7 @@ uninstall: uninstall_scripts uninstall_config uninstall_data uninstall_man unins
 
 uninstall_scripts:
 	for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done
-	for file in x2goagent; do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done
+	for file in x2goagent; do $(RM_FILE) $(DESTDIR)$(NXLIBDIR)/$$file; done
 	for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done
 
 uninstall_data:
diff --git a/x2goserver-x2goagent/bin/x2goagent b/x2goserver-x2goagent/bin/x2goagent
index a4e0665..558900d 100755
--- a/x2goserver-x2goagent/bin/x2goagent
+++ b/x2goserver-x2goagent/bin/x2goagent
@@ -15,15 +15,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
-NXAPP=x2goagent
-NX_LIBS=/usr/lib/nx
-NX_LOCAL_LIBS=/usr/local/lib/nx
-
-# make sure nxagent starts properly with pam_tmpdir.so being in use
-NX_TEMP=${NX_TEMP:-/tmp}
-export NX_TEMP
-
-test -x $NX_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS
-
-exec $NX_LIBS/../x2go/bin/$NXAPP "$@"
+export NXAPP=x2goagent
+nxagent $@
diff --git a/x2goserver.spec b/x2goserver.spec
index 5a7f160..d941841 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -810,9 +810,9 @@ fi
 %defattr(-,root,root)
 %doc debian/copyright
 %doc debian/changelog
-%dir %{_libdir}/x2go/bin
 %{_bindir}/x2goagent
-%{_libdir}/x2go/bin/x2goagent
+# %{_libdir}/nx/bin/ is owned by nxagent package...
+%{_libdir}/nx/bin/x2goagent
 %{_datadir}/x2go/versions/VERSION.x2goserver-x2goagent
 %{_datadir}/x2go/rgb
 %{_datadir}/pixmaps/x2go.xpm

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
