Hello community, here is the log from the commit of package FreeNX checked in at Mon Aug 28 23:48:07 CEST 2006. -------- --- FreeNX/FreeNX.changes 2006-01-25 21:31:13.000000000 +0100 +++ FreeNX/FreeNX.changes 2006-08-25 11:02:40.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 25 11:02:14 CEST 2006 - dmueller@suse.de + +- update to 0.5.0: + * NX 2.0 support +- build as noarch + +------------------------------------------------------------------- Old: ---- freenx-0.4.4.diff freenx-0.4.4.tar.gz freenx-enable_backend.diff freenx-enable_rootless_mode.diff New: ---- ANNOUNCE-0.5.0 freenx-0.5.0.diff freenx-0.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeNX.spec ++++++ --- /var/tmp/diff_new_pack.kVkmTj/_old 2006-08-28 23:47:59.000000000 +0200 +++ /var/tmp/diff_new_pack.kVkmTj/_new 2006-08-28 23:47:59.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package FreeNX (Version 0.4.4) +# spec file for package FreeNX (Version 0.5.0) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 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. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,22 +14,22 @@ License: GPL URL: http://debian.tu-bs.de/knoppix/nx/ Group: System/X11/Servers/XF86_4 -Version: 0.4.4 -Release: 6 +Version: 0.5.0 +Release: 1 Requires: NX openssh expect netcat Summary: FreeNX Application and Thin Client Server -Source: freenx-%{version}.tar.gz +Source: freenx-%{version}.tar.bz2 Source1: README.SuSE Source2: ANNOUNCE-0.3.0 Source3: ANNOUNCE-0.3.1 Source4: ANNOUNCE-0.4.0 Source5: ANNOUNCE-0.4.1 Source6: ANNOUNCE-0.4.2 -Source7: NX-Firewall.txt -Patch: freenx-enable_rootless_mode.diff -Patch1: freenx-enable_backend.diff -Patch2: freenx-%{version}.diff +Source7: ANNOUNCE-0.5.0 +Source8: NX-Firewall.txt +Patch: freenx-%{version}.diff Patch3: freenx-ld_library_path.diff +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,9 +47,7 @@ %prep %setup -n freenx-%{version} -%patch -p1 -%patch1 -p0 -%patch2 -p0 +%patch %patch3 -p0 %build @@ -76,6 +74,10 @@ /usr/bin/nxprint %changelog -n FreeNX +* Fri Aug 25 2006 - dmueller@suse.de +- update to 0.5.0: + * NX 2.0 support +- build as noarch * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Fri Sep 30 2005 - sndirsch@suse.de ++++++ freenx-0.4.4.diff -> freenx-0.5.0.diff ++++++ --- FreeNX/freenx-0.4.4.diff 2005-08-19 15:10:54.000000000 +0200 +++ FreeNX/freenx-0.5.0.diff 2006-08-24 22:37:44.000000000 +0200 @@ -1,11 +1,62 @@ ---- nxsetup.orig 2005-08-19 15:13:21.000000000 +0200 -+++ nxsetup 2005-08-19 15:13:50.000000000 +0200 -@@ -116,7 +116,7 @@ - # no, its a "normal" useradd - else - USERADD_OPTIONS="-d $NX_HOME_DIR -s $PATH_BIN/nxserver" -- [ -n $SETUP_GID ] && USERADD_OPTIONS="-g $SETUP_GID $USERADD_OPTIONS" -+ [ -n "$SETUP_GID" ] && USERADD_OPTIONS="-g $SETUP_GID $USERADD_OPTIONS" - # uid specified? - if [ -n "$SETUP_UID" ] - then +--- node.conf.sample ++++ node.conf.sample +@@ -317,7 +317,7 @@ + + # The key that contains the name of the complete path of command name + # 'xauth'. +-#COMMAND_XAUTH=/usr/X11R6/bin/xauth ++#COMMAND_XAUTH=/usr/bin/xauth + + # The key that contains the name of the complete path of command name + # 'smbmount'. +--- nxclient ++++ nxclient +@@ -60,7 +60,7 @@ + else + dialog_interface="xmessage" + xmessage=$(which xmessage 2>/dev/null) +- [ -z "$xmessage" ] && xmessage="/usr/X11R6/bin/xmessage" ++ [ -z "$xmessage" ] && xmessage="/usr/bin/xmessage" + fi + + # +--- nxloadconfig ++++ nxloadconfig +@@ -56,8 +56,8 @@ + NX_LICENSE="OS (GPL)" + + # Where can different nx components be found +-NX_DIR=/usr +-PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys ++NX_DIR=/usr/lib/NX ++PATH_BIN=/usr/bin + PATH_LIB=$NX_DIR/lib + NX_ETC_DIR=/etc/nxserver + NX_SESS_DIR=/var/lib/nxserver/db +@@ -161,7 +161,7 @@ + COMMAND_START_GNOME=gnome-session + COMMAND_START_CDE=cdwm + COMMAND_XTERM=xterm +-COMMAND_XAUTH=/usr/X11R6/bin/xauth ++COMMAND_XAUTH=/usr/bin/xauth + COMMAND_SMBMOUNT=smbmount + COMMAND_SMBUMOUNT=smbumount + COMMAND_NETCAT=netcat +@@ -489,7 +489,7 @@ + ERROR="yes" && echo "Error: Invalid value \"COMMAND_MD5SUM=$COMMAND_MD5SUM\"" + + # Check for expect +- COMMAND_EXPECT=$(head -n1 $PATH_BIN/nxnode-login | cut -d'!' -f2) ++ COMMAND_EXPECT=$(head -n1 /usr/bin/nxnode-login | cut -d'!' -f2) + ! which "$COMMAND_EXPECT" >/dev/null 2>&1 && \ + ERROR="yes" && echo "Error: expect necessary for $PATH_BIN/nxnode-login could not be found in '$COMMAND_EXPECT'. Please install it or change nxnode-login accordingly." + +@@ -511,7 +511,7 @@ + [ -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 $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \ ++++++ freenx-ld_library_path.diff ++++++ --- /var/tmp/diff_new_pack.kVkmTj/_old 2006-08-28 23:47:59.000000000 +0200 +++ /var/tmp/diff_new_pack.kVkmTj/_new 2006-08-28 23:47:59.000000000 +0200 @@ -1,7 +1,6 @@ -diff -u ../freenx-0.4.4.old/nxnode ./nxnode ---- ../freenx-0.4.4.old/nxnode 2005-09-21 13:42:01.143880597 +0200 -+++ ./nxnode 2005-09-21 13:44:49.073554733 +0200 -@@ -241,7 +241,7 @@ +--- nxnode ++++ nxnode +@@ -264,7 +264,7 @@ if [ "$type" = "windows" ] then # nxdesktop session (Windows RDP) @@ -10,7 +9,7 @@ U="" P="" D="" -@@ -252,18 +252,18 @@ +@@ -275,18 +275,18 @@ elif [ "$type" = "vnc" ] then # nxviewer session (VNC RFP) @@ -18,13 +17,13 @@ + [ "$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>>$USER_FAKE_HOME/.nx/C-$sess_id/session & - elif [ -n "$R" -a "$ENABLE_ROOTLESS_MODE" != "1" ] + $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 & + 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}" - $PATH_BIN/nxproxy -C :$display $PROXY_EXTRA_OPTIONS 2>>$USER_FAKE_HOME/.nx/C-$sess_id/session & + $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" @@ -32,3 +31,12 @@ P="-nopersistent" OLD_IFS=$IFS IFS="," +@@ -1027,7 +1027,7 @@ + --agent) + echo "NX> 716 Starting NX Agent ..." + shift +- [ "$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}" + PATH="$PATH:$PATH_BIN" $PATH_BIN/nxagent -name "NX Agent Test - Args: $@" $@ + echo "NX> 716 NX Agent exited with status: $?" + ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org