[arch-commits] Commit in nxclient/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Saturday, June 23, 2012 @ 09:25:42
  Author: andyrtr
Revision: 162203

upgpkg: nxclient 3.5.0.7-3

add a wrapper to load internal libpng12 from uncommon directory; FS#29961

Added:
  nxclient/trunk/nxclient.wrapper
Modified:
  nxclient/trunk/PKGBUILD
Deleted:
  nxclient/trunk/nxclient.ld.so.conf.d

-----------------------+
 PKGBUILD              |   26 +++++++++++++-------------
 nxclient.ld.so.conf.d |    1 -
 nxclient.wrapper      |    2 ++
 3 files changed, 15 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-23 12:19:01 UTC (rev 162202)
+++ PKGBUILD	2012-06-23 13:25:42 UTC (rev 162203)
@@ -4,7 +4,7 @@
 
 pkgname=nxclient
 pkgver=3.5.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Nomachine's closed source client for NX servers"
 arch=('i686' 'x86_64')
 url="http://nomachine.com"
@@ -12,14 +12,14 @@
 depends=('libxext' 'libxft' 'xorg-xauth' 'libxcomp' 'nx-common>=3.5.0-4.1' 'desktop-file-utils')
 makedepends=('rpmextract' 'chrpath')
 optdepends=('cups: for printing support')
-[ "$CARCH" = "x86_64" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.x86_64.rpm nomachine.key nxclient.ld.so.conf.d)
-[ "$CARCH" = "x86_64" ] && md5sums=('0648c2e36a14d5810e26d7d640d8382f' 'cb5df74aff5160eab9cd4313019ae228' '4faf0fbece74128729c77de7c67ee369')
-[ "$CARCH" = "i686" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.i386.rpm nomachine.key nxclient.ld.so.conf.d)
-[ "$CARCH" = "i686" ] &&  md5sums=('53e5b9b4a1096324e7d3dbd8ffb192a1' 'cb5df74aff5160eab9cd4313019ae228' '4faf0fbece74128729c77de7c67ee369')
+[ "$CARCH" = "x86_64" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.x86_64.rpm nomachine.key nxclient.wrapper)
+[ "$CARCH" = "x86_64" ] && md5sums=('0648c2e36a14d5810e26d7d640d8382f' 'cb5df74aff5160eab9cd4313019ae228' '13c9841df2ff943c8c35ce8fdb04ac44')
+[ "$CARCH" = "i686" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.i386.rpm nomachine.key nxclient.wrapper)
+[ "$CARCH" = "i686" ] &&  md5sums=('53e5b9b4a1096324e7d3dbd8ffb192a1' 'cb5df74aff5160eab9cd4313019ae228' '13c9841df2ff943c8c35ce8fdb04ac44')
 install=nxclient.install
 
 build() {
-  cd ${srcdir}/
+  cd ${srcdir}
   rpmextract.sh *.rpm
   sed -i -e 's:/usr/NX:/usr/lib/nx:g' etc/profile.d/nx.*
   sed -i -e 's:/usr/NX:/usr/lib/nx:g' ${srcdir}/usr/NX/share/applnk/network/*.desktop
@@ -41,20 +41,20 @@
   # provided by nx-common
   rm ${srcdir}/usr/NX/bin/nxssh 
   rm ${srcdir}/usr/NX/bin/nxesd # esd support has been fully dropped
- 
+
   # provide default key file later
   rm ${srcdir}/usr/NX/share/keys/server.id_dsa.key
 
   # move files
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/{bin,lib/nx}}
+  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
   cp -aR ${srcdir}/usr/NX/* ${pkgdir}/usr/lib/nx
   # add symlinks
   cd ${pkgdir}/usr/bin
   ln -sv /usr/lib/nx/bin/{nxclient,nxkill,nxprint,nxservice} .
+  # install wrapper including Linker fix
+  mv ${pkgdir}/usr/lib/nx/bin/nxclient ${pkgdir}/usr/lib/nx/bin/nxclient_orig
+  install -m 755 ${srcdir}/nxclient.wrapper ${pkgdir}/usr/lib/nx/bin/nxclient
 
-  # install ld.so.conf.d file to allow the linker to load libs from custom location
-  install -m 644 "$srcdir/nxclient.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nxclient.conf"
-
   # add default key file
   install -D -m 644 ${srcdir}/nomachine.key ${pkgdir}/usr/lib/nx/share/keys/server.id_dsa.key
 
@@ -64,7 +64,7 @@
 
   # some cleanup
   rm -rf ${pkgdir}/usr/lib/nx/share/{documents,cups}
-  
+
   # fix insecure rpath
-  chrpath -d "$pkgdir/usr/lib/nx/bin/nxclient"
+  chrpath -d "$pkgdir/usr/lib/nx/bin/nxclient_orig"
 }

Deleted: nxclient.ld.so.conf.d
===================================================================
--- nxclient.ld.so.conf.d	2012-06-23 12:19:01 UTC (rev 162202)
+++ nxclient.ld.so.conf.d	2012-06-23 13:25:42 UTC (rev 162203)
@@ -1 +0,0 @@
-/usr/lib/nx/lib

Added: nxclient.wrapper
===================================================================
--- nxclient.wrapper	                        (rev 0)
+++ nxclient.wrapper	2012-06-23 13:25:42 UTC (rev 162203)
@@ -0,0 +1,2 @@
+#!/bin/sh
+LD_LIBRARY_PATH=/usr/lib/nx/lib:$LD_LIBRARY_PATH /usr/lib/nx/bin/nxclient_orig $@