[arch-commits] Commit in freenx/repos (testing-i686 testing-i686/PKGBUILD)

[Tobias Powalowski]

    Date: Monday, September 29, 2008 @ 17:08:33
  Author: tpowa
Revision: 13921

Merged revisions 13919 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/freenx/trunk

........
  r13919 | tpowa | 2008-09-29 21:04:29 +0000 (Mo, 29 Sep 2008) | 1 line
  
  upgpkg: freenx 0.7.3-2
........

Modified:
  freenx/repos/testing-i686/	(properties)
  freenx/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)


Property changes on: freenx/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /freenx/trunk:1-13817
   + /freenx/trunk:1-13920

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-09-29 21:05:16 UTC (rev 13920)
+++ testing-i686/PKGBUILD	2008-09-29 21:08:33 UTC (rev 13921)
@@ -3,7 +3,7 @@
 #Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org> 
 pkgname=freenx
 pkgver=0.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Free Software (GPL) Implementation of the NX Server"
 arch=(i686 x86_64)
 url="http://freenx.berlios.de"
@@ -21,17 +21,15 @@
   # fixed for archlinux
   ### Broken by kde4 at the moment!
   #patch -Np0 -i ../kde-config.patch || return 1
-  #sed -i -e 's,/usr/NX/bin/nxclient,/opt/NX/bin/nxclient-nomachine,g' nxdialog
   sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig
   sed -i -e 's,/usr/NX,/opt/NX,g' nxloadconfig
-  sed -i 's,netcat,nc,g' nxloadconfig
+  sed -i -e 's,netcat,nc,g' nxloadconfig
   sed -i -e 's/utmp/nx/g' nxsetup
-  sed -i 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig
-  #sed -i 's,COMMAND_MD5SUM=openssl md5,COMMAND_MD5SUM=md5sum,g' nxloadconfig
-  sed -i 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig
-  sed -i '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 's,/etc/init.d/ssh,/etc/rc.d/sshd,g' nxsetup
-  sed -i -e 's,#ENABLE_2_0_0_BACKEND="0",ENABLE_2_0_0_BACKEND="1",g' node.conf.sample 
+  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|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
   # fix key generation
   sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup
   install -D -m755 nxnode $startdir/pkg/opt/NX/bin/nxnode
@@ -50,9 +48,8 @@
   cd nxserver-helper
   make
   install -D -m755 nxserver-helper $startdir/pkg/opt/NX/bin/nxserver-helper
-
   # create nxserver homedir
-  mkdir -p $startdir/pkg/opt/NX/home/nx
+  mkdir -m700 -p $startdir/pkg/opt/NX/home/nx
 }
 md5sums=('856f597e139018f7ed62713c9d6c9ed5'
          '70788a41f6c965ce117e9f5a8809df2a')