Date: Sunday, April 15, 2012 @ 12:23:21 Author: andyrtr Revision: 156199
archrelease: copy trunk to staging-i686, staging-x86_64 Added: nxclient/repos/staging-i686/ nxclient/repos/staging-i686/PKGBUILD (from rev 156198, nxclient/trunk/PKGBUILD) nxclient/repos/staging-i686/nomachine.key (from rev 156198, nxclient/trunk/nomachine.key) nxclient/repos/staging-i686/nxclient.install (from rev 156198, nxclient/trunk/nxclient.install) nxclient/repos/staging-x86_64/ nxclient/repos/staging-x86_64/PKGBUILD (from rev 156198, nxclient/trunk/PKGBUILD) nxclient/repos/staging-x86_64/nomachine.key (from rev 156198, nxclient/trunk/nomachine.key) nxclient/repos/staging-x86_64/nxclient.install (from rev 156198, nxclient/trunk/nxclient.install) ---------------------------------+ staging-i686/PKGBUILD | 72 ++++++++++++++++++++++++++++++++++++++ staging-i686/nomachine.key | 12 ++++++ staging-i686/nxclient.install | 22 +++++++++++ staging-x86_64/PKGBUILD | 72 ++++++++++++++++++++++++++++++++++++++ staging-x86_64/nomachine.key | 12 ++++++ staging-x86_64/nxclient.install | 22 +++++++++++ 6 files changed, 212 insertions(+) Copied: nxclient/repos/staging-i686/PKGBUILD (from rev 156198, nxclient/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2012-04-15 16:23:21 UTC (rev 156199) @@ -0,0 +1,72 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +#Contributed: eliott <eli...@solarblue.net>, Andre Naumann <anaum...@sparced.org> + +pkgname=nxclient +pkgver=3.5.0.7 +pkgrel=1.1 +pkgdesc="Nomachine's closed source client for NX servers" +arch=('i686' 'x86_64') +url="http://nomachine.com" +license=('custom:nomachine') +depends=('libxext' 'libxft' 'xorg-xauth' 'libxcomp' 'nx-x11' '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) +[ "$CARCH" = "x86_64" ] && md5sums=('0648c2e36a14d5810e26d7d640d8382f' 'cb5df74aff5160eab9cd4313019ae228') +[ "$CARCH" = "i686" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.i386.rpm nomachine.key) +[ "$CARCH" = "i686" ] && md5sums=('53e5b9b4a1096324e7d3dbd8ffb192a1' 'cb5df74aff5160eab9cd4313019ae228') +install=nxclient.install + +build() { + 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 +} + +package() { + # profile files + install -D -m 755 ${srcdir}/etc/profile.d/nx.sh ${pkgdir}/etc/profile.d/nx.sh + install -D -m 755 ${srcdir}/etc/profile.d/nx.csh ${pkgdir}/etc/profile.d/nx.csh + # menu entries + install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-wizard.desktop ${pkgdir}/usr/share/applications/nxclient-wizard.desktop + install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient.desktop ${pkgdir}/usr/share/applications/nxclient.desktop + install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-admin.desktop ${pkgdir}/usr/share/applications/nxclient-admin.desktop + rm -r ${srcdir}/usr/NX/share/applnk + + # remove libs that come in system and are provided by libxcomp/nx-x11 + rm ${srcdir}/usr/NX/lib/{libXcomp.*,libXcompsh.*,libcrypto.*,libjpeg.*,libz.*} + + # 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}/usr/{bin,lib} + cp -aR ${srcdir}/usr/NX ${pkgdir}/usr/lib + # add symlinks + cd ${pkgdir}/usr/bin + ln -sv /usr/lib/NX/bin/{nxclient,nxkill,nxprint,nxservice} . + + # move libs into proper ld.conf.so place provided by nx-x11 + install -dm 755 ${pkgdir}/usr/lib/nx + cp -aR ${pkgdir}/usr/lib/NX/lib* ${pkgdir}/usr/lib/nx + rm -rf ${pkgdir}/usr/lib/NX/lib* + + # add default key file + install -D -m 644 ${srcdir}/nomachine.key ${pkgdir}/usr/lib/NX/share/keys/server.id_dsa.key + + # add license file + mkdir -p ${pkgdir}/usr/share/licenses/nxclient + mv ${pkgdir}/usr/lib/NX/share/documents/client/license-info ${pkgdir}/usr/share/licenses/nxclient/LICENSE + + # some cleanup + rm -rf ${pkgdir}/usr/lib/NX/share/{documents,cups} + + # fix insecure rpath + chrpath -d "$pkgdir/usr/lib/NX/bin/nxclient" +} Copied: nxclient/repos/staging-i686/nomachine.key (from rev 156198, nxclient/trunk/nomachine.key) =================================================================== --- staging-i686/nomachine.key (rev 0) +++ staging-i686/nomachine.key 2012-04-15 16:23:21 UTC (rev 156199) @@ -0,0 +1,12 @@ +-----BEGIN DSA PRIVATE KEY----- +MIIBuwIBAAKBgQCXv9AzQXjxvXWC1qu3CdEqskX9YomTfyG865gb4D02ZwWuRU/9 +C3I9/bEWLdaWgJYXIcFJsMCIkmWjjeSZyTmeoypI1iLifTHUxn3b7WNWi8AzKcVF +aBsBGiljsop9NiD1mEpA0G+nHHrhvTXz7pUvYrsrXcdMyM6rxqn77nbbnwIVALCi +xFdHZADw5KAVZI7r6QatEkqLAoGBAI4L1TQGFkq5xQ/nIIciW8setAAIyrcWdK/z +5/ZPeELdq70KDJxoLf81NL/8uIc4PoNyTRJjtT3R4f8Az1TsZWeh2+ReCEJxDWgG +fbk2YhRqoQTtXPFsI4qvzBWct42WonWqyyb1bPBHk+JmXFscJu5yFQ+JUVNsENpY ++Gkz3HqTAoGANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfa +QU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3 +mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8CFDIm1xRf +8xAPsSKs6yZ6j1FNklfu +-----END DSA PRIVATE KEY----- Copied: nxclient/repos/staging-i686/nxclient.install (from rev 156198, nxclient/trunk/nxclient.install) =================================================================== --- staging-i686/nxclient.install (rev 0) +++ staging-i686/nxclient.install 2012-04-15 16:23:21 UTC (rev 156199) @@ -0,0 +1,22 @@ +post_install() { + update-desktop-database -q + + echo "For correct setup please take a look at the wiki:" + echo "http://wiki.archlinux.org/index.php/FreeNX" + + +} + +post_upgrade() { + update-desktop-database -q + + if [ "`vercmp $2 3.5.0.7-1`" -lt 0 ]; then + # important upgrade notice + echo "because file location of the default key has been moved" + echo "you may need to reconfigure your connection and settings" + fi +} + +post_remove() { + update-desktop-database -q +} Copied: nxclient/repos/staging-x86_64/PKGBUILD (from rev 156198, nxclient/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2012-04-15 16:23:21 UTC (rev 156199) @@ -0,0 +1,72 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +#Contributed: eliott <eli...@solarblue.net>, Andre Naumann <anaum...@sparced.org> + +pkgname=nxclient +pkgver=3.5.0.7 +pkgrel=1.1 +pkgdesc="Nomachine's closed source client for NX servers" +arch=('i686' 'x86_64') +url="http://nomachine.com" +license=('custom:nomachine') +depends=('libxext' 'libxft' 'xorg-xauth' 'libxcomp' 'nx-x11' '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) +[ "$CARCH" = "x86_64" ] && md5sums=('0648c2e36a14d5810e26d7d640d8382f' 'cb5df74aff5160eab9cd4313019ae228') +[ "$CARCH" = "i686" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.i386.rpm nomachine.key) +[ "$CARCH" = "i686" ] && md5sums=('53e5b9b4a1096324e7d3dbd8ffb192a1' 'cb5df74aff5160eab9cd4313019ae228') +install=nxclient.install + +build() { + 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 +} + +package() { + # profile files + install -D -m 755 ${srcdir}/etc/profile.d/nx.sh ${pkgdir}/etc/profile.d/nx.sh + install -D -m 755 ${srcdir}/etc/profile.d/nx.csh ${pkgdir}/etc/profile.d/nx.csh + # menu entries + install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-wizard.desktop ${pkgdir}/usr/share/applications/nxclient-wizard.desktop + install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient.desktop ${pkgdir}/usr/share/applications/nxclient.desktop + install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-admin.desktop ${pkgdir}/usr/share/applications/nxclient-admin.desktop + rm -r ${srcdir}/usr/NX/share/applnk + + # remove libs that come in system and are provided by libxcomp/nx-x11 + rm ${srcdir}/usr/NX/lib/{libXcomp.*,libXcompsh.*,libcrypto.*,libjpeg.*,libz.*} + + # 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}/usr/{bin,lib} + cp -aR ${srcdir}/usr/NX ${pkgdir}/usr/lib + # add symlinks + cd ${pkgdir}/usr/bin + ln -sv /usr/lib/NX/bin/{nxclient,nxkill,nxprint,nxservice} . + + # move libs into proper ld.conf.so place provided by nx-x11 + install -dm 755 ${pkgdir}/usr/lib/nx + cp -aR ${pkgdir}/usr/lib/NX/lib* ${pkgdir}/usr/lib/nx + rm -rf ${pkgdir}/usr/lib/NX/lib* + + # add default key file + install -D -m 644 ${srcdir}/nomachine.key ${pkgdir}/usr/lib/NX/share/keys/server.id_dsa.key + + # add license file + mkdir -p ${pkgdir}/usr/share/licenses/nxclient + mv ${pkgdir}/usr/lib/NX/share/documents/client/license-info ${pkgdir}/usr/share/licenses/nxclient/LICENSE + + # some cleanup + rm -rf ${pkgdir}/usr/lib/NX/share/{documents,cups} + + # fix insecure rpath + chrpath -d "$pkgdir/usr/lib/NX/bin/nxclient" +} Copied: nxclient/repos/staging-x86_64/nomachine.key (from rev 156198, nxclient/trunk/nomachine.key) =================================================================== --- staging-x86_64/nomachine.key (rev 0) +++ staging-x86_64/nomachine.key 2012-04-15 16:23:21 UTC (rev 156199) @@ -0,0 +1,12 @@ +-----BEGIN DSA PRIVATE KEY----- +MIIBuwIBAAKBgQCXv9AzQXjxvXWC1qu3CdEqskX9YomTfyG865gb4D02ZwWuRU/9 +C3I9/bEWLdaWgJYXIcFJsMCIkmWjjeSZyTmeoypI1iLifTHUxn3b7WNWi8AzKcVF +aBsBGiljsop9NiD1mEpA0G+nHHrhvTXz7pUvYrsrXcdMyM6rxqn77nbbnwIVALCi +xFdHZADw5KAVZI7r6QatEkqLAoGBAI4L1TQGFkq5xQ/nIIciW8setAAIyrcWdK/z +5/ZPeELdq70KDJxoLf81NL/8uIc4PoNyTRJjtT3R4f8Az1TsZWeh2+ReCEJxDWgG +fbk2YhRqoQTtXPFsI4qvzBWct42WonWqyyb1bPBHk+JmXFscJu5yFQ+JUVNsENpY ++Gkz3HqTAoGANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfa +QU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3 +mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8CFDIm1xRf +8xAPsSKs6yZ6j1FNklfu +-----END DSA PRIVATE KEY----- Copied: nxclient/repos/staging-x86_64/nxclient.install (from rev 156198, nxclient/trunk/nxclient.install) =================================================================== --- staging-x86_64/nxclient.install (rev 0) +++ staging-x86_64/nxclient.install 2012-04-15 16:23:21 UTC (rev 156199) @@ -0,0 +1,22 @@ +post_install() { + update-desktop-database -q + + echo "For correct setup please take a look at the wiki:" + echo "http://wiki.archlinux.org/index.php/FreeNX" + + +} + +post_upgrade() { + update-desktop-database -q + + if [ "`vercmp $2 3.5.0.7-1`" -lt 0 ]; then + # important upgrade notice + echo "because file location of the default key has been moved" + echo "you may need to reconfigure your connection and settings" + fi +} + +post_remove() { + update-desktop-database -q +}