Hello community,
here is the log from the commit of package FreeNX
checked in at Wed Mar 19 01:50:39 CET 2008.
--------
--- FreeNX/FreeNX.changes 2007-11-26 14:31:13.000000000 +0100
+++ /mounts/work_src_done/STABLE/FreeNX/FreeNX.changes 2008-03-17 23:34:04.482082000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 17 23:51:25 CET 2008 - sndirsch@suse.de
+
+- updated to release 0.7.2
+ * see ANNOUNCE-0.7.2 for more details
+
+-------------------------------------------------------------------
Old:
----
freenx-0.7.1.diff
freenx-0.7.1.tar.gz
New:
----
ANNOUNCE-0.7.2
freenx-server-0.7.2-cups.diff
freenx-server-0.7.2.diff
freenx-server-0.7.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ FreeNX.spec ++++++
--- /var/tmp/diff_new_pack.X24902/_old 2008-03-19 01:49:36.000000000 +0100
+++ /var/tmp/diff_new_pack.X24902/_new 2008-03-19 01:49:36.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package FreeNX (Version 0.7.1)
+# spec file for package FreeNX (Version 0.7.2)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 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.
#
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: FreeNX
%if %suse_version > 910
BuildRequires: xorg-x11-devel
@@ -19,11 +20,11 @@
License: GPL v2 or later
Url: http://freenx.berlios.de/
Group: System/X11/Servers/XF86_4
-Version: 0.7.1
-Release: 6
+Version: 0.7.2
+Release: 1
Requires: NX openssh expect netcat
Summary: FreeNX Application and Thin Client Server
-Source: freenx-%{version}.tar.gz
+Source: freenx-server-%{version}.tar.gz
Source1: README.SuSE
Source2: ANNOUNCE-0.3.0
Source3: ANNOUNCE-0.3.1
@@ -35,9 +36,11 @@
Source9: ANNOUNCE-0.6.0
Source10: ANNOUNCE-0.7.0
Source11: ANNOUNCE-0.7.1
-Patch: freenx-%{version}.diff
+Source12: ANNOUNCE-0.7.2
+Patch: freenx-server-%{version}.diff
Patch1: xorg7.diff
Patch2: xcb-unix.diff
+Patch3: freenx-server-0.7.2-cups.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -54,7 +57,7 @@
Fabian Franz
%prep
-%setup -n freenx-%{version}
+%setup -n freenx-server-%{version}
%patch
%if "%(xft-config --prefix)" == "/usr"
%patch1
@@ -64,66 +67,71 @@
### no longer required (Bug #289007)
#%patch2
%endif
+if [ "%{_lib}" == "lib64" ]; then
+%patch3 -p1
+fi
%build
+make
%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
+make install DESTDIR=$RPM_BUILD_ROOT
cp $RPM_SOURCE_DIR/{README.SuSE,ANNOUNCE-*,NX-Firewall.txt} .
%files
%defattr(-,root,root)
%doc README.SuSE AUTHORS CONTRIB COPYING ChangeLog INSTALL ANNOUNCE-* NX-Firewall.txt
%dir /etc/nxserver
+%dir /usr/lib/NX
+%dir /usr/lib/NX/lib
+%dir /usr/%_lib/cups
+%dir /usr/%_lib/cups/backend
%config /etc/nxserver/node.conf
/usr/bin/*
+/usr/%_lib/cups/backend/nxsmb
+/usr/lib/NX/lib/libnxredir.so.0
%changelog
-* Mon Nov 26 2007 - sndirsch@suse.de
+* Tue Mar 18 2008 sndirsch@suse.de
+- updated to release 0.7.2
+ * see ANNOUNCE-0.7.2 for more details
+* Mon Nov 26 2007 sndirsch@suse.de
- disable ENABLE_DESKTOP_SHARING by default (Bug #343918)
-* Sun Nov 11 2007 - sndirsch@suse.de
+* Sun Nov 11 2007 sndirsch@suse.de
- updated to release 0.7.1
* see ANNOUNCE-0.7.1 for more details
- nxloadconfig: set NX_VERSION back to 1.5.0-70, since otherwise no
connection was possible (upstream changed to 2.1.0-71)
-* Tue Jul 10 2007 - sndirsch@suse.de
+* Tue Jul 10 2007 sndirsch@suse.de
- read also ~/.bash_login and ~/.profile during session startup
(Bug #225482)
-* Mon Jul 09 2007 - sndirsch@suse.de
+* Mon Jul 09 2007 sndirsch@suse.de
- xcb-unix.diff obsolete (Bug #289007)
-* Sat Jul 07 2007 - sndirsch@suse.de
+* Sat Jul 07 2007 sndirsch@suse.de
- updated to release 0.7.0
* see ANNOUNCE-0.7.0 for more details
-* Thu Jul 05 2007 - sndirsch@suse.de
+* Thu Jul 05 2007 sndirsch@suse.de
- removed broken conflicting nxproxy wrapper script
- fixed error in "nxsetup --install"
-* Thu Jul 05 2007 - sndirsch@suse.de
+* Thu Jul 05 2007 sndirsch@suse.de
- nxagent binary now in /usr/lib/NX
- NX libs are now in /usr/lib/NX/lib
- wrapper scripts in /usr/bin for nxproxy, nxagent, nxdesktop,
nxviewer and nxpasswd now in NX package
-* Thu Jul 05 2007 - sndirsch@suse.de
+* Thu Jul 05 2007 sndirsch@suse.de
- moved scripts/executables back to /usr/bin (makes previously
introduced %%post obsolete)
- added wrapper scripts for nxproxy, nxagent, nxdesktop, nxviewer
and nxpasswd in /usr/bin
-* Thu Jul 05 2007 - sndirsch@suse.de
+* Thu Jul 05 2007 sndirsch@suse.de
- %%post: adjust nxserver path in /etc/passwd
-* Fri Jun 29 2007 - sndirsch@suse.de
+* 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
+* Thu Jun 28 2007 sndirsch@suse.de
- removed bogus backingstore.diff
- removed broken freenx-ld_library_path.diff
- moved executables from /usr/bin/ to /usr/NX/bin
@@ -131,43 +139,43 @@
- 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
+* Wed Jun 13 2007 sndirsch@suse.de
- improved firewall documentation (Bug #282606)
-* Wed May 02 2007 - sndirsch@suse.de
+* Wed May 02 2007 sndirsch@suse.de
- nxloadconfig: fixed setting of $APPLICATION_LIBRARY_PRELOAD
-* Wed May 02 2007 - sndirsch@suse.de
+* Wed May 02 2007 sndirsch@suse.de
- fixed typo in specfile
-* Wed May 02 2007 - sndirsch@suse.de
+* Wed May 02 2007 sndirsch@suse.de
- updated to release 0.6.0 (Bug #203197)
-* Fri Oct 13 2006 - sndirsch@suse.de
+* Fri Oct 13 2006 sndirsch@suse.de
- backingstore.diff:
* fixed backingstore option for !M 1.5.0 client.
-* Wed Sep 13 2006 - sndirsch@suse.de
+* Wed Sep 13 2006 sndirsch@suse.de
- set SERVER_FORWARD_KEY to knx key by default (Bug #205165)
-* Wed Sep 06 2006 - sndirsch@suse.de
+* Wed Sep 06 2006 sndirsch@suse.de
- removed timeout for read in nxsetup (Bug #203842)
-* Tue Aug 29 2006 - sndirsch@suse.de
+* Tue Aug 29 2006 sndirsch@suse.de
- freenx-0.5.0.diff:
* moved X11R6 related stuff to xorg7.diff and apply this patch
only for X.Org >= 7
-* Fri Aug 25 2006 - dmueller@suse.de
+* 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
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Fri Sep 30 2005 - sndirsch@suse.de
+* Fri Sep 30 2005 sndirsch@suse.de
- README.SuSE:
* use the same version of NX on both client and server (#119296)
-* Wed Sep 21 2005 - sndirsch@suse.de
+* Wed Sep 21 2005 sndirsch@suse.de
- ld_library_path.diff:
* set LD_LIBRARY_PATH correctly (#118188)
-* Mon Sep 05 2005 - sndirsch@suse.de
+* Mon Sep 05 2005 sndirsch@suse.de
- added firewall doc (wgottwalt)
-* Fri Aug 19 2005 - sndirsch@suse.de
+* Fri Aug 19 2005 sndirsch@suse.de
- freenx-0.4.4.diff:
* fixed nxsetup, when nx user does not exist yet
-* Wed Aug 10 2005 - sndirsch@suse.de
+* Wed Aug 10 2005 sndirsch@suse.de
- updated to FreeNX 0.4.4 "UKUUG Enterprise Edition"
* Added ENABLE_1_5_0_BACKEND configuration directive:
* Fixed fullscreen support in nxdesktop (still feels more
@@ -189,23 +197,23 @@
(RedHat only) and --gid.
(Based on a patch by "Ed Warnicke" )
* Fixed resume of multiple sessions.
-* Sat Jul 30 2005 - sndirsch@suse.de
+* Sat Jul 30 2005 sndirsch@suse.de
- updated README.SuSE for FreeNX > 0.2.x
-* Fri Jul 29 2005 - sndirsch@suse.de
+* Fri Jul 29 2005 sndirsch@suse.de
- the option right below was commented out - fixed now
-* Thu Jul 28 2005 - sndirsch@suse.de
+* Thu Jul 28 2005 sndirsch@suse.de
- 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
+* Tue Jul 26 2005 sndirsch@suse.de
- added announcement for 0.4.2 to docs
-* Mon Jul 25 2005 - sndirsch@suse.de
+* Mon Jul 25 2005 sndirsch@suse.de
- updated to FreeNX 0.4.2
-* Sat Jul 23 2005 - sndirsch@suse.de
+* Sat Jul 23 2005 sndirsch@suse.de
- freenx-enable_rootless_mode.diff:
* enabled rootless mode by default; supported since NX 1.5.0
Snapshot 2
-* Wed Jun 29 2005 - sndirsch@suse.de
+* Wed Jun 29 2005 sndirsch@suse.de
- 24.06.2005 FreeNX 0.4.1 "LinuxTag Edition"
* Fixed a small security problem giving access to session
database.
@@ -216,17 +224,17 @@
* Fixed Resume on Windows with non-fullscreen sessions.
* Added suspend/resume support for 1.5.0 OSS components.
* Fixed display of suspended sessions in nxserver --list.
-* Thu May 12 2005 - sndirsch@suse.de
+* Fri May 13 2005 sndirsch@suse.de
-use norootforbuild
-* Wed May 11 2005 - sndirsch@suse.de
+* Wed May 11 2005 sndirsch@suse.de
- added announcement for 0.4.0 to docs
-* Thu May 05 2005 - sndirsch@suse.de
+* Thu May 05 2005 sndirsch@suse.de
- updated to release 0.4.0:
* obsoletes freenx-0.3.1.diff
-* Thu Apr 28 2005 - sndirsch@suse.de
+* Thu Apr 28 2005 sndirsch@suse.de
- freenx-0.3.1.diff:
* nxsetup: fix permissions, fix filename of sshd init script
-* Mon Mar 21 2005 - sndirsch@suse.de
+* Mon Mar 21 2005 sndirsch@suse.de
- updated to release 0.3.1 ("Bugfix Edition")
* Fixed keyboard mapping problems.
* Fixed unix-custom mode; now allowing parameters to be passed.
@@ -237,7 +245,7 @@
* Fixed handling of /tmp/.X*-lock files.
* Fixed handling of not closed sessions in "Terminating" status.
* Fixed resume of multiple suspended sessions.
-* Sun Mar 06 2005 - sndirsch@suse.de
+* Sun Mar 06 2005 sndirsch@suse.de
- updated to release 0.3.0
* Security enhancements
* Many bugfixes
@@ -254,42 +262,42 @@
* Forwarding of connections to other NX servers
- obsoletes freenx-0.2.7.diff, freenx-0.2.8.diff, geom-fix.diff
- added announcement for 0.3.0 to docs
-* Tue Feb 15 2005 - sndirsch@suse.de
+* Tue Feb 15 2005 sndirsch@suse.de
- geom-fix.diff:
* fix for Windows resume problems
-* Mon Feb 14 2005 - sndirsch@suse.de
+* Mon Feb 14 2005 sndirsch@suse.de
- README.SuSE: improved documentation once more (Bug #50714)
-* Sat Feb 12 2005 - sndirsch@suse.de
+* Sat Feb 12 2005 sndirsch@suse.de
- README.SuSE: improved documentation (Bug #50714)
-* Sat Feb 12 2005 - sndirsch@suse.de
+* Sat Feb 12 2005 sndirsch@suse.de
- fixed version number in specfile
-* Fri Feb 11 2005 - sndirsch@suse.de
+* Fri Feb 11 2005 sndirsch@suse.de
- freenx-0.2.8.diff:
* Security: Fixed a security blunder. Authority file was not used
and so basically xhost +localhost was set.
* Security: Fixed two possible security problems (umask was not
set correctly)
-* Fri Dec 03 2004 - sndirsch@suse.de
+* Fri Dec 03 2004 sndirsch@suse.de
- README.SuSE:
* added KNOWN ISSUES section (suspend/resume problem with knx,
Bug #48753)
-* Mon Nov 29 2004 - sndirsch@suse.de
+* Mon Nov 29 2004 sndirsch@suse.de
- freenx-0.2.7.diff:
* use absolute path for nxnode-login
-* Mon Nov 22 2004 - sndirsch@suse.de
+* Mon Nov 22 2004 sndirsch@suse.de
- updated to release 0.2.7
* Fix nxserver to work again with KNX-Client. ('\r' is evil)
* Fix timeout in nxnode-login to allow proper session management
again.
* Fixed possible race condition for the wait-file.
- obsoletes freenx-0.2.6.diff
-* Tue Nov 16 2004 - sndirsch@suse.de
+* Tue Nov 16 2004 sndirsch@suse.de
- freenx-0.2.6.diff
* workaround to fix FreeNX for use with knx; the problem is that
expect adds Carriage Return, which knx cannot handle, but there
is still another problem with the input buffer, which is more
difficult to resolve ...
-* Thu Nov 11 2004 - sndirsch@suse.de
+* Thu Nov 11 2004 sndirsch@suse.de
- updated to release 0.2.6
* Security: Fixed a possible exploit in ssh-usage
thanx to Sebastian Krahmer from the SuSE security team)
@@ -304,7 +312,7 @@
$NX_ETC_DIR/users.id_dsa.pub) from your users
~/.ssh/authorized_keys2 as the system private key is no longer
needed to login the users."
-* Tue Oct 26 2004 - sndirsch@suse.de
+* Tue Oct 26 2004 sndirsch@suse.de
- updated to release 0.2.5
* Added Xdialog interface for nxclient and automatic usage
of commercial nxclient when available. (Thx go to Rick Stout
@@ -315,14 +323,14 @@
* 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
+* Sun Sep 12 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
start.
* Fixed ssh encryption for resume on client 1.4.0-snapshot 5.
* Fixed mktemp, which was non-portable to FreeBSD and Red Hat 9.
-* Sat Sep 11 2004 - sndirsch@suse.de
+* Sat Sep 11 2004 sndirsch@suse.de
- updated to release 0.2-3
* Added support for autoreconnection or autoreconnection just
for the case when an older client version is used. This makes
@@ -336,7 +344,7 @@
* Security: Any user was able to change the status of other
sessions in the session database by providing the correct
uniqueid.
-* Fri Sep 10 2004 - sndirsch@suse.de
+* Fri Sep 10 2004 sndirsch@suse.de
- updated to release 0.2-2
* Added additional support for safe session suspend,
autosuspend when network connection times out works now!
@@ -350,7 +358,7 @@
* Updated the gentoo-nomachine.diff to be not fuzzy.
- removed freenx-0.2-1.diff (fixed upstream now)
- added netcat (replaces nxssh) as Requires
-* Wed Sep 08 2004 - sndirsch@suse.de
+* Wed Sep 08 2004 sndirsch@suse.de
- updated to release 0.2-1:
* Fixed support for one windows client version.
* Fixed setting of key with --adduser.
@@ -362,11 +370,11 @@
* Fixed the bug with hanging tail processes.
- freenx-0.2-1.diff:
* fixes typos in nxsetup
-* Tue Sep 07 2004 - sndirsch@suse.de
+* Tue Sep 07 2004 sndirsch@suse.de
- README.SuSE:
* private key generated for the "nx" user by nxsetup needs to be
distributed
-* Tue Sep 07 2004 - sndirsch@suse.de
+* Tue Sep 07 2004 sndirsch@suse.de
- updated to release 0.2
* Changelog:
- Reworked the whole security model in nxsetup due to requests
@@ -389,10 +397,10 @@
- added nxclient to filelist
- removed dummy manual page for nxserver
- added some docs (AUTHORS, COPYING, ChangeLog, INSTALL)
-* Mon Sep 06 2004 - sndirsch@suse.de
+* Mon Sep 06 2004 sndirsch@suse.de
- nxuseradd.diff:
* fixed creating of nx user
-* Mon Sep 06 2004 - sndirsch@suse.de
+* Mon Sep 06 2004 sndirsch@suse.de
- nx-0.1-4.diff:
* added pam authentication
* added user_db switch
@@ -401,17 +409,17 @@
- added expect to Requires
- README.SuSE:
* added documentation for PAM_AUTH
-* Thu Sep 02 2004 - sndirsch@suse.de
+* Thu Sep 02 2004 sndirsch@suse.de
- README.SuSE:
* knxclient --> knx
-* Thu Sep 02 2004 - sndirsch@suse.de
+* Thu Sep 02 2004 sndirsch@suse.de
- nx-0.1-2.diff:
* This package is (or at least should be) compatible with all
nxclient Versions available since 1.3.0, but if a newer client
version does connect (1.4.0-43 for example), it uses the new
SSH encryption mechanism. (nxssh -B for example)
- improved README.SuSE
-* Wed Sep 01 2004 - sndirsch@suse.de
+* Wed Sep 01 2004 sndirsch@suse.de
- added nxserver manual page
-* Wed Sep 01 2004 - sndirsch@suse.de
+* Wed Sep 01 2004 sndirsch@suse.de
- created package
++++++ freenx-server-0.7.2-cups.diff ++++++
--- freenx-server-0.7.2.orig//node.conf.sample 2008-03-17 22:00:03.401537000 +0100
+++ freenx-server-0.7.2/node.conf.sample 2008-03-17 22:36:38.918748250 +0100
@@ -377,12 +377,12 @@
# of available ppd drivers via the $COMMAND_FOOMATIC command.
#ENABLE_FOOMATIC="1"
-#COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
+#COMMAND_FOOMATIC="/usr/lib64/cups/driver/foomatic-ppdfile"
# CUPS_BACKEND and CUPS_ETC are the corresponding paths of your CUPS
# installation.
-#CUPS_BACKEND="/usr/lib/cups/backend"
+#CUPS_BACKEND="/usr/lib64/cups/backend"
#CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
#CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
#CUPS_ETC="/etc/cups"
--- freenx-server-0.7.2.orig//nxloadconfig 2008-03-17 22:00:04.701618250 +0100
+++ freenx-server-0.7.2/nxloadconfig 2008-03-17 22:35:52.063820000 +0100
@@ -161,9 +161,9 @@
ENABLE_CUPS_SEAMLESS="0"
CUPS_SEAMLESS_DELAY="10"
ENABLE_FOOMATIC="1"
-COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
+COMMAND_FOOMATIC="/usr/lib64/cups/driver/foomatic-ppdfile"
-CUPS_BACKEND="/usr/lib/cups/backend"
+CUPS_BACKEND="/usr/lib64/cups/backend"
CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
CUPS_ETC="/etc/cups/"
++++++ freenx-server-0.7.2.diff ++++++
diff -u -r freenx-server-0.7.2.orig//Makefile freenx-server-0.7.2/Makefile
--- freenx-server-0.7.2.orig//Makefile 2008-03-17 22:00:03.481542000 +0100
+++ Makefile 2008-03-17 22:37:58.743737000 +0100
@@ -12,7 +12,7 @@
done
install:
- . nxloadconfig;\
+ . ./nxloadconfig;\
install -m755 -d $(DESTDIR)/$$PATH_BIN/ ;\
install -m755 -d $(DESTDIR)/$$PATH_LIB/ ;\
install -m755 -d $(DESTDIR)/$$NX_ETC_DIR/ ;\
@@ -22,5 +22,5 @@
install -m755 $$i $(DESTDIR)/$$PATH_BIN/ ;\
done;\
export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION;\
- install -m644 node.conf.sample $(DESTDIR)/$$NX_ETC_DIR/ ; \
+ install -m644 node.conf.sample $(DESTDIR)/$$NX_ETC_DIR/node.conf ; \
make -C nxredir install
diff -u -r freenx-server-0.7.2.orig//nxredir/Makefile freenx-server-0.7.2/nxredir/Makefile
--- freenx-server-0.7.2.orig//nxredir/Makefile 2008-03-17 22:00:04.501605750 +0100
+++ nxredir/Makefile 2008-03-17 22:40:57.582913750 +0100
@@ -24,7 +24,11 @@
else \
install -m755 libnxredir.so.0 $(DESTDIR)/usr/lib ;\
install -m755 nxredir $(DESTDIR)/usr/bin ;\
- install -m755 nxsmb $(DESTDIR)/usr/lib/cups/backend/ ;\
+ if [ -d $(DESTDIR)/usr/lib64/cups/backend ]; then \
+ install -m755 nxsmb $(DESTDIR)/usr/lib64/cups/backend/ ;\
+ else \
+ install -m755 nxsmb $(DESTDIR)/usr/lib/cups/backend/ ;\
+ fi; \
fi
.PHONY: clean install
diff -u -r ../freenx-server-0.7.2.orig//node.conf.sample ./node.conf.sample
--- ../freenx-server-0.7.2.orig//node.conf.sample 2008-03-17 22:00:03.401537000 +0100
+++ ./node.conf.sample 2008-03-17 23:08:50.459462000 +0100
@@ -146,7 +146,7 @@
# Note: You need to have the rights to access the display
# else it does not work.
#
-#ENABLE_DESKTOP_SHARING=1
+#ENABLE_DESKTOP_SHARING=0
#
# Enable or disable clipboard:
diff -u -r ../freenx-server-0.7.2.orig//nxloadconfig ./nxloadconfig
--- ../freenx-server-0.7.2.orig//nxloadconfig 2008-03-17 22:00:04.701618250 +0100
+++ ./nxloadconfig 2008-03-17 23:08:40.598845750 +0100
@@ -52,13 +52,13 @@
# DO NOT TOUCH unless you REALLY know what you are doing
#########################################################################
-NX_VERSION=2.1.0-72
+NX_VERSION=1.5.0-70
NX_LICENSE="OS (GPL, using backend: %BACKEND%)"
# 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
-PATH_LIB=$NX_DIR/lib
+PATH_LIB=$NX_DIR/lib/NX/lib
NX_ETC_DIR=/etc/nxserver
NX_SESS_DIR=/var/lib/nxserver/db
NX_HOME_DIR=/var/lib/nxserver/home
@@ -111,7 +111,7 @@
DISABLE_PERSISTENT_SESSION=""
ENABLE_MIRROR_VIA_VNC=1
-ENABLE_DESKTOP_SHARING=1
+ENABLE_DESKTOP_SHARING=0
ENABLE_CLIPBOARD="both"
ENABLE_PULLDOWN_MENU="1"
@@ -307,9 +307,9 @@
[ -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.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
+[ -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"
-NX_BACKEND_VERSION=$(strings $PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
+NX_BACKEND_VERSION=$(strings /usr/lib/NX/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
[ "$ENABLE_1_5_0_BACKEND" = "1" ] && NX_BACKEND_VERSION="1.5.0" # forced the backend
@@ -346,7 +346,7 @@
ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\""
# Check for NX agents ...
- [ ! -x "$PATH_BIN/nxagent" ] && \
+ [ ! -x "/usr/lib/NX/nxagent" ] && \
ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
if [ "ENABLE_EXTERNAL_NXDESKTOP" = "1" ]
@@ -598,7 +598,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|NXAGENT - Version 3.[01].0')" ] && \
+ [ -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 $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
diff -u -r ../freenx-server-0.7.2.orig//nxnode ./nxnode
--- ../freenx-server-0.7.2.orig//nxnode 2008-03-17 22:00:03.457540500 +0100
+++ ./nxnode 2008-03-17 23:07:47.011496750 +0100
@@ -252,6 +252,8 @@
. /etc/profile
[ -f ~/.bash_profile ] && . ~/.bash_profile
+ [ -f ~/.bash_login ] && . ~/.bash_login
+ [ -f ~/.profile ] && . ~/.profile
mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/pids/apps/"
diff -u -r ../freenx-server-0.7.2.orig//nxsetup ./nxsetup
--- ../freenx-server-0.7.2.orig//nxsetup 2008-03-17 22:00:03.605549750 +0100
+++ ./nxsetup 2008-03-17 23:08:16.097314500 +0100
@@ -222,7 +222,7 @@
fi
# the nx user account might be locked, so unlock it.
- passwd -u nx
+ #passwd -u nx
}
install_nx()
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org