commit FreeNX

2 May 2007

Hello community,

here is the log from the commit of package FreeNX
checked in at Wed May 2 10:40:51 CEST 2007.

--------

--- FreeNX/FreeNX.changes	2006-10-13 12:33:01.000000000 +0200
+++ /mounts/work_src_done/NOARCH/FreeNX/FreeNX.changes	2007-05-02 10:25:34.412650000 +0200
@@ -1,0 +2,5 @@
+Wed May  2 10:25:05 CEST 2007 - sndirsch@suse.de
+
+- updated to release 0.6.0 (Bug #203197)
+
+-------------------------------------------------------------------

Old:
----
  freenx-0.5.0.diff
  freenx-0.5.0.tar.bz2

New:
----
  ANNOUNCE-0.6.0
  freenx-0.6.0.diff
  freenx-0.6.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ FreeNX.spec ++++++
--- /var/tmp/diff_new_pack.RBv307/_old	2007-05-02 10:40:38.000000000 +0200
+++ /var/tmp/diff_new_pack.RBv307/_new	2007-05-02 10:40:38.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package FreeNX (Version 0.5.0)
+# spec file for package FreeNX (Version 0.6.0)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -16,14 +16,14 @@
 %else
 BuildRequires:  XFree86-devel
 %endif
-License:        GPL
+License:        GNU General Public License (GPL)
 URL:            http://debian.tu-bs.de/knoppix/nx/
 Group:          System/X11/Servers/XF86_4
-Version:        0.5.0
-Release:        12
+Version:        0.6.0
+Release:        1
 Requires:       NX openssh expect netcat
 Summary:        FreeNX Application and Thin Client Server
-Source:         freenx-%{version}.tar.bz2
+Source:         freenx-%{version}.tar.gz
 Source1:        README.SuSE
 Source2:        ANNOUNCE-0.3.0
 Source3:        ANNOUNCE-0.3.1
@@ -32,6 +32,7 @@
 Source6:        ANNOUNCE-0.4.2
 Source7:        ANNOUNCE-0.5.0
 Source8:        NX-Firewall.txt
+Source0:        ANNOUNCE-0.6.0
 Patch:          freenx-%{version}.diff
 Patch1:         xorg7.diff
 Patch3:         freenx-ld_library_path.diff
@@ -60,11 +61,17 @@
 %endif
 %patch3 -p0
 %patch4
+rm *.orig
 
 %build
 
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/bin
+make -C nxserver-helper
+mv nxserver-helper tmp
+mv tmp/nxserver-helper .
+rm -rf tmp
+mv nxcheckload.sample nxcheckload
 install -m 755 nx* $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/etc/nxserver
 install -m 644 node.conf.sample $RPM_BUILD_ROOT/etc/nxserver/node.conf
@@ -75,16 +82,20 @@
 %doc README.SuSE AUTHORS CONTRIB COPYING ChangeLog INSTALL ANNOUNCE-* NX-Firewall.txt
 %dir /etc/nxserver
 %config /etc/nxserver/node.conf
+/usr/bin/nxcheckload
 /usr/bin/nxclient
 /usr/bin/nxkeygen
 /usr/bin/nxnode
 /usr/bin/nxnode-login
 /usr/bin/nxserver
+/usr/bin/nxserver-helper
 /usr/bin/nxsetup
 /usr/bin/nxloadconfig
 /usr/bin/nxprint
 
-%changelog -n FreeNX
+%changelog
+* Wed May 02 2007 - sndirsch@suse.de
+- updated to release 0.6.0 (Bug #203197)
 * Fri Oct 13 2006 - sndirsch@suse.de
 - backingstore.diff:
   * fixed backingstore option for !M 1.5.0 client.
@@ -315,20 +326,20 @@
 * Tue Sep 07 2004 - sndirsch@suse.de
 - updated to release 0.2
   * Changelog:
-- Reworked the whole security model in nxsetup due to requests
+    - Reworked the whole security model in nxsetup due to requests
   from SuSE and Gentoo.
   * nxsetup does not use the NoMachine key by default.
   * PAM authentication is enabled by default.
-- Added nxclient for compatibility with nxclient -dialog mode.
-- Minor changes
+    - Added nxclient for compatibility with nxclient -dialog mode.
+    - Minor changes
   * Added SSHD_AUTH_PORT to config vars in nxserver
   * Made all programs NX_ aware
   * Programs do now honor the setting of AuthorizedKeysFile in sshd_config
   * Changed nxsetup check from direct reading of passwd to getent
   (Thanks to Tom Hibbert <tom@nsp.co.nz>)
   * Changed overall messages in nxsetup
-- Made a overall clean upstream package.
-- Added Gentoo / NoMachine compatibility diff
+        - Made a overall clean upstream package.
+        - Added Gentoo / NoMachine compatibility diff
   * obsoletes patches nx-0.1-2.diff, nx-0.1-4.diff,
   nxserver_0.1-2.diff.gz, nxuseradd.diff
   * adjusted README.SuSE







++++++ backingstore.diff ++++++
--- /var/tmp/diff_new_pack.RBv307/_old	2007-05-02 10:40:39.000000000 +0200
+++ /var/tmp/diff_new_pack.RBv307/_new	2007-05-02 10:40:39.000000000 +0200
@@ -1,7 +1,7 @@
 --- nxnode.orig	2006-10-13 10:19:00.000000000 +0000
 +++ nxnode	2006-10-13 10:20:04.000000000 +0000
 @@ -253,6 +253,12 @@
- 	[ -n "$kbtype" ] && K="-kbtype $kbtype"
+
  	B=""
  	[ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ] && B="-bs $backingstore"
 +	# backingstore = { "when_requested", "always", ... }
@@ -10,6 +10,6 @@
 +	[ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" -a "$backingstore" = "1" ] && B="+bs"
 +	# backingstore = 1 and 2.0.0-Backend EXPERIMENTAL
 +	[ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" = "1" ] && B="-bs $backingstore"
- 	G=""
- 	[ -n "$geometry" ] && G="-geometry $geometry"
- 	R="-D"
+
+	# geometry
+

++++++ freenx-0.5.0.diff -> freenx-0.6.0.diff ++++++
--- FreeNX/freenx-0.5.0.diff	2006-09-13 04:32:52.000000000 +0200
+++ /mounts/work_src_done/NOARCH/FreeNX/freenx-0.6.0.diff	2007-05-01 21:22:05.000000000 +0200
@@ -24,9 +24,9 @@
  	[ -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 | grep 'NXAGENT - Version 1.5.0')" ] && \
-+	[ -z "$(strings $NX_DIR/nxagent | grep 'NXAGENT - Version 1.5.0')" ] && \
- 		ERROR="yes" && echo "Error: Could not find 1.5.0 version string in nxagent. NX 1.5.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')" ] && \
++	[ -z "$(strings $NX_DIR/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 $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
 --- nxsetup.orig	2006-09-06 21:24:51.000000000 +0200

++++++ freenx-ld_library_path.diff ++++++
--- /var/tmp/diff_new_pack.RBv307/_old	2007-05-02 10:40:39.000000000 +0200
+++ /var/tmp/diff_new_pack.RBv307/_new	2007-05-02 10:40:39.000000000 +0200
@@ -1,37 +1,38 @@
---- nxnode
-+++ nxnode
-@@ -264,7 +264,7 @@
- 	if [ "$type" = "windows" ]
+--- nxnode.orig	2007-01-23 04:22:50.000000000 +0100
++++ nxnode	2007-05-01 21:49:24.856954071 +0200
+@@ -434,7 +434,7 @@
  	then
  		# nxdesktop session (Windows RDP)
+ 
 -		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
 +		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+ 		# Setup optional parameters
+ 		
  		U=""
- 		P=""
- 		D=""
-@@ -275,18 +275,18 @@
- 	elif [ "$type" = "vnc" ]
+@@ -452,7 +452,7 @@
  	then
  		# nxviewer session (VNC RFP)
+ 		
 -		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
-+		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
- 		mkdir -p $USER_FAKE_HOME/.nx/C-$sess_id/scripts/
- 		echo "$agent_password" | $PATH_BIN/nxpasswd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd doit
- 		$PATH_BIN/nxviewer -encodings tight hextile copyrect raw -passwd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $vncfullscreen $G $K $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 &
++		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH{$LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+ 		# Setup password
+ 		
+ 		mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/"
+@@ -465,11 +465,11 @@
  	elif [ "$R" = "-R" -a "$rootless" != "1" ]
  	then
  		# nxproxy single application mode session
 -		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$PROXY_LIBRARY_PATH:$LD_LIBRARY_PATH"
-+		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$PROXY_LIBRARY_PATH${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
++		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$PROXY_LIBRARY_PATH{$LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
  		$PATH_BIN/nxproxy -C :$display $PROXY_EXTRA_OPTIONS 2>&3 &
  	else
  		# nxagent session (X11)
 -		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
-+		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
- 		P="-nopersistent"
- 		OLD_IFS=$IFS
- 		IFS=","
-@@ -1027,7 +1027,7 @@
++		[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH{$LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+ 		
+ 		# Setup optional parameters
+ 
+@@ -1229,7 +1229,7 @@
  	--agent)
  		echo "NX> 716 Starting NX Agent ..."
  		shift




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)