Hello community, here is the log from the commit of package FreeNX checked in at Fri Jul 25 17:11:00 CEST 2008. -------- --- FreeNX/FreeNX.changes 2008-03-17 23:34:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/FreeNX/FreeNX.changes 2008-07-21 18:27:21.931303000 +0200 @@ -1,0 +2,29 @@ +Mon Jul 21 18:26:34 CEST 2008 - sndirsch@suse.de + +- nxloadconfig: NX_VERSION no longer needs to be set back to + 1.5.0-70, (upstream of 2.1.0-71 is safe now) + +------------------------------------------------------------------- +Mon Jul 21 17:41:53 CEST 2008 - sndirsch@suse.de + +- enabled nxserver.diff again (bnc #401366) + +------------------------------------------------------------------- +Mon Jul 21 11:00:45 CEST 2008 - sndirsch@suse.de + +- NX-3.2.0.diff + * adjusted FreeNX to changes in NX 3.2.0 +- disabled nxserver.diff for now (bnc #401366) + +------------------------------------------------------------------- +Mon Jun 30 14:40:53 CEST 2008 - sndirsch@suse.de + +- nxserver.diff + "This line does the pstree, pipe it to perl, which in turn find + the lines that have this and only this on it 'sshd(number)', + and kills the processes with that number. The stubborn process + gets to live after the first suspend, which is not so good, but + it gets killed before the next resume is done, so it is good + enough for that resume to succeed." (bnc #401366) + +------------------------------------------------------------------- New: ---- NX-3.2.0.diff nxserver.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeNX.spec ++++++ --- /var/tmp/diff_new_pack.k30762/_old 2008-07-25 17:07:31.000000000 +0200 +++ /var/tmp/diff_new_pack.k30762/_new 2008-07-25 17:07:31.000000000 +0200 @@ -21,7 +21,7 @@ Url: http://freenx.berlios.de/ Group: System/X11/Servers/XF86_4 Version: 0.7.2 -Release: 1 +Release: 27 Requires: NX openssh expect netcat Summary: FreeNX Application and Thin Client Server Source: freenx-server-%{version}.tar.gz @@ -41,6 +41,8 @@ Patch1: xorg7.diff Patch2: xcb-unix.diff Patch3: freenx-server-0.7.2-cups.diff +Patch4: nxserver.diff +Patch5: NX-3.2.0.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -70,6 +72,8 @@ if [ "%{_lib}" == "lib64" ]; then %patch3 -p1 fi +%patch4 +%patch5 %build make @@ -92,6 +96,23 @@ /usr/lib/NX/lib/libnxredir.so.0 %changelog +* Mon Jul 21 2008 sndirsch@suse.de +- nxloadconfig: NX_VERSION no longer needs to be set back to + 1.5.0-70, (upstream of 2.1.0-71 is safe now) +* Mon Jul 21 2008 sndirsch@suse.de +- enabled nxserver.diff again (bnc #401366) +* Mon Jul 21 2008 sndirsch@suse.de +- NX-3.2.0.diff + * adjusted FreeNX to changes in NX 3.2.0 +- disabled nxserver.diff for now (bnc #401366) +* Mon Jun 30 2008 sndirsch@suse.de +- nxserver.diff + "This line does the pstree, pipe it to perl, which in turn find + the lines that have this and only this on it 'sshd(number)', + and kills the processes with that number. The stubborn process + gets to live after the first suspend, which is not so good, but + it gets killed before the next resume is done, so it is good + enough for that resume to succeed." (bnc #401366) * Tue Mar 18 2008 sndirsch@suse.de - updated to release 0.7.2 * see ANNOUNCE-0.7.2 for more details @@ -205,7 +226,7 @@ - updated to FreeNX 0.4.3 - freenx-enable_backend.diff: * enables fake cookie authentication, when a 1.5.0 client connects -* Tue Jul 26 2005 sndirsch@suse.de +* Wed Jul 27 2005 sndirsch@suse.de - added announcement for 0.4.2 to docs * Mon Jul 25 2005 sndirsch@suse.de - updated to FreeNX 0.4.2 @@ -228,7 +249,7 @@ -use norootforbuild * Wed May 11 2005 sndirsch@suse.de - added announcement for 0.4.0 to docs -* Thu May 05 2005 sndirsch@suse.de +* Fri May 06 2005 sndirsch@suse.de - updated to release 0.4.0: * obsoletes freenx-0.3.1.diff * Thu Apr 28 2005 sndirsch@suse.de @@ -281,7 +302,7 @@ - README.SuSE: * added KNOWN ISSUES section (suspend/resume problem with knx, Bug #48753) -* Mon Nov 29 2004 sndirsch@suse.de +* Tue Nov 30 2004 sndirsch@suse.de - freenx-0.2.7.diff: * use absolute path for nxnode-login * Mon Nov 22 2004 sndirsch@suse.de @@ -323,7 +344,7 @@ * Added patch by Rick Stout for a typo in nxkeygen. * Updated gentoo-nomachine.diff. * Updated CONTRIB to include a description of lazy-image encoding. -* Sun Sep 12 2004 sndirsch@suse.de +* Mon Sep 13 2004 sndirsch@suse.de - updated to release 0.2.4 * Added timeout to avoid having hanging tail processes. * Added "locking" of the display-offset if nxagent failed to @@ -397,7 +418,7 @@ - added nxclient to filelist - removed dummy manual page for nxserver - added some docs (AUTHORS, COPYING, ChangeLog, INSTALL) -* Mon Sep 06 2004 sndirsch@suse.de +* Tue Sep 07 2004 sndirsch@suse.de - nxuseradd.diff: * fixed creating of nx user * Mon Sep 06 2004 sndirsch@suse.de ++++++ freenx-server-0.7.2.diff ++++++ --- /var/tmp/diff_new_pack.k30762/_old 2008-07-25 17:07:32.000000000 +0200 +++ /var/tmp/diff_new_pack.k30762/_new 2008-07-25 17:07:32.000000000 +0200 @@ -53,7 +53,7 @@ ######################################################################### -NX_VERSION=2.1.0-72 -+NX_VERSION=1.5.0-70 ++NX_VERSION=2.1.0-72 NX_LICENSE="OS (GPL, using backend: %BACKEND%)" # Where can different nx components be found ++++++ NX-3.2.0.diff ++++++ diff -u -r ../freenx-server-0.7.2.orig//nxloadconfig ./nxloadconfig --- ../freenx-server-0.7.2.orig//nxloadconfig 2008-07-21 08:32:37.000000000 +0000 +++ ./nxloadconfig 2008-07-21 08:55:38.000000000 +0000 @@ -276,8 +276,8 @@ { ! mywhich "$COMMAND_XAUTH" && which xauth; } >/dev/null 2>&1 && COMMAND_XAUTH=$(which xauth) { ! mywhich "$COMMAND_NETCAT" && which nc; } >/dev/null 2>&1 && COMMAND_NETCAT=$(which nc) { ! mywhich "$COMMAND_FOOMATIC" && which foomatic-ppdfile; } >/dev/null 2>&1 && COMMAND_FOOMATIC=$(which foomatic-ppdfile) - { ! mywhich "$PATH_BIN/nxdesktop"; } >/dev/null 2>&1 && ENABLE_EXTERNAL_NXDESKTOP="1" - { ! mywhich "$PATH_BIN/nxviewer"; } >/dev/null 2>&1 && ENABLE_EXTERNAL_NXVIEWER="1" + { ! mywhich "$PATH_BIN/rdesktop"; } >/dev/null 2>&1 && ENABLE_EXTERNAL_NXDESKTOP="1" + { ! mywhich "$PATH_BIN/vncviewer"; } >/dev/null 2>&1 && ENABLE_EXTERNAL_NXVIEWER="1" { ! mywhich "$COMMAND_VNCPASSWD" && which vncpasswd; } >/dev/null 2>&1 && COMMAND_VNCPASSWD=$(which vncpasswd) fi @@ -307,7 +307,7 @@ [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB -[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6:$APPLICATION_LIBRARY_PATH/libXext.so.6:$APPLICATION_LIBRARY_PATH/libXcomp.so.2:$APPLICATION_LIBRARY_PATH/libXcompext.so.2:$APPLICATION_LIBRARY_PATH/libXrender.so.1" +[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6:$APPLICATION_LIBRARY_PATH/libXext.so.6:$APPLICATION_LIBRARY_PATH/libXcomp.so.3:$APPLICATION_LIBRARY_PATH/libXcompext.so.3:$APPLICATION_LIBRARY_PATH/libXrender.so.1" NX_BACKEND_VERSION=$(strings /usr/lib/NX/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') @@ -354,8 +354,8 @@ [ ! mywhich "$COMMAND_RDESKTOP" >/dev/null 2>&1 ] && \ WARNING="yes" && echo "Warning: Could not find COMMAND_RDESKTOP=$COMMAND_RDESKTOP. RDP sessions won't work." else - [ ! -x "$PATH_BIN/nxdesktop" ] && \ - WARNING="yes" && echo "Warning: Could not find nxdesktop in $PATH_BIN. RDP sessions won't work." + [ ! -x "$PATH_BIN/rdesktop" ] && \ + WARNING="yes" && echo "Warning: Could not find rdesktop in $PATH_BIN. RDP sessions won't work." fi if [ "ENABLE_EXTERNAL_NXVIEWER" = "1" ] @@ -365,8 +365,8 @@ [ ! mywhich "$COMMAND_VNCPASSWD" >/dev/null 2>&1 ] && \ WARNING="yes" && echo "Warning: Could not find COMMAND_VNCPASSWD=$COMMAND_VNCPASSWD. VNC sessions won't work." else - [ ! -x "$PATH_BIN/nxviewer" ] && \ - WARNING="yes" && echo "Warning: Could not find nxviewer in $PATH_BIN. VNC sessions won't work." + [ ! -x "$PATH_BIN/vncviewer" ] && \ + WARNING="yes" && echo "Warning: Could not find vncviewer in $PATH_BIN. VNC sessions won't work." fi [ ! mywhich "$COMMAND_X11VNC" >/dev/null 2>&1 ] && \ @@ -598,8 +598,8 @@ [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \ ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\"" - [ -z "$(strings /usr/lib/NX/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[01].0')" ] && \ - ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[01].0 backend is needed for this version of FreeNX." + [ -z "$(strings /usr/lib/NX/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ + ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[012].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\"" diff -u -r ../freenx-server-0.7.2.orig//nxnode ./nxnode --- ../freenx-server-0.7.2.orig//nxnode 2008-07-21 08:32:37.000000000 +0000 +++ ./nxnode 2008-07-21 08:46:59.000000000 +0000 @@ -476,7 +476,7 @@ # Start the agent - echo "$agent_password" | $PATH_BIN/nxdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 & + echo "$agent_password" | $PATH_BIN/rdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 & elif [ "$type" = "vnc" ] then @@ -508,7 +508,7 @@ # Start the agent - $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 & + $PATH_BIN/vncviewer -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 ++++++ nxserver.diff ++++++ --- nxserver.orig 2008-06-30 14:38:54.688777713 +0200 +++ nxserver 2008-06-30 14:40:00.960036194 +0200 @@ -1,5 +1,8 @@ #!/bin/bash +# Novell Bug #401366 +pstree -p nx| perl -e '@lines=<STDIN>; foreach $line (@lines){if ($line=~/^sshd\((\d+)\)$/) { kill 9, $1;}}' + # Free implementation of nxserver components # # To use nxserver add the user "nx" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de