[arch-commits] CVS update of extra/network/freenx (8 files)

Tobias Powalowski tpowa at archlinux.org
Tue Oct 9 16:15:55 UTC 2007


    Date: Tuesday, October 9, 2007 @ 12:15:55
  Author: tpowa
    Path: /home/cvs-extra/extra/network/freenx

   Added: kde-config.patch (1.1) nx3-support.patch (1.1)
          xcb-support.patch (1.1)
Modified: PKGBUILD (1.23 -> 1.24) freenx.install (1.5 -> 1.6)
 Removed: 0.6.1.patch.bz2 (1.1) fullscreen.patch (1.1)
          nxclient-fix.patch (1.1)

'upgpkg: update to new version'


--------------------+
 0.6.1.patch.bz2    |    <<Binary file>>
 PKGBUILD           |   32 ++++++++++++++++++++----------
 freenx.install     |    4 +--
 fullscreen.patch   |   23 ---------------------
 kde-config.patch   |   15 ++++++++++++++
 nx3-support.patch  |   24 ++++++++++++++++++++++
 nxclient-fix.patch |   11 ----------
 xcb-support.patch  |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 118 insertions(+), 46 deletions(-)


Index: extra/network/freenx/0.6.1.patch.bz2
<<Binary file>>
Index: extra/network/freenx/PKGBUILD
diff -u extra/network/freenx/PKGBUILD:1.23 extra/network/freenx/PKGBUILD:1.24
--- extra/network/freenx/PKGBUILD:1.23	Mon Apr  9 13:17:19 2007
+++ extra/network/freenx/PKGBUILD	Tue Oct  9 12:15:55 2007
@@ -1,28 +1,37 @@
-# $Id: PKGBUILD,v 1.23 2007/04/09 17:17:19 tpowa Exp $
+# $Id: PKGBUILD,v 1.24 2007/10/09 16:15:55 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 #Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org> 
 pkgname=freenx
-pkgver=0.6.1
-pkgrel=3
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="Free Software (GPL) Implementation of the NX Server"
 arch=(i686 x86_64)
 url="http://freenx.berlios.de"
-depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-apps' 'xorg-fonts-misc')
+license=('GPL')
+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-0.6.0.tar.gz 0.6.1.patch.bz2)
+source=(http://download.berlios.de/freenx/$pkgname-$pkgver.tar.gz nx3-support.patch xcb-support.patch \
+	fix-tiny-fonts.patch kde-config.patch)
 
 build() {
   # patch and install nxserver
-  cd $startdir/src/freenx-0.6.0
+  cd $startdir/src/$pkgname-$pkgver
+  # patch from inside nx
   patch < gentoo-nomachine.diff || return 1
-  patch -Np1 -i ../0.6.1.patch || return 1
+  # fixes from freenx svn
+  patch -Np0 -i ../nx3-support.patch || return 1
+  patch -Np0 -i ../xcb-support.patch || return 1
+  patch -Np0 -i ../fix-tiny-fonts.patch || return 1
+  # fixed for archlinux
+  patch -Np0 -i ../kde-config.patch || return 1
   sed -i -e 's,/usr/NX/bin/nxclient,/opt/NX/bin/nxclient-nomachine,g' nxclient
   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 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig
-  sed -i 's,kde-config,/opt/kde/bin/kde-config,g' nxloadconfig
+  #sed -i 's,kde-config,/opt/kde/bin/kde-config,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
@@ -45,5 +54,8 @@
   # create nxserver homedir
   mkdir -p $startdir/pkg/opt/NX/home/nx
 }
