aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-28 22:24:24 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-01-28 22:24:24 +0100
commitce1078e87f6b845c59b5b0161b2946ac5d5ae6cf (patch)
tree6bde8851f574276f69ee7d674142ebdb4dc077c7
parent279b74158c8cbeb2b513d738159ad522f8954bc4 (diff)
downloadnx-libs-ce1078e87f6b845c59b5b0161b2946ac5d5ae6cf.tar.gz
nx-libs-ce1078e87f6b845c59b5b0161b2946ac5d5ae6cf.tar.bz2
nx-libs-ce1078e87f6b845c59b5b0161b2946ac5d5ae6cf.zip
Makefile.nx-libs: Don't allow symlinks to point into buildroot.
-rw-r--r--debian/Makefile.nx-libs6
-rw-r--r--debian/changelog1
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 06d5f804e..cd0a4e95c 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 20079a66d..52591d058 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