rpms/freenx-server/devel freenx-server-r104-fixes.patch, 1.1, 1.2 freenx-server.spec, 1.11, 1.12

athimm athimm at fedoraproject.org
Mon Nov 23 11:59:50 UTC 2009


Author: athimm

Update of /cvs/extras/rpms/freenx-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24132/devel

Modified Files:
	freenx-server-r104-fixes.patch freenx-server.spec 
Log Message:
Fix md5sum hashes.

freenx-server-r104-fixes.patch:
 init.d/freenx-server |  123 +++++++++++++++++++++++++++++++++++----------------
 nxloadconfig         |   32 +++++++++++--
 nxnode               |  110 ++++++++++++++++++++++++++++++++++++++++++---
 nxprint              |    3 -
 nxredir/Makefile     |    3 -
 nxredir/nxsmb        |    5 ++
 nxserver             |   18 +++++++
 7 files changed, 241 insertions(+), 53 deletions(-)

Index: freenx-server-r104-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/freenx-server/devel/freenx-server-r104-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freenx-server-r104-fixes.patch	23 Nov 2009 11:13:03 -0000	1.1
+++ freenx-server-r104-fixes.patch	23 Nov 2009 11:59:50 -0000	1.2
@@ -133,7 +133,7 @@ diff -rud -x .bzr freenx-server/init.d/f
 +exit $?
 diff -rud -x .bzr freenx-server/nxloadconfig freenx-server.fixes/nxloadconfig
 --- freenx-server/nxloadconfig	2009-11-23 10:16:13.103349734 +0100
-+++ freenx-server.fixes/nxloadconfig	2009-11-23 11:02:34.097352098 +0100
++++ freenx-server.fixes/nxloadconfig	2009-11-23 12:54:19.852601780 +0100
 @@ -112,11 +112,28 @@
  
  # Restriction directives
@@ -187,6 +187,15 @@ diff -rud -x .bzr freenx-server/nxloadco
  COMMAND_GDM_X_SESSION="/etc/gdm/Xsession custom"
  if [ ! -x "$COMMAND_GDM_X_SESSION" ]
  then
+@@ -213,7 +235,7 @@
+ COMMAND_SSH=ssh
+ COMMAND_SSH_KEYGEN=ssh-keygen
+ COMMAND_CUPSD=/usr/sbin/cupsd
+-COMMAND_MD5SUM="openssl md5"
++COMMAND_MD5SUM="md5sum"
+ COMMAND_PERL=perl
+ COMMAND_RDESKTOP="rdesktop"
+ COMMAND_VNCVIEWER="vncviewer"
 @@ -357,7 +379,7 @@
  [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
  [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB


Index: freenx-server.spec
===================================================================
RCS file: /cvs/extras/rpms/freenx-server/devel/freenx-server.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- freenx-server.spec	23 Nov 2009 11:13:03 -0000	1.11
+++ freenx-server.spec	23 Nov 2009 11:59:50 -0000	1.12
@@ -7,7 +7,7 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx-server
 Version: 0.7.3
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
@@ -123,10 +123,11 @@ fi
 %{_sysconfdir}/init.d/freenx-server
 
 %changelog
-* Mon Nov 23 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.7.3-16
+* Mon Nov 23 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.7.3-17
 - Rebase to launchpad development bzr code.
 - Add status to init file.
 - Fix persistent session switch.
+- Use md5sum (instead of openssl md5) for consistent hashes.
 
 * Sat Jul 25 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.7.3-14
 - Use some patches from up to svn 613 (dated 2008-09-01).




More information about the scm-commits mailing list