-
-md5sums=('504aaa2c3c93c36eefab74e2b8a6506e' 'fddf966bdff612acac47f1d4ea083f74')
+md5sums=('9c21eb45b4193ad7184109f3274c9e33'
+         '3571ecc3c7f14cc3a03109ef57fe4443'
+         'bf74504a131df1195519dbe33f557331'
+         '2f46812eb50fbca6346132fbb64250f7'
+         '48b4256d7c0d22be0e2ae597186b511e')
Index: extra/network/freenx/freenx.install
diff -u extra/network/freenx/freenx.install:1.5 extra/network/freenx/freenx.install:1.6
--- extra/network/freenx/freenx.install:1.5	Sun Feb 11 05:54:51 2007
+++ extra/network/freenx/freenx.install	Tue Oct  9 12:15:55 2007
@@ -2,7 +2,7 @@
 post_install() {
 # setting up freenx
 echo 'Generating keys ...'
-/opt/NX/bin/nxsetup --install --uid 85 2>&1 >/dev/null
+/opt/NX/bin/nxsetup --install --uid 85 --gid 85  2>&1 >/dev/null
 /bin/cat <<THEEND
 ATTENTION FREENX:
 For correct setup please take a look at the wiki:
@@ -13,7 +13,7 @@
 post_upgrade() {
 # setting up freenx
 echo 'Rerunning nxsetup ...'
-/opt/NX/bin/nxsetup --install --uid 85 2>&1 >/dev/null
+/opt/NX/bin/nxsetup --install --uid 85 --gid 85 2>&1 >/dev/null
 /bin/cat <<THEEND
 ATTENTION FREENX:
 For correct setup please take a look at the wiki:
Index: extra/network/freenx/fullscreen.patch
diff -u extra/network/freenx/fullscreen.patch:1.1 extra/network/freenx/fullscreen.patch:removed
--- extra/network/freenx/fullscreen.patch:1.1	Sun Feb 11 05:54:51 2007
+++ extra/network/freenx/fullscreen.patch	Tue Oct  9 12:15:55 2007
@@ -1,23 +0,0 @@
---- nxnode	2006-10-05 21:24:20.000000000 +0200
-+++ nxnode	2006-10-05 21:21:11.000000000 +0200
-@@ -629,6 +629,10 @@
- 	imagecompressionmethod=$(getparam imagecompressionmethod)
- 	imagecompressionlevel=$(getparam imagecompressionlevel)
- 	geometry=$(getparam geometry)
-+	
-+	# fullscreen variable added to fix fullscreen on client login
-+	fullscreen=$(getparam fullscreen)
-+	
- 	keyboard=$(getparam keyboard)
- 	kbtype=$(getparam kbtype)
- 	media=$(getparam media)
-@@ -664,7 +668,8 @@
- 	status=$(getparam status)
- 	host=$(getparam host)
- 
--	fullscreen=""
-+#	commented out to fix fullscreen on client login
-+#	fullscreen=""
- 	[ "$geometry" = "fullscreen" ] && fullscreen="1"
- 
- 	[ "$EXPORT_USERIP" = "1" ] && export NXUSERIP="$userip"
Index: extra/network/freenx/kde-config.patch
diff -u /dev/null extra/network/freenx/kde-config.patch:1.1
--- /dev/null	Tue Oct  9 12:15:55 2007
+++ extra/network/freenx/kde-config.patch	Tue Oct  9 12:15:55 2007
@@ -0,0 +1,15 @@
+--- nxloadconfig~	2007-07-07 07:59:03.000000000 +0200
++++ nxloadconfig	2007-10-09 13:41:52.000000000 +0200
+@@ -281,9 +281,11 @@
+ 	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
+ fi 
+ 
++if [ -f /opt/kde/bin/kde-config ]; then
+ [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
+-[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(kde-config --localprefix)"/share/config/kdeprintrc"
++[ -z "$KDE_PRINTRC" ] && KDE_PRINTRC=$(/opt/kde/bin/kde-config --localprefix)"/share/config/kdeprintrc"
+ [ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
++fi
+ 
+ #########################################################################
+ # Support for --check
Index: extra/network/freenx/nx3-support.patch
diff -u /dev/null extra/network/freenx/nx3-support.patch:1.1
--- /dev/null	Tue Oct  9 12:15:55 2007
+++ extra/network/freenx/nx3-support.patch	Tue Oct  9 12:15:55 2007
@@ -0,0 +1,24 @@
+Index: nxloadconfig
+===================================================================
+--- nxloadconfig	(Revision 391)
++++ nxloadconfig	(Arbeitskopie)
+@@ -289,7 +289,7 @@
+ if [ -z "$ENABLE_2_0_0_BACKEND" ]
+ then
+ 	ENABLE_2_0_0_BACKEND="1"
+-	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
++	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && ENABLE_2_0_0_BACKEND="0"
+ fi 
+ 
+ if [ "$ENABLE_KDE_CUPS" = "1" ]
+@@ -549,8 +549,8 @@
+ 	[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
+ 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
+ 
+-	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
+-		ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 backend is needed for this version of FreeNX."
++	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \
++		ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.0.0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.0.0 backend is needed for this version of FreeNX."
+ 		
+ 	[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
+ 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""
Index: extra/network/freenx/nxclient-fix.patch
diff -u extra/network/freenx/nxclient-fix.patch:1.1 extra/network/freenx/nxclient-fix.patch:removed
--- extra/network/freenx/nxclient-fix.patch:1.1	Mon Jul  3 09:19:28 2006
+++ extra/network/freenx/nxclient-fix.patch	Tue Oct  9 12:15:55 2007
@@ -1,11 +0,0 @@
---- nxclient~	2005-08-02 19:49:08.000000000 +0200
-+++ nxclient	2006-07-03 15:14:43.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display:,printer: -n $(basename $0) -- "$@"`
- 
--if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
-+if [ $? = 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
- 
- # Note the quotes around `$TEMP': they are essential!
- eval set -- "$TEMP"
Index: extra/network/freenx/xcb-support.patch
diff -u /dev/null extra/network/freenx/xcb-support.patch:1.1
--- /dev/null	Tue Oct  9 12:15:56 2007
+++ extra/network/freenx/xcb-support.patch	Tue Oct  9 12:15:55 2007
@@ -0,0 +1,54 @@
+--- nxnode.old	2007-04-20 19:59:07.000000000 +0200
++++ nxnode	2007-10-09 08:10:50.000000000 +0200
+@@ -300,7 +300,7 @@
+ 	
+ 	if [ "$virtualdesktop" = "1" -a "$type" = "unix-application" -a "$DEFAULT_X_WM" != "" -a -x "$(find_app $DEFAULT_X_WM)" ]
+ 	then
+-		DISPLAY=unix:$display $DEFAULT_X_WM >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
++		DISPLAY=:$display $DEFAULT_X_WM >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
+ 		NODE_WM_PID=$!
+ 	fi
+ 
+@@ -308,7 +308,7 @@
+ 	# Startup the application
+ 	#
+ 	
+-	DISPLAY=unix:$display $NODE_APPLICATION >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
++	DISPLAY=:$display $NODE_APPLICATION >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
+ 	NODE_APP_PID=$!
+ 	
+ 	mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/pids/"
+@@ -1087,13 +1087,13 @@
+ 
+ $COMMAND_XAUTH >/dev/null 2>&1 <<EOF
+ add localhost:$display MIT-MAGIC-COOKIE-1 $cookie
+-add unix:$display MIT-MAGIC-COOKIE-1 $cookie
++add :$display MIT-MAGIC-COOKIE-1 $cookie
+ exit
+ EOF
+ 
+ $COMMAND_XAUTH -f "$USER_FAKE_HOME/.nx/C-$sess_id/authority" >/dev/null 2>&1 <<EOF
+ add localhost:$display MIT-MAGIC-COOKIE-1 $cookie
+-add unix:$display MIT-MAGIC-COOKIE-1 $cookie
++add :$display MIT-MAGIC-COOKIE-1 $cookie
+ exit
+ EOF
+ 
+@@ -1101,7 +1101,7 @@
+ 
+ cat << EOF >$USER_FAKE_HOME/.nx/C-$sess_id/scripts/authority
+ remove localhost:$display
+-remove unix:$display
++remove :$display
+ exit
+ EOF
+ 
+@@ -1126,7 +1126,7 @@
+ then
+ 	sess_id="$SERVER_NAME-$display-$uniqueid"
+ 	# go into background immediately
+-	NXSESSIONID="$sess_id" DISPLAY=unix:$display "$NODE_AUTOSTART" "$1" >/dev/null 2>&1 &
++	NXSESSIONID="$sess_id" DISPLAY=:$display "$NODE_AUTOSTART" "$1" >/dev/null 2>&1 &
+ 	# dont't wait for this child!
+ 	disown $!
+ fi




More information about the arch-commits mailing list