[X2Go-Commits] [nx-libs] 06/06: Makefile.nx-libs: Don't allow symlinks to point into buildroot.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository nx-libs.

commit ce1078e87f6b845c59b5b0161b2946ac5d5ae6cf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jan 28 22:24:24 2015 +0100

    Makefile.nx-libs: Don't allow symlinks to point into buildroot.
---
 debian/Makefile.nx-libs |    6 +++---
 debian/changelog        |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 06d5f80..cd0a4e9 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -121,7 +121,7 @@ install-full:
 	# (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr/<libdir>/libX11.so.6
 	# (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6
 	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama
-	$(INSTALL_SYMLINK) $(DESTDIR)/$(USRLIBDIR)/libNX_Xinerama.so.1 $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1
+	$(INSTALL_SYMLINK) $(USRLIBDIR)/libNX_Xinerama.so.1 $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1
 
 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/nx/X11/bitmaps
 	$(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \
@@ -137,10 +137,10 @@ install-full:
 	$(INSTALL_FILE) etc/x2goagent.keyboard $(DESTDIR)$(ETCDIR_X2GO)/
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go
-	$(INSTALL_SYMLINK) $(DESTDIR)$(ETCDIR_X2GO)/rgb $(DESTDIR)$(PREFIX)/share/x2go/rgb
+	$(INSTALL_SYMLINK) $(ETCDIR_X2GO)/rgb $(DESTDIR)$(PREFIX)/share/x2go/rgb
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx
-	$(INSTALL_SYMLINK) $(DESTDIR)$(ETCDIR_NX)/rgb $(DESTDIR)$(PREFIX)/share/nx/rgb
+	$(INSTALL_SYMLINK) $(ETCDIR_NX)/rgb $(DESTDIR)$(PREFIX)/share/nx/rgb
 
 uninstall:
 	$(MAKE) uninstall-lite
diff --git a/debian/changelog b/debian/changelog
index 20079a6..52591d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
     patch files that get removed during code reduction.
   * Add 991_fix-hr-typos.full+lite.patch and 991_fix-hr-typos.full.patch.
     Fix several typos in upstream code detected by lintian.
+  * Makefile.nx-libs: Don't allow symlinks to point into buildroot.
 
   * NX code reduction efforts (from 93Mb to 60Mb):
     - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in

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