Date: Friday, April 30, 2010 @ 10:02:00 Author: tpowa Revision: 79130
upgpkg: freenx 0.7.3-6 fixed md5sum binary and fixed session startup on 1st login Added: freenx/trunk/nxagent-startup.patch Modified: freenx/trunk/PKGBUILD -----------------------+ PKGBUILD | 21 ++++++++++++++------- nxagent-startup.patch | 12 ++++++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-04-30 10:46:12 UTC (rev 79129) +++ PKGBUILD 2010-04-30 14:02:00 UTC (rev 79130) @@ -3,7 +3,7 @@ #Contributed: eliott <[email protected]>, Andre Naumann <[email protected]> pkgname=freenx pkgver=0.7.3 -pkgrel=5 +pkgrel=6 pkgdesc="Free Software (GPL) Implementation of the NX Server" arch=(i686 x86_64) url="http://freenx.berlios.de"; @@ -11,12 +11,12 @@ depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-apps' 'xorg-fonts-misc' 'coreutils') backup=(opt/NX/etc/node.conf) install=freenx.install -source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz kde-config.patch - keymap.patch) -md5sums=('856f597e139018f7ed62713c9d6c9ed5' - '70788a41f6c965ce117e9f5a8809df2a' - 'f0867659c925f6363fb2b7661f349248') - +source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz + kde-config.patch + keymap.patch + nxagent-startup.patch) + + build() { # patch and install nxserver cd $startdir/src/$pkgname-server-$pkgver @@ -24,6 +24,8 @@ patch < gentoo-nomachine.diff || return 1 # patch broken keymap remapping patch -Np0 -i ${srcdir}/keymap.patch || return 1 + # patch nxagent startup to avoid login issues + patch -Np0 -i ${srcdir}/nxagent-startup.patch || return 1 # fixed for archlinux ### Broken by kde4 at the moment! #patch -Np0 -i ../kde-config.patch || return 1 @@ -33,6 +35,7 @@ sed -i -e 's/utmp/nx/g' nxsetup sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig sed -i -e 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig + sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig sed -i -e 's|AGENT_EXTRA_OPTIONS_X=""|AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11/rgb -fp /usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 -xkbdir /usr/share/X11/xkb"|g' nxloadconfig sed -i -e 's/ENABLE_AUTORECONNECT_BEFORE_140="1"/ENABLE_AUTORECONNECT_BEFORE_140="0"/g' nxloadconfig sed -i -e 's,/etc/init.d/ssh,/etc/rc.d/sshd,g' nxsetup @@ -61,3 +64,7 @@ # create nxserver homedir mkdir -m700 -p $startdir/pkg/opt/NX/home/nx } +md5sums=('856f597e139018f7ed62713c9d6c9ed5' + '70788a41f6c965ce117e9f5a8809df2a' + 'f0867659c925f6363fb2b7661f349248' + '30dc16d8e2093ff71d5834a169ad9d00') Added: nxagent-startup.patch =================================================================== --- nxagent-startup.patch (rev 0) +++ nxagent-startup.patch 2010-04-30 14:02:00 UTC (rev 79130) @@ -0,0 +1,12 @@ +--- nxnode~ 2010-04-30 15:42:46.000000000 +0200 ++++ nxnode 2010-04-30 15:42:46.000000000 +0200 +@@ -328,6 +328,9 @@ + NODE_WM_PID=$! + fi + ++ # Patch - delay to allow nxagent to complete launching ++ sleep 4 ++ + echo "Xft.dpi: 96" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 + [ -d /etc/X11/Xresources ] && xrdb -display :$display -merge /etc/X11/Xresources/* >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 +
