Hello community, here is the log from the commit of package FreeNX checked in at Tue Jul 3 16:46:35 CEST 2007. -------- --- FreeNX/FreeNX.changes 2007-06-13 21:00:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/FreeNX/FreeNX.changes 2007-06-29 05:33:59.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Jun 29 05:32:10 CEST 2007 - sndirsch@suse.de + +- xcb-unix.diff: + * looks like libxcb does no longer accept the unix: notation and + thinks it is a hostname and tries to connect to it, instead of + seeing that this notation means that it should always use the + /tmp/.X11-unix/X<num> file. + +------------------------------------------------------------------- +Wed Jun 27 23:09:04 CEST 2007 - sndirsch@suse.de + +- removed bogus backingstore.diff +- removed broken freenx-ld_library_path.diff +- moved executables from /usr/bin/ to /usr/NX/bin +- nxsetup: no longer remove timeout option for read command +- node.conf.sample/nxloadconfig: use again standard location for + SERVER_FORWARD_KEY +- due to nxserver-helper FreeNX is no longer a noarch package + +------------------------------------------------------------------- Old: ---- backingstore.diff freenx-ld_library_path.diff New: ---- xcb-unix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeNX.spec ++++++ --- /var/tmp/diff_new_pack.HG3659/_old 2007-07-03 16:45:53.000000000 +0200 +++ /var/tmp/diff_new_pack.HG3659/_new 2007-07-03 16:45:53.000000000 +0200 @@ -16,11 +16,11 @@ %else BuildRequires: XFree86-devel %endif -License: GNU General Public License (GPL) -URL: http://debian.tu-bs.de/knoppix/nx/ +License: GPL v2 or later +URL: http://freenx.berlios.de/ Group: System/X11/Servers/XF86_4 Version: 0.6.0 -Release: 21 +Release: 24 Requires: NX openssh expect netcat Summary: FreeNX Application and Thin Client Server Source: freenx-%{version}.tar.gz @@ -35,9 +35,7 @@ Source9: ANNOUNCE-0.6.0 Patch: freenx-%{version}.diff Patch1: xorg7.diff -Patch3: freenx-ld_library_path.diff -Patch4: backingstore.diff -BuildArch: noarch +Patch2: xcb-unix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -58,21 +56,22 @@ %patch %if "%(xft-config --prefix)" == "/usr" %patch1 -%endif -%patch3 -p0 -%patch4 rm *.orig +%endif +%if %suse_version > 1020 +%patch2 +%endif %build %install -mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/usr/NX/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 +install -m 755 nx* $RPM_BUILD_ROOT/usr/NX/bin mkdir -p $RPM_BUILD_ROOT/etc/nxserver install -m 644 node.conf.sample $RPM_BUILD_ROOT/etc/nxserver/node.conf cp $RPM_SOURCE_DIR/{README.SuSE,ANNOUNCE-*,NX-Firewall.txt} . @@ -82,18 +81,25 @@ %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 +%dir /usr/NX +%dir /usr/NX/bin +/usr/NX/bin/* %changelog +* Fri Jun 29 2007 - sndirsch@suse.de +- xcb-unix.diff: + * looks like libxcb does no longer accept the unix: notation and + thinks it is a hostname and tries to connect to it, instead of + seeing that this notation means that it should always use the + /tmp/.X11-unix/X<num> file. +* Wed Jun 27 2007 - sndirsch@suse.de +- removed bogus backingstore.diff +- removed broken freenx-ld_library_path.diff +- moved executables from /usr/bin/ to /usr/NX/bin +- nxsetup: no longer remove timeout option for read command +- node.conf.sample/nxloadconfig: use again standard location for + SERVER_FORWARD_KEY +- due to nxserver-helper FreeNX is no longer a noarch package * Wed Jun 13 2007 - sndirsch@suse.de - improved firewall documentation (Bug #282606) * Wed May 02 2007 - sndirsch@suse.de ++++++ freenx-0.6.0.diff ++++++ --- /var/tmp/diff_new_pack.HG3659/_old 2007-07-03 16:45:53.000000000 +0200 +++ /var/tmp/diff_new_pack.HG3659/_new 2007-07-03 16:45:53.000000000 +0200 @@ -6,64 +6,11 @@ # 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 ++NX_DIR=/usr/NX ++PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys PATH_LIB=$NX_DIR/lib NX_ETC_DIR=/etc/nxserver NX_SESS_DIR=/var/lib/nxserver/db -@@ -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 | 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 -+++ nxsetup 2006-09-06 21:25:12.000000000 +0200 -@@ -340,7 +340,7 @@ - echo "----> Testing your nxserver connection ..." - - CONNECTION="" -- while read -t 3 line -+ while read line - do - case "$line" in - *"HELLO NXSERVER - Version $NX_VERSION"*) -diff -u ../freenx-0.5.0.orig/node.conf.sample ./node.conf.sample ---- ../freenx-0.5.0.orig/node.conf.sample 2006-09-13 04:29:34.000000000 +0200 -+++ ./node.conf.sample 2006-09-13 04:30:28.000000000 +0200 -@@ -171,7 +171,7 @@ - #ENABLE_SERVER_FORWARD="0" - #SERVER_FORWARD_HOST="" - #SERVER_FORWARD_PORT=22 --#SERVER_FORWARD_KEY="/usr/NX/share/client.id_dsa.key" -+#SERVER_FORWARD_KEY="/usr/share/knx/client.id_dsa.key" - - - # FreeNX with ENABLE_NOMACHINE_FORWARD_USER="1" will automatically forward all -diff -u ../freenx-0.5.0.orig/nxloadconfig ./nxloadconfig ---- ../freenx-0.5.0.orig/nxloadconfig 2006-09-13 04:29:34.000000000 +0200 -+++ ./nxloadconfig 2006-09-13 04:31:28.000000000 +0200 -@@ -124,7 +124,7 @@ - ENABLE_SERVER_FORWARD="0" - SERVER_FORWARD_HOST="" - SERVER_FORWARD_PORT=22 --SERVER_FORWARD_KEY="/usr/NX/share/client.id_dsa.key" -+SERVER_FORWARD_KEY="/usr/share/knx/client.id_dsa.key" - - ENABLE_NOMACHINE_FORWARD_USER="0" - NOMACHINE_SERVER="/usr/NX/bin/nxserver" --- nxloadconfig.orig 2007-05-02 14:58:25.000000000 +0200 +++ nxloadconfig 2007-05-02 14:59:40.000000000 +0200 @@ -263,7 +263,7 @@ ++++++ xcb-unix.diff ++++++ diff -u ../freenx-0.6.0.orig/nxnode ./nxnode --- ../freenx-0.6.0.orig/nxnode 2007-06-29 05:24:37.000000000 +0200 +++ ./nxnode 2007-06-29 05:26:41.000000000 +0200 @@ -295,7 +295,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 @@ -303,7 +303,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/" @@ -1089,7 +1089,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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org