rpms/freenx-server/F-10 freenx-server-0.7.3-fixes.patch, 1.1, 1.2 freenx-server.spec, 1.7, 1.8

[athimm]

Author: athimm

Update of /cvs/extras/rpms/freenx-server/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30334/F-10

Modified Files:
	freenx-server-0.7.3-fixes.patch freenx-server.spec 
Log Message:
Fix regression reported in bug #437655.

freenx-server-0.7.3-fixes.patch:
 ChangeLog            |   17 ++++++
 Makefile             |    4 -
 init.d/freenx-server |   84 +++++++++++++++++++++++++++-----
 node.conf.sample     |    7 ++
 nxloadconfig         |   35 +++++++++++--
 nxnode               |  132 ++++++++++++++++++++++++++++++++++++++++++++++-----
 nxprint              |    3 -
 nxredir/nxsmb        |    5 +
 nxserver             |  114 +++++++++++++++++++++++++-------------------
 9 files changed, 318 insertions(+), 83 deletions(-)

Index: freenx-server-0.7.3-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/freenx-server/F-10/freenx-server-0.7.3-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freenx-server-0.7.3-fixes.patch	25 Jul 2009 22:29:29 -0000	1.1
+++ freenx-server-0.7.3-fixes.patch	31 Jul 2009 19:19:29 -0000	1.2
@@ -25,7 +25,7 @@ diff -Naur freenx-server-0.7.3/ChangeLog
 diff -Naur freenx-server-0.7.3/init.d/freenx-server freenx-server.svn613.plusfixes/init.d/freenx-server
 --- freenx-server-0.7.3/init.d/freenx-server	2008-03-02 11:29:52.000000000 +0100
 +++ freenx-server.svn613.plusfixes/init.d/freenx-server	2009-07-25 22:15:28.000000000 +0200
-@@ -8,21 +8,78 @@
+@@ -8,21 +8,79 @@
  #
  # SVN: $Id$
  #
@@ -49,6 +49,7 @@ diff -Naur freenx-server-0.7.3/init.d/fr
 +	if [ ! -d "/tmp/.X11-unix" ]; then
 +	  mkdir -m1777 /tmp/.X11-unix/
 +	  ret=$?
++	  restorecon /tmp/.X11-unix 2>/dev/null || :
 +	else
 +	  X11_owner=`/bin/ls -ald /tmp/.X11-unix | /bin/gawk {'print $3'}`
 +          if [ "$X11_owner" != "root" ]; then


Index: freenx-server.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx-server/F-10/freenx-server.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- freenx-server.spec	25 Jul 2009 22:55:30 -0000	1.7
+++ freenx-server.spec	31 Jul 2009 19:19:29 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx-server
 Version: 0.7.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
@@ -121,7 +121,7 @@ fi
 %{_sysconfdir}/init.d/freenx-server
 
 %changelog
-* Sat Jul 25 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.7.3-14
+* Fri Jul 31 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.7.3-15
 - Use some patches from up to svn 613 (dated 2008-09-01).
 - Add keymap.patch from Fedora bug #506470.
 - Add cups listing patch from Fedora bug #509879.